docs(detection): 删除CN_Gather Detection模块Netty通信架构分析文档

- 移除了详细的Netty客户端和服务端组件说明文档
- 删除了WebSocket通信组件的技术细节描述
- 移除了Socket响应处理器和管理工具类的详细分析
- 清理了通信数据对象和流程分析相关内容
- 移除了智能Socket通信机制的技术文档
- 删除了配置管理组件和Spring集成的相关说明

.gitignore

@@ -48,3 +48,8 @@ rebel.xml
 /.fastRequest/collections/Root/Default Group/directory.json
 /.fastRequest/collections/Root/directory.json
 /.fastRequest/config/fastRequestCurrentProjectConfig.json
+
+# 个人工作文档，不与团队共享
+CLAUDE.md
+docs/
+data/

detection/pom.xml

@@ -139,6 +139,12 @@
             <artifactId>report-generator</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <!--激活工具-->
+        <dependency>
+            <groupId>com.njcn.gather</groupId>
+            <artifactId>activate-tool</artifactId>
+            <version>1.0.0</version>
+        </dependency>
     </dependencies>
 
 

detection/src/main/java/com/njcn/gather/detection/controller/PreDetectionController.java

@@ -1,17 +1,27 @@
 package com.njcn.gather.detection.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.LogUtil;
+import com.njcn.gather.detection.lock.DetectionLock;
+import com.njcn.gather.detection.lock.DetectionLockManager;
+import com.njcn.gather.detection.lock.DetectionLockManager.AcquireResult;
+import com.njcn.gather.detection.pojo.enums.DetectionResponseEnum;
 import com.njcn.gather.detection.pojo.param.ContrastDetectionParam;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
 import com.njcn.gather.detection.pojo.param.SimulateDetectionParam;
+import com.njcn.gather.detection.pojo.vo.DetectionLockHolderVO;
 import com.njcn.gather.detection.service.PreDetectionService;
+import com.njcn.gather.detection.util.socket.FormalTestManager;
+import com.njcn.gather.user.user.pojo.po.SysUser;
+import com.njcn.gather.user.user.service.ISysUserService;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.utils.HttpResultUtil;
+import com.njcn.web.utils.RequestUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -32,6 +42,7 @@ import org.springframework.web.bind.annotation.*;
 public class PreDetectionController extends BaseController {
 
     private final PreDetectionService preDetectionService;
+    private final ISysUserService sysUserService;
 
     /**
      * 开始检测通用入口
@@ -42,10 +53,27 @@ public class PreDetectionController extends BaseController {
     @OperateInfo
     @ApiOperation("开始检测")
     @ApiImplicitParam(name = "param", value = "查询参数", required = true)
-    public HttpResult<String> startPreTest(@RequestBody @Validated PreDetectionParam param) {
+    public HttpResult<?> startPreTest(@RequestBody @Validated PreDetectionParam param) {
         String methodDescribe = getMethodDescribe("startPreTest");
-        preDetectionService.sourceCommunicationCheck(param);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        HttpResult<DetectionLockHolderVO> busy = tryAcquireLock(param.getUserPageId());
+        if (busy != null) {
+            return busy;
+        }
+        // 同步阶段抛异常时回滚锁（PLAN_AND_SOURCE_NOT / SOURCE_INFO_NOT 等业务异常会被全局处理器吞掉，
+        // 锁会卡在用户手上直到 4 小时超时，故需 finally 兜底）
+        boolean keepLock = false;
+        try {
+            // 重置 FormalTestManager 暂停计数残留，避免上次暂停残留计数误触发 R4
+            FormalTestManager.stopTime = 0;
+            FormalTestManager.hasStopFlag = false;
+            preDetectionService.sourceCommunicationCheck(param);
+            keepLock = true;
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        } finally {
+            if (!keepLock) {
+                releaseLockSelf("START_PRE_SYNC_FAILED");
+            }
+        }
     }
 
 
@@ -59,8 +87,12 @@ public class PreDetectionController extends BaseController {
     @OperateInfo
     @ApiOperation("源通讯校验")
     @ApiImplicitParam(name = "param", value = "查询参数", required = true)
-    public HttpResult<String> ytxCheckSimulate(@RequestBody @Validated SimulateDetectionParam param) {
+    public HttpResult<?> ytxCheckSimulate(@RequestBody @Validated SimulateDetectionParam param) {
         String methodDescribe = getMethodDescribe("ytxCheckSimulate");
+        HttpResult<DetectionLockHolderVO> busy = requireFreeOrSelf();
+        if (busy != null) {
+            return busy;
+        }
         preDetectionService.ytxCheckSimulate(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
@@ -72,8 +104,12 @@ public class PreDetectionController extends BaseController {
     @OperateInfo
     @ApiOperation("启动")
     @ApiImplicitParam(name = "param", value = "查询参数", required = true)
-    public HttpResult<String> startTestSimulate(@RequestBody @Validated SimulateDetectionParam param) {
+    public HttpResult<?> startTestSimulate(@RequestBody @Validated SimulateDetectionParam param) {
         String methodDescribe = getMethodDescribe("startTestSimulate");
+        HttpResult<DetectionLockHolderVO> busy = requireHolderSelf();
+        if (busy != null) {
+            return busy;
+        }
         preDetectionService.sendScript(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
@@ -85,9 +121,18 @@ public class PreDetectionController extends BaseController {
     @OperateInfo
     @ApiOperation("停止")
     @ApiImplicitParam(name = "param", value = "查询参数", required = true)
-    public HttpResult<String> closeSimulateTest(@RequestBody @Validated SimulateDetectionParam param) {
+    public HttpResult<?> closeSimulateTest(@RequestBody @Validated SimulateDetectionParam param) {
         String methodDescribe = getMethodDescribe("closeSimulateTest");
-        preDetectionService.closeTestSimulate(param);
+        HttpResult<DetectionLockHolderVO> busy = requireHolderSelf();
+        if (busy != null) {
+            return busy;
+        }
+        try {
+            preDetectionService.closeTestSimulate(param);
+        } finally {
+            // 即使业务异常也要释放锁，避免锁残留导致他人无法接手
+            releaseLockSelf("USER_STOP");
+        }
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
@@ -99,8 +144,12 @@ public class PreDetectionController extends BaseController {
     @OperateInfo
     @ApiOperation("系数校验")
     @ApiImplicitParam(name = "param", value = "查询参数", required = true)
-    public HttpResult<String> coefficientCheck(@RequestBody PreDetectionParam param) {
+    public HttpResult<?> coefficientCheck(@RequestBody PreDetectionParam param) {
         String methodDescribe = getMethodDescribe("coefficientCheck");
+        HttpResult<DetectionLockHolderVO> busy = requireHolderSelf();
+        if (busy != null) {
+            return busy;
+        }
         preDetectionService.coefficientCheck(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
@@ -113,8 +162,13 @@ public class PreDetectionController extends BaseController {
     @OperateInfo
     @ApiOperation("暂停检测")
     @ApiImplicitParam(name = "param", value = "参数", required = true)
-    public HttpResult<String> temStopTest() {
+    public HttpResult<?> temStopTest() {
         String methodDescribe = getMethodDescribe("temStopTest");
+        HttpResult<DetectionLockHolderVO> busy = requireHolderSelf();
+        if (busy != null) {
+            return busy;
+        }
+        // 暂停保持锁（spec §2.3），不释放
         preDetectionService.temStopTest();
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
@@ -126,8 +180,12 @@ public class PreDetectionController extends BaseController {
     @OperateInfo
     @ApiOperation("重新开始检测")
     @ApiImplicitParam(name = "param", value = "参数", required = true)
-    public HttpResult<String> restartTemTest(@RequestBody PreDetectionParam param) {
+    public HttpResult<?> restartTemTest(@RequestBody PreDetectionParam param) {
         String methodDescribe = getMethodDescribe("restartTemTest");
+        HttpResult<DetectionLockHolderVO> busy = requireHolderSelf();
+        if (busy != null) {
+            return busy;
+        }
         preDetectionService.restartTemTest(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
@@ -140,10 +198,26 @@ public class PreDetectionController extends BaseController {
     @OperateInfo
     @ApiOperation("开始比对检测")
     @ApiImplicitParam(name = "param", value = "查询参数", required = true)
-    public HttpResult<String> startContrastTest(@RequestBody @Validated ContrastDetectionParam param) {
+    public HttpResult<?> startContrastTest(@RequestBody @Validated ContrastDetectionParam param) {
         String methodDescribe = getMethodDescribe("startContrastTest");
-        preDetectionService.startContrastTest(param);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        // ContrastDetectionParam 无 userPageId 字段，用 loginName 作为会话标识（与 WS 会话 key 一致）
+        HttpResult<DetectionLockHolderVO> busy = tryAcquireLock(param.getLoginName());
+        if (busy != null) {
+            return busy;
+        }
+        // 同步阶段抛异常时回滚锁，理由同 startPreTest
+        boolean keepLock = false;
+        try {
+            FormalTestManager.stopTime = 0;
+            FormalTestManager.hasStopFlag = false;
+            preDetectionService.startContrastTest(param);
+            keepLock = true;
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        } finally {
+            if (!keepLock) {
+                releaseLockSelf("START_CONTRAST_SYNC_FAILED");
+            }
+        }
     }
 
 
@@ -155,4 +229,105 @@ public class PreDetectionController extends BaseController {
         LogUtil.njcnDebug(log, "{}", methodDescribe);
         preDetectionService.exportAlignData();
     }
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @GetMapping("/canCoefficient")
+    @ApiOperation("比对模式是否能够进行系数校验")
+    public HttpResult<Boolean> canCoefficient() {
+        String methodDescribe = getMethodDescribe("canCoefficient");
+        LogUtil.njcnDebug(log, "{}", methodDescribe);
+
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, preDetectionService.getCanCoefficient(), methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @GetMapping("/startCoefficient")
+    @ApiOperation("比对模式开启系数校验")
+    public HttpResult<?> startCoefficient() {
+        String methodDescribe = getMethodDescribe("startCoefficient");
+        LogUtil.njcnDebug(log, "{}", methodDescribe);
+        HttpResult<DetectionLockHolderVO> busy = requireHolderSelf();
+        if (busy != null) {
+            return busy;
+        }
+        preDetectionService.startCoefficient();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    // ============ 检测互斥锁辅助方法 ============
+
+    /** 抢锁入口（startPreTest / startContrastTest 用）。
+     *  抢到→null；被他人持有或竞态失败→返回 busy 响应；
+     *  使用方：拿到非 null 返回值直接 return 给上层。 */
+    private HttpResult<DetectionLockHolderVO> tryAcquireLock(String userPageId) {
+        String userId = RequestUtil.getUserId();
+        AcquireResult r = DetectionLockManager.getInstance()
+                .tryAcquire(userId, resolveDisplayName(userId), userPageId);
+        if (r.isOk()) {
+            return null;
+        }
+        return HttpResultUtil.assembleResult(
+                DetectionResponseEnum.DETECTION_BUSY.getCode(),
+                r.getHolder(),
+                DetectionResponseEnum.DETECTION_BUSY.getMessage());
+    }
+
+    /** 中间接口校验：要求当前 holder == 自己。
+     *  空闲 → 返回 busy data=null（"请先开始检测"语义）；
+     *  他人持有 → 返回 busy + holder；
+     *  自己持有 → 返回 null（放行）。 */
+    private HttpResult<DetectionLockHolderVO> requireHolderSelf() {
+        DetectionLock cur = DetectionLockManager.getInstance().getCurrent();
+        String me = RequestUtil.getUserId();
+        if (cur != null && me.equals(cur.getUserId())) {
+            return null;
+        }
+        DetectionLockHolderVO holder = cur == null ? null : DetectionLockManager.toHolderVO(cur);
+        return HttpResultUtil.assembleResult(
+                DetectionResponseEnum.DETECTION_BUSY.getCode(),
+                holder,
+                DetectionResponseEnum.DETECTION_BUSY.getMessage());
+    }
+
+    /** 辅助接口规则（ytxCheckSimulate）：锁空闲 → 放行；他人持有 → busy；自己持有 → 放行。 */
+    private HttpResult<DetectionLockHolderVO> requireFreeOrSelf() {
+        DetectionLock cur = DetectionLockManager.getInstance().getCurrent();
+        if (cur == null) {
+            return null;
+        }
+        String me = RequestUtil.getUserId();
+        if (me.equals(cur.getUserId())) {
+            return null;
+        }
+        return HttpResultUtil.assembleResult(
+                DetectionResponseEnum.DETECTION_BUSY.getCode(),
+                DetectionLockManager.toHolderVO(cur),
+                DetectionResponseEnum.DETECTION_BUSY.getMessage());
+    }
+
+    /** 释放锁（用户主动终止）。 */
+    private void releaseLockSelf(String reason) {
+        DetectionLockManager.getInstance().releaseIfHeldBy(RequestUtil.getUserId(), reason);
+    }
+
+    /** 解析展示给前端的用户名（昵称优先，loginName 兜底，避免 BUSY 弹窗显示 "unknown user"）。 */
+    private String resolveDisplayName(String userId) {
+        if (StrUtil.isBlank(userId)) {
+            return "";
+        }
+        try {
+            SysUser user = sysUserService.getById(userId);
+            if (user != null && StrUtil.isNotBlank(user.getName())) {
+                return user.getName();
+            }
+            if (user != null && StrUtil.isNotBlank(user.getLoginName())) {
+                return user.getLoginName();
+            }
+        } catch (Exception e) {
+            log.warn("解析检测锁持有者昵称失败，userId={}", userId, e);
+        }
+        // 最终兜底：用 token 里的 loginName，不要返回 "unknown user"
+        String loginName = RequestUtil.getLoginNameByToken();
+        return StrUtil.isNotBlank(loginName) ? loginName : userId;
+    }
 }

detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.njcn.gather.detection.lock.DetectionLockManager;
 import com.njcn.gather.detection.pojo.dto.DevXiNumData;
 import com.njcn.gather.detection.pojo.enums.DetectionCodeEnum;
 import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum;
@@ -33,6 +34,7 @@ import com.njcn.gather.script.pojo.param.PqScriptIssueParam;
 import com.njcn.gather.script.pojo.po.SourceIssue;
 import com.njcn.gather.script.service.IPqScriptCheckDataService;
 import com.njcn.gather.script.service.IPqScriptDtlsService;
+import com.njcn.gather.source.service.IPqSourceService;
 import com.njcn.gather.storage.pojo.param.StorageParam;
 import com.njcn.gather.storage.pojo.po.SimAndDigHarmonicResult;
 import com.njcn.gather.storage.pojo.po.SimAndDigNonHarmonicResult;
@@ -76,6 +78,7 @@ public class SocketDevResponseService {
     private final SimAndDigHarmonicService adHarmonicService;
     private final IAdPlanService adPlanService;
     private final IDictDataService dictDataService;
+    private final IPqSourceService pqSourceService;
 
     /**
      * 存储的装置相序数据
@@ -391,6 +394,7 @@ public class SocketDevResponseService {
         if (param.getTestItemList().get(2)) {
             //如果后续做正式检测
             PqScriptIssueParam issueParam = new PqScriptIssueParam();
+            issueParam.setSourceId(param.getSourceName());
             issueParam.setPlanId(param.getPlanId());
             issueParam.setSourceId(param.getSourceId());
             issueParam.setDevIds(param.getDevIds());
@@ -439,6 +443,7 @@ public class SocketDevResponseService {
 
             //告诉前端当前项开始了
             WebSocketVO<Object> webSocketVO = new WebSocketVO<>();
+            FormalTestManager.currentIssue = sourceIssues.get(0);
             String type = sourceIssues.get(0).getType();
             if (ResultUnitEnum.P.getCode().equals(type)) {
                 sourceIssues.get(0).setType(ResultUnitEnum.V_ABSOLUTELY.getCode());
@@ -612,7 +617,7 @@ public class SocketDevResponseService {
 
     private void assemblyEntity(List<DevData> deList, DevXiNumData.F F, DevXiNumData.GF startF, CoefficientVO coefficientVO, CoefficientVO.DevParameter devParameter) {
         //表示接收完成,必须保证3个数
-        if (deList.size() >= 3) {
+        if (deList.size() >= 7) {
             List<Double> aList = deList.stream().map(it -> it.getSqlData().get(0).getList().getA()).collect(Collectors.toList());
             List<Double> bList = deList.stream().map(it -> it.getSqlData().get(0).getList().getB()).collect(Collectors.toList());
             List<Double> cList = deList.stream().map(it -> it.getSqlData().get(0).getList().getC()).collect(Collectors.toList());
@@ -687,7 +692,7 @@ public class SocketDevResponseService {
      */
     private Double reduceList(List<Double> valList) {
         // valList.subList(0, 5).clear();
-        // valList.subList(valList.size() - 3, valList.size() - 1).clear();
+        valList.subList(valList.size() - 2, valList.size()).clear();
         return valList.stream().mapToDouble(Double::doubleValue).average().getAsDouble();
     }
 
@@ -893,7 +898,7 @@ public class SocketDevResponseService {
                             //开始下源控制脚本
                             PqScriptIssueParam issueParam = new PqScriptIssueParam();
                             issueParam.setPlanId(param.getPlanId());
-                            issueParam.setSourceId(param.getSourceId());
+                            issueParam.setSourceId(param.getSourceName());
                             issueParam.setDevIds(param.getDevIds());
                             issueParam.setScriptId(param.getScriptId());
 
@@ -953,6 +958,7 @@ public class SocketDevResponseService {
                                 } else {
                                     webSocketVO.setRequestId(sourceIssues.get(0).getType() + CnSocketUtil.START_TAG);
                                 }
+                                FormalTestManager.currentIssue = sourceIssues.get(0);
                                 socketMsg.setData(JSON.toJSONString(sourceIssues.get(0)));
                                 socketMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue() + CnSocketUtil.STEP_TAG + type);
                                 socketMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue());
@@ -1160,8 +1166,8 @@ public class SocketDevResponseService {
                             } else if (param.getTestItemList().get(2)) {
                                 // 后续做正式检测
                                 PqScriptIssueParam issueParam = new PqScriptIssueParam();
+                                issueParam.setSourceId(param.getSourceName());
                                 issueParam.setPlanId(param.getPlanId());
-                                issueParam.setSourceId(param.getSourceId());
                                 issueParam.setDevIds(param.getDevIds());
                                 issueParam.setScriptId(param.getScriptId());
 
@@ -1210,6 +1216,7 @@ public class SocketDevResponseService {
                                 } else {
                                     webSocketVO.setRequestId(sourceIssues.get(0).getType() + CnSocketUtil.START_TAG);
                                 }
+                                FormalTestManager.currentIssue = sourceIssues.get(0);
                                 socketMsg.setData(JSON.toJSONString(sourceIssues.get(0)));
                                 socketMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue() + CnSocketUtil.STEP_TAG + type);
                                 socketMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue());
@@ -1371,8 +1378,11 @@ public class SocketDevResponseService {
                             checkDataParam.setIsValueTypeName(false);
                             List<String> valueType = iPqScriptCheckDataService.getValueType(checkDataParam);
 
-                            iPqDevService.updateResult(param.getDevIds(), valueType, param.getCode(), param.getUserId(), param.getTemperature(), param.getHumidity());
+                            iPqDevService.updateResult(param.getDevIds(), valueType, param.getCode(), param.getUserId(), param.getTemperature(), param.getHumidity(), true);
                             CnSocketUtil.quitSend(param);
+                            // 数模式检测全部小项完成 → 释放锁，避免用户必须点"停止"才能让出
+                            DetectionLockManager.getInstance()
+                                    .releaseIfMatchPage(param.getUserPageId(), "DEV_TEST_FINISHED");
                         }
                         successComm.clear();
                         FormalTestManager.realDataXiList.clear();
@@ -1782,6 +1792,7 @@ public class SocketDevResponseService {
         } else {
             dataRule = DictDataEnum.SECTION_VALUE;
         }
+        FormalTestManager.currentTestPlan = plan;
 
         String code = dictDataService.getDictDataById(plan.getPattern()).getCode();
         FormalTestManager.patternEnum = PatternEnum.getEnum(code);
@@ -1812,8 +1823,8 @@ public class SocketDevResponseService {
         XiNumberManager.devParameterList.add(devParameterSmall);
 
         PqScriptIssueParam issueParam = new PqScriptIssueParam();
+        issueParam.setSourceId(param.getSourceName());
         issueParam.setPlanId(param.getPlanId());
-        issueParam.setSourceId(param.getSourceId());
         issueParam.setDevIds(param.getDevIds());
         issueParam.setScriptId(param.getScriptId());
         issueParam.setIsPhaseSequence(CommonEnum.COEFFICIENT_TEST.getValue());

detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java

@@ -2,6 +2,7 @@ package com.njcn.gather.detection.handler;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum;
 import com.njcn.gather.detection.pojo.enums.SourceResponseCodeEnum;
 import com.njcn.gather.detection.pojo.param.DevPhaseSequenceParam;
@@ -14,7 +15,12 @@ import com.njcn.gather.detection.util.socket.*;
 import com.njcn.gather.detection.util.socket.websocket.WebServiceManager;
 import com.njcn.gather.device.pojo.vo.PreDetection;
 import com.njcn.gather.device.service.IPqDevService;
+import com.njcn.gather.plan.pojo.po.AdPlanSource;
+import com.njcn.gather.plan.service.IAdPlanSourceService;
+import com.njcn.gather.result.pojo.enums.ResultUnitEnum;
 import com.njcn.gather.script.pojo.po.SourceIssue;
+import com.njcn.gather.source.pojo.po.SourceInitialize;
+import com.njcn.gather.source.service.IPqSourceService;
 import com.njcn.gather.system.pojo.enums.DicDataEnum;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -56,6 +62,8 @@ public class SocketSourceResponseService {
      * 设备信息服务，提供设备基础信息查询功能
      */
     private final IPqDevService iPqDevService;
+    private final IAdPlanSourceService adPlanSourceService;
+    private final IPqSourceService pqSourceService;
 
     /**
      * Socket连接管理器，负责管理设备和源的Socket连接
@@ -334,9 +342,9 @@ public class SocketSourceResponseService {
                     // 系数校验固定检测项：实时电压有效值和实时电流有效值
                     phaseSequenceParam.setDataType(Arrays.asList("real$VRMS", "real$IRMS"));
                     // 读取3次数据用于系数计算
-                    phaseSequenceParam.setReadCount(3);
+                    phaseSequenceParam.setReadCount(7); //3
                     // 忽略前4次数据，等待测量稳定
-                    phaseSequenceParam.setIgnoreCount(4);
+                    phaseSequenceParam.setIgnoreCount(3); //4
                     socketMsg.setData(JSON.toJSONString(phaseSequenceParam));
                     SocketManager.sendMsg(s, JSON.toJSONString(socketMsg));
 
@@ -363,18 +371,32 @@ public class SocketSourceResponseService {
             SocketMsg<String> socketMsg = new SocketMsg<>();
             switch (dictDataEnumByCode) {
                 case SUCCESS:
-                    //todo 前端推送收到的消息暂未处理好
-                    sendWebSocketMessage(param.getUserPageId(), socketDataMsg);
-                    //开始设备通讯检测(发送设备初始化)
-                    Map<String, List<PreDetection>> map = new HashMap<>(1);
-                    map.put("deviceList", FormalTestManager.devList);
-                    String jsonString = JSON.toJSONString(map);
-                    socketMsg.setRequestId(SourceOperateCodeEnum.YJC_SBTXJY.getValue());
-                    socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_INIT_GATHER_01.getValue());
-                    socketMsg.setData(jsonString);
-                    String json = JSON.toJSONString(socketMsg);
-                    // 使用智能发送工具类，自动管理设备连接
-                    socketManager.smartSendToDevice(param, json);
+                    if (FormalTestManager.unknownError) {
+                        FormalTestManager.unknownError = false;
+
+                        //重新下发脚本
+                        String type = FormalTestManager.currentIssue.getType();
+                        if (ResultUnitEnum.P.getCode().equals(type)) {
+                            FormalTestManager.currentIssue.setType(ResultUnitEnum.V_ABSOLUTELY.getCode());
+                        }
+                        socketMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue());
+                        socketMsg.setData(JSON.toJSONString(FormalTestManager.currentIssue));
+                        socketMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue() + CnSocketUtil.STEP_TAG + type);
+                        SocketManager.sendMsg(param.getUserPageId() + CnSocketUtil.SOURCE_TAG, JSON.toJSONString(socketMsg));
+                    } else {
+                        //todo 前端推送收到的消息暂未处理好
+                        sendWebSocketMessage(param.getUserPageId(), socketDataMsg);
+                        //开始设备通讯检测(发送设备初始化)
+                        Map<String, List<PreDetection>> map = new HashMap<>(1);
+                        map.put("deviceList", FormalTestManager.devList);
+                        String jsonString = JSON.toJSONString(map);
+                        socketMsg.setRequestId(SourceOperateCodeEnum.YJC_SBTXJY.getValue());
+                        socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_INIT_GATHER_01.getValue());
+                        socketMsg.setData(jsonString);
+                        String json = JSON.toJSONString(socketMsg);
+                        // 使用智能发送工具类，自动管理设备连接
+                        socketManager.smartSendToDevice(param, json);
+                    }
                     break;
                 case UNPROCESSED_BUSINESS:
                     sendWebSocketMessage(param.getUserPageId(), socketDataMsg);
@@ -570,6 +592,10 @@ public class SocketSourceResponseService {
                 case UNPROCESSED_BUSINESS:
                     sendWebSocketMessage(param.getUserPageId(), socketDataMsg);
                     break;
+                case UNKNOWN_ERROR: //-1源未知异常
+                    CnSocketUtil.quitSendSource(param);
+                    FormalTestManager.unknownError = true;
+                    break;
                 default:
                     sendErrorAndQuit(param, socketDataMsg, dictDataEnumByCode);
                     break;
@@ -601,9 +627,23 @@ public class SocketSourceResponseService {
         SourceResponseCodeEnum dictDataEnumByCode = SourceResponseCodeEnum.getDictDataEnumByCode(socketDataMsg.getCode());
         switch (Objects.requireNonNull(dictDataEnumByCode)) {
             case SUCCESS:
-                //通讯校验成功
-                SocketManager.removeUser(param.getUserPageId() + CnSocketUtil.SOURCE_TAG);
-                sendWebSocketMessage(param.getUserPageId(), socketDataMsg);
+                if (FormalTestManager.unknownError) {
+                    //获取源初始化参数
+                    AdPlanSource planSource = adPlanSourceService.getOne(new LambdaQueryWrapper<AdPlanSource>().eq(AdPlanSource::getPlanId, param.getPlanId()));
+                    SourceInitialize sourceParam = pqSourceService.getSourceInitializeParam(planSource.getSourceId());
+                    if (ObjectUtil.isNotNull(sourceParam)) {
+                        SocketMsg<String> socketMsg1 = new SocketMsg<>();
+                        socketMsg1.setRequestId(SourceOperateCodeEnum.YJC_YTXJY.getValue());
+                        socketMsg1.setOperateCode(SourceOperateCodeEnum.INIT_GATHER.getValue());
+                        socketMsg1.setData(JSON.toJSONString(sourceParam));
+                        //使用智能发送工具类，自动管理与源控程序的socket连接
+                        socketManager.smartSendToSource(param, JSON.toJSONString(socketMsg1));
+                    }
+                } else {
+                    //通讯校验成功
+                    SocketManager.removeUser(param.getUserPageId() + CnSocketUtil.SOURCE_TAG);
+                    sendWebSocketMessage(param.getUserPageId(), socketDataMsg);
+                }
                 break;
             case UNPROCESSED_BUSINESS:
                 break;
@@ -653,6 +693,8 @@ public class SocketSourceResponseService {
 
         // 同步更新系数管理器中的设备列表
         XiNumberManager.xiDevList = devList;
+        FormalTestManager.unknownError = false;
+        FormalTestManager.currentIssue = null;
     }
 
 }

detection/src/main/java/com/njcn/gather/detection/lock/DetectionLock.java

@@ -0,0 +1,29 @@
+package com.njcn.gather.detection.lock;
+
+/**
+ * 检测互斥锁对象（不可变）。
+ * 字段含义见 docs/superpowers/specs/2026-05-28-单用户检测互斥-design.md §2.1
+ */
+public final class DetectionLock {
+
+    private final String userId;
+    private final String userName;
+    private final String userPageId;
+    private final long acquireTime;
+    private final long expireAt;
+
+    public DetectionLock(String userId, String userName, String userPageId,
+                         long acquireTime, long expireAt) {
+        this.userId = userId;
+        this.userName = userName;
+        this.userPageId = userPageId;
+        this.acquireTime = acquireTime;
+        this.expireAt = expireAt;
+    }
+
+    public String getUserId()      { return userId; }
+    public String getUserName()    { return userName; }
+    public String getUserPageId()  { return userPageId; }
+    public long   getAcquireTime() { return acquireTime; }
+    public long   getExpireAt()    { return expireAt; }
+}

detection/src/main/java/com/njcn/gather/detection/lock/DetectionLockManager.java

@@ -0,0 +1,134 @@
+package com.njcn.gather.detection.lock;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+import com.njcn.gather.detection.pojo.vo.DetectionLockHolderVO;
+
+/**
+ * 检测互斥锁管理器（进程内单例）。
+ * 详细设计：docs/superpowers/specs/2026-05-28-单用户检测互斥-design.md
+ */
+@Slf4j
+public final class DetectionLockManager {
+
+    private static final long LOCK_MAX_HOLD_MS = TimeUnit.HOURS.toMillis(4);
+
+    private static final DetectionLockManager INSTANCE = new DetectionLockManager();
+
+    public static DetectionLockManager getInstance() {
+        return INSTANCE;
+    }
+
+    private final AtomicReference<DetectionLock> current = new AtomicReference<>(null);
+
+    private DetectionLockManager() {}
+
+    /** 抢锁。同账号视为重入（刷新 page/expireAt）。 */
+    public AcquireResult tryAcquire(String userId, String userName, String userPageId) {
+        for (int attempt = 0; attempt < 2; attempt++) {
+            DetectionLock cur = current.get();
+            long now = System.currentTimeMillis();
+            // 空闲 或 绝对超时已过 → 直接抢
+            if (cur == null || now > cur.getExpireAt()) {
+                DetectionLock fresh = new DetectionLock(userId, userName, userPageId, now, now + LOCK_MAX_HOLD_MS);
+                if (current.compareAndSet(cur, fresh)) {
+                    log.info("DetectionLock acquired by userId={}, userName={}, userPageId={}", userId, userName, userPageId);
+                    return AcquireResult.ok();
+                }
+                continue;  // CAS 失败重试
+            }
+            // 同账号重入 → 刷新
+            if (userId.equals(cur.getUserId())) {
+                DetectionLock refreshed = new DetectionLock(userId, userName, userPageId, now, now + LOCK_MAX_HOLD_MS);
+                if (current.compareAndSet(cur, refreshed)) {
+                    log.debug("DetectionLock reentered by userId={}, new userPageId={}", userId, userPageId);
+                    return AcquireResult.ok();
+                }
+                continue;
+            }
+            // 被他人持有
+            return AcquireResult.busy(toHolderVO(cur));
+        }
+        // 两次 CAS 都失败属于罕见高并发场景：绝不返回 ok()（那样会让调用方误以为持锁）。
+        // 返回 busy，data 可能为 null（锁刚被释放）；调用方/前端按"请重试"处理。
+        DetectionLock cur = current.get();
+        return AcquireResult.busy(cur == null ? null : toHolderVO(cur));
+    }
+
+    /** 仅当 holder.userId == userId 才释放（幂等）。
+     *  循环终止性：每轮 CAS 失败意味着 current 被其他线程改写；
+     *  下一轮 get 后 cur 可能变成 null 或不再匹配 userId，命中前置 return 退出。
+     *  唯一可能继续的情况是另一线程把它换成了同 userId 的新 lock，下一轮 CAS 会再次尝试；
+     *  最坏情况下 CAS 成功，仍然终止。 */
+    public void releaseIfHeldBy(String userId, String reason) {
+        while (true) {
+            DetectionLock cur = current.get();
+            if (cur == null || !cur.getUserId().equals(userId)) return;
+            if (current.compareAndSet(cur, null)) {
+                log.info("DetectionLock released, reason={}, userId={}", reason, userId);
+                return;
+            }
+        }
+    }
+
+    /** 仅当 holder.userPageId == userPageId 才释放（幂等）。终止性同 releaseIfHeldBy。 */
+    public void releaseIfMatchPage(String userPageId, String reason) {
+        while (true) {
+            DetectionLock cur = current.get();
+            if (cur == null || !cur.getUserPageId().equals(userPageId)) return;
+            if (current.compareAndSet(cur, null)) {
+                log.info("DetectionLock released, reason={}, userPageId={}", reason, userPageId);
+                return;
+            }
+        }
+    }
+
+    /** 管理员强制释放，不校验 holder。 */
+    public void forceRelease(String operatorUserId, String reason) {
+        DetectionLock cur = current.getAndSet(null);
+        if (cur != null) {
+            log.warn("DetectionLock force-released by operator={}, victim userId={}, reason={}",
+                    operatorUserId, cur.getUserId(), reason);
+        }
+    }
+
+    /** 返回当前 holder 快照；返回 null 表示空闲。 */
+    public DetectionLock getCurrent() {
+        DetectionLock cur = current.get();
+        // 顺手做惰性超时回收（spec R5）
+        if (cur != null && System.currentTimeMillis() > cur.getExpireAt()) {
+            current.compareAndSet(cur, null);
+            return null;
+        }
+        return cur;
+    }
+
+    /** 把 DetectionLock 转成给前端的 VO。 */
+    public static DetectionLockHolderVO toHolderVO(DetectionLock lock) {
+        DetectionLockHolderVO vo = new DetectionLockHolderVO();
+        vo.setHolderUserId(lock.getUserId());
+        vo.setHolderUserName(lock.getUserName());
+        vo.setAcquireTime(new Date(lock.getAcquireTime()));
+        vo.setExpireAt(new Date(lock.getExpireAt()));
+        return vo;
+    }
+
+    /** 抢锁结果。 */
+    public static final class AcquireResult {
+        private final boolean ok;
+        private final DetectionLockHolderVO holder;
+
+        private AcquireResult(boolean ok, DetectionLockHolderVO holder) {
+            this.ok = ok;
+            this.holder = holder;
+        }
+        public static AcquireResult ok() { return new AcquireResult(true, null); }
+        public static AcquireResult busy(DetectionLockHolderVO holder) { return new AcquireResult(false, holder); }
+        public boolean isOk() { return ok; }
+        public DetectionLockHolderVO getHolder() { return holder; }
+    }
+}

detection/src/main/java/com/njcn/gather/detection/pojo/enums/DetectionResponseEnum.java

@@ -19,7 +19,8 @@ public enum DetectionResponseEnum {
 
 
     SCRIPT_CHECK_DATA_NOT_EXIST("A020040","测试脚本项暂无配置" ),
-    EXCEED_MAX_TIME("A020041","检测次数超出最大限制！" );
+    EXCEED_MAX_TIME("A020041","检测次数超出最大限制！" ),
+    DETECTION_BUSY("A020042", "检测进行中");
 
     private final String code;
     private final String message;

detection/src/main/java/com/njcn/gather/detection/pojo/enums/SourceOperateCodeEnum.java

@@ -67,6 +67,8 @@ public enum SourceOperateCodeEnum {
     SERVER_ERROR("server_error","服务端主动关闭连接,请稍后再试"),
     DEVICE_ERROR("device_error","设备主动关闭连接,请稍后再试"),
 
+    FLICKER_DATA_CHECK("flicker_data_check","闪变数据校验"),
+
 
 
 

detection/src/main/java/com/njcn/gather/detection/pojo/enums/SourceResponseCodeEnum.java

@@ -42,8 +42,9 @@ public enum SourceResponseCodeEnum {
     FAIL(25002,"失败"),
     ALL_FAIL(25003,"校验失败"),
     RECEIVE_DATA_TIME_OUT(25004,"接收数据超时"),
-    REAL_DATA_CHECK_FAIL(25005,"实时数据校验失败"),
-    STATISTICS_DATA_CHECK_FAIL(25006,"统计数据校验失败")
+    REAL_DATA_CHECK_FAIL(25005,"实时数据不符合"),
+    STATISTICS_DATA_CHECK_FAIL(25006,"统计数据不符合"),
+    FLICKER_DATA_START(25007,"开始接收闪变数据")
 
 
 

detection/src/main/java/com/njcn/gather/detection/pojo/param/ContrastDetectionParam.java

@@ -43,4 +43,9 @@ public class ContrastDetectionParam {
     private List<Boolean> testItemList;
 
     private String userId;
+
+    /**
+     * 是否进行相许校验
+     */
+    private Integer phaseCheck;
 }

detection/src/main/java/com/njcn/gather/detection/pojo/param/PreDetectionParam.java

@@ -46,6 +46,11 @@ public class PreDetectionParam {
      */
     private String sourceId;
 
+    /**
+     * 源名称
+     */
+    private String sourceName;
+
     /**
      * 所属误差体系
      */

detection/src/main/java/com/njcn/gather/detection/pojo/vo/DetectionData.java

@@ -53,4 +53,9 @@ public class DetectionData {
      * 误差体系详情ID(比对式使用)
      */
     private String errorDtlId;
+
+    /**
+     * 有效组数
+     */
+    private Integer validGroupNum;
 }

detection/src/main/java/com/njcn/gather/detection/pojo/vo/DetectionLockHolderVO.java

@@ -0,0 +1,22 @@
+package com.njcn.gather.detection.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 检测锁持有者信息，用于在抢锁失败响应中返回给前端。
+ */
+@Data
+public class DetectionLockHolderVO {
+
+    private String holderUserId;
+    private String holderUserName;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date acquireTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date expireAt;
+}

detection/src/main/java/com/njcn/gather/detection/service/PreDetectionService.java

@@ -4,6 +4,7 @@ import com.njcn.gather.detection.pojo.param.ContrastDetectionParam;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
 import com.njcn.gather.detection.pojo.param.SimulateDetectionParam;
 
+import java.util.List;
 import java.util.Map;
 
 
@@ -63,4 +64,8 @@ public interface PreDetectionService {
      * 导出实时数据对齐过程中的数据
      */
     void exportAlignData();
+
+    boolean getCanCoefficient();
+
+    void startCoefficient();
 }

detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java

@@ -21,6 +21,8 @@ import com.njcn.gather.detection.util.business.DetectionCommunicateUtil;
 import com.njcn.gather.detection.util.socket.CnSocketUtil;
 import com.njcn.gather.detection.util.socket.FormalTestManager;
 import com.njcn.gather.detection.util.socket.SocketManager;
+import com.njcn.gather.detection.util.socket.XiNumberManager;
+import com.njcn.gather.detection.util.socket.cilent.NettyContrastClientHandler;
 import com.njcn.gather.detection.util.socket.websocket.WebServiceManager;
 import com.njcn.gather.device.pojo.po.PqDev;
 import com.njcn.gather.device.pojo.vo.PreDetection;
@@ -38,6 +40,8 @@ import com.njcn.gather.script.service.IPqScriptCheckDataService;
 import com.njcn.gather.script.service.IPqScriptDtlsService;
 import com.njcn.gather.source.pojo.po.SourceInitialize;
 import com.njcn.gather.source.service.IPqSourceService;
+import com.njcn.gather.system.cfg.service.ISysTestConfigService;
+import com.njcn.gather.system.config.PathConfig;
 import com.njcn.gather.system.dictionary.pojo.enums.DictDataEnum;
 import com.njcn.gather.system.dictionary.service.IDictDataService;
 import com.njcn.web.utils.HttpServletUtil;
@@ -50,6 +54,7 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -75,9 +80,12 @@ public class PreDetectionServiceImpl implements PreDetectionService {
     private final SocketContrastResponseService socketContrastResponseService;
     private final IPqScriptCheckDataService iPqScriptCheckDataService;
     private final SocketManager socketManager;
+    private final ISysTestConfigService sysTestConfigService;
 
-    @Value("${log.homeDir}")
-    private String alignDataFilePath;
+
+//    @Value("${report.reportDir}")
+//    private String alignDataFilePath;
+    private final PathConfig pathConfig;
 
 
     @Override
@@ -130,6 +138,7 @@ public class PreDetectionServiceImpl implements PreDetectionService {
         );
         if (ObjectUtil.isNotNull(planSource)) {
             SourceInitialize sourceParam = pqSourceService.getSourceInitializeParam(planSource.getSourceId());
+            param.setSourceName(sourceParam.getSourceId());
             if (ObjectUtil.isNotNull(sourceParam)) {
                 //开始组装socket报文请求头
                 socketDevResponseService.initList(param);
@@ -176,6 +185,7 @@ public class PreDetectionServiceImpl implements PreDetectionService {
         if (ObjectUtil.isNotNull(planSource)) {
             //获取源初始化参数
             SourceInitialize sourceParam = pqSourceService.getSourceInitializeParam(planSource.getSourceId());
+            param.setSourceName(sourceParam.getSourceId());
             if (ObjectUtil.isNotNull(sourceParam)) {
                 //开始组装socket报文请求头
                 socketDevResponseService.initList(param);
@@ -238,6 +248,8 @@ public class PreDetectionServiceImpl implements PreDetectionService {
         FormalTestManager.stopFlag = false;
         socketDevResponseService.initRestart();
         List<SourceIssue> sourceIssueList = SocketManager.getSourceList();
+        SourceInitialize sourceInitialize = pqSourceService.getSourceInitializeParam(param.getSourceId());
+        param.setSourceName(sourceInitialize.getSourceId());
         if (CollUtil.isNotEmpty(sourceIssueList)) {
             SourceIssue sourceIssues = SocketManager.getSourceList().get(0);
             SocketMsg<String> xuMsg = new SocketMsg<>();
@@ -253,7 +265,7 @@ public class PreDetectionServiceImpl implements PreDetectionService {
             checkDataParam.setIsValueTypeName(false);
             List<String> adType = iPqScriptCheckDataService.getValueType(checkDataParam);
 
-            iPqDevService.updateResult(param.getDevIds(), adType, param.getCode(), param.getUserId(), param.getTemperature(), param.getHumidity());
+            iPqDevService.updateResult(param.getDevIds(), adType, param.getCode(), param.getUserId(), param.getTemperature(), param.getHumidity(), true);
             CnSocketUtil.quitSend(param);
         }
 
@@ -284,7 +296,8 @@ public class PreDetectionServiceImpl implements PreDetectionService {
         }
         //组装源控制脚本
         PqScriptIssueParam issueParam = new PqScriptIssueParam();
-        issueParam.setSourceId(param.getSourceId());
+        SourceInitialize sourceInitialize = pqSourceService.getSourceInitializeParam(param.getSourceId());
+        issueParam.setSourceId(sourceInitialize.getSourceId());
         issueParam.setScriptId(param.getScriptId());
         issueParam.setType(1);
         issueParam.setIsPhaseSequence(SourceOperateCodeEnum.SIMULATE_TEST.getValue());
@@ -337,13 +350,13 @@ public class PreDetectionServiceImpl implements PreDetectionService {
 
     @Override
     public void exportAlignData() {
-        String fileName = "实时数据.xlsx";
+        String fileName = "对齐数据.xlsx";
         HttpServletResponse response = HttpServletUtil.getResponse();
         response.reset();
         response.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "\"");
         response.setContentType("application/octet-stream;charset=UTF-8");
         try {
-            InputStream inputStream = new FileInputStream(alignDataFilePath + "\\" + fileName);
+            InputStream inputStream = new FileInputStream(pathConfig.getDataPath() + File.separator + fileName);
             byte[] buffer = new byte[1024];
             int len = 0;
             ServletOutputStream outputStream = response.getOutputStream();
@@ -358,6 +371,36 @@ public class PreDetectionServiceImpl implements PreDetectionService {
         }
     }
 
+    @Override
+    public boolean getCanCoefficient() {
+        return CollUtil.isNotEmpty(DetectionServiceImpl.vAndIResultMap);
+    }
+
+    @Override
+    public void startCoefficient() {
+        if (CollUtil.isNotEmpty(DetectionServiceImpl.vAndIResultMap)) {
+            // 是否进行系数校准
+            //万一录波了这里就进不来了，但是在误差处理的时候DetectionServiceImpl.vAndIResultMap该集合会保留不符合的结果
+
+            XiNumberManager.xiDevList.clear();
+            XiNumberManager.devXiNumDataMap.clear();
+            List<String> stdIpList = DetectionServiceImpl.vAndIResultMap.values().stream().map(DetectionServiceImpl.VAndIResult::getIp).collect(Collectors.toList());
+            XiNumberManager.xiDevList = FormalTestManager.standardDevList.stream().filter(d -> stdIpList.contains(d.getDevIP())).collect(Collectors.toList());
+            // 逐一设备向通讯模块要原始系数
+            SocketMsg<String> socketMsg = new SocketMsg<>();
+            socketMsg.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue());
+            socketMsg.setOperateCode(SourceOperateCodeEnum.DATA_CHNFACTOR$01.getValue());
+            PreDetection preDetection = XiNumberManager.xiDevList.get(0);
+            Map<String, Object> map = new HashMap<>();
+            map.put("devIP", preDetection.getDevIP());
+            map.put("chnNum", preDetection.getDevChns());
+            socketMsg.setData(JSON.toJSONString(map));
+            SocketManager.sendMsg(NettyContrastClientHandler.param.getUserPageId() + CnSocketUtil.CONTRAST_DEV_TAG, JSON.toJSONString(socketMsg));
+
+            FormalTestManager.currentStep = SourceOperateCodeEnum.Coefficient_Check;
+        }
+    }
+
     /**
      * 比对式-与通信模块进行连接
      *

detection/src/main/java/com/njcn/gather/detection/util/DetectionUtil.java

@@ -1,6 +1,7 @@
 package com.njcn.gather.detection.util;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.njcn.gather.detection.pojo.po.DevData;
 import lombok.extern.slf4j.Slf4j;
@@ -421,7 +422,7 @@ public class DetectionUtil {
             }
             return newList;
         }
-        return null;
+        return Collections.emptyList();
     }
 
     /**
@@ -437,4 +438,94 @@ public class DetectionUtil {
             System.out.println("  文件大小: " + file.length() + " bytes");
         }
     }
+
+    /**
+     * 获取皮尔逊系数
+     *
+     * <p>相关系数绝对值|r|所代表的相关强度</p>
+     * <ul>
+     *     <li>0.8 - 1.0：极强相关</li>
+     *     <li>0.6 - 0.8：强相关</li>
+     *     <li>0.4 - 0.6：中等程度相关</li>
+     *     <li>0.2 - 0.4：弱相关</li>
+     *     <li>0.0 - 0.2：极弱相关或无相关</li>
+     * </ul>
+     *
+     * @return
+     */
+    public static BigDecimal getPearsonCorrelationCoefficient(List<Double> x, List<Double> y) {
+        Double xAvg = x.parallelStream().mapToDouble(Double::doubleValue).average().orElse(0.0);
+        Double yAvg = y.parallelStream().mapToDouble(Double::doubleValue).average().orElse(0.0);
+
+        // 协方差求和
+        BigDecimal covarianceSum = BigDecimal.ZERO;
+        // x的方差
+        BigDecimal varianceX = BigDecimal.ZERO;
+        // y的方差
+        BigDecimal varianceY = BigDecimal.ZERO;
+        for (int i = 0; i < x.size(); i++) {
+            covarianceSum = covarianceSum.add(BigDecimal.valueOf((x.get(i) - xAvg) * (y.get(i) - yAvg)));
+            varianceX = varianceX.add(BigDecimal.valueOf(Math.pow(x.get(i) - xAvg, 2)));
+            varianceY = varianceY.add(BigDecimal.valueOf(Math.pow(y.get(i) - yAvg, 2)));
+        }
+        BigDecimal fm = BigDecimal.valueOf(Math.sqrt(varianceX.doubleValue()) * Math.sqrt(varianceY.doubleValue()));
+        if (NumberUtil.equals(fm.doubleValue(), BigDecimal.ZERO.doubleValue())) {
+            if (NumberUtil.equals(covarianceSum, BigDecimal.ZERO)) {
+                return BigDecimal.valueOf(1.0);
+            } else {
+                return BigDecimal.ZERO;
+            }
+        } else {
+            return BigDecimal.valueOf(Math.abs(covarianceSum.divide(fm, 8, BigDecimal.ROUND_HALF_UP).doubleValue())); //相关系数
+        }
+    }
+
+    /**
+     * 比值一致性，获取CV系数
+     *
+     * <p>一致性等级</p>
+     * <ul>
+     *     <li>CV<1%：非常优秀</li>
+     *     <li>1%≤CV＜5%：优良</li>
+     *     <li>5%≤CV＜10%：良好</li>
+     *     <li>10%≤CV＜20%：中等</li>
+     *     <li>20%≤CV：较差</li>
+     * </ul>
+     *
+     * @param x
+     * @param y
+     * @return
+     */
+    public static BigDecimal getCvCoefficient(List<Double> x, List<Double> y) {
+        List<BigDecimal> ratioList = new ArrayList<>();
+        for (int i = 0; i < x.size(); i++) {
+            ratioList.add(BigDecimal.valueOf(x.get(i) / y.get(i)));
+        }
+
+        BigDecimal avg = BigDecimal.valueOf(ratioList.parallelStream().mapToDouble(BigDecimal::doubleValue).average().orElse(0.0));
+        BigDecimal variance = BigDecimal.valueOf(
+                ratioList.parallelStream().mapToDouble(BigDecimal::doubleValue)
+                        .map(v -> Math.pow(v - avg.doubleValue(), 2)).average().orElse(0.0));
+
+        return BigDecimal.valueOf(Math.sqrt(variance.doubleValue()) / avg.doubleValue());
+    }
+
+    /**
+     * 计算新的系数
+     *
+     * @param devList
+     * @param stdDevList
+     * @return
+     */
+    public static Double getNewXi(List<Double> devList, List<Double> stdDevList) {
+        ArrayList<Double> xiList = new ArrayList<>();
+        for (int i = 0; i < stdDevList.size(); i++) {
+            if (!stdDevList.get(i).equals(0)) {
+                BigDecimal bigDecimalDev = BigDecimal.valueOf(devList.get(i));
+                BigDecimal bigDecimalStdDev = BigDecimal.valueOf(stdDevList.get(i));
+                xiList.add((bigDecimalDev.subtract(bigDecimalStdDev)).divide(BigDecimal.valueOf(2.0).multiply(bigDecimalDev), 8, BigDecimal.ROUND_HALF_UP).doubleValue() + 1.0);
+            }
+        }
+        return xiList.stream().mapToDouble(Double::doubleValue).average().orElse(1.0);
+    }
 }

detection/src/main/java/com/njcn/gather/detection/util/socket/CnSocketUtil.java

@@ -47,7 +47,7 @@ public class CnSocketUtil {
         socketMsg.setRequestId(SourceOperateCodeEnum.QUITE_SOURCE.getValue());
         socketMsg.setOperateCode(SourceOperateCodeEnum.CLOSE_GATHER.getValue());
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("sourceId", param.getSourceId());
+        jsonObject.put("sourceId", param.getSourceName());
         socketMsg.setData(jsonObject.toJSONString());
         SocketManager.sendMsg(param.getUserPageId() + SOURCE_TAG, JSON.toJSONString(socketMsg));
         WebServiceManager.removePreDetectionParam(param.getUserPageId());

detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java

@@ -10,6 +10,7 @@ import com.njcn.gather.device.pojo.vo.PreDetection;
 import com.njcn.gather.plan.pojo.enums.DataSourceEnum;
 import com.njcn.gather.plan.pojo.po.AdPlan;
 import com.njcn.gather.plan.pojo.po.AdPlanTestConfig;
+import com.njcn.gather.script.pojo.po.SourceIssue;
 import com.njcn.gather.system.dictionary.pojo.enums.DictDataEnum;
 
 import java.util.ArrayList;
@@ -180,4 +181,31 @@ public class FormalTestManager {
 
 
     public static boolean isWaveCheck;
+
+    public static List<String> pstDataType;
+
+    public static boolean isPstData;
+
+    /**
+     * 是否在检测中
+     */
+    public static boolean isTesting;
+
+    public static boolean realProtocol;
+
+    public static boolean statisticsProtocol;
+
+    public static boolean voltageProtocol;
+
+    public static boolean unknownError;
+
+    /**
+     * 当前下发的脚本
+     */
+    public static SourceIssue currentIssue;
+
+    /**
+     * 是否进行相序校验
+     */
+    public static boolean isXu;
 }

detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyClient.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.njcn.gather.detection.handler.SocketContrastResponseService;
 import com.njcn.gather.detection.handler.SocketDevResponseService;
 import com.njcn.gather.detection.handler.SocketSourceResponseService;
+import com.njcn.gather.detection.lock.DetectionLockManager;
 import com.njcn.gather.detection.pojo.enums.SourceResponseCodeEnum;
 import com.njcn.gather.detection.pojo.param.ContrastDetectionParam;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
@@ -26,6 +27,8 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -42,6 +45,20 @@ import java.util.concurrent.TimeUnit;
 @Component
 public class NettyClient {
 
+    // ========== TODO TEST-ONLY: 联调 BUSY 弹窗用，测试完成后整段删除 ==========
+    /**
+     * 测试期：连接源/设备失败时，延迟若干秒再释放检测锁，方便手动测试 BUSY 弹窗。
+     * 正式上线时把 RELEASE_DELAY_FOR_TEST_SECONDS 改回 0 或直接删除调度逻辑。
+     */
+    private static final long RELEASE_DELAY_FOR_TEST_SECONDS = 300L;
+    private static final ScheduledExecutorService DELAYED_RELEASER =
+            Executors.newSingleThreadScheduledExecutor(r -> {
+                Thread t = new Thread(r, "lock-release-delay-test");
+                t.setDaemon(true);
+                return t;
+            });
+    // ========== /TODO TEST-ONLY ==========
+
     @Resource
     private SocketSourceResponseService socketSourceResponseService;
 
@@ -349,7 +366,7 @@ public class NettyClient {
                                                NioEventLoopGroup group, String msg) {
         channelFuture.addListener((ChannelFutureListener) ch -> {
             if (!ch.isSuccess()) {
-                onConnectionFailure(handler, group);
+                onConnectionFailure(param, handler, group);
             } else {
                 onConnectionSuccess(channelFuture, param, handler, group, msg);
             }
@@ -358,15 +375,30 @@ public class NettyClient {
 
     /**
      * 连接失败处理
-     * 输出失败信息并优雅关闭事件循环组
+     * 输出失败信息、优雅关闭事件循环组、通知前端、释放检测锁
      *
+     * @param param   检测参数，用于定位锁与前端通知
      * @param handler 业务处理器，用于区分设备类型
      * @param group   事件循环组
      */
-    private static void onConnectionFailure(SimpleChannelInboundHandler<String> handler, NioEventLoopGroup group) {
+    private static void onConnectionFailure(PreDetectionParam param,
+                                            SimpleChannelInboundHandler<String> handler, NioEventLoopGroup group) {
         String deviceType = getDeviceType(handler);
         log.info("连接{}服务端失败...", deviceType);
         group.shutdownGracefully();
+        // 异步建连失败时前端原本静默，补一次通知避免用户黑屏等待
+        notifyFrontendError(param, handler);
+        // 释放检测锁：抢锁后由 controller 异步发起的建连若失败，无法走 controller 兜底
+        // TODO TEST-ONLY: 测试 BUSY 弹窗期间延迟释放，正式部署改回立即释放
+        if (param != null && param.getUserPageId() != null) {
+            final String userPageId = param.getUserPageId();
+            DELAYED_RELEASER.schedule(
+                    () -> DetectionLockManager.getInstance()
+                            .releaseIfMatchPage(userPageId, "ASYNC_CONNECT_FAILED_DELAYED"),
+                    RELEASE_DELAY_FOR_TEST_SECONDS, TimeUnit.SECONDS);
+            log.warn("[TEST-ONLY] 检测锁将在 {}s 后释放（连接失败延迟释放，便于测试 BUSY 弹窗），userPageId={}",
+                    RELEASE_DELAY_FOR_TEST_SECONDS, userPageId);
+        }
     }
 
     /**
@@ -455,6 +487,18 @@ public class NettyClient {
 
         // 通过WebSocket通知前端页面
         notifyFrontendError(param, handler);
+
+        // 释放检测锁，理由同 onConnectionFailure
+        // TODO TEST-ONLY: 测试 BUSY 弹窗期间延迟释放，正式部署改回立即释放
+        if (param != null && param.getUserPageId() != null) {
+            final String userPageId = param.getUserPageId();
+            DELAYED_RELEASER.schedule(
+                    () -> DetectionLockManager.getInstance()
+                            .releaseIfMatchPage(userPageId, "ASYNC_CONNECT_EXCEPTION_DELAYED"),
+                    RELEASE_DELAY_FOR_TEST_SECONDS, TimeUnit.SECONDS);
+            log.warn("[TEST-ONLY] 检测锁将在 {}s 后释放（连接异常延迟释放，便于测试 BUSY 弹窗），userPageId={}",
+                    RELEASE_DELAY_FOR_TEST_SECONDS, userPageId);
+        }
     }
 
     /**

detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyContrastClientHandler.java

@@ -2,6 +2,7 @@ package com.njcn.gather.detection.util.socket.cilent;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.njcn.gather.detection.handler.SocketContrastResponseService;
+import com.njcn.gather.detection.lock.DetectionLockManager;
 import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum;
 import com.njcn.gather.detection.pojo.enums.SourceResponseCodeEnum;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
@@ -68,6 +69,11 @@ public class NettyContrastClientHandler extends SimpleChannelInboundHandler<Stri
             CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, false);
             CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, false);
             CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, true);
+            // 业务消息处理异常 → 释放检测锁
+            if (param != null && param.getUserPageId() != null) {
+                DetectionLockManager.getInstance()
+                        .releaseIfMatchPage(param.getUserPageId(), "CONTRAST_READ_EXCEPTION");
+            }
         }
     }
 
@@ -76,6 +82,11 @@ public class NettyContrastClientHandler extends SimpleChannelInboundHandler<Stri
         System.out.println("与通信模块端断线");
         ctx.close();
         SocketManager.removeUser(param.getUserPageId() + CnSocketUtil.CONTRAST_DEV_TAG);
+        // 比对通信模块主动断开 → 本次检测视为结束，释放检测锁
+        if (param != null && param.getUserPageId() != null) {
+            DetectionLockManager.getInstance()
+                    .releaseIfMatchPage(param.getUserPageId(), "CONTRAST_CHANNEL_INACTIVE");
+        }
     }
 
     /**
@@ -88,20 +99,33 @@ public class NettyContrastClientHandler extends SimpleChannelInboundHandler<Stri
     public void userEventTriggered(ChannelHandlerContext ctx, Object evt) {
         if (evt instanceof IdleStateEvent) { //IdleState.在一段时间内没有收到任何消息时，会触发该事件
             if (((IdleStateEvent) evt).state() == IdleState.READER_IDLE) {
-                System.out.println(LocalDateTime.now() + "contrastClientHandler触发读超时函数**************************************");
+                if (FormalTestManager.isTesting) {
+                    System.out.println(LocalDateTime.now() + "contrastClientHandler触发读超时函数**************************************");
 
-                if (!FormalTestManager.isRemoveSocket && ObjectUtil.isNotNull(FormalTestManager.nonWaveDataSourceEnum)) {
-                    long time = SocketManager.contrastClockMap.get(FormalTestManager.nonWaveDataSourceEnum) + 60L;
-                    SocketManager.contrastClockMap.put(FormalTestManager.nonWaveDataSourceEnum, time);
+                    if (!FormalTestManager.isRemoveSocket && ObjectUtil.isNotNull(FormalTestManager.nonWaveDataSourceEnum)) {
+                        long time = SocketManager.contrastClockMap.get(FormalTestManager.nonWaveDataSourceEnum) + 60L;
+                        SocketManager.contrastClockMap.put(FormalTestManager.nonWaveDataSourceEnum, time);
 
-                    if (DataSourceEnum.REAL_DATA == FormalTestManager.nonWaveDataSourceEnum) {
-                        if (time >= 60) {
-                            CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, true);
-                            timeoutSend(SourceOperateCodeEnum.QUIT_INIT_02);
+                        if (FormalTestManager.isPstData) {
+                            if (time > 60 * 10) {
+                                if (DataSourceEnum.REAL_DATA == FormalTestManager.nonWaveDataSourceEnum) {
+                                    CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, true);
+                                }
+                                if (FormalTestManager.isWaveCheck) {
+                                    CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, true);
+                                }
+                                CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, true);
+                                timeoutSend(SourceOperateCodeEnum.QUIT_INIT_01);
+                            }
+                        } else if (DataSourceEnum.REAL_DATA == FormalTestManager.nonWaveDataSourceEnum) {
+                            if (time >= 60) {
+                                CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, true);
+                                timeoutSend(SourceOperateCodeEnum.QUIT_INIT_02);
+                            }
+                        } else if (time >= FormalTestManager.maxTime) {
+                            CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, true);
+                            timeoutSend(SourceOperateCodeEnum.QUIT_INIT_01);
                         }
-                    } else if (time >= FormalTestManager.maxTime) {
-                        CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, true);
-                        timeoutSend(SourceOperateCodeEnum.QUIT_INIT_01);
                     }
                 }
             }
@@ -137,11 +161,18 @@ public class NettyContrastClientHandler extends SimpleChannelInboundHandler<Stri
         CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, false);
         CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, true);
         ctx.close();
+        // 比对通道异常 → 释放检测锁
+        if (param != null && param.getUserPageId() != null) {
+            DetectionLockManager.getInstance()
+                    .releaseIfMatchPage(param.getUserPageId(), "CONTRAST_EXCEPTION");
+        }
     }
 
 
     /**
      * 接收数据超时处理
+     * 比对模式读超时（10 分钟 Pst / 1 分钟实时 / 动态统计）都汇到这里，
+     * 推前端的同时一并释放检测锁（避免锁卡到 4 小时绝对超时）。
      */
     private void timeoutSend(SourceOperateCodeEnum sourceOperateCodeEnum) {
         System.out.println("超时处理-----》" + "统计数据已超时----------------关闭");
@@ -151,6 +182,11 @@ public class NettyContrastClientHandler extends SimpleChannelInboundHandler<Stri
         webSend.setData(sourceOperateCodeEnum.getMsg() + SourceResponseCodeEnum.RECEIVE_DATA_TIME_OUT.getMessage());
         webSend.setCode(SourceResponseCodeEnum.RECEIVE_DATA_TIME_OUT.getCode());
         WebServiceManager.sendMsg(param.getUserPageId(), MsgUtil.msgToWebData(webSend, FormalTestManager.devNameMapComm, 0));
+        // 比对模式读超时终态 → 释放检测锁
+        if (param != null && param.getUserPageId() != null) {
+            DetectionLockManager.getInstance()
+                    .releaseIfMatchPage(param.getUserPageId(), "CONTRAST_IDLE_TIMEOUT");
+        }
     }
 
 }

detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyDevClientHandler.java

@@ -3,6 +3,8 @@ package com.njcn.gather.detection.util.socket.cilent;
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.njcn.gather.detection.handler.SocketDevResponseService;
+import com.njcn.gather.detection.lock.DetectionLock;
+import com.njcn.gather.detection.lock.DetectionLockManager;
 import com.njcn.gather.detection.pojo.enums.ResultEnum;
 import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
@@ -115,6 +117,9 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
         ctx.close();
         SocketManager.removeUser(param.getUserPageId() + CnSocketUtil.DEV_TAG);
         CnSocketUtil.quitSendSource(param);
+        // 设备主动断开 → 本次检测视为结束，释放检测锁
+        DetectionLockManager.getInstance()
+                .releaseIfMatchPage(param.getUserPageId(), "DEV_CHANNEL_INACTIVE");
     }
 
     /**
@@ -132,6 +137,9 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
         } catch (Exception e) {
             log.error("处理服务端消息异常", e);
             CnSocketUtil.quitSend(param);
+            // 业务消息处理异常 → 退出并释放检测锁
+            DetectionLockManager.getInstance()
+                    .releaseIfMatchPage(param.getUserPageId(), "DEV_READ_EXCEPTION");
         }
     }
 
@@ -187,6 +195,9 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
         CnSocketUtil.quitSendSource(param);
         socketResponseService.backCheckState(param);
         ctx.close();
+        // 通道异常 → 释放检测锁
+        DetectionLockManager.getInstance()
+                .releaseIfMatchPage(param.getUserPageId(), "DEV_EXCEPTION");
     }
 
     /**
@@ -231,6 +242,9 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
             CnSocketUtil.quitSend(param);
             WebServiceManager.sendDetectionErrorMessage(param.getUserPageId(), SourceOperateCodeEnum.SOCKET_TIMEOUT);
             socketResponseService.backCheckState(param);
+            // 常规步骤读超时兜底 → 释放检测锁
+            DetectionLockManager.getInstance()
+                    .releaseIfMatchPage(param.getUserPageId(), "DEV_READ_TIMEOUT");
         }
     }
 
@@ -244,6 +258,14 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
         if (FormalTestManager.stopTime > STOP_TIMEOUT) {
             CnSocketUtil.quitSend(param);
             WebServiceManager.sendDetectionErrorMessage(param.getUserPageId(), SourceOperateCodeEnum.FORMAL_REAL.getValue(), SourceOperateCodeEnum.STOP_TIMEOUT);
+            // R4 释放：暂停 10 分钟超时视同放弃本次检测
+            DetectionLock cur = DetectionLockManager.getInstance().getCurrent();
+            if (cur != null) {
+                DetectionLockManager.getInstance().releaseIfHeldBy(cur.getUserId(), "PAUSE_TIMEOUT");
+            }
+            // 重置 FormalTestManager 状态，避免下次进入误判
+            FormalTestManager.stopTime = 0;
+            FormalTestManager.hasStopFlag = false;
         }
     }
 
@@ -302,6 +324,9 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
         CnSocketUtil.quitSend(param);
         timeoutSend(sourceIssue);
         socketResponseService.backCheckState(param);
+        // 单项检测超时本质等于整轮中止（已 quitSend），释放检测锁
+        DetectionLockManager.getInstance()
+                .releaseIfMatchPage(param.getUserPageId(), "DEV_ITEM_TIMEOUT");
     }
 
     /**
@@ -336,7 +361,7 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
         devLineTestResult.setDeviceName(dev.getDevName());
 
         Integer[] resultFlags = dev.getMonitorList().stream()
-                .map(monitor -> ResultEnum.NETWORK_TIMEOUT)
+                .map(monitor -> ResultEnum.NETWORK_TIMEOUT.getValue())
                 .toArray(Integer[]::new);
         devLineTestResult.setChnResult(resultFlags);
 

detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettySourceClientHandler.java

@@ -1,6 +1,7 @@
 package com.njcn.gather.detection.util.socket.cilent;
 
 import com.njcn.gather.detection.handler.SocketSourceResponseService;
+import com.njcn.gather.detection.lock.DetectionLockManager;
 import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
 import com.njcn.gather.detection.util.socket.CnSocketUtil;
@@ -70,6 +71,9 @@ public class NettySourceClientHandler extends SimpleChannelInboundHandler<String
         // 从Socket管理器中移除用户通道映射
         if (webUser != null && StrUtil.isNotBlank(userId)) {
             SocketManager.removeUser(userId + CnSocketUtil.SOURCE_TAG);
+            // 源端主动断开 → 本次检测视为结束，释放检测锁
+            DetectionLockManager.getInstance()
+                    .releaseIfMatchPage(userId, "SOURCE_CHANNEL_INACTIVE");
         }
     }
 
@@ -95,6 +99,11 @@ public class NettySourceClientHandler extends SimpleChannelInboundHandler<String
             log.error("源设备消息处理异常, userId: {}, message: {}", userId, msg, e);
             // 发生异常时退出发送，避免后续问题
             CnSocketUtil.quitSend(webUser);
+            // 业务消息处理异常 → 释放检测锁
+            if (StrUtil.isNotBlank(userId)) {
+                DetectionLockManager.getInstance()
+                        .releaseIfMatchPage(userId, "SOURCE_READ_EXCEPTION");
+            }
         }
     }
 
@@ -136,6 +145,13 @@ public class NettySourceClientHandler extends SimpleChannelInboundHandler<String
         
         // 发生异常时关闭通道
         ctx.close();
+
+        // 源通道异常 → 释放检测锁
+        String userIdForRelease = webUser != null ? webUser.getUserPageId() : null;
+        if (StrUtil.isNotBlank(userIdForRelease)) {
+            DetectionLockManager.getInstance()
+                    .releaseIfMatchPage(userIdForRelease, "SOURCE_EXCEPTION");
+        }
     }
 
 }

detection/src/main/java/com/njcn/gather/detection/util/socket/websocket/WebServiceManager.java

@@ -1,6 +1,7 @@
 package com.njcn.gather.detection.util.socket.websocket;
 
 import com.alibaba.fastjson.JSON;
+import com.njcn.gather.detection.lock.DetectionLockManager;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
 import com.njcn.gather.detection.pojo.vo.WebSocketVO;
 import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum;
@@ -296,6 +297,8 @@ public class WebServiceManager {
         webSocketVO.setData(errorType.getMsg());
         webSocketVO.setOperateCode(errorType.getValue());
         sendMessage(userId, webSocketVO);
+        // 守门员：错误推送即视为本次检测终态，释放检测锁（幂等，与显式释放点叠加双保险）
+        releaseLockOnTerminal(userId, errorType);
     }
 
     /**
@@ -313,6 +316,25 @@ public class WebServiceManager {
         webSocketVO.setData(errorType.getMsg());
         webSocketVO.setOperateCode(errorType.getValue());
         sendMessage(userId, webSocketVO);
+        // 守门员：理由同上
+        releaseLockOnTerminal(userId, errorType);
+    }
+
+    /**
+     * 守门员释放锁
+     * <p>覆盖业务回调里所有走 {@code sendDetectionErrorMessage} 的失败路径，
+     * 等价于在 detection/handler 全目录的错误终态点显式释放。与各 Netty handler
+     * 内的显式释放幂等叠加，形成双保险。</p>
+     *
+     * <p>注：业务"正常完成"路径不走此方法（数模式 formalDeal 已在 Phase 1 显式释放；
+     * 比对模式正常完成走 sendMsg 推 ERROR_FLOW_END，依赖 WS 断开后心跳超时兜底）。</p>
+     */
+    private static void releaseLockOnTerminal(String userId, SourceOperateCodeEnum errorType) {
+        if (userId == null || userId.isEmpty()) {
+            return;
+        }
+        DetectionLockManager.getInstance()
+                .releaseIfMatchPage(userId, "WS_ERROR_PUSH:" + errorType.name());
     }
 }
     

detection/src/main/java/com/njcn/gather/detection/util/socket/websocket/WebSocketHandler.java

@@ -1,13 +1,12 @@
 package com.njcn.gather.detection.util.socket.websocket;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.njcn.gather.detection.lock.DetectionLockManager;
 import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
 import com.njcn.gather.detection.util.socket.CnSocketUtil;
 import com.njcn.gather.detection.util.socket.FormalTestManager;
-import com.njcn.gather.detection.util.socket.SocketManager;
 import com.njcn.gather.device.pojo.enums.PatternEnum;
-import com.njcn.gather.plan.pojo.enums.DataSourceEnum;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.codec.CorruptedFrameException;
@@ -373,40 +372,54 @@ public class WebSocketHandler extends SimpleChannelInboundHandler<TextWebSocketF
                 // 使用该用户的检测参数关闭Socket连接
                 log.info("使用用户检测参数关闭Socket连接，userId: {}", userId);
                 if (FormalTestManager.patternEnum.equals(PatternEnum.CONTRAST)) {
-                    if (FormalTestManager.isRemoveSocket) {
-                        boolean channelActive = SocketManager.isChannelActive(preDetectionParam.getUserPageId() + CnSocketUtil.CONTRAST_DEV_TAG);
-                        if (channelActive) {
-                            SocketManager.removeUser(preDetectionParam.getUserPageId() + CnSocketUtil.CONTRAST_DEV_TAG);
-                        }
-                    } else {
-                        if (FormalTestManager.currentStep == SourceOperateCodeEnum.RECORD_WAVE_STEP1) {
-                            CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, true);
-                        } else if (FormalTestManager.currentStep != SourceOperateCodeEnum.QUITE) {
-                            if (ObjectUtil.isNotNull(FormalTestManager.nonWaveDataSourceEnum)) {
-                                if (FormalTestManager.nonWaveDataSourceEnum == DataSourceEnum.REAL_DATA) {
-                                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, false);
-                                } else {
-                                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, false);
-                                }
-                                if (FormalTestManager.isWaveCheck) {
-                                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, true);
-                                }
-                            } else {
-                                if (FormalTestManager.isWaveCheck) {
-                                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, false);
-                                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, true);
-                                }
-                            }
-                        } else {
-                            SocketManager.removeUser(preDetectionParam.getUserPageId() + CnSocketUtil.CONTRAST_DEV_TAG);
-                        }
-                    }
+                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, false);
+                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, false);
+                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, false);
+//                    if (FormalTestManager.isRemoveSocket) {
+//                        boolean channelActive = SocketManager.isChannelActive(preDetectionParam.getUserPageId() + CnSocketUtil.CONTRAST_DEV_TAG);
+//                        if (channelActive) {
+//                            SocketManager.removeUser(preDetectionParam.getUserPageId() + CnSocketUtil.CONTRAST_DEV_TAG);
+//                        }
+//                    } else {
+//                        if (FormalTestManager.currentStep == SourceOperateCodeEnum.RECORD_WAVE_STEP1) {
+//                            CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, false);
+//                        } else if (FormalTestManager.currentStep != SourceOperateCodeEnum.QUITE) {
+//                            if (ObjectUtil.isNotNull(FormalTestManager.nonWaveDataSourceEnum)) {
+//                                if (FormalTestManager.nonWaveDataSourceEnum == DataSourceEnum.REAL_DATA) {
+//                                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, false);
+//                                    if (FormalTestManager.statisticsProtocol) {
+//                                        CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, false);
+//                                    }
+//                                } else {
+//                                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, false);
+//                                }
+//                                if (FormalTestManager.isWaveCheck) {
+//                                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, false);
+//                                }
+//                            } else {
+//                                if (FormalTestManager.statisticsProtocol) {
+//                                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, false);
+//                                }
+//                                if (FormalTestManager.isWaveCheck) {
+//                                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, false);
+//                                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, false);
+//                                }
+//                            }
+//                        } else {
+//                            SocketManager.removeUser(preDetectionParam.getUserPageId() + CnSocketUtil.CONTRAST_DEV_TAG);
+//                        }
+//                    }
                 } else {
                     CnSocketUtil.quitSendSource(preDetectionParam);
                     CnSocketUtil.quitSend(preDetectionParam);
                 }
                 // 清理完成后移除该用户的检测参数
                 WebServiceManager.removePreDetectionParam(userId);
+                // R3 释放：WS 断开 / 客户端关页面 / 心跳超时后顺手释放检测锁
+                if (preDetectionParam.getUserPageId() != null) {
+                    DetectionLockManager.getInstance()
+                            .releaseIfMatchPage(preDetectionParam.getUserPageId(), "WS_DISCONNECTED");
+                }
             }
         } catch (Exception e) {
             log.error("清理Socket连接时发生异常，userId: {}", userId, e);

detection/src/main/java/com/njcn/gather/device/controller/PqDevController.java

@@ -12,7 +12,6 @@ import com.njcn.common.utils.LogUtil;
 import com.njcn.gather.device.pojo.param.PqDevParam;
 import com.njcn.gather.device.pojo.vo.PqDevVO;
 import com.njcn.gather.device.service.IPqDevService;
-import com.njcn.gather.monitor.pojo.po.PqMonitor;
 import com.njcn.gather.type.service.IDevTypeService;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.utils.FileUtil;
@@ -101,7 +100,7 @@ public class PqDevController extends BaseController {
     @OperateInfo(operateType = OperateType.DELETE)
     @PostMapping("/delete")
     @ApiOperation("删除被检设备")
-    @ApiImplicitParam(name = "ids", value = "被检设备id", required = true)
+    @ApiImplicitParam(name = "param", value = "删除参数", required = true)
     public HttpResult<Boolean> delete(@RequestBody @Validated PqDevParam.DeleteParam param) {
         String methodDescribe = getMethodDescribe("delete");
         LogUtil.njcnDebug(log, "{}，删除ID数据为：{}", methodDescribe, String.join(StrUtil.COMMA, param.getIds()));
@@ -137,7 +136,7 @@ public class PqDevController extends BaseController {
             @ApiImplicitParam(name = "file", value = "被检设备数据文件", required = true),
             @ApiImplicitParam(name = "patternId", value = "模式id", required = true)
     })
-    public HttpResult<Boolean> importDev(@RequestParam("file") MultipartFile file, @RequestParam("patternId") String patternId, @RequestParam("planId") String planId, HttpServletResponse response) {
+    public HttpResult importDev(@RequestParam("file") MultipartFile file, @RequestParam("patternId") String patternId, @RequestParam("planId") String planId, @RequestParam(value = "cover", defaultValue = "0") Integer cover, HttpServletResponse response) {
         String methodDescribe = getMethodDescribe("importDev");
         LogUtil.njcnDebug(log, "{}，上传文件为：{}", methodDescribe, file.getOriginalFilename());
         boolean fileType = FileUtil.judgeFileIsExcel(file.getOriginalFilename());
@@ -147,12 +146,7 @@ public class PqDevController extends BaseController {
         if ("null".equals(planId)) {
             planId = null;
         }
-        Boolean result = pqDevService.importDev(file, patternId, planId, response);
-        if (result) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
-        } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
-        }
+        return pqDevService.importDev(file, patternId, planId, response, cover);
     }
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -168,10 +162,31 @@ public class PqDevController extends BaseController {
 
     @OperateInfo
     @GetMapping("/getSelectOptions")
-    @ApiOperation("根据历史记录信息来获取下拉框内容")
+    @ApiOperation("从历史数据中查询下拉框选项")
+    @ApiImplicitParam(name = "pattern", value = "模式id", required = true)
     public HttpResult<Map<String, List<String>>> getSelectOptions(@RequestParam("pattern") String pattern) {
         String methodDescribe = getMethodDescribe("getSelectOptions");
         Map<String, List<String>> result = pqDevService.listSelectOptions(pattern);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD)
+    @PostMapping(value = "/ttt")
+    @ApiOperation("批量导入被检设备")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "被检设备数据文件", required = true),
+            @ApiImplicitParam(name = "patternId", value = "模式id", required = true)
+    })
+    public HttpResult ttt(@RequestParam("file") MultipartFile file, @RequestParam("patternId") String patternId, @RequestParam("planId") String planId, @RequestParam(value = "cover", defaultValue = "0") Integer cover, HttpServletResponse response) {
+        String methodDescribe = getMethodDescribe("ttt");
+        LogUtil.njcnDebug(log, "{}，上传文件为：{}", methodDescribe, file.getOriginalFilename());
+        boolean fileType = FileUtil.judgeFileIsExcel(file.getOriginalFilename());
+        if (!fileType) {
+            throw new BusinessException(CommonResponseEnum.FILE_XLSX_ERROR);
+        }
+        if ("null".equals(planId)) {
+            planId = null;
+        }
+        return pqDevService.importDev(file, patternId, planId, response, cover);
+    }
 }

detection/src/main/java/com/njcn/gather/device/controller/PqStandardDevController.java

@@ -12,6 +12,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.LogUtil;
 import com.njcn.gather.device.pojo.param.PqStandardDevParam;
 import com.njcn.gather.device.pojo.po.PqStandardDev;
+import com.njcn.gather.device.pojo.vo.PqStandardDevVO;
 import com.njcn.gather.device.service.IPqStandardDevService;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.utils.FileUtil;
@@ -55,10 +56,10 @@ public class PqStandardDevController extends BaseController {
     @GetMapping("/getById")
     @ApiOperation("根据id查询标准设备")
     @ApiImplicitParam(name = "id", value = "标准设备id", required = true)
-    public HttpResult<PqStandardDev> getById(@RequestParam("id") String id) {
+    public HttpResult<PqStandardDevVO> getById(@RequestParam("id") String id) {
         String methodDescribe = getMethodDescribe("getById");
         LogUtil.njcnDebug(log, "{}，查询ID为：{}", methodDescribe, id);
-        PqStandardDev result = pqStandardDevService.getPqStandardDevById(id);
+        PqStandardDevVO result = pqStandardDevService.getPqStandardDevById(id);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
@@ -149,17 +150,17 @@ public class PqStandardDevController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/listByPlanId")
-    @ApiOperation("查询出指定计划已关联的标准设备")
-    @ApiImplicitParam(name = "planId", value = "计划id", required = true)
-    public HttpResult<List<PqStandardDev>> listByPlanId(@RequestParam("planId") String planId) {
-        String methodDescribe = getMethodDescribe("listByPlanId");
-        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, planId);
-        List<PqStandardDev> pqDevVOList = pqStandardDevService.listByPlanId(planId);
-
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pqDevVOList, methodDescribe);
-    }
+//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+//    @PostMapping("/listByPlanId")
+//    @ApiOperation("查询出指定计划已关联的标准设备")
+//    @ApiImplicitParam(name = "planId", value = "计划id", required = true)
+//    public HttpResult<List<PqStandardDev>> listByPlanId(@RequestParam("planId") String planId) {
+//        String methodDescribe = getMethodDescribe("listByPlanId");
+//        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, planId);
+//        List<PqStandardDev> pqDevVOList = pqStandardDevService.listByPlanId(planId);
+//
+//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pqDevVOList, methodDescribe);
+//    }
 
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)

detection/src/main/java/com/njcn/gather/device/mapper/PqStandardDevGainMapper.java

@@ -0,0 +1,13 @@
+package com.njcn.gather.device.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.njcn.gather.device.pojo.po.PqStandardDevGain;
+
+/**
+ * @author caozehui
+ * @date 2026-01-12
+ */
+public interface PqStandardDevGainMapper extends MPJBaseMapper<PqStandardDevGain> {
+
+}
+

detection/src/main/java/com/njcn/gather/device/mapper/PqStandardDevGainRecordMapper.java

@@ -0,0 +1,13 @@
+package com.njcn.gather.device.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.njcn.gather.device.pojo.po.PqStandardDevGainRecord;
+
+/**
+ * @author caozehui
+ * @date 2026-01-15
+ */
+public interface PqStandardDevGainRecordMapper extends MPJBaseMapper<PqStandardDevGainRecord> {
+
+}
+

detection/src/main/java/com/njcn/gather/device/mapper/mapping/PqDevMapper.xml

@@ -134,6 +134,7 @@
                 #{item}
             </foreach>
         </if>
+        order by dev.Create_Time DESC, dev.Name ASC
     </select>
 </mapper>
 

detection/src/main/java/com/njcn/gather/device/mapper/mapping/PqStandardDevGainMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.gather.device.mapper.PqStandardDevGainMapper">
+
+
+</mapper>
+

detection/src/main/java/com/njcn/gather/device/mapper/mapping/PqStandardDevGainRecordMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.gather.device.mapper.PqStandardDevGainRecordMapper">
+
+
+</mapper>
+

detection/src/main/java/com/njcn/gather/device/pojo/po/PqStandardDevGain.java

@@ -0,0 +1,61 @@
+package com.njcn.gather.device.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.mybatisplus.bo.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * @author caozehui
+ * @date 2026-01-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pq_standard_dev_gain")
+public class PqStandardDevGain extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = -46280767885558804L;
+
+
+    /**
+     * 标准设备Id_通道号
+     */
+    @TableId
+    private String stdDevMonitorId;
+
+    private Integer uaGain;
+
+    private Integer ubGain;
+
+
+    private Integer ucGain;
+
+
+    private Integer u0Gain;
+
+
+    private Integer iaGain;
+
+
+    private Integer ibGain;
+
+
+    private Integer icGain;
+
+
+    private Integer i0Gain;
+
+
+    private Integer uabGain;
+
+
+    private Integer ubcGain;
+
+
+    private Integer ucaGain;
+
+    private Integer state;
+}
+

detection/src/main/java/com/njcn/gather/device/pojo/po/PqStandardDevGainRecord.java

@@ -0,0 +1,35 @@
+package com.njcn.gather.device.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.mybatisplus.bo.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * @author caozehui
+ * @date 2026-01-15
+ */
+@Data
+@TableName("pq_standard_dev_gain_record")
+public class PqStandardDevGainRecord implements Serializable {
+    private static final long serialVersionUID = 477276215572686991L;
+
+    /**
+     * 标准设备监测点id,由设备id_通道号组成
+     */
+    private String stdDevMonitorId;
+
+    /**
+     * 被检设备监测点id,由设备id_通道号组成
+     */
+    private String devMonitorId;
+
+    /**
+     * 系数下发次数
+     */
+    private Integer num;
+
+}
+

detection/src/main/java/com/njcn/gather/device/pojo/vo/ContrastDevExcel.java

@@ -38,8 +38,8 @@ public class ContrastDevExcel implements Serializable {
     @Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = DetectionValidMessage.NAME_FORMAT_ERROR)
     private String name;
 
-    @Excel(name = "设备序列号*", width = 20, needMerge = true, orderNum = "5")
-    @NotBlank(message = DetectionValidMessage.FACTORYNO_NOT_BLANK)
+    @Excel(name = "设备序列号", width = 20, needMerge = true, orderNum = "5")
+//    @NotBlank(message = DetectionValidMessage.FACTORYNO_NOT_BLANK)
     private String createId;
 
     @Excel(name = "设备类型*", width = 20, needMerge = true, orderNum = "6")
@@ -91,8 +91,8 @@ public class ContrastDevExcel implements Serializable {
     @NotNull(message = DetectionValidMessage.INSPECT_DATE_NOT_NULL)
     private LocalDate inspectDate;
 
-    @Excel(name = "谐波系统设备id*", width = 30, needMerge = true, orderNum = "18")
-    @NotBlank(message = DetectionValidMessage.HARM_SYS_ID_NOT_BLANK)
+    @Excel(name = "谐波系统设备id", width = 30, needMerge = true, orderNum = "18")
+//    @NotBlank(message = DetectionValidMessage.HARM_SYS_ID_NOT_BLANK)
     private String harmSysId;
 
     @ExcelCollection(name = "监测点信息", orderNum = "19")

detection/src/main/java/com/njcn/gather/device/pojo/vo/PqDevVO.java

@@ -111,4 +111,9 @@ public class PqDevVO extends PqDev {
      * 是否已经分配。0-未分配、1-已分配、2-所有
      */
     private Integer assign;
+
+    /**
+     * 检测点结果
+     */
+    private List<Integer> monitorResults;
 }

detection/src/main/java/com/njcn/gather/device/pojo/vo/PqStandardDevVO.java

@@ -0,0 +1,20 @@
+package com.njcn.gather.device.pojo.vo;
+
+import com.njcn.gather.device.pojo.po.PqStandardDev;
+import com.njcn.gather.device.pojo.po.PqStandardDevGain;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author caozehui
+ * @data 2026-01-19
+ */
+@Data
+public class PqStandardDevVO extends PqStandardDev {
+
+    /**
+     * 通道系数
+     */
+    List<PqStandardDevGain> gainList;
+}

detection/src/main/java/com/njcn/gather/device/service/IPqDevService.java

@@ -3,6 +3,7 @@ package com.njcn.gather.device.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.common.pojo.poi.PullDown;
+import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.gather.device.pojo.enums.TimeCheckResultEnum;
 import com.njcn.gather.device.pojo.param.PqDevParam;
 import com.njcn.gather.device.pojo.po.PqDev;
@@ -114,9 +115,10 @@ public interface IPqDevService extends IService<PqDev> {
      * @param userId
      * @param temperature
      * @param humidity
+     * @param updateCheckNum 是否更新检测次数
      * @return
      */
-    boolean updateResult(List<String> ids, List<String> adType, String code, String userId, Float temperature, Float humidity);
+    boolean updateResult(List<String> ids, List<String> adType, String code, String userId, Float temperature, Float humidity, boolean updateCheckNum);
 
     /**
      * 比对式-修改设备状态
@@ -124,7 +126,7 @@ public interface IPqDevService extends IService<PqDev> {
      * @param devId
      * @param userId
      */
-    void updateResult(String devId,String userId);
+    void updateResult(String devId, String userId);
 
     void updatePqDevReportState(String devId, int i);
 
@@ -160,7 +162,7 @@ public interface IPqDevService extends IService<PqDev> {
      * @param planId    计划Id
      * @param response  响应
      */
-    boolean importDev(MultipartFile file, String patternId, String planId, HttpServletResponse response);
+    HttpResult importDev(MultipartFile file, String patternId, String planId, HttpServletResponse response, Integer cover);
 
     /**
      * 导入灿能二楼设备数据
@@ -254,7 +256,7 @@ public interface IPqDevService extends IService<PqDev> {
      * @param planId    计划Id
      * @param response  响应
      */
-    boolean importContrastDev(MultipartFile file, String patternId, String planId, HttpServletResponse response);
+    HttpResult importContrastDev(MultipartFile file, String patternId, String planId, HttpServletResponse response, Integer cover);
 
     /**
      * 导入比对式设备数据
@@ -262,7 +264,7 @@ public interface IPqDevService extends IService<PqDev> {
      * @param contrastDevExcelList
      * @param patternId
      */
-    boolean importContrastDev(List<ContrastDevExcel> contrastDevExcelList, String patternId, String planId);
+    HttpResult importContrastDev(List<ContrastDevExcel> contrastDevExcelList, String patternId, String planId, Integer cover);
 
     /**
      * 获取比对式设备导出、导出文件模板的下拉列表

detection/src/main/java/com/njcn/gather/device/service/IPqStandardDevGainRecordService.java

@@ -0,0 +1,29 @@
+package com.njcn.gather.device.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.gather.device.pojo.po.PqStandardDevGainRecord;
+
+import java.util.List;
+
+/**
+ * @author caozehui
+ * @date 2026-01-15
+ */
+public interface IPqStandardDevGainRecordService extends IService<PqStandardDevGainRecord> {
+
+    /**
+     * 获取最大下发系数的次数
+     *
+     * @param stdDevMonitorId
+     * @param devMonitorId
+     * @return
+     */
+    int getMaxNum(String stdDevMonitorId, String devMonitorId);
+
+    /**
+     * 批量新增或更新记录
+     * @param recordList
+     * @return
+     */
+    boolean addOrUpdate(List<PqStandardDevGainRecord> recordList);
+}

detection/src/main/java/com/njcn/gather/device/service/IPqStandardDevGainService.java

@@ -0,0 +1,19 @@
+package com.njcn.gather.device.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.gather.device.pojo.po.PqStandardDevGain;
+
+import java.util.List;
+
+/**
+ * @author caozehui
+ * @date 2026-01-12
+ */
+public interface IPqStandardDevGainService extends IService<PqStandardDevGain> {
+
+    boolean add(List<PqStandardDevGain> pqStandardDevGainList);
+
+    PqStandardDevGain get(String stdDevMonitorId);
+
+    List<PqStandardDevGain> list(String stdDevId);
+}

detection/src/main/java/com/njcn/gather/device/service/IPqStandardDevService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.gather.device.pojo.param.PqStandardDevParam;
 import com.njcn.gather.device.pojo.po.PqStandardDev;
+import com.njcn.gather.device.pojo.vo.PqStandardDevVO;
 import com.njcn.gather.device.pojo.vo.PreDetection;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -30,7 +31,7 @@ public interface IPqStandardDevService extends IService<PqStandardDev> {
      * @param id 设备id
      * @return 设备对象
      */
-    PqStandardDev getPqStandardDevById(String id);
+    PqStandardDevVO getPqStandardDevById(String id);
 
     /**
      * 新增标准设备
@@ -82,7 +83,7 @@ public interface IPqStandardDevService extends IService<PqStandardDev> {
      * @param planId
      * @return
      */
-    List<PqStandardDev> listByPlanId(String planId);
+//    List<PqStandardDev> listByPlanId(String planId);
 
     /**
      * 查询出标准设备所需的检测信息

detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java

@@ -11,6 +11,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
@@ -19,8 +20,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.njcn.common.pojo.constant.PatternRegex;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.poi.PullDown;
+import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.EncryptionUtil;
 import com.njcn.db.mybatisplus.constant.DbConstant;
 import com.njcn.gather.device.mapper.PqDevMapper;
@@ -34,6 +37,10 @@ import com.njcn.gather.device.service.IPqDevSubService;
 import com.njcn.gather.monitor.pojo.po.PqMonitor;
 import com.njcn.gather.monitor.pojo.vo.PqMonitorExcel;
 import com.njcn.gather.monitor.service.IPqMonitorService;
+import com.njcn.gather.plan.pojo.enums.DataSourceEnum;
+import com.njcn.gather.plan.mapper.AdPlanMapper;
+import com.njcn.gather.plan.pojo.po.AdPlan;
+import com.njcn.gather.plan.service.IPqDevCheckHistoryService;
 import com.njcn.gather.pojo.enums.DetectionResponseEnum;
 import com.njcn.gather.storage.service.DetectionDataDealService;
 import com.njcn.gather.system.cfg.pojo.enums.SceneEnum;
@@ -49,6 +56,7 @@ import com.njcn.gather.user.user.pojo.po.SysUser;
 import com.njcn.gather.user.user.service.ISysUserService;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.utils.ExcelUtil;
+import com.njcn.web.utils.HttpResultUtil;
 import com.njcn.web.utils.PoiUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -63,6 +71,7 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @author caozehui
@@ -81,6 +90,8 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
     private final IDictTypeService dictTypeService;
     private final ISysUserService userService;
     private final IPqDevSubService pqDevSubService;
+    private final AdPlanMapper adPlanMapper;
+    private final IPqDevCheckHistoryService pqDevCheckHistoryService;
 
     @Override
     public Page<PqDevVO> listPqDevs(PqDevParam.QueryParam queryParam) {
@@ -212,7 +223,8 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
         if (PatternEnum.CONTRAST.getValue().equals(dictDataService.getDictDataById(param.getPattern()).getCode())) {
             for (String id : param.getIds()) {
                 if (ObjectUtils.isNotEmpty(pqMonitorService.listPqMonitorByDevIds(Collections.singletonList(id)))) {
-                    throw new BusinessException(DetectionResponseEnum.PQ_DEV_HAS_MONITOR);
+//                    throw new BusinessException(DetectionResponseEnum.PQ_DEV_HAS_MONITOR);
+                    pqMonitorService.removeByDevId(id);
                 }
             }
         }
@@ -286,6 +298,33 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
             return Collections.emptyList();
         }
         List<PqDevVO> pqDevList = this.baseMapper.selectByQueryParam(param);
+        pqDevList.forEach(pqDev -> {
+            List<PqMonitor> monitorList = pqMonitorService.listPqMonitorByDevIds(Collections.singletonList(pqDev.getId()));
+            List<PqMonitor> enabledMonitorList = monitorList.stream().filter(x -> x.getCheckFlag() == 1).collect(Collectors.toList());
+            pqDev.setMonitorResults(enabledMonitorList.stream().map(x -> {
+                if (ObjectUtil.isNull(x.getResultType())) {
+                    return CheckResultEnum.UNCHECKED.getValue();
+                } else {
+                    DataSourceEnum dataSourceEnum = DataSourceEnum.ofByValue(x.getResultType());
+
+                    switch (dataSourceEnum) {
+                        case REAL_DATA:
+                            return x.getRealtimeResult();
+                        case MINUTE_STATISTICS_AVG:
+                        case MINUTE_STATISTICS_CP95:
+                        case MINUTE_STATISTICS_MIN:
+                        case MINUTE_STATISTICS_MAX:
+                            return x.getStatisticsResult();
+                        case WAVE_DATA:
+                            return x.getRecordedResult();
+                        default:
+                            break;
+                    }
+                }
+                return CheckResultEnum.UNCHECKED.getValue();
+            }).collect(Collectors.toList()));
+        });
+
         return pqDevList;
     }
 
@@ -449,7 +488,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
 
 
     @Override
-    public boolean updateResult(List<String> ids, List<String> adType, String code, String userId, Float temperature, Float humidity) {
+    public boolean updateResult(List<String> ids, List<String> adType, String code, String userId, Float temperature, Float humidity, boolean updateCheckNum) {
         if (CollUtil.isNotEmpty(ids)) {
 
             SysTestConfig config = sysTestConfigService.getOneConfig();
@@ -481,13 +520,18 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
                         checkState = CheckStateEnum.DOCUMENTED.getValue();
                         i = pqDevVo.getRecheckNum();
                     } else {
-                        checkState = CheckStateEnum.CHECKED.getValue();
-                        i = pqDevVo.getRecheckNum() + 1;
+                        checkState = pqDevVo.getCheckState() == CheckStateEnum.DOCUMENTED.getValue() ? CheckStateEnum.DOCUMENTED.getValue() : CheckStateEnum.CHECKED.getValue();
+                        if (updateCheckNum) {
+                            i = pqDevVo.getRecheckNum() + 1;
+                        } else {
+                            i = pqDevVo.getRecheckNum();
+                        }
                         wrapper.set(PqDevSub::getReportState, DevReportStateEnum.NOT_GENERATED.getValue());
                     }
                     wrapper.set(PqDevSub::getRecheckNum, i)
                             .set(PqDevSub::getCheckState, checkState);
                     pqDevSubService.update(wrapper);
+                    saveCheckHistory(pqDevVo, i, checkState, userId);
 
                     PqDevParam.QueryParam param = new PqDevParam.QueryParam();
                     param.setPlanIdList(Arrays.asList(pqDevVo.getPlanId()));
@@ -529,22 +573,31 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
         PqDev dev = this.getById(devId);
         Integer checkState = pqMonitorService.getDevCheckState(devId);
         Integer checkResult = pqMonitorService.getDevCheckResult(devId);
+        if (checkResult == 1) {
+            checkResult = CheckResultEnum.ACCORD.getValue();
+        }
+        if (checkResult == 2) {
+            checkResult = CheckResultEnum.NOT_ACCORD.getValue();
+        }
+
 
         SysUser user = userService.getById(userId);
 
         LambdaUpdateChainWrapper<PqDevSub> w = pqDevSubService.lambdaUpdate()
                 .set(PqDevSub::getCheckState, checkState)
                 .set(PqDevSub::getCheckResult, checkResult)
+                .set(PqDevSub::getReportState, DevReportStateEnum.NOT_GENERATED.getValue())
                 .set(PqDevSub::getCheckTime, LocalDateTime.now())
                 .eq(PqDevSub::getDevId, devId);
 
-        if(ObjectUtil.isNotNull(user)){
+        if (ObjectUtil.isNotNull(user)) {
             w.set(PqDevSub::getCheckBy, user.getName());
         }
-        if(checkState.equals(CheckStateEnum.CHECKED.getValue())){
+        if (checkState.equals(CheckStateEnum.CHECKED.getValue())) {
             w.set(PqDevSub::getReportState, DevReportStateEnum.NOT_GENERATED.getValue());
         }
         w.update();
+        saveCheckHistory(devId, userId);
 
         PqDevParam.QueryParam param = new PqDevParam.QueryParam();
         String planId = dev.getPlanId();
@@ -552,15 +605,23 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
         List<PqDevVO> pqDevVOList = this.baseMapper.selectByQueryParam(param);
 
         if (CollUtil.isNotEmpty(pqDevVOList)) {
-            Set<Integer> set = pqDevVOList.stream().map(PqDevVO::getCheckResult).collect(Collectors.toSet());
-            if (set.contains(CheckResultEnum.NOT_ACCORD.getValue())) {
-                this.baseMapper.updatePlanCheckResult(planId, CheckResultEnum.NOT_ACCORD.getValue());
-            } else if (set.contains(CheckResultEnum.UNCHECKED.getValue())) {
+            Set<Integer> set = pqDevVOList.stream().filter(obj -> CheckStateEnum.CHECKED.getValue().equals(obj.getCheckState()) || CheckStateEnum.DOCUMENTED.getValue().equals(obj.getCheckState())).map(PqDevVO::getCheckResult).collect(Collectors.toSet());
+            if (checkState == CheckStateEnum.CHECKED.getValue()) {
+                set.add(checkResult);
+            }
+            if (CollUtil.isEmpty(set)) {
                 this.baseMapper.updatePlanCheckResult(planId, CheckResultEnum.UNCHECKED.getValue());
             } else {
-                this.baseMapper.updatePlanCheckResult(planId, CheckResultEnum.ACCORD.getValue());
+                if (set.contains(CheckResultEnum.NOT_ACCORD.getValue())) {
+                    this.baseMapper.updatePlanCheckResult(planId, CheckResultEnum.NOT_ACCORD.getValue());
+                } else if (set.contains(CheckResultEnum.UNCHECKED.getValue())) {
+                    this.baseMapper.updatePlanCheckResult(planId, CheckResultEnum.UNCHECKED.getValue());
+                } else {
+                    this.baseMapper.updatePlanCheckResult(planId, CheckResultEnum.ACCORD.getValue());
+                }
             }
 
+
             set = pqDevVOList.stream().map(PqDevVO::getCheckState).collect(Collectors.toSet());
             if (set.contains(CheckStateEnum.UNCHECKED.getValue())) {
                 this.baseMapper.updatePlanTestState(planId, CheckStateEnum.CHECKING.getValue());
@@ -572,6 +633,37 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
         }
     }
 
+    private void saveCheckHistory(PqDevVO pqDevVo, Integer recheckNum, Integer checkState, String userId) {
+        if (ObjectUtil.isNull(pqDevVo)
+                || (!CheckStateEnum.CHECKED.getValue().equals(checkState) && !CheckStateEnum.DOCUMENTED.getValue().equals(checkState))) {
+            return;
+        }
+        AdPlan plan = adPlanMapper.selectById(pqDevVo.getPlanId());
+        if (ObjectUtil.isNull(plan)) {
+            return;
+        }
+        pqDevVo.setRecheckNum(recheckNum);
+        pqDevVo.setCheckBy(userId);
+        pqDevVo.setCheckTime(LocalDateTime.now());
+        pqDevCheckHistoryService.saveOrUpdateDeviceHistory(plan, pqDevVo);
+    }
+
+    private void saveCheckHistory(String devId, String userId) {
+        PqDevVO pqDevVo = this.baseMapper.selectByDevId(devId);
+        if (ObjectUtil.isNull(pqDevVo)
+                || (!CheckStateEnum.CHECKED.getValue().equals(pqDevVo.getCheckState()) && !CheckStateEnum.DOCUMENTED.getValue().equals(pqDevVo.getCheckState()))) {
+            return;
+        }
+        AdPlan plan = adPlanMapper.selectById(pqDevVo.getPlanId());
+        if (ObjectUtil.isNull(plan)) {
+            return;
+        }
+        if (StrUtil.isBlank(pqDevVo.getCheckBy())) {
+            pqDevVo.setCheckBy(userId);
+        }
+        pqDevCheckHistoryService.saveOrUpdateDeviceHistory(plan, pqDevVo);
+    }
+
     @Override
     public void updatePqDevReportState(String devId, int reportState) {
         LambdaUpdateWrapper<PqDevSub> updateWrapper = new LambdaUpdateWrapper<>();
@@ -643,25 +735,31 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
     }
 
     @Override
-    public boolean importDev(MultipartFile file, String patternId, String planId, HttpServletResponse response) {
+    public HttpResult importDev(MultipartFile file, String patternId, String planId, HttpServletResponse response, Integer cover) {
         DictData dictData = dictDataService.getDictDataById(patternId);
         if (PatternEnum.CONTRAST.getValue().equals(dictData.getCode())) {
-            return this.importContrastDev(file, patternId, planId, response);
+            return this.importContrastDev(file, patternId, planId, response, cover);
         } else {
             String currrentScene = sysTestConfigService.getCurrrentScene();
             SceneEnum sceneEnum = SceneEnum.getSceneEnum(currrentScene);
             switch (sceneEnum) {
                 case PROVINCE_PLATFORM:
-                    return this.importProvinceDev(file, patternId, planId, response);
+                    boolean result = this.importProvinceDev(file, patternId, planId, response);
+                    if (result) {
+                        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, "导入成功");
+                    }
                 case LEAVE_FACTORY_TEST:
-                    return this.importCNDev(file, patternId, planId, response);
+                    result = this.importCNDev(file, patternId, planId, response);
+                    if (result) {
+                        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, "导入成功");
+                    }
                 case SELF_TEST:
                     break;
                 default:
                     break;
             }
         }
-        return false;
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, "导入失败");
     }
 
     @Override
@@ -788,21 +886,15 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
      * @param isExcludeSelf 是否排除自己
      */
     private void checkRepeat(PqDevParam param, boolean isExcludeSelf) {
-        QueryWrapper<PqDev> queryWrapper = new QueryWrapper<>();
-        queryWrapper
-                .eq("state", DataStateEnum.ENABLE.getCode())
-                .eq(StrUtil.isNotBlank(param.getDevType()), "Dev_Type", param.getDevType())
-                .eq(StrUtil.isNotBlank(param.getPattern()), "pattern", param.getPattern())
-                .eq(StrUtil.isNotBlank(param.getCityName()), "City_Name", param.getCityName())
-                .eq(StrUtil.isNotBlank(param.getGdName()), "Gd_Name", param.getGdName())
-                .eq(StrUtil.isNotBlank(param.getSubName()), "Sub_Name", param.getSubName())
-                .and(q -> q.eq(StrUtil.isNotBlank(param.getName()), "name", param.getName()).or()
-                        .eq(StrUtil.isNotBlank(param.getCreateId()), "Create_Id", param.getCreateId())); //设备序列号重复
-//                        .eq("manufacturer", param.getManufacturer())
-//                        .eq("Dev_Type", param.getDevType()).or()
+        LambdaQueryWrapper<PqDev> queryWrapper = new LambdaQueryWrapper<PqDev>()
+                .eq(PqDev::getState, DataStateEnum.ENABLE.getCode())
+                .eq(StrUtil.isNotBlank(param.getIp()), PqDev::getIp, param.getIp())
+                .eq(ObjectUtil.isNotNull(param.getPort()), PqDev::getPort, param.getPort())
+                .eq(StrUtil.isNotBlank(param.getPattern()), PqDev::getPattern, param.getPattern())
+                .eq(StrUtil.isNotBlank(param.getCreateId()), PqDev::getCreateId, param.getCreateId());
         if (isExcludeSelf) {
             if (param instanceof PqDevParam.UpdateParam) {
-                queryWrapper.ne("id", ((PqDevParam.UpdateParam) param).getId());
+                queryWrapper.ne(PqDev::getId, ((PqDevParam.UpdateParam) param).getId());
             }
         }
         int count = this.count(queryWrapper);
@@ -1181,7 +1273,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
     }
 
     @Override
-    public boolean importContrastDev(MultipartFile file, String patternId, String planId, HttpServletResponse response) {
+    public HttpResult importContrastDev(MultipartFile file, String patternId, String planId, HttpServletResponse response, Integer cover) {
         ImportParams params = new ImportParams();
         params.setStartSheetIndex(0);
         params.setSheetNum(1);
@@ -1201,52 +1293,56 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
         } catch (Exception e) {
             throw new BusinessException(DetectionResponseEnum.IMPORT_DATA_FAIL);
         }
-        return this.importContrastDev(contrastDevExcelList, patternId, planId);
+        return this.importContrastDev(contrastDevExcelList, patternId, planId, cover);
     }
 
     @Override
     @Transactional
-    public boolean importContrastDev(List<ContrastDevExcel> contrastDevExcelList, String patternId, String planId) {
+    public HttpResult importContrastDev(List<ContrastDevExcel> contrastDevExcelList, String patternId, String planId, Integer cover) {
         if (CollUtil.isNotEmpty(contrastDevExcelList)) {
             // 根据设备名称分组
             Map<String, List<ContrastDevExcel>> listMap = contrastDevExcelList.stream()
                     .collect(Collectors.groupingBy(ContrastDevExcel::getName, LinkedHashMap::new, Collectors.toList()));
-            List<PqDev> oldDevList = new ArrayList<>(listMap.size());
-            List<PqMonitor> finalMonitorList = new ArrayList<>();
+            List<PqDev> newDevList = new ArrayList<>(listMap.size());
+            List<PqDev> updateDevList = new ArrayList<>();
+            List<PqDev> finalUpdateDevList = new ArrayList<>();
             for (Map.Entry<String, List<ContrastDevExcel>> entry : listMap.entrySet()) {
                 String name = entry.getKey();
+
                 List<ContrastDevExcel> devExcelList = entry.getValue();
                 // 监测点数据
                 List<PqMonitorExcel> pqMonitorExcelList = devExcelList.stream()
                         .map(ContrastDevExcel::getPqMonitorExcelList)
                         .filter(Objects::nonNull)
                         .flatMap(List::stream)
+                        // 过滤掉没有线路号的数据
+                        .filter(item -> ObjectUtil.isNotNull(item.getNum()))
                         .collect(Collectors.toList());
                 // 取第一条为设备基本信息
                 ContrastDevExcel devExcel = devExcelList.get(0);
-                PqDev pqDev = BeanUtil.copyProperties(devExcel, PqDev.class);
-                if (pqDev.getEncryptionFlag() == 1) {
-                    if (StrUtil.isNotBlank(pqDev.getSeries()) && StrUtil.isNotBlank(pqDev.getDevKey())) {
-                        pqDev.setSeries(EncryptionUtil.encodeString(1, pqDev.getSeries()));
-                        pqDev.setDevKey(EncryptionUtil.encodeString(1, pqDev.getDevKey()));
+                PqDev importPqDev = BeanUtil.copyProperties(devExcel, PqDev.class);
+                if (importPqDev.getEncryptionFlag() == 1) {
+                    if (StrUtil.isNotBlank(importPqDev.getSeries()) && StrUtil.isNotBlank(importPqDev.getDevKey())) {
+                        importPqDev.setSeries(EncryptionUtil.encodeString(1, importPqDev.getSeries()));
+                        importPqDev.setDevKey(EncryptionUtil.encodeString(1, importPqDev.getDevKey()));
                     } else {
                         throw new BusinessException(DetectionResponseEnum.SERIES_AND_DEVKEY_NOT_BLANK);
                     }
                 }
-                DevType devType = devTypeService.getByName(pqDev.getDevType());
+                DevType devType = devTypeService.getByName(importPqDev.getDevType());
                 if (ObjectUtil.isNull(devType)) {
                     throw new BusinessException(DetectionResponseEnum.DEV_TYPE_NOT_EXIST);
                 }
                 // 校验监测点数量
                 int devChns = devType.getDevChns();
-                if (pqMonitorExcelList.size() != devChns) {
-                    throw new BusinessException(DetectionResponseEnum.IMPORT_DATA_FAIL, "【" + name + "】的设备类型必须具备" + devChns + "个监测点信息！");
-                }
+//                if (pqMonitorExcelList.size() != devChns) {
+//                    throw new BusinessException(DetectionResponseEnum.IMPORT_DATA_FAIL, "【" + name + "】的设备类型必须具备" + devChns + "个监测点信息！");
+//                }
                 List<Integer> numList = pqMonitorExcelList.stream().map(PqMonitorExcel::getNum).collect(Collectors.toList());
                 // 判断是否有重复的num
                 Set<Integer> uniqueNumSet = new HashSet<>(numList);
                 if (uniqueNumSet.size() != numList.size()) {
-                    throw new BusinessException(DetectionResponseEnum.MONITOR_NUM_REPEAT);
+                    throw new BusinessException(DetectionResponseEnum.MONITOR_NUM_REPEAT, "【" + name + "】该被检设备下存在相同线路号的监测点！");
                 }
                 Integer max = CollectionUtil.max(numList);
                 Integer min = CollectionUtil.min(numList);
@@ -1254,90 +1350,144 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
                     throw new BusinessException(DetectionResponseEnum.MONITOR_NUM_OUT_OF_RANGE);
                 }
 
-                pqDev.setDevType(devType.getId());
-                pqDev.setImportFlag(1);
-                pqDev.setId(UUID.randomUUID().toString().replaceAll("-", ""));
-                pqDev.setCreateId(pqDev.getName()); //导入时设备序列号默认与设备名称相同
-                List<PqMonitor> monitorList = new ArrayList<>();
+                importPqDev.setDevType(devType.getId());
+                importPqDev.setImportFlag(1);
+                importPqDev.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+
+                if (StrUtil.isEmpty(importPqDev.getCreateId())) {
+                    // 与设备名称相同
+                    importPqDev.setCreateId(importPqDev.getName());
+                }
                 // 根据num排序
                 pqMonitorExcelList.sort(Comparator.comparingInt(PqMonitorExcel::getNum));
-                for (PqMonitorExcel pqMonitorExcel : pqMonitorExcelList) {
-                    PqMonitor monitor = BeanUtil.copyProperties(pqMonitorExcel, PqMonitor.class);
-                    monitor.setDevId(pqDev.getId());
-                    monitorList.add(monitor);
-                }
                 StringBuilder inspectChannelBuilder = new StringBuilder();
-                for (int i = 1; i <= devChns; i++) {
-                    inspectChannelBuilder.append(i);
-                    if (i < devChns) {
-                        inspectChannelBuilder.append(",");
+                for (int i = 0; i < numList.size(); i++) {
+                    inspectChannelBuilder.append(numList.get(i));
+                    if (i < numList.size() - 1) {
+                        inspectChannelBuilder.append(StrUtil.COMMA);
                     }
                 }
-                pqDev.setInspectChannel(inspectChannelBuilder.toString());
-                oldDevList.add(pqDev);
-                finalMonitorList.addAll(monitorList);
-            }
-            //逆向可视化
-            this.reverseVisualizeProvinceDev(oldDevList, patternId);
-
-            List<PqDev> newDevList = new ArrayList<>();
-            oldDevList.forEach(pqDev -> {
-                PqDevParam param = BeanUtil.copyProperties(pqDev, PqDevParam.class);
-                this.checkRepeat(param, false);
-                long count = newDevList.stream().filter(dev ->
-                                dev.getDevType().equals(pqDev.getDevType())
-                                        && dev.getCityName().equals(pqDev.getCityName())
-                                        && dev.getGdName().equals(pqDev.getGdName())
-                                        && dev.getSubName().equals(pqDev.getSubName())
-                                        && (dev.getName().equals(pqDev.getName()) || dev.getCreateId().equals(pqDev.getCreateId())))
-                        .count();
-                if (count == 0) {
-                    pqDev.setPlanId(planId);
-                    newDevList.add(pqDev);
-                }
-            });
-            QueryWrapper<PqDev> wrapper1 = new QueryWrapper<PqDev>()
-                    .eq("pq_dev.State", DataStateEnum.ENABLE.getCode())
-                    .in("pq_dev.Harm_Sys_Id", newDevList.stream().map(PqDev::getHarmSysId).collect(Collectors.toList()));
-            List<PqDev> oldDevList1 = this.list(wrapper1);
-            if (CollUtil.isNotEmpty(oldDevList1)) {
-                oldDevList1.stream().forEach(oldDev -> {
-                    PqDev newDev = newDevList.stream().filter(dev -> dev.getHarmSysId().equals(oldDev.getHarmSysId())).findFirst().orElse(null);
-                    if (ObjectUtil.isNotNull(newDev)) {
-                        newDevList.remove(newDev);
-                        finalMonitorList.stream()
-                                .filter(monitor -> monitor.getDevId().equals(newDev.getId()))
-                                .forEach(monitor -> monitor.setDevId(oldDev.getId()));
-                        BeanUtil.copyProperties(newDev, oldDev, "id");
+                importPqDev.setInspectChannel(inspectChannelBuilder.toString());
+                List<PqMonitor> monitorList = new ArrayList<>();
+                // 1、先判断是否有谐波系统ID
+                boolean hasHarmSys = false;
+                if (StrUtil.isNotBlank(importPqDev.getHarmSysId())) {
+                    // 1.1、如果有则判断是否已存在
+                    List<PqDev> hasList = this.lambdaQuery()
+                            .eq(PqDev::getState, DataStateEnum.ENABLE.getCode())
+                            .eq(PqDev::getPattern, patternId)
+                            .eq(PqDev::getHarmSysId, importPqDev.getHarmSysId())
+                            .isNull(PqDev::getPlanId)
+                            .orderByDesc(PqDev::getCreateTime).list();
+                    // 1.2、 存在则放入强制更新list
+                    if (CollUtil.isNotEmpty(hasList)) {
+                        importPqDev.setId(hasList.get(0).getId());
+                        for (PqMonitorExcel pqMonitorExcel : pqMonitorExcelList) {
+                            PqMonitor monitor = BeanUtil.copyProperties(pqMonitorExcel, PqMonitor.class);
+                            monitor.setDevId(importPqDev.getId());
+                            monitor.setPt(pqMonitorExcel.getPt1() + StrUtil.C_COLON + pqMonitorExcel.getPt2());
+                            monitor.setCt(pqMonitorExcel.getCt1() + StrUtil.C_COLON + pqMonitorExcel.getCt2());
+                            monitorList.add(monitor);
+                        }
+                        importPqDev.setMonitorList(monitorList);
+                        finalUpdateDevList.add(importPqDev);
+                        hasHarmSys = true;
                     }
-                });
-                this.updateBatchById(oldDevList1);
-            }
-            this.saveBatch(newDevList);
-            List<PqDevSub> pqDevSubList = new ArrayList<>();
-            for (PqDev dev : newDevList) {
-                PqDevSub pqDevSub = new PqDevSub();
-                pqDevSub.setDevId(dev.getId());
-                pqDevSub.setCheckState(CheckStateEnum.UNCHECKED.getValue());
-                pqDevSub.setCheckResult(CheckResultEnum.UNCHECKED.getValue());
-                pqDevSub.setReportState(DevReportStateEnum.UNCHECKED.getValue());
-                pqDevSub.setTimeCheckResult(TimeCheckResultEnum.UNKNOWN.getValue());
-                pqDevSub.setFactorCheckResult(FactorCheckResultEnum.UNKNOWN.getValue());
-                pqDevSubList.add(pqDevSub);
-            }
-            pqDevSubService.saveBatch(pqDevSubList);
 
-            List<String> devIdList = oldDevList1.stream().map(PqDev::getId).collect(Collectors.toList());
-            if (CollUtil.isNotEmpty(devIdList)) {
-                QueryWrapper<PqMonitor> wrapper = new QueryWrapper<PqMonitor>()
-                        .in("pq_monitor.Dev_Id", devIdList);
-                pqMonitorService.remove(wrapper);
+                }
+                if (!hasHarmSys) {
+                    // 2、查询 ip + 端口 + 序列号 + patternId + Plan_Id为空 是否存在
+                    List<PqDev> hasList = this.lambdaQuery()
+                            .eq(PqDev::getState, DataStateEnum.ENABLE.getCode())
+                            .eq(PqDev::getIp, devExcel.getIp())
+                            .eq(PqDev::getPort, devExcel.getPort())
+                            .eq(PqDev::getPattern, patternId)
+                            .eq(PqDev::getCreateId, devExcel.getCreateId())
+                            .isNull(PqDev::getPlanId)
+                            .orderByDesc(PqDev::getCreateTime).list();
+                    // 2.1、存在则放入更新list
+                    if (CollUtil.isNotEmpty(hasList)) {
+                        importPqDev.setId(hasList.get(0).getId());
+                        for (PqMonitorExcel pqMonitorExcel : pqMonitorExcelList) {
+                            PqMonitor monitor = BeanUtil.copyProperties(pqMonitorExcel, PqMonitor.class);
+                            monitor.setDevId(importPqDev.getId());
+                            monitor.setPt(pqMonitorExcel.getPt1() + StrUtil.C_COLON + pqMonitorExcel.getPt2());
+                            monitor.setCt(pqMonitorExcel.getCt1() + StrUtil.C_COLON + pqMonitorExcel.getCt2());
+                            monitorList.add(monitor);
+                        }
+                        importPqDev.setMonitorList(monitorList);
+                        updateDevList.add(importPqDev);
+                    } else {
+                        //2.2、不存在则放入新增list
+                        for (PqMonitorExcel pqMonitorExcel : pqMonitorExcelList) {
+                            PqMonitor monitor = BeanUtil.copyProperties(pqMonitorExcel, PqMonitor.class);
+                            monitor.setDevId(importPqDev.getId());
+                            monitor.setPt(pqMonitorExcel.getPt1() + StrUtil.C_COLON + pqMonitorExcel.getPt2());
+                            monitor.setCt(pqMonitorExcel.getCt1() + StrUtil.C_COLON + pqMonitorExcel.getCt2());
+                            monitorList.add(monitor);
+                        }
+                        importPqDev.setMonitorList(monitorList);
+                        newDevList.add(importPqDev);
+                    }
+                }
             }
-            pqMonitorService.reverseVisualizeMonitor(finalMonitorList);
-            pqMonitorService.saveBatch(finalMonitorList);
-            return true;
+            // 3、是否有重复的设备
+            if (CollUtil.isNotEmpty(updateDevList)) {
+                // 3.1、有则让用户确认是否覆盖
+                if (cover == 0) {
+                    List<String> existDevList = new ArrayList<>();
+                    updateDevList.forEach(pqDev -> {
+                        existDevList.add(pqDev.getName() + "(" + pqDev.getIp() + ":" + pqDev.getPort() + ")");
+                    });
+                    return HttpResultUtil.assembleResult(DetectionResponseEnum.DEV_IP_PORT_EXIST.getCode(), existDevList, "请确认是否覆盖");
+
+                } else {
+                    // 3.2、确认覆盖则放入强制更新list
+                    finalUpdateDevList.addAll(updateDevList);
+                }
+            }
+
+
+            // 4、新增list
+            if (CollUtil.isNotEmpty(newDevList)) {
+                //逆向可视化
+                this.reverseVisualizeProvinceDev(newDevList, patternId);
+                this.saveBatch(newDevList);
+                List<PqDevSub> pqDevSubList = new ArrayList<>();
+                List<PqMonitor> newMonitorList = new ArrayList<>();
+                for (PqDev dev : newDevList) {
+                    PqDevSub pqDevSub = new PqDevSub();
+                    pqDevSub.setDevId(dev.getId());
+                    pqDevSub.setCheckState(CheckStateEnum.UNCHECKED.getValue());
+                    pqDevSub.setCheckResult(CheckResultEnum.UNCHECKED.getValue());
+                    pqDevSub.setReportState(DevReportStateEnum.UNCHECKED.getValue());
+                    pqDevSub.setTimeCheckResult(TimeCheckResultEnum.UNKNOWN.getValue());
+                    pqDevSub.setFactorCheckResult(FactorCheckResultEnum.UNKNOWN.getValue());
+                    pqDevSubList.add(pqDevSub);
+                    newMonitorList.addAll(dev.getMonitorList());
+                }
+                pqMonitorService.reverseVisualizeMonitor(newMonitorList);
+                pqMonitorService.saveBatch(newMonitorList);
+                pqDevSubService.saveBatch(pqDevSubList);
+            }
+            // 5、更新list
+            if (CollUtil.isNotEmpty(finalUpdateDevList)) {
+                //逆向可视化
+                this.reverseVisualizeProvinceDev(finalUpdateDevList, patternId);
+                this.updateBatchById(finalUpdateDevList);
+                List<PqMonitor> updateMonitorList = new ArrayList<>();
+                for (PqDev dev : finalUpdateDevList) {
+                    updateMonitorList.addAll(dev.getMonitorList());
+                }
+                pqMonitorService.reverseVisualizeMonitor(updateMonitorList);
+                for (PqMonitor monitor : updateMonitorList) {
+                    pqMonitorService.update(monitor, new LambdaUpdateWrapper<PqMonitor>().eq(PqMonitor::getDevId, monitor.getDevId()));
+                }
+            }
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, "导入成功");
         }
-        return false;
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, "导入失败");
+
     }
 
     @Override
@@ -1395,13 +1545,19 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
         if (ObjectUtil.isNotNull(dictType)) {
             dictDataList = dictDataService.getDictDataByTypeId(dictType.getId());
             pullDown = new PullDown();
-            pullDown.setFirstCol(startCol + 24);
-            pullDown.setLastCol(startCol + 24);
+            pullDown.setFirstCol(startCol + 26);
+            pullDown.setLastCol(startCol + 26);
 
             pullDown.setStrings(dictDataList.stream().map(DictData::getName).collect(Collectors.toList()));
             pullDowns.add(pullDown);
         }
 
+        pullDown = new PullDown();
+        pullDown.setFirstCol(startCol + 27);
+        pullDown.setLastCol(startCol + 27);
+        pullDown.setStrings(Stream.iterate(1, x -> x + 1).limit(10).map(String::valueOf).collect(Collectors.toList()));
+        pullDowns.add(pullDown);
+
         return pullDowns;
     }
 
@@ -1463,7 +1619,22 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
             contrastDevExcels.forEach(contrastDevExcel -> {
                 List<PqMonitor> monitorList = pqMonitorService.listPqMonitorByDevIds(Collections.singletonList(contrastDevExcel.getId()));
                 pqMonitorService.visualizeMonitor(monitorList);
-                List<PqMonitorExcel> pqMonitorExcelList = BeanUtil.copyToList(monitorList, PqMonitorExcel.class);
+                List<PqMonitorExcel> pqMonitorExcelList = new ArrayList<>();
+                for (int i = 0; i < monitorList.size(); i++) {
+                    PqMonitor pqMonitor = monitorList.get(i);
+                    PqMonitorExcel pqMonitorExcel = BeanUtil.copyProperties(pqMonitor, PqMonitorExcel.class);
+                    String pt = pqMonitor.getPt();
+                    String[] split1 = pt.split(String.valueOf(StrUtil.C_COLON));
+                    pqMonitorExcel.setPt1(split1[0]);
+                    pqMonitorExcel.setPt2(split1[1]);
+
+                    String ct = pqMonitor.getCt();
+                    String[] split2 = ct.split(String.valueOf(StrUtil.C_COLON));
+                    pqMonitorExcel.setCt1(split2[0]);
+                    pqMonitorExcel.setCt2(split2[1]);
+
+                    pqMonitorExcelList.add(pqMonitorExcel);
+                }
                 contrastDevExcel.setPqMonitorExcelList(pqMonitorExcelList);
             });
         }

detection/src/main/java/com/njcn/gather/device/service/impl/PqStandardDevGainRecordServiceImpl.java

@@ -0,0 +1,45 @@
+package com.njcn.gather.device.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.gather.device.mapper.PqStandardDevGainRecordMapper;
+import com.njcn.gather.device.pojo.po.PqStandardDevGainRecord;
+import com.njcn.gather.device.service.IPqStandardDevGainRecordService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author caozehui
+ * @date 2026-01-15
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class PqStandardDevGainRecordServiceImpl extends ServiceImpl<PqStandardDevGainRecordMapper, PqStandardDevGainRecord> implements IPqStandardDevGainRecordService {
+
+    @Override
+    public int getMaxNum(String stdDevMonitorId, String devMonitorId) {
+        return this.lambdaQuery().eq(PqStandardDevGainRecord::getStdDevMonitorId, stdDevMonitorId)
+                .eq(PqStandardDevGainRecord::getDevMonitorId, devMonitorId)
+                .list().stream().mapToInt(PqStandardDevGainRecord::getNum).max().orElse(0);
+    }
+
+    @Override
+    public boolean addOrUpdate(List<PqStandardDevGainRecord> recordList) {
+        recordList.forEach(record -> {
+            List<PqStandardDevGainRecord> list = this.lambdaQuery().eq(PqStandardDevGainRecord::getStdDevMonitorId, record.getStdDevMonitorId())
+                    .eq(PqStandardDevGainRecord::getDevMonitorId, record.getDevMonitorId()).list();
+            if (CollectionUtil.isNotEmpty(list)) {
+                this.lambdaUpdate().eq(PqStandardDevGainRecord::getStdDevMonitorId, record.getStdDevMonitorId())
+                        .eq(PqStandardDevGainRecord::getDevMonitorId, record.getDevMonitorId())
+                        .set(PqStandardDevGainRecord::getNum, record.getNum()).update();
+            } else {
+                this.save(record);
+            }
+        });
+        return true;
+    }
+}

detection/src/main/java/com/njcn/gather/device/service/impl/PqStandardDevGainServiceImpl.java

@@ -0,0 +1,42 @@
+package com.njcn.gather.device.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.gather.device.mapper.PqStandardDevGainMapper;
+import com.njcn.gather.device.pojo.po.PqStandardDevGain;
+import com.njcn.gather.device.service.IPqStandardDevGainService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author caozehui
+ * @date 2026-01-12
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class PqStandardDevGainServiceImpl extends ServiceImpl<PqStandardDevGainMapper, PqStandardDevGain> implements IPqStandardDevGainService {
+
+    @Override
+    public boolean add(List<PqStandardDevGain> pqStandardDevGainList) {
+        log.info("add PqStandardDevGainList: {}", pqStandardDevGainList.size());
+        List<String> stdMonitorIdList = pqStandardDevGainList.stream().map(PqStandardDevGain::getStdDevMonitorId).distinct().collect(Collectors.toList());
+        List<String> existingStdMonitorIdList = this.listByIds(stdMonitorIdList).stream().map(PqStandardDevGain::getStdDevMonitorId).collect(Collectors.toList());
+
+        pqStandardDevGainList = pqStandardDevGainList.stream().filter(pqStandardDevGain -> !existingStdMonitorIdList.contains(pqStandardDevGain.getStdDevMonitorId())).collect(Collectors.toList());
+        return this.saveBatch(pqStandardDevGainList);
+    }
+
+    @Override
+    public PqStandardDevGain get(String stdDevMonitorId) {
+        return this.lambdaQuery().eq(PqStandardDevGain::getStdDevMonitorId, stdDevMonitorId).one();
+    }
+
+    @Override
+    public List<PqStandardDevGain> list(String stdDevId) {
+        return this.lambdaQuery().likeRight(PqStandardDevGain::getStdDevMonitorId, stdDevId).orderByAsc(PqStandardDevGain::getStdDevMonitorId).list();
+    }
+}

detection/src/main/java/com/njcn/gather/device/service/impl/PqStandardDevServiceImpl.java

@@ -8,7 +8,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -18,17 +17,15 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.poi.PullDown;
 import com.njcn.common.utils.EncryptionUtil;
 import com.njcn.gather.device.mapper.PqStandardDevMapper;
-import com.njcn.gather.device.pojo.enums.CheckStateEnum;
-import com.njcn.gather.device.pojo.enums.CommonEnum;
 import com.njcn.gather.device.pojo.param.PqStandardDevParam;
 import com.njcn.gather.device.pojo.po.PqStandardDev;
+import com.njcn.gather.device.pojo.po.PqStandardDevGain;
 import com.njcn.gather.device.pojo.vo.PqStandardDevExcel;
+import com.njcn.gather.device.pojo.vo.PqStandardDevVO;
 import com.njcn.gather.device.pojo.vo.PreDetection;
+import com.njcn.gather.device.service.IPqStandardDevGainService;
 import com.njcn.gather.device.service.IPqStandardDevService;
 import com.njcn.gather.plan.mapper.AdPlanStandardDevMapper;
-import com.njcn.gather.plan.pojo.po.AdPlan;
-import com.njcn.gather.plan.pojo.po.AdPlanStandardDev;
-import com.njcn.gather.plan.service.IAdPlanService;
 import com.njcn.gather.plan.service.IAdPlanStandardDevService;
 import com.njcn.gather.pojo.enums.DetectionResponseEnum;
 import com.njcn.gather.system.dictionary.pojo.po.DictData;
@@ -64,8 +61,7 @@ public class PqStandardDevServiceImpl extends ServiceImpl<PqStandardDevMapper, P
     private final IDevTypeService devTypeService;
     private final IDictDataService dictDataService;
     private final IDictTypeService dictTypeService;
-    private final AdPlanStandardDevMapper adPlanStandardDevMapper;
-    private final IAdPlanStandardDevService adPlanStandardDevService;
+    private final IPqStandardDevGainService pqStandardDevGainService;
 
     @Override
     public Page<PqStandardDev> listPqStandardDevs(PqStandardDevParam.QueryParam queryParam) {
@@ -73,18 +69,23 @@ public class PqStandardDevServiceImpl extends ServiceImpl<PqStandardDevMapper, P
         wrapper.like(StrUtil.isNotBlank(queryParam.getName()), "name", queryParam.getName())
                 .eq(StrUtil.isNotBlank(queryParam.getManufacturer()), "manufacturer", queryParam.getManufacturer())
                 .eq(StrUtil.isNotBlank(queryParam.getDevType()), "dev_type", queryParam.getDevType())
-                .eq("state", DataStateEnum.ENABLE.getCode());
+                .eq("state", DataStateEnum.ENABLE.getCode())
+                .orderByDesc("create_time");
         return this.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), wrapper);
     }
 
     @Override
-    public PqStandardDev getPqStandardDevById(String id) {
+    public PqStandardDevVO getPqStandardDevById(String id) {
         PqStandardDev standardDev = this.getById(id);
+        PqStandardDevVO pqStandardDevVO = BeanUtil.copyProperties(standardDev, PqStandardDevVO.class);
         if (standardDev.getEncryptionFlag() == 1) {
-            standardDev.setSeries(EncryptionUtil.decoderString(1, standardDev.getSeries()));
-            standardDev.setDevKey(EncryptionUtil.decoderString(1, standardDev.getDevKey()));
+            pqStandardDevVO.setSeries(EncryptionUtil.decoderString(1, standardDev.getSeries()));
+            pqStandardDevVO.setDevKey(EncryptionUtil.decoderString(1, standardDev.getDevKey()));
         }
-        return standardDev;
+
+        List<PqStandardDevGain> gainList = pqStandardDevGainService.list(id);
+        pqStandardDevVO.setGainList(gainList);
+        return pqStandardDevVO;
     }
 
     @Override
@@ -159,10 +160,10 @@ public class PqStandardDevServiceImpl extends ServiceImpl<PqStandardDevMapper, P
         this.importData(contrastDevExcelList);
     }
 
-    @Override
-    public List<PqStandardDev> listByPlanId(String planId) {
-        return adPlanStandardDevMapper.listByPlanId(Collections.singletonList(planId));
-    }
+//    @Override
+//    public List<PqStandardDev> listByPlanId(String planId) {
+//        return adPlanStandardDevMapper.listByPlanId(Collections.singletonList(planId));
+//    }
 
     @Override
     public List<PreDetection> listStandardDevPreDetection(List<String> ids) {
@@ -311,7 +312,7 @@ public class PqStandardDevServiceImpl extends ServiceImpl<PqStandardDevMapper, P
 
     @Override
     public List<PqStandardDev> canBindingList() {
-        List<String> excludeStandardDevIds = new ArrayList<>();
+        /*List<String> excludeStandardDevIds = new ArrayList<>();
         // 获取所有已绑定的标准设备
         List<AdPlanStandardDev> boundList = adPlanStandardDevService.list();
         if (CollectionUtil.isNotEmpty(boundList)) {
@@ -350,13 +351,13 @@ public class PqStandardDevServiceImpl extends ServiceImpl<PqStandardDevMapper, P
                         .collect(Collectors.toList());
                 excludeStandardDevIds = excludeBoundList.stream().map(AdPlanStandardDev::getStandardDevId).collect(Collectors.toList());
             }
-        }
+        }*/
         List<PqStandardDev> list = this.lambdaQuery()
                 .eq(PqStandardDev::getState, DataStateEnum.ENABLE.getCode())
                 .list();
-        for (PqStandardDev pqStandardDev : list) {
+        /*for (PqStandardDev pqStandardDev : list) {
             pqStandardDev.setDisabled(excludeStandardDevIds.contains(pqStandardDev.getId()));
-        }
+        }*/
         return list;
     }
 }

detection/src/main/java/com/njcn/gather/err/service/impl/PqErrSysServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.gather.detection.pojo.enums.DetectionCodeEnum;
 import com.njcn.gather.err.mapper.PqErrSysMapper;
 import com.njcn.gather.err.pojo.param.PqErrSysDtlsParam;
 import com.njcn.gather.err.pojo.param.PqErrSysParam;
@@ -18,6 +19,7 @@ import com.njcn.gather.err.pojo.vo.PqErrSysDtlsVO;
 import com.njcn.gather.err.service.IPqErrSysDtlsService;
 import com.njcn.gather.err.service.IPqErrSysService;
 import com.njcn.gather.pojo.enums.DetectionResponseEnum;
+import com.njcn.gather.report.pojo.enums.PowerIndexEnum;
 import com.njcn.gather.system.dictionary.pojo.po.DictData;
 import com.njcn.gather.system.dictionary.pojo.po.DictTree;
 import com.njcn.gather.system.dictionary.service.IDictDataService;
@@ -219,7 +221,9 @@ public class PqErrSysServiceImpl extends ServiceImpl<PqErrSysMapper, PqErrSys> i
             List<DictTree> parentDictTreeList = dictTreeService.listByIds(pids);
             Map<String, String> map = new HashMap<>();
             parentDictTreeList.forEach(dictTree -> {
-                map.put(dictTree.getId(), dictTree.getName());
+                if(!dictTree.getCode().equals(PowerIndexEnum.VOLTAGE.getKey())&&!dictTree.getCode().equals(PowerIndexEnum.P.getKey())){
+                    map.put(dictTree.getId(), dictTree.getName());
+                }
             });
             return map;
         }

detection/src/main/java/com/njcn/gather/icd/controller/PqIcdPathController.java

@@ -60,7 +60,7 @@ public class PqIcdPathController extends BaseController {
     @PostMapping("/add")
     @ApiOperation("新增icd")
     @ApiImplicitParam(name = "param", value = "icd新增参数", required = true)
-    public HttpResult<Boolean> add(@RequestBody @Validated PqIcdPathParam param) {
+    public HttpResult<Boolean> add(PqIcdPathParam param) {
         String methodDescribe = getMethodDescribe("add");
         LogUtil.njcnDebug(log, "{}，新增数据为：{}", methodDescribe, param);
 
@@ -76,7 +76,7 @@ public class PqIcdPathController extends BaseController {
     @PostMapping("/update")
     @ApiOperation("修改icd")
     @ApiImplicitParam(name = "param", value = "icd修改参数", required = true)
-    public HttpResult<Boolean> update(@RequestBody @Validated PqIcdPathParam.UpdateParam param) {
+    public HttpResult<Boolean> update(PqIcdPathParam.UpdateParam param) {
         String methodDescribe = getMethodDescribe("update");
         LogUtil.njcnDebug(log, "{}，修改数据为：{}", methodDescribe, param);
 

detection/src/main/java/com/njcn/gather/icd/pojo/enums/IcdResponseEnum.java

@@ -0,0 +1,19 @@
+package com.njcn.gather.icd.pojo.enums;
+
+/**
+ * @author caozehui
+ * @data 2025-11-11
+ */
+public enum IcdResponseEnum {
+    FILE_NOT_NULL("A018001", "映射文件不能为空"),
+    FILE_TYPE_ERROR("A018002", "映射文件类型错误"),
+    FILE_SIZE_ERROR("A018003", "映射文件大小超出限制");
+
+    private String code;
+    private String message;
+
+    IcdResponseEnum(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

detection/src/main/java/com/njcn/gather/icd/pojo/param/PqIcdPathParam.java

@@ -6,6 +6,7 @@ import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
@@ -32,6 +33,9 @@ public class PqIcdPathParam {
     @ApiModelProperty(value = "角型接线时是否使用相别的指标来进行检测，0表示否，1表示是", required = true)
     private Integer usePhaseIndex;
 
+    @ApiModelProperty(value = "映射文件", required = true)
+    private MultipartFile mappingFile;
+
     /**
      * 分页查询实体
      */

detection/src/main/java/com/njcn/gather/icd/pojo/po/PqIcdPath.java

@@ -1,5 +1,6 @@
 package com.njcn.gather.icd.pojo.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.mybatisplus.bo.BaseEntity;
 import lombok.Data;
@@ -46,5 +47,18 @@ public class PqIcdPath extends BaseEntity implements Serializable {
      * 角型接线时是否使用相别的指标来进行检测，0表示否，1表示是
      */
     private Integer usePhaseIndex;
+
+    /**
+     * 映射文件路径
+     */
+    @TableField(exist = false)
+    private FileVO mappingFile;
+
+    @Data
+    public static class FileVO{
+        private String name;
+
+        private String url;
+    }
 }
 

detection/src/main/java/com/njcn/gather/icd/service/impl/PqIcdPathServiceImpl.java

@@ -1,5 +1,6 @@
 package com.njcn.gather.icd.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,17 +8,26 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.gather.icd.mapper.PqIcdPathMapper;
+import com.njcn.gather.icd.pojo.enums.IcdResponseEnum;
 import com.njcn.gather.icd.pojo.param.PqIcdPathParam;
 import com.njcn.gather.icd.pojo.po.PqIcdPath;
 import com.njcn.gather.icd.service.IPqIcdPathService;
 import com.njcn.gather.pojo.enums.DetectionResponseEnum;
+import com.njcn.gather.report.pojo.enums.ReportResponseEnum;
 import com.njcn.web.factory.PageFactory;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
 
 /**
@@ -41,6 +51,13 @@ public class PqIcdPathServiceImpl extends ServiceImpl<PqIcdPathMapper, PqIcdPath
                 .like(StrUtil.isNotBlank(param.getName()), PqIcdPath::getName, param.getName())
                 .orderByDesc(PqIcdPath::getCreateTime);
         Page<PqIcdPath> page = this.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), wrapper);
+        String commInstallPath = this.getCommInstallPath();
+        page.getRecords().forEach(pqIcdPath -> {
+            PqIcdPath.FileVO fileVO = new PqIcdPath.FileVO();
+            fileVO.setUrl(commInstallPath + "\\DeviceControl\\Config\\" + pqIcdPath.getName() + ".txt");
+            fileVO.setName(pqIcdPath.getName() + ".txt");
+            pqIcdPath.setMappingFile(fileVO);
+        });
         return page;
     }
 
@@ -52,9 +69,81 @@ public class PqIcdPathServiceImpl extends ServiceImpl<PqIcdPathMapper, PqIcdPath
         PqIcdPath pqIcdPath = new PqIcdPath();
         BeanUtils.copyProperties(param, pqIcdPath);
         pqIcdPath.setState(DataStateEnum.ENABLE.getCode());
+
+        String commInstallPath = this.getCommInstallPath();
+        System.out.println("commInstallPath = " + commInstallPath);
+        long FILE_SIZE_LIMIT = 1 * 1024 * 1024;
+        MultipartFile mappingFile = param.getMappingFile();
+
+        System.out.println("mappingFile = " + ObjectUtil.isNotNull(mappingFile) + " " + !mappingFile.isEmpty());
+        if (ObjectUtil.isNotNull(mappingFile) && !mappingFile.isEmpty()) {
+            String mappingFilename = mappingFile.getOriginalFilename();
+
+            if (!mappingFilename.endsWith(".txt")) {
+                throw new BusinessException(IcdResponseEnum.FILE_TYPE_ERROR);
+            }
+            if (mappingFile.getSize() > FILE_SIZE_LIMIT) {
+                throw new BusinessException(IcdResponseEnum.FILE_SIZE_ERROR);
+            }
+
+            try {
+                // 如果文件存在，则先删除
+                String mappingFilePath = commInstallPath + "\\DeviceControl\\Config\\" + mappingFilename;
+                System.out.println("mappingFilePath = " + mappingFilePath);
+                Path path = Paths.get(mappingFilePath);
+                File file = path.toFile();
+                if (file.exists()) {
+                    file.delete();
+                }
+
+                // 保存文件
+                byte[] bytes = mappingFile.getBytes();
+                BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(new FileOutputStream(mappingFilePath));
+                bufferedOutputStream.write(bytes);
+                bufferedOutputStream.flush();
+
+                bufferedOutputStream.close();
+                System.out.println("File saved successfully");
+            } catch (IOException e) {
+                throw new BusinessException(ReportResponseEnum.FILE_UPLOAD_FAILED);
+            }
+        } else {
+            System.out.println("mappingFile is null or empty");
+            throw new BusinessException(IcdResponseEnum.FILE_NOT_NULL);
+        }
+
+        this.executeRestartCmd(commInstallPath);
+
         return this.save(pqIcdPath);
     }
 
+    /**
+     * 执行重启通讯服务脚本
+     *
+     * @param commInstallPath
+     */
+    private void executeRestartCmd(String commInstallPath) {
+        // 以管理员身份运行bat脚本
+        String batFilePath = commInstallPath + "\\重启所有服务.bat";
+        try {
+            Runtime.getRuntime().exec(batFilePath);
+        } catch (IOException e) {
+            log.error("重启通讯服务失败", e);
+        }
+    }
+
+    private String getCommInstallPath() {
+        String workDir = System.getProperty("user.dir");
+//        String workDir = "D:\\program\\CN_Gather";
+        // 获取映射文件存放文件夹
+        String dirPath = workDir + "\\9100";
+        int index = workDir.indexOf("\\resources\\extraResources\\java");
+        if (index != -1) {
+            dirPath = workDir.substring(0, workDir.indexOf("\\resources\\extraResources\\java")) + "\\9100";
+        }
+        return dirPath;
+    }
+
     @Override
     @Transactional
     public boolean updateIcd(PqIcdPathParam.UpdateParam param) {
@@ -62,12 +151,60 @@ public class PqIcdPathServiceImpl extends ServiceImpl<PqIcdPathMapper, PqIcdPath
         this.checkRepeat(param, true);
         PqIcdPath pqIcdPath = new PqIcdPath();
         BeanUtils.copyProperties(param, pqIcdPath);
+
+        String commInstallPath = this.getCommInstallPath();
+        long FILE_SIZE_LIMIT = 1 * 1024 * 1024;
+        MultipartFile mappingFile = param.getMappingFile();
+        if (ObjectUtil.isNotNull(mappingFile) && !mappingFile.isEmpty()) {
+            String mappingFilename = mappingFile.getOriginalFilename();
+
+            if (!mappingFilename.endsWith(".txt")) {
+                throw new BusinessException(IcdResponseEnum.FILE_TYPE_ERROR);
+            }
+            if (mappingFile.getSize() > FILE_SIZE_LIMIT) {
+                throw new BusinessException(IcdResponseEnum.FILE_SIZE_ERROR);
+            }
+
+            try {
+                // 如果文件存在，则先删除
+                String mappingFilePath = commInstallPath + "\\DeviceControl\\Config\\" + mappingFilename;
+                Path path = Paths.get(mappingFilePath);
+                File file = path.toFile();
+                if (file.exists()) {
+                    file.delete();
+                }
+
+                // 保存文件
+                byte[] bytes = mappingFile.getBytes();
+                BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(new FileOutputStream(mappingFilePath));
+                bufferedOutputStream.write(bytes);
+                bufferedOutputStream.flush();
+
+                bufferedOutputStream.close();
+            } catch (IOException e) {
+                throw new BusinessException(ReportResponseEnum.FILE_UPLOAD_FAILED);
+            }
+        }
+
+        this.executeRestartCmd(commInstallPath);
+
         return this.updateById(pqIcdPath);
     }
 
     @Override
     @Transactional
     public boolean deleteIcd(List<String> ids) {
+        List<PqIcdPath> pqIcdPaths = this.listByIds(ids);
+        String commInstallPath = this.getCommInstallPath();
+        pqIcdPaths.forEach(pqIcdPath -> {
+            String mappingFilePath = commInstallPath + "\\DeviceControl\\Config\\" + pqIcdPath.getName() + ".txt";
+            Path path = Paths.get(mappingFilePath);
+            File file = path.toFile();
+            if (file.exists()) {
+                file.delete();
+            }
+        });
+
         return this.lambdaUpdate().in(PqIcdPath::getId, ids).set(PqIcdPath::getState, DataStateEnum.DELETED.getCode()).update();
     }
 

detection/src/main/java/com/njcn/gather/monitor/mapper/PqMonitorMapper.java

@@ -1,8 +1,10 @@
 package com.njcn.gather.monitor.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
+import com.njcn.gather.device.pojo.po.PqDevSub;
 import com.njcn.gather.device.pojo.vo.PreDetection;
 import com.njcn.gather.monitor.pojo.po.PqMonitor;
+import com.njcn.gather.plan.pojo.po.AdPlan;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -33,5 +35,21 @@ public interface PqMonitorMapper extends MPJBaseMapper<PqMonitor> {
     PqMonitor getByDevIdAndNum(@Param("devId") String devId, @Param("num") Integer num);
 
     List<PqMonitor> listByDevIds(@Param("devIds") List<String> devIds);
+
+    void updateDeviceCheckState(@Param("devId")String devId, @Param("value") Integer value);
+
+    void updateDeviceCheckResult(@Param("devId")String devId, @Param("value") Integer value);
+
+    void updateDeviceReportRState(@Param("devId")String devId, @Param("value") Integer value);
+
+    AdPlan getPlanByDevId(@Param("devId") String devId);
+
+    List<PqDevSub> listDevSubByPlanId(@Param("planId") String planId);
+
+    void updatePlanCheckState(@Param("planId") String planId, @Param("value") Integer value);
+
+    void updatePlanCheckResult(@Param("planId") String planId, @Param("value") Integer value);
+
+    void updatePlanReportRState(@Param("planId") String planId, @Param("value") Integer value);
 }
 

detection/src/main/java/com/njcn/gather/monitor/mapper/mapping/PqMonitorMapper.xml

@@ -2,6 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.gather.monitor.mapper.PqMonitorMapper">
 
+
     <select id="selectMonitorInfo"
             resultType="com.njcn.gather.device.pojo.vo.PreDetection$MonitorListDTO">
         SELECT CONCAT(pq_dev.IP, '_', Num) as lineId,
@@ -41,5 +42,55 @@
         </foreach>
         order by Num
     </select>
+
+    <update id="updateDeviceCheckState">
+        update pq_dev_sub
+        set Check_State = #{value}
+        where dev_Id = #{devId}
+    </update>
+
+    <update id="updateDeviceCheckResult">
+        update pq_dev_sub
+        set Check_Result = #{value}
+        where dev_Id = #{devId}
+    </update>
+
+    <update id="updateDeviceReportRState">
+        update pq_dev_sub
+        set Report_State = #{value}
+        where dev_Id = #{devId}
+    </update>
+
+    <select id="getPlanByDevId" resultType="com.njcn.gather.plan.pojo.po.AdPlan">
+        select *
+        from ad_plan
+                 inner join pq_dev on ad_plan.id = pq_dev.Plan_Id
+        where pq_dev.Id = #{devId}
+    </select>
+
+    <select id="listDevSubByPlanId" resultType="com.njcn.gather.device.pojo.po.PqDevSub">
+        select *
+        from pq_dev_sub
+                 inner join pq_dev on pq_dev_sub.dev_Id = pq_dev.Id
+        where pq_dev.Plan_Id = #{planId}
+    </select>
+
+    <update id="updatePlanCheckState">
+        update ad_plan
+        set Test_State = #{value}
+        where id = #{planId}
+    </update>
+
+    <update id="updatePlanCheckResult">
+        update ad_plan
+        set Result = #{value}
+        where id = #{planId}
+    </update>
+
+    <update id="updatePlanReportRState">
+        update ad_plan
+        set Report_State = #{value}
+        where id = #{planId}
+    </update>
 </mapper>
 

detection/src/main/java/com/njcn/gather/monitor/pojo/param/PqMonitorParam.java

@@ -52,7 +52,7 @@ public class PqMonitorParam {
     private Integer statInterval;
 
     @ApiModelProperty(value = "谐波系统监测点id")
-    @NotBlank(message = DetectionValidMessage.MONITOR_ID_NOT_BLANK)
+//    @NotBlank(message = DetectionValidMessage.MONITOR_ID_NOT_BLANK)
     private String harmSysId;
 
     @ApiModelProperty(value = "是否做检测")

detection/src/main/java/com/njcn/gather/monitor/pojo/vo/PqMonitorExcel.java

@@ -14,11 +14,11 @@ import javax.validation.constraints.NotNull;
 @Data
 public class PqMonitorExcel {
 
-    @Excel(name = "谐波系统监测点ID*", width = 20, orderNum = "1")
-    @NotBlank(message = DetectionValidMessage.MONITOR_ID_NOT_BLANK)
+    @Excel(name = "谐波系统监测点ID", width = 20, orderNum = "1")
+//    @NotBlank(message = DetectionValidMessage.MONITOR_ID_NOT_BLANK)
     private String harmSysId;
 
-    @Excel(name = "所属母线*", width = 20, orderNum = "2")
+    @Excel(name = "母线名称*", width = 20, orderNum = "2")
     @NotBlank(message = DetectionValidMessage.BELONG_LINE_NOT_BLANK)
     private String busbar;
 
@@ -30,19 +30,27 @@ public class PqMonitorExcel {
     @NotNull(message = DetectionValidMessage.MONITOR_NUM_NOT_NULL)
     private Integer num;
 
-    @Excel(name = "PT变比(pt1:pt2)*", width = 20, orderNum = "5")
+    @Excel(name = "PT一次变比*", width = 20, orderNum = "5")
     @NotBlank(message = DetectionValidMessage.PT_NOT_BLANK)
-    private String pt;
+    private String pt1;
 
-    @Excel(name = "CT变比(ct1:ct2)*", width = 20, orderNum = "6")
+    @Excel(name = "PT二次变比*", width = 20, orderNum = "6")
+    @NotBlank(message = DetectionValidMessage.PT_NOT_BLANK)
+    private String pt2;
+
+    @Excel(name = "CT一次变比*", width = 20, orderNum = "7")
     @NotBlank(message = DetectionValidMessage.CT_NOT_BLANK)
-    private String ct;
+    private String ct1;
 
-    @Excel(name = "接线方式*", width = 20, orderNum = "7")
+    @Excel(name = "CT二次变比*", width = 20, orderNum = "8")
+    @NotBlank(message = DetectionValidMessage.CT_NOT_BLANK)
+    private String ct2;
+
+    @Excel(name = "接线方式*", width = 20, orderNum = "9")
     @NotBlank(message = DetectionValidMessage.CONNECTION_NOT_BLANK)
     private String connection;
 
-    @Excel(name = "统计间隔*", width = 10, orderNum = "8")
+    @Excel(name = "统计间隔*", width = 20, orderNum = "10")
     @NotNull(message = DetectionValidMessage.STAT_INTERVAL_NOT_NULL)
     private Integer statInterval;
 }

detection/src/main/java/com/njcn/gather/monitor/service/IPqMonitorService.java

@@ -6,7 +6,6 @@ import com.njcn.gather.monitor.pojo.po.PqMonitor;
 import com.njcn.gather.plan.pojo.enums.DataSourceEnum;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author caozehui
@@ -112,4 +111,18 @@ public interface IPqMonitorService extends IService<PqMonitor> {
      */
     Integer getDevCheckResult(String devId);
 
+    /**
+     * 根据被检设备id删除监测点信息
+     *
+     * @param devId
+     * @return
+     */
+    boolean removeByDevId(String devId);
+
+    /**
+     * 根据被检设备id和监测点编号获取监测点信息
+     * @param devId 设备id
+     * @param monitorNum 监测点编号
+     */
+    PqMonitor getByDevIdAndNum(String devId, int monitorNum);
 }

detection/src/main/java/com/njcn/gather/monitor/service/impl/PqMonitorServiceImpl.java

@@ -10,11 +10,15 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.gather.detection.util.socket.CnSocketUtil;
 import com.njcn.gather.device.pojo.enums.CheckResultEnum;
 import com.njcn.gather.device.pojo.enums.CheckStateEnum;
+import com.njcn.gather.device.pojo.enums.DevReportStateEnum;
+import com.njcn.gather.device.pojo.po.PqDevSub;
 import com.njcn.gather.monitor.mapper.PqMonitorMapper;
 import com.njcn.gather.monitor.pojo.param.PqMonitorParam;
 import com.njcn.gather.monitor.pojo.po.PqMonitor;
 import com.njcn.gather.monitor.service.IPqMonitorService;
 import com.njcn.gather.plan.pojo.enums.DataSourceEnum;
+import com.njcn.gather.plan.pojo.enums.PlanReportStateEnum;
+import com.njcn.gather.plan.pojo.po.AdPlan;
 import com.njcn.gather.pojo.enums.DetectionResponseEnum;
 import com.njcn.gather.storage.service.DetectionDataDealService;
 import com.njcn.gather.storage.service.impl.DetectionDataServiceImpl;
@@ -26,6 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
@@ -62,11 +67,110 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
     @Transactional
     public boolean updatePqMonitorByDevId(String devId, List<PqMonitorParam> paramList) {
         // 先删除原有数据
-        this.deletePqMonitorByDevId(devId);
-        // 再添加新数据
+//        this.deletePqMonitorByDevId(devId);
+
+        // 添加新数据
         List<PqMonitor> pqMonitorList = BeanUtil.copyToList(paramList, PqMonitor.class);
         pqMonitorList.forEach(pqMonitor -> pqMonitor.setDevId(devId));
-        return this.saveBatch(pqMonitorList);
+
+        List<PqMonitor> existedMonitorList = this.listPqMonitorByDevIds(Collections.singletonList(devId));
+
+        Map<Integer, List<PqMonitor>> map = pqMonitorList.stream().collect(Collectors.groupingBy(PqMonitor::getNum));
+
+        List<PqMonitor> newMonitorList = new ArrayList<>();
+        map.forEach((num, monitorList) -> {
+            PqMonitor pqMonitor = existedMonitorList.stream().filter(monitor -> monitor.getNum() == num).findFirst().orElse(null);
+
+            if (ObjectUtil.isNotNull(pqMonitor)) {
+                BeanUtil.copyProperties(monitorList.get(0), pqMonitor, "id", "realtimeResult", "statisticsResult", "recordedResult", "realtimeNum", "statisticsNum", "recordedNum", "resultType", "qualifiedNum");
+                newMonitorList.add(pqMonitor);
+                existedMonitorList.remove(pqMonitor);
+            } else {
+                newMonitorList.addAll(monitorList);
+            }
+        });
+
+        // 同步更新设备的状态
+        List<PqMonitor> enableCheckMonitorList = newMonitorList.stream().filter(pqMonitor -> pqMonitor.getCheckFlag() == 1).collect(Collectors.toList());
+        List<PqMonitor> checkedMonitorList = enableCheckMonitorList.stream().filter(pqMonitor -> ObjectUtil.isNotNull(pqMonitor.getResultType())).collect(Collectors.toList());
+
+        if (enableCheckMonitorList.size() == checkedMonitorList.size() && checkedMonitorList.size() > 0) {
+            this.baseMapper.updateDeviceCheckState(devId, CheckStateEnum.CHECKED.getValue());
+            this.baseMapper.updateDeviceReportRState(devId, DevReportStateEnum.NOT_GENERATED.getValue());
+        }
+        if (enableCheckMonitorList.size() > checkedMonitorList.size() && checkedMonitorList.size() > 0) {
+            this.baseMapper.updateDeviceCheckState(devId, CheckStateEnum.CHECKING.getValue());
+            this.baseMapper.updateDeviceReportRState(devId, DevReportStateEnum.NOT_GENERATED.getValue());
+        }
+        if (enableCheckMonitorList.size() > 0 && checkedMonitorList.size() == 0) {
+            this.baseMapper.updateDeviceCheckState(devId, CheckStateEnum.UNCHECKED.getValue());
+        }
+
+        List<Integer> monitorResultList = checkedMonitorList.stream().map(pqMonitor -> {
+            String resultType = pqMonitor.getResultType();
+            DataSourceEnum dataSourceEnum = DataSourceEnum.ofByValue(resultType);
+            switch (dataSourceEnum) {
+                case REAL_DATA:
+                    return pqMonitor.getRealtimeResult();
+                case WAVE_DATA:
+                    return pqMonitor.getRecordedResult();
+                case MINUTE_STATISTICS_MAX:
+                case MINUTE_STATISTICS_MIN:
+                case MINUTE_STATISTICS_AVG:
+                case MINUTE_STATISTICS_CP95:
+                    return pqMonitor.getStatisticsResult();
+                default:
+                    break;
+            }
+            return null;
+        }).collect(Collectors.toList());
+
+        long qualifiedCount = monitorResultList.stream().filter(result -> result != null && result == 1).count();
+        if (qualifiedCount == monitorResultList.size() && monitorResultList.size() > 0) {
+            this.baseMapper.updateDeviceCheckResult(devId, CheckResultEnum.ACCORD.getValue());
+        } else if (monitorResultList.size() > 0) {
+            this.baseMapper.updateDeviceCheckResult(devId, CheckResultEnum.NOT_ACCORD.getValue());
+        } else {
+            this.baseMapper.updateDeviceCheckResult(devId, CheckResultEnum.UNCHECKED.getValue());
+        }
+
+        // 同步更新计划的状态
+        AdPlan plan = this.baseMapper.getPlanByDevId(devId);
+        if (ObjectUtil.isNotNull(plan)) {
+
+
+            List<PqDevSub> devSubList = this.baseMapper.listDevSubByPlanId(plan.getId());
+
+            List<PqDevSub> checkedDevSubList = devSubList.stream().filter(pqDevSub -> pqDevSub.getCheckState() == CheckStateEnum.CHECKED.getValue()).collect(Collectors.toList());
+            List<PqDevSub> checkingDevSubList = devSubList.stream().filter(pqDevSub -> pqDevSub.getCheckState() == CheckStateEnum.CHECKING.getValue()).collect(Collectors.toList());
+            if (checkedDevSubList.size() == devSubList.size() && devSubList.size() > 0) {
+                this.baseMapper.updatePlanCheckState(plan.getId(), CheckStateEnum.CHECKED.getValue());
+            } else if (checkedDevSubList.size() > 0 || checkingDevSubList.size() > 0) {
+                this.baseMapper.updatePlanCheckState(plan.getId(), CheckStateEnum.CHECKING.getValue());
+            } else {
+                this.baseMapper.updatePlanCheckState(plan.getId(), CheckStateEnum.UNCHECKED.getValue());
+            }
+
+            List<PqDevSub> accordDevSubList = checkedDevSubList.stream().filter(pqDevSub -> pqDevSub.getCheckResult() == CheckResultEnum.ACCORD.getValue()).collect(Collectors.toList());
+            if (accordDevSubList.size() == checkedDevSubList.size() && checkedDevSubList.size() > 0) {
+                this.baseMapper.updatePlanCheckResult(plan.getId(), CheckResultEnum.ACCORD.getValue());
+            } else if (accordDevSubList.size() > 0) {
+                this.baseMapper.updatePlanCheckResult(plan.getId(), CheckResultEnum.NOT_ACCORD.getValue());
+            } else {
+                this.baseMapper.updatePlanCheckResult(plan.getId(), CheckResultEnum.UNCHECKED.getValue());
+            }
+
+            List<PqDevSub> generatedDevSubList = checkedDevSubList.stream().filter(pqDevSub -> pqDevSub.getReportState() == DevReportStateEnum.GENERATED.getValue()).collect(Collectors.toList());
+            if (generatedDevSubList.size() == checkedDevSubList.size() && checkedDevSubList.size() > 0) {
+                this.baseMapper.updatePlanReportRState(plan.getId(), PlanReportStateEnum.REPORT_STATE_ALL_GENERATED.getValue());
+            } else if (generatedDevSubList.size() > 0) {
+                this.baseMapper.updatePlanReportRState(plan.getId(), PlanReportStateEnum.REPORT_STATE_PARTIALLY_GENERATED.getValue());
+            } else {
+                this.baseMapper.updatePlanReportRState(plan.getId(), PlanReportStateEnum.REPORT_STATE_NOT_GENERATED.getValue());
+            }
+        }
+        this.removeByIds(existedMonitorList.stream().map(PqMonitor::getId).collect(Collectors.toList()));
+        return this.saveOrUpdateBatch(newMonitorList);
     }
 
     @Override
@@ -163,10 +267,19 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
                 } else {
                     newWaveNum.set(waveNum);
                     newMonitorResult = waveNumResultMap.get(waveNum);
+                    if (newMonitorResult == 2) {
+                        newMonitorResult = CheckResultEnum.NOT_ACCORD.getValue();
+                    }
                 }
                 break;
             default:
                 newMonitorResult = detectionDataDealService.getMonitorResult(monitorId, adTypes, dataSourceEnum.getValue(), num, null, code);
+                if (newMonitorResult == 2) {
+                    newMonitorResult = CheckResultEnum.NOT_ACCORD.getValue();
+                }
+                if (newMonitorResult == 1) {
+                    newMonitorResult = CheckResultEnum.ACCORD.getValue();
+                }
                 break;
         }
 
@@ -188,7 +301,18 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
 
             if (CheckResultEnum.ACCORD.getValue().equals(oldMonitorResult)) {
                 if (CheckResultEnum.ACCORD.getValue().equals(newMonitorResult)) {
-                    qualifiedNum += 1;
+                    String oldNum = "";
+                    if (DataSourceEnum.REAL_DATA.getValue().equals(resultType)) {
+                        oldNum = monitor.getRealtimeNum();
+                    } else if (DataSourceEnum.WAVE_DATA.getValue().equals(resultType)) {
+                        oldNum = monitor.getRecordedNum();
+                    } else {
+                        oldNum = monitor.getStatisticsNum();
+                    }
+                    String[] split1 = oldNum.split(CnSocketUtil.SPLIT_TAG);
+                    if (!split1[0].equals(num.toString())) {
+                        qualifiedNum += 1;
+                    }
                     updateFlag = true;
                 }
             } else {
@@ -269,15 +393,61 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
             String resultType = monitor.getResultType();
             if (StrUtil.isNotBlank(resultType)) {
                 if (DataSourceEnum.REAL_DATA.getValue().equals(resultType)) {
-                    allResultFlags.add(monitor.getRealtimeResult());
+                    //allResultFlags.add(monitor.getRealtimeResult());
+                    if (monitor.getRealtimeResult() == 0) {
+                        allResultFlags.add(2);
+                    }
+                    if (monitor.getRealtimeResult() == 1) {
+                        allResultFlags.add(1);
+                    }
+                    if (monitor.getRealtimeResult() == 4) {
+                        allResultFlags.add(4);
+                    }
                 } else if (DataSourceEnum.WAVE_DATA.getValue().equals(resultType)) {
-                    allResultFlags.add(monitor.getRecordedResult());
+                    //allResultFlags.add(monitor.getRecordedResult());
+                    if (monitor.getRecordedResult() == 0) {
+                        allResultFlags.add(2);
+                    }
+                    if (monitor.getRecordedResult() == 1) {
+                        allResultFlags.add(1);
+                    }
+                    if (monitor.getRecordedResult() == 4) {
+                        allResultFlags.add(4);
+                    }
                 } else {
-                    allResultFlags.add(monitor.getStatisticsResult());
+                    //allResultFlags.add(monitor.getStatisticsResult());
+                    if (monitor.getStatisticsResult() == 0) {
+                        allResultFlags.add(2);
+                    }
+                    if (monitor.getStatisticsResult() == 1) {
+                        allResultFlags.add(1);
+                    }
+                    if (monitor.getStatisticsResult() == 4) {
+                        allResultFlags.add(4);
+                    }
                 }
             }
         }
 
         return DetectionDataServiceImpl.isResultFlag(allResultFlags);
     }
+
+    @Override
+    public boolean removeByDevId(String devId) {
+        QueryWrapper<PqMonitor> wrapper = new QueryWrapper<>();
+        wrapper.eq("pq_monitor.Dev_Id", devId);
+        return this.remove(wrapper);
+    }
+
+    @Override
+    public PqMonitor getByDevIdAndNum(String devId, int monitorNum) {
+        QueryWrapper<PqMonitor> wrapper = new QueryWrapper<>();
+        wrapper.eq("pq_monitor.Dev_Id", devId)
+                .eq("pq_monitor.Num", monitorNum);
+        List<PqMonitor> pqMonitors = this.list(wrapper);
+        if (CollUtil.isNotEmpty(pqMonitors)) {
+            return pqMonitors.get(0);
+        }
+        return null;
+    }
 }

detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java

@@ -22,6 +22,7 @@ import com.njcn.gather.device.service.IPqDevService;
 import com.njcn.gather.plan.pojo.param.AdPlanParam;
 import com.njcn.gather.plan.pojo.po.AdPlan;
 import com.njcn.gather.plan.pojo.vo.AdPlanVO;
+import com.njcn.gather.plan.pojo.vo.PlanStatisticsVO;
 import com.njcn.gather.plan.service.AsyncPlanHandler;
 import com.njcn.gather.plan.service.IAdPlanService;
 import com.njcn.gather.type.pojo.po.DevType;
@@ -42,6 +43,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -178,7 +181,7 @@ public class AdPlanController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getBigTestItem")
     @ApiOperation("获取检测大项数据")
-    @ApiImplicitParam(name = "id", value = "检测计划id", required = true)
+    @ApiImplicitParam(name = "checkParam", value = "检测计划id", required = true)
     public HttpResult<List<Map<String, String>>> getBigTestItem(@RequestBody AdPlanParam.CheckParam checkParam) {
         String methodDescribe = getMethodDescribe("getBigTestItem");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, checkParam);
@@ -189,17 +192,28 @@ public class AdPlanController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DOWNLOAD)
     @PostMapping("/analyse")
     @ApiOperation("检测数据分析")
-    @ApiImplicitParam(name = "planId", value = "检测计划id", required = true)
+    @ApiImplicitParam(name = "ids", value = "检测计划id", required = true)
     public void analyse(@RequestBody List<String> ids) {
         String methodDescribe = getMethodDescribe("analyse");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, String.join(StrUtil.COMMA, ids));
         adPlanService.analyse(ids);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/statistics")
+    @ApiOperation("检测计划统计")
+    @ApiImplicitParam(name = "param", value = "检测计划统计参数", required = true)
+    public HttpResult<PlanStatisticsVO> statistics(@RequestBody @Validated AdPlanParam.StatisticsParam param) {
+        String methodDescribe = getMethodDescribe("statistics");
+        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, param);
+        PlanStatisticsVO result = adPlanService.statistics(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/listByPlanId")
     @ApiOperation("查询出所有已绑定的设备")
-    @ApiImplicitParam(name = "planId", value = "计划id", required = true)
+    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
     public HttpResult<List<PqDevVO>> listByPlanId(@RequestBody @Validated PqDevParam.QueryParam param) {
         String methodDescribe = getMethodDescribe("listByPlanId");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, param);
@@ -239,7 +253,7 @@ public class AdPlanController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/listDevByPlanId")
     @ApiOperation("根据计划id分页查询被检设备")
-    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
+    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
     public HttpResult<Page<PqDevVO>> listDevByPlanId(@RequestBody @Validated PqDevParam.QueryParam param) {
         String methodDescribe = getMethodDescribe("listDevByPlanId");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, param);
@@ -452,7 +466,17 @@ public class AdPlanController extends BaseController {
             fileTypeError.setMessage("请上传zip文件");
             throw new BusinessException(fileTypeError);
         }
-        asyncPlanHandler.importAndMergePlanCheckData(file, getUserId(), planId);
+        // 创建临时文件
+        File tempFile = cn.hutool.core.io.FileUtil.createTempFile();
+        // 将MultipartFile内容写入临时文件
+        try {
+            file.transferTo(tempFile);
+        } catch (IOException e) {
+            throw new BusinessException(CommonResponseEnum.FAIL, "文件保存失败");
+        }
+        // 获取文件路径
+        String filePath = tempFile.getAbsolutePath();
+        asyncPlanHandler.importAndMergePlanCheckData(filePath, getUserId(), planId);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
 
     }

detection/src/main/java/com/njcn/gather/plan/mapper/PqDevCheckHistoryMapper.java

@@ -0,0 +1,15 @@
+package com.njcn.gather.plan.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.njcn.gather.plan.pojo.po.PqDevCheckHistory;
+import com.njcn.gather.plan.pojo.vo.PlanStatisticsItemVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface PqDevCheckHistoryMapper extends MPJBaseMapper<PqDevCheckHistory> {
+
+    List<PlanStatisticsItemVO> listItemDistributions(@Param("planId") String planId,
+                                                     @Param("manufacturer") String manufacturer,
+                                                     @Param("devType") String devType);
+}

detection/src/main/java/com/njcn/gather/plan/mapper/mapping/PqDevCheckHistoryMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.gather.plan.mapper.PqDevCheckHistoryMapper">
+
+    <select id="listItemDistributions" resultType="com.njcn.gather.plan.pojo.vo.PlanStatisticsItemVO">
+        SELECT
+            Item_Id AS itemId,
+            Item_Name AS itemName,
+            SUM(CASE WHEN Result = 0 THEN 1 ELSE 0 END) AS unqualifiedCount
+        FROM pq_dev_check_history
+        <where>
+            State = 1
+            AND Plan_Id = #{planId}
+            <if test="manufacturer != null and manufacturer != ''">
+                AND Manufacturer = #{manufacturer}
+            </if>
+            <if test="devType != null and devType != ''">
+                AND Dev_Type = #{devType}
+            </if>
+        </where>
+        GROUP BY Item_Id, Item_Name
+        ORDER BY unqualifiedCount DESC, Item_Name ASC
+    </select>
+</mapper>

detection/src/main/java/com/njcn/gather/plan/pojo/param/AdPlanParam.java

@@ -130,4 +130,17 @@ public class AdPlanParam {
         private String patternId;
         private String scriptType;
     }
+
+    @Data
+    public static class StatisticsParam {
+        @ApiModelProperty(value = "检测计划ID", required = true)
+        @NotBlank(message = DetectionValidMessage.PLAN_ID_NOT_BLANK)
+        private String planId;
+
+        @ApiModelProperty("设备厂家")
+        private String manufacturer;
+
+        @ApiModelProperty("设备类型")
+        private String devType;
+    }
 }

detection/src/main/java/com/njcn/gather/plan/pojo/po/PqDevCheckHistory.java

@@ -0,0 +1,60 @@
+package com.njcn.gather.plan.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@TableName("pq_dev_check_history")
+public class PqDevCheckHistory {
+
+    @TableId(value = "Id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    @TableField("Plan_Id")
+    private String planId;
+
+    @TableField("Dev_Id")
+    private String devId;
+
+    @TableField("Dev_Type")
+    private String devType;
+
+    @TableField("Manufacturer")
+    private String manufacturer;
+
+    @TableField("ReCheck_Num")
+    private Integer recheckNum;
+
+    @TableField("Item_Id")
+    private String itemId;
+
+    @TableField("Item_Name")
+    private String itemName;
+
+    @TableField("Result")
+    private Integer result;
+
+    @TableField("Check_Time")
+    private LocalDateTime checkTime;
+
+    @TableField("State")
+    private Integer state;
+
+    @TableField("Create_By")
+    private String createBy;
+
+    @TableField(value = "Create_Time", fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    @TableField("Update_By")
+    private String updateBy;
+
+    @TableField(value = "Update_Time", fill = FieldFill.UPDATE)
+    private LocalDateTime updateTime;
+}

detection/src/main/java/com/njcn/gather/plan/pojo/vo/PlanStatisticsItemVO.java

@@ -0,0 +1,25 @@
+package com.njcn.gather.plan.pojo.vo;
+
+import lombok.Data;
+
+/**
+ * 检测计划单个检测大项柱状图统计结果。
+ */
+@Data
+public class PlanStatisticsItemVO {
+
+    /**
+     * 检测大项ID。
+     */
+    private String itemId;
+
+    /**
+     * 检测大项名称。
+     */
+    private String itemName;
+
+    /**
+     * 不合格次数。
+     */
+    private Integer unqualifiedCount;
+}

detection/src/main/java/com/njcn/gather/plan/pojo/vo/PlanStatisticsVO.java

@@ -0,0 +1,93 @@
+package com.njcn.gather.plan.pojo.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 检测计划统计结果。
+ */
+@Data
+public class PlanStatisticsVO {
+
+    /**
+     * 检测计划ID。
+     */
+    private String planId;
+
+    /**
+     * 检测计划名称。
+     */
+    private String planName;
+
+    /**
+     * 所有设备检测次数之和。
+     */
+    private Integer totalCheckCount;
+
+    /**
+     * 已检设备总数。
+     */
+    private Integer checkedDeviceCount;
+
+    /**
+     * 未检设备总数。
+     */
+    private Integer uncheckedDeviceCount;
+
+    /**
+     * 第一次检测合格的设备数量。
+     */
+    private Integer firstQualifiedDeviceCount;
+
+    /**
+     * 第二次检测后合格的设备数量。
+     */
+    private Integer secondQualifiedDeviceCount;
+
+    /**
+     * 第三次及以上检测后合格的设备数量。
+     */
+    private Integer thirdOrMoreQualifiedDeviceCount;
+
+    /**
+     * 最终合格的设备数量。
+     */
+    private Integer qualifiedDeviceCount;
+
+    /**
+     * 最终不合格的设备数量。
+     */
+    private Integer unqualifiedDeviceCount;
+
+    /**
+     * 存在不合格结果的检测项数量。
+     */
+    private Integer unqualifiedItemCount;
+
+    /**
+     * 一次合格率，百分制。
+     */
+    private BigDecimal firstPassRate;
+
+    /**
+     * 二次合格率，百分制。
+     */
+    private BigDecimal secondPassRate;
+
+    /**
+     * 三次及以上合格率，百分制。
+     */
+    private BigDecimal thirdOrMorePassRate;
+
+    /**
+     * 不合格率，百分制。
+     */
+    private BigDecimal unqualifiedRate;
+
+    /**
+     * 检测项分布。
+     */
+    private List<PlanStatisticsItemVO> itemDistributions;
+}

detection/src/main/java/com/njcn/gather/plan/service/AsyncPlanHandler.java

@@ -23,6 +23,7 @@ import com.njcn.gather.monitor.service.IPqMonitorService;
 import com.njcn.gather.plan.pojo.po.AdPlan;
 import com.njcn.gather.plan.pojo.vo.AdPlanCheckDataVO;
 import com.njcn.gather.plan.service.util.BatchFileReader;
+import com.njcn.gather.system.config.PathConfig;
 import com.njcn.gather.system.config.handler.NonWebAutoFillValueHandler;
 import com.njcn.gather.tools.report.model.constant.ReportConstant;
 import com.njcn.gather.type.pojo.po.DevType;
@@ -37,10 +38,8 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
-import java.io.IOException;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -65,10 +64,12 @@ public class AsyncPlanHandler {
     private final IAdPariService adPairService;
 
     private final JdbcTemplate jdbcTemplate;
-    @Value("${report.reportDir}")
-    private String reportPath;
-    @Value("${data.homeDir}")
-    private String dataPath;
+
+    private final PathConfig pathConfig;
+//    @Value("${report.reportDir}")
+//    private String reportPath;
+//    @Value("${data.homeDir}")
+//    private String dataPath;
 
     private static final int BATCH_SIZE = 10000;
     private static final int FINAL_STEP = 85;
@@ -199,13 +200,13 @@ public class AsyncPlanHandler {
 
             // 创建 ZIP 文件
             String zipFileName = plan.getName() + "_检测数据包.zip";
-            File zipFile = FileUtil.file(dataPath + File.separator + TEST_DATA_DIR + File.separator, zipFileName);
+            File zipFile = FileUtil.file(pathConfig.getDataPath() + File.separator + TEST_DATA_DIR + File.separator, zipFileName);
 
             // 添加检测报告文件
             if (ObjectUtil.isNotNull(report) && report.equals(1)) {
                 for (PqDev dev : devList) {
                     DevType devType = devTypeService.getById(dev.getDevType());
-                    String dirPath = reportPath.concat(File.separator).concat(devType.getName());
+                    String dirPath = pathConfig.getReportPath().concat(File.separator).concat(devType.getName());
                     File reportFile = new File(dirPath.concat(File.separator).concat(dev.getCreateId()).concat(ReportConstant.DOCX));
                     // 如果reportFile存在，则将reportFile中的文件添加到已有的zip文件中
                     if (FileUtil.exist(reportFile)) {
@@ -235,35 +236,28 @@ public class AsyncPlanHandler {
     }
 
 
-    @Transactional
     @Async
-    public void importAndMergePlanCheckData(MultipartFile file, String uid, String planId) {
+    public void importAndMergePlanCheckData(String zipFilePath, String uid, String planId) {
+        importAndMergePlanCheckDataLogic(zipFilePath, uid, planId);
+
+    }
+
+    @Transactional
+    public void importAndMergePlanCheckDataLogic(String zipFilePath, String uid, String planId) {
         NonWebAutoFillValueHandler.setCurrentUserId(uid);
         LocalDateTime startTime = LocalDateTime.now();
         AtomicInteger progress = new AtomicInteger(0);
         AtomicInteger currentProgress = new AtomicInteger(0);
         AtomicInteger dataCount = new AtomicInteger(0);
         try {
-            sseClient.sendMessage(uid, planId, HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), progress, "开始保存文件，请耐心等待..."));
             // 创建临时目录用于解压文件
             File tempDir = FileUtil.mkdir(FileUtil.getTmpDirPath() + "import_plan_check_data_" + System.currentTimeMillis() + "/");
-
-            // 将上传的zip文件保存到临时目录
-            File zipFile = FileUtil.file(tempDir, file.getOriginalFilename());
-            try {
-                // 直接获取文件字节，避免依赖Tomcat临时文件
-                byte[] fileBytes = file.getBytes();
-                FileUtil.writeBytes(fileBytes, zipFile);
-            } catch (IOException e) {
-                log.error("保存上传文件失败", e);
-                throw e;
-            }
             progress.addAndGet(1);
             sseClient.sendMessage(uid, planId, HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), progress, "开始解压文件，请耐心等待..."));
 
             // 解压zip文件
             File unzipDir = FileUtil.mkdir(FileUtil.file(tempDir, "unzip"));
-            ZipUtil.unzip(zipFile.getAbsolutePath(), unzipDir.getAbsolutePath());
+            ZipUtil.unzip(zipFilePath, unzipDir.getAbsolutePath());
 
             // 查找解压目录中的json文件
             File[] files = unzipDir.listFiles();
@@ -351,7 +345,7 @@ public class AsyncPlanHandler {
                 for (File docx : docxFiles) {
                     for (PqDev dev : devList) {
                         DevType devType = devTypeService.getById(dev.getDevType());
-                        String dirPath = reportPath.concat(File.separator).concat(devType.getName());
+                        String dirPath = pathConfig.getReportPath().concat(File.separator).concat(devType.getName());
                         File reportFile = new File(dirPath.concat(File.separator).concat(dev.getCreateId()).concat(ReportConstant.DOCX));
                         // 文件名匹配，复制到对应目录下
                         if (docx.getName().equals(reportFile.getName())) {
@@ -464,14 +458,14 @@ public class AsyncPlanHandler {
             sseClient.sendMessage(uid, planId, HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), progress, "数据合并完成"));
 
         } catch (Exception e) {
+
             log.error("导入数据失败", e);
             sseClient.sendMessage(uid, planId, HttpResultUtil.assembleResult(CommonResponseEnum.FAIL.getCode(), progress.get() + currentProgress.get(), "导入失败"));
         } finally {
             NonWebAutoFillValueHandler.clearCurrentUserId();
         }
-
+        FileUtil.del(zipFilePath);
         sseClient.closeSse(uid);
-
     }
 
     // 构建分页查询SQL

detection/src/main/java/com/njcn/gather/plan/service/IAdPlanService.java

@@ -6,6 +6,7 @@ import com.njcn.gather.device.pojo.po.PqStandardDev;
 import com.njcn.gather.plan.pojo.param.AdPlanParam;
 import com.njcn.gather.plan.pojo.po.AdPlan;
 import com.njcn.gather.plan.pojo.vo.AdPlanVO;
+import com.njcn.gather.plan.pojo.vo.PlanStatisticsVO;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -105,6 +106,14 @@ public interface IAdPlanService extends IService<AdPlan> {
      */
     void analyse(List<String> ids);
 
+    /**
+     * 统计检测计划结果。
+     *
+     * @param planId 检测计划ID
+     * @return 检测计划统计结果
+     */
+    PlanStatisticsVO statistics(AdPlanParam.StatisticsParam param);
+
     /**
      * 导出检测计划数据
      *

detection/src/main/java/com/njcn/gather/plan/service/IPqDevCheckHistoryService.java

@@ -0,0 +1,18 @@
+package com.njcn.gather.plan.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.gather.device.pojo.vo.PqDevVO;
+import com.njcn.gather.plan.pojo.po.AdPlan;
+import com.njcn.gather.plan.pojo.po.PqDevCheckHistory;
+import com.njcn.gather.plan.pojo.vo.PlanStatisticsItemVO;
+
+import java.util.List;
+
+public interface IPqDevCheckHistoryService extends IService<PqDevCheckHistory> {
+
+    void saveOrUpdateDeviceHistory(AdPlan plan, PqDevVO device);
+
+    void backfillPlanHistoryIfEmpty(AdPlan plan, List<PqDevVO> checkedDevices);
+
+    List<PlanStatisticsItemVO> listItemDistributions(String planId, String manufacturer, String devType);
+}

detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java

@@ -59,6 +59,7 @@ import com.njcn.gather.plan.service.IAdPlanService;
 import com.njcn.gather.plan.service.IAdPlanSourceService;
 import com.njcn.gather.plan.service.IAdPlanStandardDevService;
 import com.njcn.gather.plan.service.IAdPlanTestConfigService;
+import com.njcn.gather.plan.service.IPqDevCheckHistoryService;
 import com.njcn.gather.pojo.enums.DetectionResponseEnum;
 import com.njcn.gather.report.pojo.po.PqReport;
 import com.njcn.gather.report.service.IPqReportService;
@@ -69,11 +70,14 @@ import com.njcn.gather.script.service.IPqScriptService;
 import com.njcn.gather.source.pojo.po.PqSource;
 import com.njcn.gather.source.service.IPqSourceService;
 import com.njcn.gather.storage.pojo.param.StorageParam;
+import com.njcn.gather.storage.pojo.po.SimAndDigBaseResult;
 import com.njcn.gather.storage.service.SimAndDigHarmonicService;
+import com.njcn.gather.storage.service.SimAndDigNonHarmonicService;
 import com.njcn.gather.storage.service.TableGenService;
 import com.njcn.gather.system.cfg.pojo.enums.SceneEnum;
 import com.njcn.gather.system.cfg.pojo.po.SysTestConfig;
 import com.njcn.gather.system.cfg.service.ISysTestConfigService;
+import com.njcn.gather.system.config.PathConfig;
 import com.njcn.gather.system.dictionary.pojo.po.DictData;
 import com.njcn.gather.system.dictionary.pojo.po.DictTree;
 import com.njcn.gather.system.dictionary.pojo.po.DictType;
@@ -107,6 +111,8 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.net.URLEncoder;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -133,6 +139,7 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
     private final IDevTypeService devTypeService;
     private final IDictTypeService dictTypeService;
     private final SimAndDigHarmonicService adHarmonicService;
+    private final SimAndDigNonHarmonicService adNonHarmonicService;
     private final PqDevMapper pqDevMapper;
     private final IPqDevSubService pqDevSubService;
     private final IAdPlanStandardDevService adPlanStandardDevService;
@@ -145,10 +152,12 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
     private final IAdPariService adPairService;
     private final IAdPlanTestConfigService adPlanTestConfigService;
     private final ISysUserService sysUserService;
+    private final IPqDevCheckHistoryService pqDevCheckHistoryService;
 
     private final JdbcTemplate jdbcTemplate;
-    @Value("${report.reportDir}")
-    private String reportPath;
+//    @Value("${report.reportDir}")
+//    private String reportPath;
+    private final PathConfig pathConfig;
 
     @Override
     public List<AdPlanVO> listAdPlan(AdPlanParam.QueryParam queryParam) {
@@ -207,7 +216,7 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
         }
         List<PqDevVO> pqDevVOList = pqDevMapper.selectByQueryParam(queryParam1);
         if (CollUtil.isNotEmpty(pqDevVOList)) {
-            long count = pqDevVOList.stream().filter(pqDev -> CheckStateEnum.CHECKED.getValue().equals(pqDev.getCheckState())).count();
+            long count = pqDevVOList.stream().filter(pqDev -> CheckStateEnum.CHECKED.getValue().equals(pqDev.getCheckState()) || CheckStateEnum.DOCUMENTED.getValue().equals(pqDev.getCheckState())).count();
             adPlanVO.setProgress((float) count / pqDevVOList.size());
         } else {
             adPlanVO.setProgress(0.0f);
@@ -531,7 +540,7 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
 
     @Override
     public List<Map<String, Object>> listByPattern(String pattern) {
-        List<AdPlan> adPlanList = this.lambdaQuery().eq(AdPlan::getPattern, pattern).eq(AdPlan::getState, DataStateEnum.ENABLE.getCode()).list();
+        List<AdPlan> adPlanList = this.lambdaQuery().eq(AdPlan::getPattern, pattern).eq(AdPlan::getState, DataStateEnum.ENABLE.getCode()).orderByDesc(AdPlan::getCreateTime).list();
         Map<Integer, List<AdPlan>> map1 = adPlanList.stream().collect(Collectors.groupingBy(AdPlan::getTestState));
 
         List<Map<String, Object>> result = new ArrayList<>();
@@ -554,6 +563,8 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
                     child.put("pid", adPlan.getFatherPlanId());
                     child.put("name", adPlan.getName());
                     child.put("timeCheck", adPlan.getTimeCheck());
+                    child.put("dataRule", adPlan.getDataRule());
+                    child.put("testState", adPlan.getTestState());
 
                     List<PqStandardDev> pqStandardDevs = adPlanStandardDevMapper.listByPlanId(Collections.singletonList(adPlan.getId()));
                     List<String> devTypeIdList = pqStandardDevs.stream().map(PqStandardDev::getDevType).collect(Collectors.toList());
@@ -630,7 +641,7 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
                     || datasourceId.contains(DataSourceEnum.MINUTE_STATISTICS_MAX.getValue())
                     || datasourceId.contains(DataSourceEnum.MINUTE_STATISTICS_MIN.getValue())) {
                 String[] split = adPlan.getTestItem().split(StrUtil.COMMA);
-                List<DictTree> dictTreeList = dictTreeService.list(new QueryWrapper<DictTree>().in("id", split).eq("state", DataStateEnum.DELETED.getCode()));
+                List<DictTree> dictTreeList = dictTreeService.list(new QueryWrapper<DictTree>().in("id", split).eq("state", DataStateEnum.DELETED.getCode()).orderByAsc("sort"));
 
                 for (DictTree dictTree : dictTreeList) {
                     Map<String, String> map = new HashMap<>();
@@ -808,6 +819,242 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
         }
     }
 
+    @Override
+    public PlanStatisticsVO statistics(AdPlanParam.StatisticsParam param) {
+        String planId = param.getPlanId();
+        AdPlan plan = this.getById(planId);
+        if (ObjectUtil.isNull(plan)) {
+            throw new BusinessException(DetectionResponseEnum.PLAN_NOT_EXIST);
+        }
+
+        List<PqDevVO> planDevices = listPlanDevices(plan.getId(), param.getManufacturer(), param.getDevType());
+        List<PqDevVO> checkedDevices = planDevices.stream()
+                .filter(this::isCheckedDevice)
+                .collect(Collectors.toList());
+        PlanStatisticsVO statistics = new PlanStatisticsVO();
+        statistics.setPlanId(plan.getId());
+        statistics.setPlanName(plan.getName());
+        statistics.setUncheckedDeviceCount(planDevices.size() - checkedDevices.size());
+        statistics.setCheckedDeviceCount(checkedDevices.size());
+        statistics.setTotalCheckCount(checkedDevices.stream().mapToInt(dev -> defaultZero(dev.getRecheckNum())).sum());
+
+        int firstQualifiedCount = (int) checkedDevices.stream()
+                .filter(dev -> Objects.equals(dev.getRecheckNum(), 1))
+                .filter(dev -> Objects.equals(dev.getCheckResult(), CheckResultEnum.ACCORD.getValue()))
+                .count();
+        int secondQualifiedCount = (int) checkedDevices.stream()
+                .filter(dev -> Objects.equals(dev.getRecheckNum(), 2))
+                .filter(dev -> Objects.equals(dev.getCheckResult(), CheckResultEnum.ACCORD.getValue()))
+                .count();
+        int thirdOrMoreQualifiedCount = (int) checkedDevices.stream()
+                .filter(dev -> defaultZero(dev.getRecheckNum()) >= 3)
+                .filter(dev -> Objects.equals(dev.getCheckResult(), CheckResultEnum.ACCORD.getValue()))
+                .count();
+        int unqualifiedDeviceCount = (int) checkedDevices.stream()
+                .filter(dev -> Objects.equals(dev.getCheckResult(), CheckResultEnum.NOT_ACCORD.getValue()))
+                .count();
+
+        statistics.setFirstQualifiedDeviceCount(firstQualifiedCount);
+        statistics.setSecondQualifiedDeviceCount(secondQualifiedCount);
+        statistics.setThirdOrMoreQualifiedDeviceCount(thirdOrMoreQualifiedCount);
+        statistics.setQualifiedDeviceCount(firstQualifiedCount + secondQualifiedCount + thirdOrMoreQualifiedCount);
+        statistics.setUnqualifiedDeviceCount(unqualifiedDeviceCount);
+        statistics.setFirstPassRate(rate(firstQualifiedCount, checkedDevices.size()));
+        statistics.setSecondPassRate(rate(secondQualifiedCount, checkedDevices.size()));
+        statistics.setThirdOrMorePassRate(rate(thirdOrMoreQualifiedCount, checkedDevices.size()));
+        statistics.setUnqualifiedRate(rate(unqualifiedDeviceCount, checkedDevices.size()));
+
+        pqDevCheckHistoryService.backfillPlanHistoryIfEmpty(plan, checkedDevices);
+        List<PlanStatisticsItemVO> itemDistributions = pqDevCheckHistoryService.listItemDistributions(plan.getId(), param.getManufacturer(), param.getDevType());
+        statistics.setItemDistributions(itemDistributions);
+        statistics.setUnqualifiedItemCount(itemDistributions.stream()
+                .mapToInt(item -> defaultZero(item.getUnqualifiedCount()))
+                .sum());
+        return statistics;
+    }
+
+    private List<PqDevVO> listPlanDevices(String planId, String manufacturer, String devType) {
+        PqDevParam.QueryParam queryParam = new PqDevParam.QueryParam();
+        queryParam.setPlanIdList(Collections.singletonList(planId));
+        List<PqDevVO> pqDevVOList = pqDevMapper.selectByQueryParam(queryParam);
+        if (CollUtil.isEmpty(pqDevVOList)) {
+            return Collections.emptyList();
+        }
+        return pqDevVOList.stream()
+                .filter(dev -> StrUtil.isBlank(manufacturer) || Objects.equals(dev.getManufacturer(), manufacturer))
+                .filter(dev -> StrUtil.isBlank(devType) || Objects.equals(dev.getDevType(), devType))
+                .collect(Collectors.toList());
+    }
+
+    private boolean isCheckedDevice(PqDevVO dev) {
+        return (Objects.equals(dev.getCheckState(), CheckStateEnum.CHECKED.getValue())
+                || Objects.equals(dev.getCheckState(), CheckStateEnum.DOCUMENTED.getValue()))
+                && !Objects.equals(dev.getCheckResult(), CheckResultEnum.UNCHECKED.getValue());
+    }
+
+    private List<PlanStatisticsItemVO> buildItemDistributions(AdPlan plan, List<PqDevVO> checkedDevices) {
+        if (CollUtil.isEmpty(checkedDevices) || StrUtil.isBlank(plan.getScriptId()) || ObjectUtil.isNull(plan.getCode())) {
+            return Collections.emptyList();
+        }
+
+        Map<Integer, ScriptItemInfo> scriptItemInfoMap = getScriptItemInfoMap(plan.getScriptId());
+        if (CollUtil.isEmpty(scriptItemInfoMap)) {
+            return Collections.emptyList();
+        }
+
+        Map<String, PlanStatisticsItemAccumulator> itemAccumulatorMap = new TreeMap<>();
+        for (PqDevVO device : checkedDevices) {
+            List<SimAndDigBaseResult> deviceResultList = new ArrayList<>();
+            deviceResultList.addAll(adNonHarmonicService.listSimAndDigBaseResult(plan.getScriptId(), plan.getCode() + "", device.getId()));
+            deviceResultList.addAll(adHarmonicService.listAllResultData(plan.getScriptId(), plan.getCode() + "", device.getId()));
+            if (CollUtil.isEmpty(deviceResultList)) {
+                continue;
+            }
+
+            Map<String, List<SimAndDigBaseResult>> deviceItemResultMap = deviceResultList.stream()
+                    .filter(result -> ObjectUtil.isNotNull(result.getSort()))
+                    .map(result -> new AbstractMap.SimpleEntry<>(scriptItemInfoMap.get(result.getSort()), result))
+                    .filter(entry -> ObjectUtil.isNotNull(entry.getKey()))
+                    .collect(Collectors.groupingBy(
+                            entry -> entry.getKey().getItemId(),
+                            TreeMap::new,
+                            Collectors.mapping(Map.Entry::getValue, Collectors.toList())
+                    ));
+
+            deviceItemResultMap.forEach((itemId, results) -> {
+                boolean hasUnqualified = results.stream().anyMatch(result -> isUnqualifiedResultFlag(result.getResultFlag()));
+                boolean hasQualified = results.stream().anyMatch(result -> Objects.equals(result.getResultFlag(), 1));
+                if (!hasUnqualified && !hasQualified) {
+                    return;
+                }
+
+                ScriptItemInfo itemInfo = scriptItemInfoMap.get(results.get(0).getSort());
+                PlanStatisticsItemAccumulator accumulator = itemAccumulatorMap.computeIfAbsent(
+                        itemId,
+                        key -> new PlanStatisticsItemAccumulator(itemId, itemInfo.getItemName())
+                );
+                accumulator.totalCount++;
+                if (hasUnqualified) {
+                    accumulator.unqualifiedCount++;
+                } else {
+                    accumulator.qualifiedCount++;
+                }
+            });
+        }
+
+        return itemAccumulatorMap.values().stream()
+                .map(PlanStatisticsItemAccumulator::toVO)
+                .collect(Collectors.toList());
+    }
+
+    private Map<Integer, ScriptItemInfo> getScriptItemInfoMap(String scriptId) {
+        List<PqScriptDtls> scriptDtlsList = pqScriptDtlsService.list(new LambdaQueryWrapper<PqScriptDtls>()
+                .eq(PqScriptDtls::getScriptId, scriptId)
+                .ne(PqScriptDtls::getScriptIndex, -1)
+                .eq(PqScriptDtls::getEnable, DataStateEnum.ENABLE.getCode())
+        );
+        if (CollUtil.isEmpty(scriptDtlsList)) {
+            return Collections.emptyMap();
+        }
+
+        List<String> scriptTypeIds = scriptDtlsList.stream()
+                .map(PqScriptDtls::getScriptType)
+                .filter(StrUtil::isNotBlank)
+                .distinct()
+                .collect(Collectors.toList());
+        Map<String, DictTree> dictTreeMap = Collections.emptyMap();
+        if (CollUtil.isNotEmpty(scriptTypeIds)) {
+            dictTreeMap = dictTreeService.getDictTreeById(scriptTypeIds).stream()
+                    .collect(Collectors.toMap(DictTree::getId, dictTree -> dictTree, (left, right) -> left));
+        }
+
+        Map<String, DictTree> finalDictTreeMap = dictTreeMap;
+        return scriptDtlsList.stream()
+                .collect(Collectors.groupingBy(PqScriptDtls::getScriptIndex, TreeMap::new, Collectors.toList()))
+                .entrySet()
+                .stream()
+                .collect(Collectors.toMap(
+                        Map.Entry::getKey,
+                        entry -> resolveScriptItemInfo(entry.getKey(), entry.getValue(), finalDictTreeMap),
+                        (left, right) -> left,
+                        TreeMap::new
+                ));
+    }
+
+    private ScriptItemInfo resolveScriptItemInfo(Integer sort, List<PqScriptDtls> dtlsList, Map<String, DictTree> dictTreeMap) {
+        if (CollUtil.isEmpty(dtlsList)) {
+            return new ScriptItemInfo(String.valueOf(sort), "检测项" + sort);
+        }
+        PqScriptDtls first = dtlsList.get(0);
+        DictTree dictTree = dictTreeMap.get(first.getScriptType());
+        if (ObjectUtil.isNotNull(dictTree) && StrUtil.isNotBlank(dictTree.getName())) {
+            return new ScriptItemInfo(dictTree.getId(), dictTree.getName());
+        }
+        if (StrUtil.isNotBlank(first.getScriptType())) {
+            return new ScriptItemInfo(first.getScriptType(), "检测项" + sort);
+        }
+        return new ScriptItemInfo(String.valueOf(sort), "检测项" + sort);
+    }
+
+    private boolean isUnqualifiedResultFlag(Integer resultFlag) {
+        return ObjectUtil.isNotNull(resultFlag)
+                && !Objects.equals(resultFlag, 1)
+                && !Objects.equals(resultFlag, 4)
+                && !Objects.equals(resultFlag, 5);
+    }
+
+    private Integer defaultZero(Integer value) {
+        return ObjectUtil.isNull(value) ? 0 : value;
+    }
+
+    private BigDecimal rate(Integer numerator, Integer denominator) {
+        if (ObjectUtil.isNull(denominator) || denominator == 0) {
+            return BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
+        }
+        return BigDecimal.valueOf(defaultZero(numerator))
+                .multiply(BigDecimal.valueOf(100))
+                .divide(BigDecimal.valueOf(denominator), 2, RoundingMode.HALF_UP);
+    }
+
+    private class PlanStatisticsItemAccumulator {
+        private final String itemId;
+        private final String itemName;
+        private int totalCount;
+        private int qualifiedCount;
+        private int unqualifiedCount;
+
+        private PlanStatisticsItemAccumulator(String itemId, String itemName) {
+            this.itemId = itemId;
+            this.itemName = itemName;
+        }
+
+        private PlanStatisticsItemVO toVO() {
+            PlanStatisticsItemVO itemVO = new PlanStatisticsItemVO();
+            itemVO.setItemId(itemId);
+            itemVO.setItemName(itemName);
+            itemVO.setUnqualifiedCount(unqualifiedCount);
+            return itemVO;
+        }
+    }
+
+    private static class ScriptItemInfo {
+        private final String itemId;
+        private final String itemName;
+
+        private ScriptItemInfo(String itemId, String itemName) {
+            this.itemId = itemId;
+            this.itemName = itemName;
+        }
+
+        private String getItemId() {
+            return itemId;
+        }
+
+        private String getItemName() {
+            return itemName;
+        }
+    }
+
     @Override
     public void exportPlan(AdPlanParam.QueryParam queryParam) {
         DictData dictData = dictDataService.getDictDataById(queryParam.getPatternId());
@@ -1264,7 +1511,7 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
         for (int i = 1; i <= maxTime; i++) {
             row2[i] = i + "次检测";
             int tempI = i;
-            List<PqDevVO> tempDevList = devList.stream().filter(dev -> dev.getRecheckNum() <= tempI).collect(Collectors.toList());
+            List<PqDevVO> tempDevList = devList.stream().filter(dev -> dev.getRecheckNum() == tempI).collect(Collectors.toList());
             long passCount = tempDevList.stream().filter(dev -> dev.getCheckResult() == CheckResultEnum.ACCORD.getValue()).count();
             row3[i] = passCount + "";
             row4[i] = total + "";
@@ -1554,8 +1801,8 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
             }
 
             // 检测脚本
-            List<Map<String, Object>> maps1 = pqScriptService.listAllPqScript(null);
-            List<String> scriptNameList = maps1.stream().map(m -> (String) m.get("name")).collect(Collectors.toList());
+            List<PqScript> pqScriptList = pqScriptService.listAllPqScript(null);
+            List<String> scriptNameList = pqScriptList.stream().map(m -> m.getName()).collect(Collectors.toList());
             pullDown = new PullDown();
             pullDown.setFirstCol(3);
             pullDown.setLastCol(3);
@@ -1721,8 +1968,8 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
             String zipFileName = URLEncoder.encode(subPlan.getName() + ".zip", "UTF-8");
             File zipFile = FileUtil.file(tempDir, zipFileName);
 
-            // 先将json文件添加到zip中
-            ZipUtil.zip(jsonFile.getAbsolutePath(), zipFile.getAbsolutePath());
+            // 先将json文件添加到zip中（使用UTF-8编码）
+            ZipUtil.zip(zipFile, CharsetUtil.CHARSET_UTF_8, false, jsonFile);
 
 
             // 创建一个临时目录存放两个文件
@@ -1744,8 +1991,8 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
             }
 
 
-            // 重新创建zip文件，包含所有文件
-            ZipUtil.zip(tempZipDir.getAbsolutePath(), zipFile.getAbsolutePath());
+            // 重新创建zip文件，包含所有文件，使用UTF-8编码
+            ZipUtil.zip(zipFile, CharsetUtil.CHARSET_UTF_8, false, FileUtil.file(tempZipDir));
 
             // 删除临时目录
             FileUtil.del(tempZipDir);
@@ -1779,9 +2026,9 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
             File zipFile = FileUtil.file(tempDir, file.getOriginalFilename());
             file.transferTo(zipFile);
 
-            // 解压zip文件
+            // 解压zip文件，使用UTF-8编码
             File unzipDir = FileUtil.mkdir(FileUtil.file(tempDir, "unzip"));
-            ZipUtil.unzip(zipFile.getAbsolutePath(), unzipDir.getAbsolutePath());
+            ZipUtil.unzip(zipFile, unzipDir, CharsetUtil.CHARSET_UTF_8);
 
             // 查找解压目录中的json文件
             File[] files = unzipDir.listFiles();
@@ -2088,7 +2335,7 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
             if (ObjectUtil.isNotNull(report) && report.equals(1)) {
                 for (PqDev dev : devList) {
                     DevType devType = devTypeService.getById(dev.getDevType());
-                    String dirPath = reportPath.concat(File.separator).concat(devType.getName());
+                    String dirPath = pathConfig.getReportPath().concat(File.separator).concat(devType.getName());
                     File reportFile = new File(dirPath.concat(File.separator).concat(dev.getCreateId()).concat(ReportConstant.DOCX));
                     // 如果reportFile存在，则将reportFile中的文件添加到已有的zip文件中
                     if (FileUtil.exist(reportFile)) {
@@ -2099,8 +2346,8 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
                 }
             }
 
-            // 重新创建zip文件，包含所有文件
-            ZipUtil.zip(tempZipDir.getAbsolutePath(), zipFile.getAbsolutePath());
+            // 重新创建zip文件，包含所有文件，使用UTF-8编码
+            ZipUtil.zip(zipFile, CharsetUtil.CHARSET_UTF_8, false, FileUtil.file(tempZipDir));
 
             // 删除临时目录
             FileUtil.del(tempZipDir);

detection/src/main/java/com/njcn/gather/plan/service/impl/PqDevCheckHistoryServiceImpl.java

@@ -0,0 +1,220 @@
+package com.njcn.gather.plan.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.gather.device.pojo.vo.PqDevVO;
+import com.njcn.gather.plan.mapper.PqDevCheckHistoryMapper;
+import com.njcn.gather.plan.pojo.po.AdPlan;
+import com.njcn.gather.plan.pojo.po.PqDevCheckHistory;
+import com.njcn.gather.plan.pojo.vo.PlanStatisticsItemVO;
+import com.njcn.gather.plan.service.IPqDevCheckHistoryService;
+import com.njcn.gather.script.mapper.PqScriptDtlsMapper;
+import com.njcn.gather.script.pojo.po.PqScriptDtls;
+import com.njcn.gather.storage.pojo.po.SimAndDigBaseResult;
+import com.njcn.gather.storage.service.SimAndDigHarmonicService;
+import com.njcn.gather.storage.service.SimAndDigNonHarmonicService;
+import com.njcn.gather.system.dictionary.pojo.po.DictTree;
+import com.njcn.gather.system.dictionary.service.IDictTreeService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.TreeMap;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+public class PqDevCheckHistoryServiceImpl extends ServiceImpl<PqDevCheckHistoryMapper, PqDevCheckHistory> implements IPqDevCheckHistoryService {
+
+    private final SimAndDigNonHarmonicService adNonHarmonicService;
+    private final SimAndDigHarmonicService adHarmonicService;
+    private final PqScriptDtlsMapper pqScriptDtlsMapper;
+    private final IDictTreeService dictTreeService;
+
+    @Override
+    @Transactional
+    public void saveOrUpdateDeviceHistory(AdPlan plan, PqDevVO device) {
+        if (ObjectUtil.isNull(plan)
+                || ObjectUtil.isNull(device)
+                || StrUtil.isBlank(plan.getScriptId())
+                || ObjectUtil.isNull(plan.getCode())
+                || StrUtil.isBlank(device.getId())
+                || ObjectUtil.isNull(device.getRecheckNum())) {
+            return;
+        }
+
+        Map<Integer, ScriptItemInfo> scriptItemInfoMap = getScriptItemInfoMap(plan.getScriptId());
+        if (CollUtil.isEmpty(scriptItemInfoMap)) {
+            return;
+        }
+
+        List<SimAndDigBaseResult> resultList = new ArrayList<>();
+        resultList.addAll(adNonHarmonicService.listSimAndDigBaseResult(plan.getScriptId(), plan.getCode() + "", device.getId()));
+        resultList.addAll(adHarmonicService.listAllResultData(plan.getScriptId(), plan.getCode() + "", device.getId()));
+        if (CollUtil.isEmpty(resultList)) {
+            return;
+        }
+
+        Map<String, List<SimAndDigBaseResult>> itemResultMap = resultList.stream()
+                .filter(result -> ObjectUtil.isNotNull(result.getSort()))
+                .map(result -> new AbstractMap.SimpleEntry<>(scriptItemInfoMap.get(result.getSort()), result))
+                .filter(entry -> ObjectUtil.isNotNull(entry.getKey()))
+                .collect(Collectors.groupingBy(
+                        entry -> entry.getKey().getItemId(),
+                        TreeMap::new,
+                        Collectors.mapping(Map.Entry::getValue, Collectors.toList())
+                ));
+
+        LocalDateTime now = LocalDateTime.now();
+        itemResultMap.forEach((itemId, results) -> {
+            boolean hasUnqualified = results.stream().anyMatch(result -> isUnqualifiedResultFlag(result.getResultFlag()));
+            boolean hasQualified = results.stream().anyMatch(result -> Objects.equals(result.getResultFlag(), 1));
+            if (!hasUnqualified && !hasQualified) {
+                return;
+            }
+
+            ScriptItemInfo itemInfo = scriptItemInfoMap.get(results.get(0).getSort());
+            PqDevCheckHistory history = this.getOne(new LambdaQueryWrapper<PqDevCheckHistory>()
+                    .eq(PqDevCheckHistory::getPlanId, plan.getId())
+                    .eq(PqDevCheckHistory::getDevId, device.getId())
+                    .eq(PqDevCheckHistory::getRecheckNum, device.getRecheckNum())
+                    .eq(PqDevCheckHistory::getItemId, itemId)
+                    .last("LIMIT 1"));
+
+            if (ObjectUtil.isNull(history)) {
+                history = new PqDevCheckHistory();
+                history.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+                history.setPlanId(plan.getId());
+                history.setDevId(device.getId());
+                history.setRecheckNum(device.getRecheckNum());
+                history.setItemId(itemId);
+                history.setCreateBy(device.getCheckBy());
+                history.setCreateTime(now);
+            }
+
+            history.setDevType(device.getDevType());
+            history.setManufacturer(device.getManufacturer());
+            history.setItemName(itemInfo.getItemName());
+            history.setResult(hasUnqualified ? 0 : 1);
+            history.setCheckTime(ObjectUtil.isNotNull(device.getCheckTime()) ? device.getCheckTime() : now);
+            history.setState(DataStateEnum.ENABLE.getCode());
+            history.setUpdateBy(device.getCheckBy());
+            history.setUpdateTime(now);
+            this.saveOrUpdate(history);
+        });
+    }
+
+    @Override
+    public void backfillPlanHistoryIfEmpty(AdPlan plan, List<PqDevVO> checkedDevices) {
+        if (ObjectUtil.isNull(plan) || CollUtil.isEmpty(checkedDevices)) {
+            return;
+        }
+        long historyCount = this.count(new LambdaQueryWrapper<PqDevCheckHistory>()
+                .eq(PqDevCheckHistory::getPlanId, plan.getId())
+                .eq(PqDevCheckHistory::getState, DataStateEnum.ENABLE.getCode()));
+        if (historyCount > 0) {
+            return;
+        }
+        checkedDevices.forEach(device -> saveOrUpdateDeviceHistory(plan, device));
+    }
+
+    @Override
+    public List<PlanStatisticsItemVO> listItemDistributions(String planId, String manufacturer, String devType) {
+        List<PlanStatisticsItemVO> itemDistributions = this.baseMapper.listItemDistributions(planId, manufacturer, devType);
+        if (CollUtil.isEmpty(itemDistributions)) {
+            return Collections.emptyList();
+        }
+        itemDistributions.forEach(item -> item.setUnqualifiedCount(defaultZero(item.getUnqualifiedCount())));
+        return itemDistributions;
+    }
+
+    private Map<Integer, ScriptItemInfo> getScriptItemInfoMap(String scriptId) {
+        List<PqScriptDtls> scriptDtlsList = pqScriptDtlsMapper.selectList(new LambdaQueryWrapper<PqScriptDtls>()
+                .eq(PqScriptDtls::getScriptId, scriptId)
+                .ne(PqScriptDtls::getScriptIndex, -1)
+                .eq(PqScriptDtls::getEnable, DataStateEnum.ENABLE.getCode())
+        );
+        if (CollUtil.isEmpty(scriptDtlsList)) {
+            return Collections.emptyMap();
+        }
+
+        List<String> scriptTypeIds = scriptDtlsList.stream()
+                .map(PqScriptDtls::getScriptType)
+                .filter(StrUtil::isNotBlank)
+                .distinct()
+                .collect(Collectors.toList());
+        Map<String, DictTree> dictTreeMap = Collections.emptyMap();
+        if (CollUtil.isNotEmpty(scriptTypeIds)) {
+            dictTreeMap = dictTreeService.getDictTreeById(scriptTypeIds).stream()
+                    .collect(Collectors.toMap(DictTree::getId, dictTree -> dictTree, (left, right) -> left));
+        }
+
+        Map<String, DictTree> finalDictTreeMap = dictTreeMap;
+        return scriptDtlsList.stream()
+                .collect(Collectors.groupingBy(PqScriptDtls::getScriptIndex, TreeMap::new, Collectors.toList()))
+                .entrySet()
+                .stream()
+                .collect(Collectors.toMap(
+                        Map.Entry::getKey,
+                        entry -> resolveScriptItemInfo(entry.getKey(), entry.getValue(), finalDictTreeMap),
+                        (left, right) -> left,
+                        TreeMap::new
+                ));
+    }
+
+    private ScriptItemInfo resolveScriptItemInfo(Integer sort, List<PqScriptDtls> dtlsList, Map<String, DictTree> dictTreeMap) {
+        if (CollUtil.isEmpty(dtlsList)) {
+            return new ScriptItemInfo(String.valueOf(sort), "检测项" + sort);
+        }
+        PqScriptDtls first = dtlsList.get(0);
+        DictTree dictTree = dictTreeMap.get(first.getScriptType());
+        if (ObjectUtil.isNotNull(dictTree) && StrUtil.isNotBlank(dictTree.getName())) {
+            return new ScriptItemInfo(dictTree.getId(), dictTree.getName());
+        }
+        if (StrUtil.isNotBlank(first.getScriptType())) {
+            return new ScriptItemInfo(first.getScriptType(), "检测项" + sort);
+        }
+        return new ScriptItemInfo(String.valueOf(sort), "检测项" + sort);
+    }
+
+    private boolean isUnqualifiedResultFlag(Integer resultFlag) {
+        return ObjectUtil.isNotNull(resultFlag)
+                && !Objects.equals(resultFlag, 1)
+                && !Objects.equals(resultFlag, 4)
+                && !Objects.equals(resultFlag, 5);
+    }
+
+    private Integer defaultZero(Integer value) {
+        return ObjectUtil.isNull(value) ? 0 : value;
+    }
+
+    private static class ScriptItemInfo {
+        private final String itemId;
+        private final String itemName;
+
+        private ScriptItemInfo(String itemId, String itemName) {
+            this.itemId = itemId;
+            this.itemName = itemName;
+        }
+
+        private String getItemId() {
+            return itemId;
+        }
+
+        private String getItemName() {
+            return itemName;
+        }
+    }
+}

detection/src/main/java/com/njcn/gather/pojo/enums/DetectionResponseEnum.java

@@ -73,8 +73,9 @@ public enum DetectionResponseEnum {
     MONITOR_NUM_REPEAT("A02094", "该被检设备下存在相同线路号的监测点"),
     PLAN_HAS_CHILDREN("A02095", "该计划下存在子计划，请先删除子计划"),
     PLAN_REPEATED_IN_SAME_LEVEL("A02096", "该父计划下存在同名的子计划"),
-    PLEASE_UNASSIGN_STANDARD_DEV("A02097","存在已分配给子计划的标准设备，请先解除分配" ),
-    PLEASE_UNASSIGN_DEVICE("A02098", "存在已分配给计划的被检设备，请先解除分配");
+    PLEASE_UNASSIGN_STANDARD_DEV("A02097", "存在已分配给子计划的标准设备，请先解除分配"),
+    PLEASE_UNASSIGN_DEVICE("A02098", "存在已分配给计划的被检设备，请先解除分配"),
+    DEV_IP_PORT_EXIST("A02099", "存在重复被检设备");
 
     private final String code;
 

detection/src/main/java/com/njcn/gather/report/controller/ReportController.java

@@ -31,22 +31,22 @@ import java.util.List;
  * @data 2025/1/9 14:02
  */
 @Slf4j
-@Api(tags = "报表管理")
+@Api(tags = "报告管理")
 @RestController
 @RequestMapping("/report")
 @RequiredArgsConstructor
-public class ReportController extends BaseController {
+public class  ReportController extends BaseController {
 
     private final IPqReportService pqReportService;
 
     /**
      * 此方法临时的，给楼下使用，实际需要优化
      * 1、不同的设备需要不同的模板；
-     * 2、数据页的内容暂时是固定的，后期可能是动态的；
+     * 2、数据页的内容暂时是固定的，后期可能是动态 的；
      */
     @OperateInfo
     @PostMapping("/generateReport")
-    @ApiOperation("生成测试报告")
+    @ApiOperation("生成报告")
     @ApiImplicitParam(name = "param", value = "查询参数", required = true)
     public HttpResult<Object> generateReport(@RequestBody DevReportParam devReportParam) {
         String methodDescribe = getMethodDescribe("generateReport");
@@ -60,7 +60,7 @@ public class ReportController extends BaseController {
      */
     @OperateInfo
     @PostMapping("/downloadReport")
-    @ApiOperation("下载测试报告")
+    @ApiOperation("下载报告")
     @ApiImplicitParam(name = "param", value = "查询参数", required = true)
     public void downloadReport(@RequestBody DevReportParam devReportParam, HttpServletResponse response) {
         String methodDescribe = getMethodDescribe("downloadReport");
@@ -91,7 +91,7 @@ public class ReportController extends BaseController {
     @OperateInfo(operateType = OperateType.ADD)
     @PostMapping("/add")
     @ApiOperation("新增报告模板")
-    @ApiImplicitParam(name = "param", value = "报告模板参数", required = true)
+    @ApiImplicitParam(name = "reportParam", value = "报告模板参数", required = true)
     public HttpResult<Boolean> add(ReportParam reportParam) {
         String methodDescribe = getMethodDescribe("add");
         LogUtil.njcnDebug(log, "{}，新增参数为：{}", methodDescribe, reportParam);
@@ -106,7 +106,7 @@ public class ReportController extends BaseController {
     @OperateInfo(operateType = OperateType.UPDATE)
     @PostMapping("/update")
     @ApiOperation("更新报告模板")
-    @ApiImplicitParam(name = "param", value = "报告模板参数", required = true)
+    @ApiImplicitParam(name = "reportParam", value = "报告模板参数", required = true)
     public HttpResult<Boolean> update(ReportParam.UpdateParam reportParam) {
         String methodDescribe = getMethodDescribe("update");
         LogUtil.njcnDebug(log, "{}，修改参数为：{}", methodDescribe, reportParam);
@@ -136,7 +136,6 @@ public class ReportController extends BaseController {
     @OperateInfo
     @GetMapping("/listAllName")
     @ApiOperation("查询所有报告模板名称")
-    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
     public HttpResult<List<String>> listAllName() {
         String methodDescribe = getMethodDescribe("listAllName");
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pqReportService.listAllName(), methodDescribe);
@@ -145,7 +144,7 @@ public class ReportController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
     @PostMapping("/documented")
     @ApiOperation("设备归档")
-    @ApiImplicitParam(name = "id", value = "设备id", required = true)
+    @ApiImplicitParam(name = "ids", value = "设备id", required = true)
     public HttpResult<Boolean> documented(@RequestBody List<String> ids) {
         String methodDescribe = getMethodDescribe("documented");
         LogUtil.njcnDebug(log, "{}，设备id为：{}", methodDescribe, ids);

detection/src/main/java/com/njcn/gather/report/pojo/enums/BaseReportKeyEnum.java

@@ -31,6 +31,7 @@ public enum BaseReportKeyEnum {
     DAY("day","日"),
     YEAR_MONTH_DAY("year-month-day","年-月-日"),
     REPORT_DATE("reportDate","年-月-日"),
+    GD_NAME("gdName","供电部门"),
     SUB_NAME("subName","变电站"),
     CHECK_BY("checkBy","检测人"),
     AUDIT_BY("auditBy","负责人、审核人"),
@@ -38,7 +39,10 @@ public enum BaseReportKeyEnum {
     CREATE_DATE("createDate","生产日期"),
     TEMPERATURE("temp","温度"),
     HUMIDITY("hum","相对湿度"),
-    DELEGATE("delegate","委托方");
+    DELEGATE("delegate","委托方"),
+    CREATEDATE("createDate","出厂日期"),
+    HW_VERSION("hardwareVersion","硬件版本"),
+    SW_VERSION("softwareVersion","软件版本");
 
     private String key;
 

detection/src/main/java/com/njcn/gather/report/pojo/enums/BookmarkEnum.java

@@ -30,6 +30,7 @@ public enum BookmarkEnum {
 
     private String desc;
 
+    /** 书签处理顺序：1=数据项，2=结果信息，3=目录信息；由 dealDataModelScatteredByBookmark 排序时使用 */
     private Integer sort;
 
     BookmarkEnum(String key, String desc, Integer sort) {

detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java

@@ -39,6 +39,8 @@ import com.njcn.gather.device.service.IPqDevService;
 import com.njcn.gather.device.service.IPqDevSubService;
 import com.njcn.gather.err.pojo.po.PqErrSys;
 import com.njcn.gather.err.service.IPqErrSysService;
+import com.njcn.gather.monitor.pojo.po.PqMonitor;
+import com.njcn.gather.monitor.service.IPqMonitorService;
 import com.njcn.gather.plan.pojo.enums.DataSourceEnum;
 import com.njcn.gather.plan.pojo.enums.PlanReportStateEnum;
 import com.njcn.gather.plan.pojo.po.AdPlan;
@@ -59,20 +61,20 @@ import com.njcn.gather.report.service.IPqReportService;
 import com.njcn.gather.result.service.IResultService;
 import com.njcn.gather.script.pojo.vo.PqScriptDtlDataVO;
 import com.njcn.gather.script.service.IPqScriptDtlsService;
+import com.njcn.gather.storage.pojo.param.SingleNonHarmParam;
 import com.njcn.gather.storage.pojo.po.SimAndDigHarmonicResult;
 import com.njcn.gather.storage.pojo.po.SimAndDigNonHarmonicResult;
 import com.njcn.gather.storage.service.SimAndDigHarmonicService;
 import com.njcn.gather.storage.service.SimAndDigNonHarmonicService;
 import com.njcn.gather.system.cfg.pojo.enums.SceneEnum;
 import com.njcn.gather.system.cfg.service.ISysTestConfigService;
+import com.njcn.gather.system.config.PathConfig;
 import com.njcn.gather.system.dictionary.pojo.po.DictData;
 import com.njcn.gather.system.dictionary.service.IDictDataService;
+import com.njcn.gather.system.pojo.enums.SystemResponseEnum;
 import com.njcn.gather.tools.report.model.constant.ReportConstant;
 import com.njcn.gather.tools.report.service.IWordReportService;
-import com.njcn.gather.tools.report.util.BookmarkUtil;
-import com.njcn.gather.tools.report.util.Docx4jUtil;
-import com.njcn.gather.tools.report.util.DocxMergeUtil;
-import com.njcn.gather.tools.report.util.WordDocumentUtil;
+import com.njcn.gather.tools.report.util.*;
 import com.njcn.gather.type.pojo.po.DevType;
 import com.njcn.gather.type.service.IDevTypeService;
 import com.njcn.gather.user.user.pojo.po.SysUser;
@@ -85,11 +87,11 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPReply;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.docx4j.jaxb.Context;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 import org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart;
 import org.docx4j.wml.*;
-import org.docx4j.wml.Color;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.ClassPathResource;
@@ -109,9 +111,11 @@ import java.math.BigInteger;
 import java.math.RoundingMode;
 import java.net.URLEncoder;
 import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -127,13 +131,24 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> implements IPqReportService {
 
-    @Value("${report.template:D:\\template}")
-    private String templatePath;
-
-    @Value("${report.reportDir:D:\\report}")
-    private String reportPath;
-
+    /**
+     * resultMap 内部协议：当 dealDataLine 跑完一轮但未采集到任何有效合格性数据时，
+     * 在 resultMap 中塞入这个 key 作为"已尝试且无数据"的哨兵，避免后续 TEST_RESULT_*
+     * 分支的 fallback 重复调用 dealDataLine 浪费资源；同时 dealTestResultLine 检测到
+     * 此 key 存在时跳过结论表生成。
+     * <p>
+     * 故意使用明显非业务字符串，避免与任何 PqScriptDtls.scriptCode / PowerIndexEnum
+     * 的真实业务取值撞车。
+     */
+    private static final String RESULT_MAP_NO_DATA_FLAG = "__internal_no_data__";
 
+    //    @Value("${report.template:D:\\template}")
+//    private String templatePath;
+//
+//    @Value("${report.reportDir:D:\\report}")
+//    private String reportPath;
+    private final PathConfig pathConfig;
+    
     @Value("${qr.cloud}")
     private String cloudUrl;
 
@@ -161,6 +176,8 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
     @Value("${qr.gcDev.path}")
     private String gcDevPath;
 
+    @Value("${report.dateFormat}")
+    private String dateFormat;
 
     private final IPqDevService iPqDevService;
     private final PqDevMapper pqDevMapper;
@@ -178,6 +195,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
     private final ISysUserService sysUserService;
     private final IPqErrSysService pqErrSysService;
     private final IAdPlanTestConfigService adPlanTestConfigService;
+    private final IPqMonitorService pqMonitorService;
 
     @Resource
     private RestTemplateUtil restTemplateUtil;
@@ -306,7 +324,8 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
     private void uploadFile(ReportParam reportParam, PqReport pqReport, boolean isAdd) {
         MultipartFile baseFile = reportParam.getBaseFile();
         MultipartFile detailFile = reportParam.getDetailFile();
-        String newDir = templatePath + File.separator + reportParam.getName() + File.separator + reportParam.getVersion() + File.separator;
+        String relativePath = reportParam.getName() + File.separator + reportParam.getVersion() + File.separator;
+        String newDir = pathConfig.getReportTemplatePath() + File.separator + relativePath;
 
         long FILE_SIZE_LIMIT = 5 * 1024 * 1024;
         if (isAdd) {
@@ -325,13 +344,13 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
                     throw new BusinessException(ReportResponseEnum.FILE_SIZE_ERROR);
                 }
 
-                pqReport.setBasePath(newDir + baseOriginalFilename);
-                pqReport.setDetailPath(newDir + detailOriginalFilename);
+                pqReport.setBasePath(relativePath + baseOriginalFilename);
+                pqReport.setDetailPath(relativePath + detailOriginalFilename);
 
                 this.createDirectory(newDir);
                 this.clearDirectory(newDir);
-                this.uploadFile(baseFile, pqReport.getBasePath());
-                this.uploadFile(detailFile, pqReport.getDetailPath());
+                this.uploadFile(baseFile, newDir + baseOriginalFilename);
+                this.uploadFile(detailFile, newDir + detailOriginalFilename);
             } else {
                 throw new BusinessException(ReportResponseEnum.FILE_NOT_NULL);
             }
@@ -379,34 +398,34 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
 
             //若修改了文件名称、版本号，则需要重命名文件
             this.createDirectory(newDir);
-            if (!oldDir.equals(newDir)) {
+            if (!oldDir.equals(relativePath)) {
                 // 文件夹重命名
                 String oldBasePathStr = oldPqReport.getBasePath();
                 String baseName = oldBasePathStr.substring(oldBasePathStr.lastIndexOf(File.separator) + 1);
-                Path oldBasePath = Paths.get(oldBasePathStr);
+                Path oldBasePath = Paths.get(pathConfig.getReportTemplatePath() + File.separator + oldBasePathStr);
                 Path newBasePath = Paths.get(newDir + baseName);
-                pqReport.setBasePath(newDir + baseName);
+                pqReport.setBasePath(relativePath + baseName);
 
                 String oldDetailPathStr = oldPqReport.getDetailPath();
                 String detailName = oldDetailPathStr.substring(oldDetailPathStr.lastIndexOf(File.separator) + 1);
-                Path oldDetailPath = Paths.get(oldDetailPathStr);
+                Path oldDetailPath = Paths.get(pathConfig.getReportTemplatePath() + File.separator + oldDetailPathStr);
                 Path newDetailPath = Paths.get(newDir + detailName);
-                pqReport.setDetailPath(newDir + detailName);
+                pqReport.setDetailPath(relativePath + detailName);
 
                 try {
                     // windows下文件夹名称不区分大小写
-                    if (!oldDir.equalsIgnoreCase(newDir)) {
+                    if (!oldDir.equalsIgnoreCase(relativePath)) {
                         this.clearDirectory(newDir);
                         Files.move(oldBasePath, newBasePath);
                         Files.move(oldDetailPath, newDetailPath);
                         if (!oldPqReport.getName().equals(reportParam.getName()) && !this.existSameName(pqReport.getId(), oldPqReport.getName())) {
-                            this.recursionDeleteDirectory(templatePath + File.separator + oldPqReport.getName());
+                            this.recursionDeleteDirectory(pathConfig.getReportTemplatePath() + File.separator + oldPqReport.getName());
                         } else {
-                            Paths.get(oldDir).toFile().delete();
+                            Paths.get(pathConfig.getReportTemplatePath() + oldDir).toFile().delete();
                         }
                     } else {
                         // 文件夹重命名
-                        Paths.get(oldDir).toFile().renameTo(Paths.get(newDir).toFile());
+                        Paths.get(pathConfig.getReportTemplatePath() + oldDir).toFile().renameTo(Paths.get(newDir).toFile());
                     }
                 } catch (IOException e) {
                     throw new BusinessException(ReportResponseEnum.FILE_RENAME_FAILED);
@@ -414,16 +433,16 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
             }
 
             if (!baseFileOriginalFilename.isEmpty()) {
-                pqReport.setBasePath(newDir + baseFileOriginalFilename);
-                Paths.get(oldPqReport.getBasePath()).toFile().delete();
+                pqReport.setBasePath(relativePath + baseFileOriginalFilename);
+                Paths.get(pathConfig.getReportTemplatePath() + File.separator + oldPqReport.getBasePath()).toFile().delete();
                 Paths.get(newDir + oldPqReport.getBasePath().substring(oldPqReport.getBasePath().lastIndexOf(File.separator) + 1)).toFile().delete();
-                this.uploadFile(baseFile, pqReport.getBasePath());
+                this.uploadFile(baseFile, newDir + baseFileOriginalFilename);
             }
             if (!detailFileOriginalFilename.isEmpty()) {
-                pqReport.setDetailPath(newDir + detailFileOriginalFilename);
-                Paths.get(oldPqReport.getDetailPath()).toFile().delete();
+                pqReport.setDetailPath(relativePath + detailFileOriginalFilename);
+                Paths.get(pathConfig.getReportTemplatePath() + File.separator + oldPqReport.getDetailPath()).toFile().delete();
                 Paths.get(newDir + oldPqReport.getDetailPath().substring(oldPqReport.getDetailPath().lastIndexOf(File.separator) + 1)).toFile().delete();
-                this.uploadFile(detailFile, pqReport.getDetailPath());
+                this.uploadFile(detailFile, newDir + detailFileOriginalFilename);
             }
         }
     }
@@ -506,7 +525,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
     private void deleteFile(List<String> ids) {
         List<PqReport> pqReports = this.listByIds(ids);
         for (PqReport pqReport : pqReports) {
-            String uploadDir = templatePath + File.separator + pqReport.getName() + File.separator + pqReport.getVersion() + File.separator;
+            String uploadDir = pathConfig.getReportTemplatePath() + File.separator + pqReport.getName() + File.separator + pqReport.getVersion() + File.separator;
             Path uploadPath = Paths.get(uploadDir);
             if (Files.exists(uploadPath)) {
                 //清空目录下的文件
@@ -518,7 +537,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
                     }
                 }
                 file1.delete();
-                String dir = templatePath + File.separator + pqReport.getName() + File.separator;
+                String dir = pathConfig.getReportTemplatePath() + File.separator + pqReport.getName() + File.separator;
                 Path dirPath = Paths.get(dir);
                 File dirFile = dirPath.toFile();
                 File[] fileArr2 = dirFile.listFiles();
@@ -571,9 +590,13 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
 
 
     /**
-     *
      * 根据设备类型生成报告
      * 注：该方法目前仅支持楼下出厂检测场景，属于模板占位符替换方式，后期可能会有调整
+     * <p>
+     * 批量语义：采用"任一设备失败则整批中断"——forEach 循环内任一设备抛 BusinessException
+     * 会终止整个循环，已生成的报告文件保留，中断之后的设备不再处理；失败原因通过异常抛给
+     * 调用方，调用方应提示用户修复问题后重新发起批量。此为有意保留的批量原子语义，
+     * 而非待修复缺陷。
      *
      * @param devReportParam 被检设备信息
      */
@@ -608,8 +631,8 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
                 InputStream finalWordStream = DocxMergeUtil.mergeDocuments(wordFileInputStreams);
                 // 处理需要输出的目录地址 基础路径+设备类型+装置编号.docx
                 // 最终文件输出的路径
-//                String dirPath = reportPath.concat(File.separator).concat(devType.getName());
-                String dirPath = reportPath;
+//                String dirPath = pathConfig.getReportPath().concat(File.separator).concat(devType.getName());
+                String dirPath = pathConfig.getReportPath();
                 // 确保目录存在
                 ensureDirectoryExists(dirPath);
                 String reportFullPath = dirPath.concat(File.separator).concat(pqDevVO.getCreateId()).concat(ReportConstant.DOCX);
@@ -641,6 +664,13 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
                         }
                     }
                 });
+            } catch (NoSuchFileException e) {
+                String filePath = e.getFile() != null ? e.getFile().replaceAll("\\\\", "/") : "未知文件";
+                log.error("报告模板文件不存在 - 文件路径: {}", filePath, e);
+                throw new BusinessException(SystemResponseEnum.FILE_NOT_FOUND);
+            } catch (IOException e) {
+                log.error("报告文件读写异常", e);
+                throw new BusinessException(SystemResponseEnum.FILE_IO_ERROR);
             } catch (Exception e) {
                 log.error(ReportResponseEnum.GENERATE_REPORT_ERROR.getMessage(), e);
                 throw new BusinessException(ReportResponseEnum.GENERATE_REPORT_ERROR);
@@ -767,6 +797,11 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
     /**
      * 需要支持批量生成,如果用户选择批量生成,则默认都采用测试数据的第一个合格,如果
      * 比对模式下生成检测报告,实际后期需要根据用户选择的检测数据或者某次波形数据生成报告
+     * <p>
+     * 批量语义：采用"任一设备失败则整批中断"——forEach 循环内任一设备抛 BusinessException
+     * 会终止整个循环，已生成的报告文件保留，中断之后的设备不再处理；失败原因通过异常抛给
+     * 调用方，调用方应提示用户修复问题后重新发起批量。此为有意保留的批量原子语义，
+     * 而非待修复缺陷。
      *
      * @param plan           计划信息
      * @param devReportParam 设备信息
@@ -779,46 +814,63 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
             if (Objects.isNull(pqDevVO)) {
                 throw new BusinessException(ReportResponseEnum.DEVICE_NOT_EXIST);
             }
-            devReportParam.setDevId(devId);
-            // 获取设备型号
-            DevType devType = devTypeService.getById(pqDevVO.getDevType());
-            if (Objects.isNull(devType)) {
-                throw new BusinessException(ReportResponseEnum.DEVICE_TYPE_NOT_EXIST);
-            }
-            PqReport report = this.lambdaQuery().eq(PqReport::getId, plan.getReportTemplateId()).eq(PqReport::getState, DataStateEnum.ENABLE.getCode()).one();
-            if (Objects.isNull(report)) {
-                throw new BusinessException(ReportResponseEnum.REPORT_TEMPLATE_NOT_EXIST);
-            }
-            Path basePath = Paths.get(report.getBasePath());
-            Path detailPath = Paths.get(report.getDetailPath());
-            try (InputStream baseInputStream = Files.newInputStream(basePath);
-                 InputStream detailInputStream = Files.newInputStream(detailPath)) {
-                WordprocessingMLPackage detailModelDocument = WordprocessingMLPackage.load(detailInputStream);
-                // 获取文档基础部分，并替换占位符
-                Map<String, String> baseModelDataMap = dealBaseModelContrastData(plan, pqDevVO, devType);
-                InputStream wordFinishInputStream = wordReportService.replacePlaceholders(baseInputStream, baseModelDataMap);
-                WordprocessingMLPackage baseModelDocument = WordprocessingMLPackage.load(wordFinishInputStream);
-                MainDocumentPart baseDocumentPart = baseModelDocument.getMainDocumentPart();
+            if (CheckStateEnum.CHECKED.getValue().compareTo(pqDevVO.getCheckState()) <= 0) {
+                devReportParam.setDevId(devId);
+                // 获取设备型号
+                DevType devType = devTypeService.getById(pqDevVO.getDevType());
+                if (Objects.isNull(devType)) {
+                    throw new BusinessException(ReportResponseEnum.DEVICE_TYPE_NOT_EXIST);
+                }
+                PqReport report = this.lambdaQuery().eq(PqReport::getId, plan.getReportTemplateId()).eq(PqReport::getState, DataStateEnum.ENABLE.getCode()).one();
+                if (Objects.isNull(report)) {
+                    throw new BusinessException(ReportResponseEnum.REPORT_TEMPLATE_NOT_EXIST);
+                }
+                Path basePath = Paths.get(pathConfig.getReportTemplatePath() + File.separator + report.getBasePath());
+                Path detailPath = Paths.get(pathConfig.getReportTemplatePath() + File.separator + report.getDetailPath());
+                try (InputStream baseInputStream = Files.newInputStream(basePath);
+                     InputStream detailInputStream = Files.newInputStream(detailPath)) {
+                    WordprocessingMLPackage detailModelDocument = WordprocessingMLPackage.load(detailInputStream);
+                    // 获取文档基础部分，并替换占位符
+                    Map<String, String> baseModelDataMap = dealBaseModelContrastData(plan, pqDevVO, devType);
+                    InputStream wordFinishInputStream = wordReportService.replacePlaceholders(baseInputStream, baseModelDataMap);
+                    WordprocessingMLPackage baseModelDocument = WordprocessingMLPackage.load(wordFinishInputStream);
+                    MainDocumentPart baseDocumentPart = baseModelDocument.getMainDocumentPart();
 
-                // 获取数据模版页内容，根据脚本动态组装数据页内容
-                MainDocumentPart detailDocumentPart = detailModelDocument.getMainDocumentPart();
-                dealDataModelScatteredByBookmarkByPlanContrast(baseDocumentPart, detailDocumentPart, devReportParam, pqDevVO);
-                // 保存新的文档
-                String dirPath = reportPath.concat(File.separator).concat(plan.getName());
-                // 确保目录存在
-                ensureDirectoryExists(dirPath);
-                // 构建文件名：cityName_gdName_subName_name.docx
-                String fileName = String.format("%s_%s_%s_%s.docx",
-                    pqDevVO.getCityName() != null ? pqDevVO.getCityName() : "未知地市",
-                    pqDevVO.getGdName() != null ? pqDevVO.getGdName() : "未知供电公司",
-                    pqDevVO.getSubName() != null ? pqDevVO.getSubName() : "未知电站",
-                    pqDevVO.getName() != null ? pqDevVO.getName() : "未知设备");
-                Docx4jUtil.cleanBlankPagesAndRedundantPageBreaks(baseModelDocument);
-                baseModelDocument.save(new File(dirPath.concat(File.separator).concat(fileName)));
-                this.updateDevAndPlanState(devId, devReportParam.getPlanId());
-            } catch (Exception e) {
-                log.error(ReportResponseEnum.GENERATE_REPORT_ERROR.getMessage(), e);
-                throw new BusinessException(ReportResponseEnum.GENERATE_REPORT_ERROR);
+                    // 获取数据模版页内容，根据脚本动态组装数据页内容
+                    MainDocumentPart detailDocumentPart = detailModelDocument.getMainDocumentPart();
+                    dealDataModelScatteredByBookmarkByPlanContrast(baseDocumentPart, detailDocumentPart, devReportParam, pqDevVO);
+                    // 保存新的文档
+                    String dirPath = pathConfig.getReportPath().concat(File.separator).concat(FilePathSanitizer.toSafeFileName(plan.getName()));
+                    // 确保目录存在
+                    ensureDirectoryExists(dirPath);
+                    // 构建文件名：cityName_gdName_subName_name.docx
+                    String fileName = String.format("%s_%s_%s_%s.docx",
+                            pqDevVO.getCityName() != null ? pqDevVO.getCityName() : "未知地市",
+                            pqDevVO.getGdName() != null ? pqDevVO.getGdName() : "未知供电公司",
+                            pqDevVO.getSubName() != null ? pqDevVO.getSubName() : "未知电站",
+                            pqDevVO.getName() != null ? pqDevVO.getName() : "未知设备");
+                    // 判断是否需要在报告上输出水印
+                    String leader = baseModelDataMap.get(BaseReportKeyEnum.AUDIT_BY.getKey());
+                    String loginName = RequestUtil.getLoginNameByToken();
+                    SysUser user = sysUserService.getUserByLoginName(loginName);
+                    if (!leader.equals(user.getName())) {
+                        log.info("当前用户不是审核人，添加非正式水印");
+                        Docx4jUtil.addWatermarkToDocument(baseModelDocument, "非正式");
+                    }
+                    Docx4jUtil.cleanBlankPagesAndRedundantPageBreaks(baseModelDocument);
+                    baseModelDocument.save(new File(dirPath.concat(File.separator).concat(fileName)));
+                    this.updateDevAndPlanState(devId, devReportParam.getPlanId());
+                } catch (NoSuchFileException e) {
+                    String filePath = e.getFile() != null ? e.getFile().replaceAll("\\\\", "/") : "未知文件";
+                    log.error("报告模板文件不存在 - 文件路径: {}", filePath, e);
+                    throw new BusinessException(SystemResponseEnum.FILE_NOT_FOUND);
+                } catch (IOException e) {
+                    log.error("报告文件读写异常", e);
+                    throw new BusinessException(SystemResponseEnum.FILE_IO_ERROR);
+                } catch (Exception e) {
+                    log.error(ReportResponseEnum.GENERATE_REPORT_ERROR.getMessage(), e);
+                    throw new BusinessException(ReportResponseEnum.GENERATE_REPORT_ERROR);
+                }
             }
         });
 
@@ -828,6 +880,11 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
     /**
      * 根据计划绑定的报告模板生成报告
      * 注：该方法目前属于同用信息占位符替换，数据页为面向对象动态填充拼凑方式
+     * <p>
+     * 批量语义：采用"任一设备失败则整批中断"——forEach 循环内任一设备抛 BusinessException
+     * 会终止整个循环，已生成的报告文件保留，中断之后的设备不再处理；失败原因通过异常抛给
+     * 调用方，调用方应提示用户修复问题后重新发起批量。此为有意保留的批量原子语义，
+     * 而非待修复缺陷。
      *
      * @param plan           计划信息
      * @param devReportParam 设备信息
@@ -850,8 +907,8 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
             if (Objects.isNull(report)) {
                 throw new BusinessException(ReportResponseEnum.REPORT_TEMPLATE_NOT_EXIST);
             }
-            Path basePath = Paths.get(report.getBasePath());
-            Path detailPath = Paths.get(report.getDetailPath());
+            Path basePath = Paths.get(pathConfig.getReportTemplatePath() + File.separator + report.getBasePath());
+            Path detailPath = Paths.get(pathConfig.getReportTemplatePath() + File.separator + report.getDetailPath());
             try (InputStream baseInputStream = Files.newInputStream(basePath);
                  InputStream detailInputStream = Files.newInputStream(detailPath)) {
                 WordprocessingMLPackage detailModelDocument = WordprocessingMLPackage.load(detailInputStream);
@@ -866,11 +923,18 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
                 dealDataModelScatteredByBookmark(baseDocumentPart, detailDocumentPart, devReportParam, pqDevVO);
 
                 // 保存新的文档
-                String dirPath = reportPath.concat(File.separator).concat(devType.getName());
+                String dirPath = pathConfig.getReportPath().concat(File.separator).concat(FilePathSanitizer.toSafeFileName(devType.getName()));
                 // 确保目录存在
                 ensureDirectoryExists(dirPath);
                 baseModelDocument.save(new File(dirPath.concat(File.separator).concat(pqDevVO.getCreateId()).concat(ReportConstant.DOCX)));
                 this.updateDevAndPlanState(devId, devReportParam.getPlanId());
+            } catch (NoSuchFileException e) {
+                String filePath = e.getFile() != null ? e.getFile().replaceAll("\\\\", "/") : "未知文件";
+                log.error("报告模板文件不存在 - 文件路径: {}", filePath, e);
+                throw new BusinessException(SystemResponseEnum.FILE_NOT_FOUND);
+            } catch (IOException e) {
+                log.error("报告文件读写异常", e);
+                throw new BusinessException(SystemResponseEnum.FILE_IO_ERROR);
             } catch (Exception e) {
                 log.error(ReportResponseEnum.GENERATE_REPORT_ERROR.getMessage(), e);
                 throw new BusinessException(ReportResponseEnum.GENERATE_REPORT_ERROR);
@@ -910,9 +974,9 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
              * 1、数据项
              * 2、结果信息
              * 3、目录信息
-             * 所以要先先获取的书签进行操作排序
+             * 按 BookmarkEnum.sort 字段排序，避免依赖枚举常量声明顺序
              * */
-            Collections.sort(bookmarkEnums);
+            bookmarkEnums.sort(Comparator.comparingInt(BookmarkEnum::getSort).thenComparingInt(Enum::ordinal));
             List<Object> todoInsertList;
             BookmarkUtil.BookmarkInfo bookmarkInfo;
             Map<Integer/*回路号*/, List<ContrastTestResult>> resultMap = null;
@@ -1065,7 +1129,6 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
      * 实时数据：3秒数据（150周波数据）
      * 录波：录波数据
      * 分钟统计数据：分钟统计数据-最大值、分钟统计数据-最小值、分钟统计数据-平均值、分钟统计数据-CP95值
-     *
      */
     private String getDataTypeFromParam(AdPlan adPlan) {
         String dataSource = adPlan.getDatasourceId();
@@ -1088,11 +1151,11 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
         AdPlanTestConfig adPlanTestConfig = adPlanTestConfigService.getByPlanId(adPlan.getId());
         StringBuilder sampleCount = new StringBuilder();
         for (String item : dataSourceArray) {
-            if(item.equalsIgnoreCase(DataSourceEnum.REAL_DATA.getValue())){
+            if (item.equalsIgnoreCase(DataSourceEnum.REAL_DATA.getValue())) {
                 sampleCount.append("实时数据采集").append(adPlanTestConfig.getRealTime()).append("组，");
-            }else if(item.equalsIgnoreCase(DataSourceEnum.WAVE_DATA.getValue())){
+            } else if (item.equalsIgnoreCase(DataSourceEnum.WAVE_DATA.getValue())) {
                 sampleCount.append("录波数据采集").append(adPlanTestConfig.getWaveRecord()).append("组，");
-            }else{
+            } else {
                 sampleCount.append("统计数据采集").append(adPlanTestConfig.getStatistics()).append("组，");
             }
         }
@@ -1134,10 +1197,11 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
             Integer monitorNum = next.getKey();
             // 线路下的指标数据
             List<ContrastTestResult> contrastTestResults = next.getValue();
+            PqMonitor pqMonitor = pqMonitorService.getByDevIdAndNum(pqDevVO.getId(), monitorNum);
             // 插入回路号前，先换个页
             todoInsertList.add(Docx4jUtil.createPageBreakParagraph());
             // 回路标题
-            todoInsertList.add(getContrastLineTitle(contentMap, monitorNum, stepIndex, factory));
+            todoInsertList.add(getContrastLineTitle(contentMap, monitorNum, stepIndex, factory, pqDevVO));
             int scriptIndex = 1;
             for (ContrastTestResult contrastTestResult : contrastTestResults) {
                 // 比如电压 V
@@ -1148,7 +1212,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
                 // 根据code获取对应需要填充的内容
                 List<Docx4jUtil.HeadingContent> tempContent = contentMap.get(scriptCode);
                 // 需要区分下谐波类和非谐波类
-                List<Object> tempList = fillContentInTemplateContrast(tempContent, factory, contrastTestResult);
+                List<Object> tempList = fillContentInTemplateContrast(tempContent, factory, contrastTestResult, pqMonitor);
                 todoInsertList.addAll(tempList);
                 scriptIndex++;
             }
@@ -1190,9 +1254,9 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
              * 1、数据项
              * 2、结果信息
              * 3、目录信息
-             * 所以要先先获取的书签进行操作排序
+             * 按 BookmarkEnum.sort 字段排序，避免依赖枚举常量声明顺序
              * */
-            Collections.sort(bookmarkEnums);
+            bookmarkEnums.sort(Comparator.comparingInt(BookmarkEnum::getSort).thenComparingInt(Enum::ordinal));
             // 定义个结果，以便存在结果信息的书签
             Map<String/*指标名称*/, List<Boolean/*以回路的顺序填充结果*/>> resultMap = new HashMap<>();
             List<Object> todoInsertList;
@@ -1241,7 +1305,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
                         if (CollUtil.isEmpty(resultMap)) {
                             dealDataLine(baseDocumentPart, devReportParam, pqDevVO, resultMap);
                         }
-                        bookmarkInfo = BookmarkUtil.getBookmarkInfo(BookmarkEnum.TEST_RESULT_LINE.getKey(), bookmarks);
+                        bookmarkInfo = BookmarkUtil.getBookmarkInfo(BookmarkEnum.TEST_RESULT_DETAIL.getKey(), bookmarks);
                         todoInsertList = dealTestResultLine(devReportParam, resultMap, DocAnchorEnum.TEST_RESULT_DETAIL);
                         if (Objects.nonNull(bookmarkInfo) && CollectionUtil.isNotEmpty(todoInsertList)) {
                             BookmarkUtil.insertElement(bookmarkInfo, todoInsertList);
@@ -1266,8 +1330,8 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
      */
     private List<Object> dealTestResultLine(DevReportParam devReportParam, Map<String, List<Boolean>> resultMap, DocAnchorEnum docAnchorEnum) {
         List<Object> todoInsertList = new ArrayList<>();
-        // 先判断数据有没有，如果没有，则不处理
-        if (CollUtil.isEmpty(resultMap.get(PowerIndexEnum.UNKNOWN.getKey()))) {
+        // 先判断数据有没有，如果没有，则不处理（哨兵协议详见 RESULT_MAP_NO_DATA_FLAG 注释）
+        if (!resultMap.containsKey(RESULT_MAP_NO_DATA_FLAG)) {
             ObjectFactory factory = Context.getWmlObjectFactory();
             // 源文档的内容
             // 创建表格（示例为3列，列数可任意调整）
@@ -1356,13 +1420,27 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
 
 
     /**
-     * 处理以回路为维度的数据项，书签占位符的方式
+     * 以回路维度处理数据项，并填充 resultMap（指标合格性结论）。
+     * <p>
+     * 本方法承担双重职责：
+     * <ol>
+     *   <li><b>返回值</b>：根据 modelPart 中的 H5 分组表格模板，灌入实测数据后生成可插入文档的元素列表；</li>
+     *   <li><b>副作用</b>：把每个指标在各回路上的合格性写入 resultMap，供后续 dealTestResultLine 构造结论表使用。</li>
+     * </ol>
+     * 调用约定（务必区分以下两条路径，避免误解形参用途）：
+     * <ul>
+     *   <li><b>常规路径</b>（DATA_LINE 分支）：modelPart 传 detail 文档（数据页模板池），返回值会被插入 DATA_LINE 书签锚点。</li>
+     *   <li><b>fallback 路径</b>（TEST_RESULT_* 分支且 resultMap 为空时）：modelPart 允许传 base 文档（封面页）；此时模板池为空，返回值无业务意义，调用方应丢弃，仅借此触发 resultMap 计算。</li>
+     * </ul>
+     * 因此 modelPart 命名保持中性，不要改回 detailXxx 等带语义偏向的名字。
      *
-     * @param detailModelDocument 数据项模板
-     * @param devReportParam      测试报告参数
-     * @param pqDevVO             被检设备
+     * @param modelPart      文档模板部分；常规传 detail 文档，fallback 仅需算 resultMap 时可传 base 文档
+     * @param devReportParam 测试报告参数
+     * @param pqDevVO        被检设备
+     * @param resultMap      结果性数据集合（被本方法写入；fallback 路径正是借此计算）
+     * @return 待插入文档的元素列表；fallback 路径下应被调用方丢弃
      */
-    private List<Object> dealDataLine(MainDocumentPart detailModelDocument, DevReportParam devReportParam, PqDevVO pqDevVO, Map<String, List<Boolean>> resultMap) {
+    private List<Object> dealDataLine(MainDocumentPart modelPart, DevReportParam devReportParam, PqDevVO pqDevVO, Map<String, List<Boolean>> resultMap) {
         List<Object> todoInsertList = new ArrayList<>();
         // 以回路维度处理数据项
         Integer devChns = pqDevVO.getDevChns();
@@ -1370,8 +1448,8 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
         // 读取该计划的检测大项组装数据内容
         List<PqScriptDtlDataVO> pqScriptDtlsList = pqScriptDtlsService.getScriptDtlsDataList(devReportParam.getScriptId());
         Map<String, List<PqScriptDtlDataVO>> scriptMap = pqScriptDtlsList.stream().collect(Collectors.groupingBy(PqScriptDtlDataVO::getScriptCode, LinkedHashMap::new, Collectors.toList()));
-        List<Object> allContent = detailModelDocument.getContent();
-        List<Docx4jUtil.HeadingContent> headingContents = Docx4jUtil.extractHeading5Contents(allContent, detailModelDocument);
+        List<Object> allContent = modelPart.getContent();
+        List<Docx4jUtil.HeadingContent> headingContents = Docx4jUtil.extractHeading5Contents(allContent, modelPart);
         Map<String, List<Docx4jUtil.HeadingContent>> contentMap = headingContents.stream().collect(Collectors.groupingBy(Docx4jUtil.HeadingContent::getHeadingText, Collectors.toList()));
         for (int i = 0; i < devChns; i++) {
             // 回路标题
@@ -1439,9 +1517,11 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
                 }
             }
         }
-        // 如果经过一顿处理后，结果性数据集合还是空，塞个特殊数据进去，避免嵌套循环
+        // 经过一轮处理仍未采集到任何合格性数据时，塞入哨兵：
+        // 一是让后续 TEST_RESULT_* 分支的 fallback 看到 resultMap 非空而跳过重复调用本方法，
+        // 二是供 dealTestResultLine 据此跳过结论表生成（哨兵协议详见 RESULT_MAP_NO_DATA_FLAG 注释）。
         if (CollUtil.isEmpty(resultMap)) {
-            resultMap.put(PowerIndexEnum.UNKNOWN.getKey(), Collections.singletonList(false));
+            resultMap.put(RESULT_MAP_NO_DATA_FLAG, Collections.singletonList(false));
         }
         return todoInsertList;
     }
@@ -1566,18 +1646,37 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
 
                                         // 获取现有行的样式
                                         Tr existingRow = (Tr) tbl.getContent().get(rows.size() - 1);
+
                                         // 获取现有样式
                                         TrPr trPr = existingRow.getTrPr();
-                                        JAXBElement<Tc> element = (JAXBElement<Tc>) existingRow.getContent().get(0);
-                                        TcPr tcPr = element.getValue().getTcPr();
-                                        TblWidth cellWidth = factory.createTblWidth();
-                                        cellWidth.setType("dxa");
-                                        cellWidth.setW(BigInteger.valueOf(5000 / tableKeys.size()));
-                                        tcPr.setTcW(cellWidth);
+                                        // 获取每个单元格的TcPr（保留各单元格独立的边框设置）
+                                        List<TcPr> tcPrList = new ArrayList<>();
+                                        RPr templateRPr = null;
+                                        for (Object cellObj : existingRow.getContent()) {
+                                            if (cellObj instanceof JAXBElement) {
+                                                JAXBElement<Tc> cellElement = (JAXBElement<Tc>) cellObj;
+                                                Tc templateCell = cellElement.getValue();
+                                                TcPr tcPr = templateCell.getTcPr();
+                                                // 设置单元格宽度
+                                                if (tcPr == null) {
+                                                    tcPr = factory.createTcPr();
+                                                }
+                                                TblWidth cellWidth = factory.createTblWidth();
+                                                cellWidth.setType("dxa");
+                                                cellWidth.setW(BigInteger.valueOf(5000 / tableKeys.size()));
+                                                tcPr.setTcW(cellWidth);
+                                                tcPrList.add(tcPr);
+                                                // 从第一个单元格获取字体样式
+                                                if (templateRPr == null && !templateCell.getContent().isEmpty() && templateCell.getContent().get(0) instanceof P) {
+                                                    P templateP = (P) templateCell.getContent().get(0);
+                                                    templateRPr = Docx4jUtil.getTcPrFromParagraph(templateP);
+                                                }
+                                            }
+                                        }
                                         tbl.getContent().remove(existingRow);
                                         // 迭代增加行,需要填充的表格keys在tableKeys集合中
                                         for (Map<String, String> stringStringMap : dataList) {
-                                            Tr newRow = Docx4jUtil.createCustomRow(factory, stringStringMap, tableKeys, trPr, tcPr, true);
+                                            Tr newRow = Docx4jUtil.createCustomRow(factory, stringStringMap, tableKeys, trPr, tcPrList, templateRPr, true);
                                             tbl.getContent().add(newRow);
                                         }
                                     } else {
@@ -1604,7 +1703,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
      *
      * @return
      */
-    private List<Object> fillContentInTemplateContrast(List<Docx4jUtil.HeadingContent> tempContent, ObjectFactory factory, ContrastTestResult contrastTestResult) {
+    private List<Object> fillContentInTemplateContrast(List<Docx4jUtil.HeadingContent> tempContent, ObjectFactory factory, ContrastTestResult contrastTestResult, PqMonitor pqMonitor) {
         List<Object> todoInsertList = new ArrayList<>();
         Docx4jUtil.HeadingContent headingContent = tempContent.get(0);
         List<String> tableKeys = Docx4jUtil.getTableFillKeys(tempContent);
@@ -1718,9 +1817,47 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
                     // 纵向表格暂不考虑
                 }
 
-                // 如果存在特殊说明，在表格后添加一个段落
-                if (StrUtil.isNotBlank(contrastTestResult.getSpecialCase())) {
-                    P specialCaseP = Docx4jUtil.createSpecialCaseParagraph(factory, contrastTestResult.getSpecialCase());
+                StringBuilder description = new StringBuilder();
+                if (contrastTestResult.getScriptCode().equalsIgnoreCase("I")) {
+                    // 获取该通道的额定电流
+                    String ct = pqMonitor.getCt();
+                    // 理论上ct是 xxx:xxx的格式。比如10:1，100:5
+                    if (ct.indexOf(":") > 0) {
+                        String[] ctArray = ct.split(":");
+                        description.append("注：当前回路额定电流为：").append(ctArray[1]).append("A。");
+                    }
+                } else if (contrastTestResult.getScriptCode().equalsIgnoreCase("V")) {
+                    // 获取该通道的额定电压
+                    String pt = pqMonitor.getPt();
+                    // 理论上pt是 xxx:xxx的格式。比如380:380，10000:100
+                    if (pt.indexOf(":") > 0) {
+                        String[] ptArray = pt.split(":");
+                        // 电压需要特殊处理下，处理为相电压值
+                        String voltage = ptArray[1];
+                        if (voltage.equalsIgnoreCase("100")) {
+                            voltage = "57.74";
+                        } else if (voltage.equalsIgnoreCase("380")) {
+                            voltage = "220";
+                        } else {
+                            // 其他场景下就除以根号3
+                            double result = Double.parseDouble(voltage) / Math.sqrt(3);
+                            voltage = doubleRound(2, result);
+                        }
+                        description.append("注：当前回路额定电流为：").append(voltage).append("V。");
+                    }
+                }
+
+                // 如果存在特殊说明，在表格后添加一个段落 如果有电压和电流需要把额定电压和电流标注进来 pqMonitor
+                if (StrUtil.isNotBlank(contrastTestResult.getSpecialCase()) || StrUtil.isNotBlank(description.toString())) {
+                    P specialCaseP;
+                    if (StrUtil.isNotBlank(description.toString())) {
+                        if (StrUtil.isNotBlank(contrastTestResult.getSpecialCase())) {
+                            description.append(contrastTestResult.getSpecialCase().replace("注：", ""));
+                        }
+                        specialCaseP = Docx4jUtil.createSpecialCaseParagraph(factory, description.toString());
+                    } else {
+                        specialCaseP = Docx4jUtil.createSpecialCaseParagraph(factory, contrastTestResult.getSpecialCase());
+                    }
                     todoInsertList.add(specialCaseP);
                 }
             }
@@ -1797,7 +1934,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
 
         if (SceneEnum.LEAVE_FACTORY_TEST.getValue().equals(currrentScene)) {
             // 出厂测试场景
-            filePath = reportPath.concat(File.separator).concat(pqDevVO.getCreateId()).concat(ReportConstant.DOCX);
+            filePath = pathConfig.getReportPath().concat(File.separator).concat(pqDevVO.getCreateId()).concat(ReportConstant.DOCX);
             downloadFileName = pqDevVO.getCreateId() + ReportConstant.DOCX;
         } else if (plan != null) {
             // 根据计划模式确定路径结构
@@ -1805,20 +1942,20 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
             if (dictDataById != null && "Contrast".equals(dictDataById.getCode())) {
                 // 比对模式：使用新的路径结构
                 String fileName = String.format("%s_%s_%s_%s.docx",
-                    pqDevVO.getCityName() != null ? pqDevVO.getCityName() : "未知地市",
-                    pqDevVO.getGdName() != null ? pqDevVO.getGdName() : "未知供电公司",
-                    pqDevVO.getSubName() != null ? pqDevVO.getSubName() : "未知电站",
-                    pqDevVO.getName() != null ? pqDevVO.getName() : "未知设备");
-                filePath = reportPath.concat(File.separator).concat(plan.getName()).concat(File.separator).concat(fileName);
+                        pqDevVO.getCityName() != null ? pqDevVO.getCityName() : "未知地市",
+                        pqDevVO.getGdName() != null ? pqDevVO.getGdName() : "未知供电公司",
+                        pqDevVO.getSubName() != null ? pqDevVO.getSubName() : "未知电站",
+                        pqDevVO.getName() != null ? pqDevVO.getName() : "未知设备");
+                filePath = pathConfig.getReportPath().concat(File.separator).concat(FilePathSanitizer.toSafeFileName(plan.getName())).concat(File.separator).concat(fileName);
                 downloadFileName = fileName;
             } else {
                 // 数字/模拟模式：使用原来的路径结构
-                filePath = reportPath.concat(File.separator).concat(devType.getName()).concat(File.separator).concat(pqDevVO.getCreateId()).concat(ReportConstant.DOCX);
+                filePath = pathConfig.getReportPath().concat(File.separator).concat(FilePathSanitizer.toSafeFileName(devType.getName())).concat(File.separator).concat(pqDevVO.getCreateId()).concat(ReportConstant.DOCX);
                 downloadFileName = pqDevVO.getCreateId() + ReportConstant.DOCX;
             }
         } else {
             // 兜底：使用旧的路径结构
-            filePath = reportPath.concat(File.separator).concat(devType.getName()).concat(File.separator).concat(pqDevVO.getCreateId()).concat(ReportConstant.DOCX);
+            filePath = pathConfig.getReportPath().concat(File.separator).concat(FilePathSanitizer.toSafeFileName(devType.getName())).concat(File.separator).concat(pqDevVO.getCreateId()).concat(ReportConstant.DOCX);
             downloadFileName = pqDevVO.getCreateId() + ReportConstant.DOCX;
         }
 
@@ -1837,7 +1974,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
                 try {
                     // 对中文文件名进行URL编码// 将+号替换为%20（空格的正确编码）
                     String encodedFileName = URLEncoder.encode(downloadFileName, "UTF-8")
-                            .replaceAll("\\+", "%20"); 
+                            .replaceAll("\\+", "%20");
 
                     // 使用RFC 5987标准格式
                     response.setHeader("Content-Disposition",
@@ -1879,12 +2016,12 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
 
             for (int i = 0; i < pqDevVOList.size(); i++) {
                 pqDevVO = pqDevVOList.get(i);
+                tempPqDevVO = pqDevVO;
                 if (!pqDevVO.getCheckState().equals(CheckStateEnum.CHECKED.getValue())) {
                     throw new BusinessException(DetectionResponseEnum.DEV_UN_CHECKED);
                 }
                 if (!pqDevVO.getReportState().equals(DevReportStateEnum.GENERATED.getValue())) {
                     devIds.add(pqDevVO.getId());
-                    tempPqDevVO = pqDevVO;
                 }
             }
 
@@ -1928,6 +2065,18 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
         baseModelMap.put(BaseReportKeyEnum.DEV_TYPE.getKey(), devType.getName());
         // 检测员
         baseModelMap.put(BaseReportKeyEnum.INSPECTOR.getKey(), pqDevVO.getCheckBy() + "");
+        baseModelMap.put(BaseReportKeyEnum.INSPECTOR.getKey(), pqDevVO.getCheckBy() + "");
+        String datePattern = DatePattern.NORM_DATE_PATTERN;
+        if (DatePattern.CHINESE_DATE_PATTERN.equals(dateFormat)) {
+            datePattern = DatePattern.CHINESE_DATE_PATTERN;
+        }
+
+        // 出厂日期
+        baseModelMap.put(BaseReportKeyEnum.CREATEDATE.getKey(), pqDevVO.getCreateDate().format(DateTimeFormatter.ofPattern(datePattern)));
+        // 硬件版本
+        baseModelMap.put(BaseReportKeyEnum.HW_VERSION.getKey(), StrUtil.isNotBlank(pqDevVO.getHardwareVersion()) ? pqDevVO.getHardwareVersion() : StrUtil.EMPTY);
+        // 软件版本
+        baseModelMap.put(BaseReportKeyEnum.SW_VERSION.getKey(), StrUtil.isNotBlank(pqDevVO.getSoftwareVersion()) ? pqDevVO.getSoftwareVersion() : StrUtil.EMPTY);
         // 调试日期
         if (pqDevVO.getCheckTime() != null) {
             baseModelMap.put(BaseReportKeyEnum.TEST_DATE.getKey(), DateUtil.format(pqDevVO.getCheckTime(), DatePattern.CHINESE_DATE_PATTERN));
@@ -1986,7 +2135,6 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
     }
 
     /**
-     *
      * 比对模式下需要获取的数据
      * 处理基础模版中的信息，非数据页报告
      * 因为Docx4j工具包替换时会默认增加${}
@@ -1997,7 +2145,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
         // 委托方
         String delegate = pqDevVO.getDelegate();
         if (StrUtil.isNotBlank(delegate)) {
-            DictData delegateDictData = dictDataService.getDictDataById(pqDevVO.getManufacturer());
+            DictData delegateDictData = dictDataService.getDictDataById(pqDevVO.getDelegate());
             if (ObjectUtil.isNotNull(delegateDictData)) {
                 baseModelMap.put(BaseReportKeyEnum.DELEGATE.getKey(), delegateDictData.getName());
             } else {
@@ -2010,6 +2158,8 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
         baseModelMap.put(BaseReportKeyEnum.SAMPLE_ID.getKey(), StrUtil.isEmpty(pqDevVO.getName()) ? StrPool.TAB : pqDevVO.getName());
         // 报告日期
         baseModelMap.put(BaseReportKeyEnum.REPORT_DATE.getKey(), DateUtil.format(new Date(), DatePattern.CHINESE_DATE_PATTERN));
+        // 供电部门
+        baseModelMap.put(BaseReportKeyEnum.GD_NAME.getKey(), pqDevVO.getGdName());
         // 变电站名称
         baseModelMap.put(BaseReportKeyEnum.SUB_NAME.getKey(), pqDevVO.getSubName());
         // 检测人
@@ -2067,7 +2217,19 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
     private void dealDataModel(List<InputStream> wordFileInputStreams, DevReportParam devReportParam, PqDevVO pqDevVO) throws Exception {
         Integer devChns = pqDevVO.getDevChns();
         for (int i = 1; i <= devChns; i++) {
-            ClassPathResource resource = new ClassPathResource("/model/report_table.docx");
+            String path = "/model/report_table.docx";
+            DevType devType = devTypeService.getById(pqDevVO.getDevType());
+            if (devType.getName().equals("PQ-COM")) {
+                path = "/model/report_table - PQ-COM.docx";
+            }
+            ClassPathResource resource = new ClassPathResource(path);
+            XWPFDocument dataModelDocumentTemp = new XWPFDocument(resource.getInputStream());
+
+            SingleNonHarmParam singleNonHarmParam = new SingleNonHarmParam();
+            singleNonHarmParam.setPlanCode(devReportParam.getPlanCode());
+            singleNonHarmParam.setDevId(pqDevVO.getId());
+            singleNonHarmParam.setChannelNo(i);
+
             // 获取数据
             Map<String, String> dataModelMap = new HashMap<>(16);
             // 读取模板文件中的占位符
@@ -2085,11 +2247,20 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
             List<SimAndDigHarmonicResult> adHarmonicResultList = adHarmonicService.listAllResultData(devReportParam.getScriptId(), devReportParam.getPlanCode(), devReportParam.getDevId() + "_" + i);
 
             // 填充数据
+            int finalI = i;
             indexKeysMap.forEach((index, keys) -> {
                 String s1 = keys.stream().findFirst().get();
                 // 谐波类
                 if (DetectionCodeEnum.V2_50.getCode().equals(s1) || DetectionCodeEnum.I2_50.getCode().equals(s1) || DetectionCodeEnum.SV_1_49.getCode().equals(s1) || DetectionCodeEnum.SI_1_49.getCode().equals(s1)) {
-                    fillMapValueHarm(adHarmonicResultList, dataModelMap, keys, index);
+                    // 查找一下U1
+                    double u1 = 57.74;
+                    List<SimAndDigHarmonicResult> rawData = adHarmonicService.listAllRawData(devReportParam.getScriptId(), devReportParam.getPlanCode(), devReportParam.getDevId() + "_" + finalI);
+                    SimAndDigHarmonicResult adHarmonicResult = rawData.stream().filter(obj -> obj.getAdType().equals(DetectionCodeEnum.V2_50.getCode())).sorted((obj1, obj2) -> obj2.getTimeId().compareTo(obj1.getTimeId())).findFirst().orElse(null);
+                    if (ObjectUtil.isNotNull(adHarmonicResult)) {
+                        String aValue1 = adHarmonicResult.getAValue1();
+                        u1 = Double.parseDouble(aValue1);
+                    }
+                    fillMapValueHarm(adHarmonicResultList, dataModelMap, keys, index, u1);
                 } else {
                     // 非谐波类
                     if (DetectionCodeEnum.V_UNBAN.getCode().equals(s1) || DetectionCodeEnum.FREQ.getCode().equals(s1)) {
@@ -2157,14 +2328,14 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
      * @param keys                  key
      * @param index                 index
      */
-    private void fillMapValueHarm(List<SimAndDigHarmonicResult> allHarmonicResultList, Map<String, String> dataModelMap, Set<String> keys, String index) {
+    private void fillMapValueHarm(List<SimAndDigHarmonicResult> allHarmonicResultList, Map<String, String> dataModelMap, Set<String> keys, String index, double baseValue) {
         keys.forEach(key -> {
             List<SimAndDigHarmonicResult> resultList = allHarmonicResultList.stream().filter(obj -> obj.getAdType().equals(key) && obj.getSort().toString().equals(index)).collect(Collectors.toList());
             if (CollectionUtil.isNotEmpty(resultList)) {
                 SimAndDigHarmonicResult adHarmonicResult = resultList.get(0);
                 if (Objects.nonNull(adHarmonicResult)) {
                     if (DetectionCodeEnum.V2_50.getCode().equals(key) || DetectionCodeEnum.SV_1_49.getCode().equals(key)) {
-                        fillHarm(dataModelMap, adHarmonicResult, index, key, 57.74, 100);
+                        fillHarm(dataModelMap, adHarmonicResult, index, key, baseValue, 100);
                     }
                     if (DetectionCodeEnum.I2_50.getCode().equals(key) || DetectionCodeEnum.SI_1_49.getCode().equals(key)) {
                         fillHarm(dataModelMap, adHarmonicResult, index, key, 1, 1);
@@ -2312,7 +2483,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
             return;
         }
         log.info("找到{}台设备需要上传报告", devices.size());
-        String dirPath = reportPath;
+        String dirPath = pathConfig.getReportPath();
         // 确保目录存在
         ensureDirectoryExists(dirPath);
         // 异步批量上传每台设备的报告
@@ -2371,16 +2542,21 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
     /**
      * 创建回路标题到报告中
      */
-    private P getContrastLineTitle(Map<String, List<Docx4jUtil.HeadingContent>> contentMap, int monitorNum, int index, ObjectFactory factory) {
+    private P getContrastLineTitle(Map<String, List<Docx4jUtil.HeadingContent>> contentMap, int monitorNum, int index, ObjectFactory factory, PqDevVO pqDevVO) {
+        PqMonitor pqMonitor = pqMonitorService.getByDevIdAndNum(pqDevVO.getId(), monitorNum);
+        String monitorInfoName = "";
+        if (StrUtil.isNotBlank(pqDevVO.getSubName()) && Objects.nonNull(pqMonitor)) {
+            monitorInfoName = "(" + pqDevVO.getSubName() + "-" + pqMonitor.getName() + ")";
+        }
         List<Docx4jUtil.HeadingContent> headingContents = contentMap.get(PowerIndexEnum.LINE_TITLE.getKey());
         // 如果contentMap中有指定内容，创建大纲级别为2的标题
         if (CollUtil.isNotEmpty(headingContents)) {
-            return Docx4jUtil.createTitle(factory, 2, index + ".测量回路" + monitorNum,
+            return Docx4jUtil.createTitle(factory, 2, index + ".测量回路" + monitorNum + monitorInfoName,
                     "SimSun", 30, true);
         }
         // 没有模板配置时，创建默认样式段落
         P titleParagraph = factory.createP();
-        Docx4jUtil.createTitle(factory, titleParagraph, "测量回路" + monitorNum,
+        Docx4jUtil.createTitle(factory, titleParagraph, "测量回路" + monitorNum + monitorInfoName,
                 28, true);
         return titleParagraph;
     }

detection/src/main/java/com/njcn/gather/result/controller/ResultController.java

@@ -90,7 +90,7 @@ public class ResultController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
     @PostMapping("/reCalculate")
     @ApiOperation("重新计算检测结果")
-    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
+    @ApiImplicitParam(name = "param", value = "重新计算参数", required = true)
     public HttpResult<Object> reCalculate(@RequestBody @Validated ResultParam.ChangeErrorSystemParam param) {
         String methodDescribe = getMethodDescribe("reCalculate");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, param);
@@ -115,7 +115,7 @@ public class ResultController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DELETE)
     @GetMapping("/deleteTempTable")
     @ApiOperation("删除临时表")
-    @ApiImplicitParam(name = "param", value = "删除参数", required = true)
+    @ApiImplicitParam(name = "code", value = "计划对应的表后缀code", required = true)
     public HttpResult<Object> deleteTempTable(@RequestParam("code") String code) {
         String methodDescribe = getMethodDescribe("deleteTempTable");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, code);
@@ -127,7 +127,7 @@ public class ResultController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getContrastFormContent")
     @ApiOperation("获取比对式检测结果-表单内容")
-    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
+    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
     public HttpResult<FormContentVO> getContrastFormContent(@RequestBody @Validated ResultParam.QueryParam queryParam) {
         String methodDescribe = getMethodDescribe("getContrastFormContent");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
@@ -139,7 +139,7 @@ public class ResultController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getContrastResult")
     @ApiOperation("获取比对式检测结果")
-    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
+    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
     public HttpResult<ContrastResultVO> getContrastResult(@RequestBody @Validated ResultParam.QueryParam queryParam) {
         String methodDescribe = getMethodDescribe("getContrastResult");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
@@ -154,7 +154,7 @@ public class ResultController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getMonitorResult")
     @ApiOperation("获取监测点的检测结果")
-    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
+    @ApiImplicitParam(name = "devId", value = "设备id", required = true)
     public HttpResult<List<MonitorResultVO>> getMonitorResult(@RequestParam("devId") String devId) {
         String methodDescribe = getMethodDescribe("getMonitorResult");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, devId);
@@ -180,7 +180,7 @@ public class ResultController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/updateMonitorResult")
     @ApiOperation("更新监测点的检测结果")
-    @ApiImplicitParam(name = "result", value = "更新内容", required = true)
+    @ApiImplicitParam(name = "resultParams", value = "更新内容", required = true)
     public HttpResult<Boolean> updateMonitorResult(@RequestBody @Validated MonitorResultVO resultParams) {
         String methodDescribe = getMethodDescribe("updateMonitorResult");
         LogUtil.njcnDebug(log, "{}，更新数据为：{}", methodDescribe, resultParams);
@@ -198,7 +198,7 @@ public class ResultController extends BaseController {
         String methodDescribe = getMethodDescribe("getCheckItem");
 
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, monitorQueryParam);
-        List<ContrastTestItemVO> result = resultService.getCheckItem(monitorQueryParam.getDevId(),monitorQueryParam.getChnNum(), monitorQueryParam.getNum());
+        List<ContrastTestItemVO> result = resultService.getCheckItem(monitorQueryParam.getPlanId(), monitorQueryParam.getDevId(), monitorQueryParam.getChnNum(), monitorQueryParam.getNum(), monitorQueryParam.getCode());
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 }

detection/src/main/java/com/njcn/gather/result/pojo/param/MonitorQueryParam.java

@@ -15,4 +15,8 @@ public class MonitorQueryParam {
     private Integer num;
 
     private Integer waveNum;
+
+    private String planId;
+
+    private String code;
 }

detection/src/main/java/com/njcn/gather/result/pojo/param/ResultParam.java

@@ -2,6 +2,7 @@ package com.njcn.gather.result.pojo.param;
 
 import com.njcn.common.pojo.constant.PatternRegex;
 import com.njcn.gather.pojo.constant.DetectionValidMessage;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -74,6 +75,8 @@ public class ResultParam {
 
         // 模式id
         private String patternId;
+
+        private String code;
     }
 
     @Data
@@ -83,7 +86,7 @@ public class ResultParam {
         @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.PLAN_ID_FORMAT_ERROR)
         private String planId;
 
-        @ApiModelProperty(value = "脚本Id", required = false)
+        @ApiModelProperty(value = "脚本Id")
         private String scriptId;
 
         @ApiModelProperty(value = "误差体系Id", required = true)
@@ -95,9 +98,16 @@ public class ResultParam {
         @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.DEV_ID_FORMAT_ERROR)
         private String deviceId;
 
+        @ApiModelProperty(value = "计划对应表后缀", required = true)
         private String code;
 
         @ApiModelProperty(value = "模式Id", required = true)
         private String patternId;
+
+        @ApiModelProperty(value = "通道号", required = true)
+        private String chnNum;
+
+        @ApiModelProperty(value = "数据处理原则", required = true)
+        private String dataRuleId;
     }
 }

detection/src/main/java/com/njcn/gather/result/pojo/vo/MonitorResultVO.java

@@ -14,58 +14,38 @@ import javax.validation.constraints.NotNull;
 @Data
 public class MonitorResultVO implements Comparable<MonitorResultVO> {
 
-    /**
-     * 监测点id
-     */
     @ApiModelProperty(value = "监测点id", required = true)
     @NotBlank(message = DetectionValidMessage.DEV_MONITOR_ID_NOT_BLANK)
     private String monitorId;
 
-    /**
-     * 监测点序号
-     */
+    @ApiModelProperty(value = "监测点序号")
     private Integer monitorNum;
 
-    /**
-     * 总检测次数
-     */
+    @ApiModelProperty(value = "总检测次数")
     private Integer totalNum;
 
-    /**
-     * 合格检测次数
-     */
+    @ApiModelProperty(value = "合格检测次数")
     private Integer qualifiedNum;
 
-    /**
-     * 不合格检测次数
-     */
+    @ApiModelProperty(value = "不合格检测次数")
     private Integer unQualifiedNum;
 
-    /**
-     * 误差体系名称
-     */
+    @ApiModelProperty(value = "误差体系名称")
     private String errorSysName;
 
-    /**
-     * 检测结果
-     */
     @ApiModelProperty(value = "检测结果", required = true)
     @NotNull(message = DetectionValidMessage.DEV_MONITOR_RESULT_NOT_NULL)
     private Integer checkResult;
 
-    /**
-     * 结论来源
-     */
+
+    @ApiModelProperty(value = "结论来源")
     private String resultOrigin;
-    /**
-     * 哪次
-     */
+
     @ApiModelProperty(value = "使用哪次检测结果", required = true)
     @NotNull(message = DetectionValidMessage.DEV_MONITOR_RESULT_NUM_NOT_BLANK)
     private String whichTime;
-    /**
-     * 数据源类型
-     */
+
+
     @ApiModelProperty(value = "数据源类型", required = true)
     @NotBlank(message = DetectionValidMessage.DEV_MONITOR_RESULT_TYPE_NOT_BLANK)
     private String resultType;

detection/src/main/java/com/njcn/gather/result/service/IResultService.java

@@ -119,17 +119,20 @@ public interface IResultService {
     /**
      * 获取检测项
      *
+     * @param planId
      * @param devId
      * @param chnNum
      * @param num
+     * @param code
      * @return
      */
-    List<ContrastTestItemVO> getCheckItem(String devId, String chnNum, Integer num);
+    List<ContrastTestItemVO> getCheckItem(String planId, String devId, String chnNum, Integer num,String code);
 
     /**
      * 获取设备比对式结果，用于出比对检测的报告
+     *
      * @param devReportParam 设备报告参数
-     * @param pqDevVO 设备信息 省去一次sql查询
+     * @param pqDevVO        设备信息 省去一次sql查询
      * @return 该设备的比对式结果
      */
     Map<Integer, List<ContrastTestResult>> getContrastResultForReport(DevReportParam devReportParam, PqDevVO pqDevVO);

detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java

@@ -22,6 +22,7 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.utils.PubUtils;
 import com.njcn.gather.detection.handler.SocketContrastResponseService;
 import com.njcn.gather.detection.pojo.enums.DetectionCodeEnum;
+import com.njcn.gather.detection.pojo.enums.ResultEnum;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
 import com.njcn.gather.detection.pojo.po.AdPair;
 import com.njcn.gather.detection.pojo.po.DevData;
@@ -99,6 +100,8 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.njcn.gather.plan.pojo.enums.DataSourceEnum.*;
+
 /**
  * @author caozehui
  * @data 2024-12-30
@@ -111,6 +114,7 @@ public class ResultServiceImpl implements IResultService {
     private final IAdPlanService adPlanService;
     private final IAdPlanTestConfigService adPlanTestConfigService;
     private final IPqDevService pqDevService;
+    private final IPqStandardDevService pqStandardDevService;
     private final SimAndDigNonHarmonicService simAndDigNonHarmonicService;
     private final SimAndDigHarmonicService simAndDigHarmonicService;
     private final ContrastHarmonicService contrastHarmonicService;
@@ -142,11 +146,11 @@ public class ResultServiceImpl implements IResultService {
         formContentVO.setErrorSysId(plan.getErrorSysId());
         String scriptId = null;
         if (ObjectUtil.isNotNull(plan)) {
+            formContentVO.setDataRule(plan.getDataRule());
             scriptId = plan.getScriptId();
             adPlanService.visualize(Collections.singletonList(plan));
+            formContentVO.setScriptName(plan.getScriptId());
         }
-        formContentVO.setScriptName(plan.getScriptId());
-        formContentVO.setDataRule(plan.getDataRule());
         formContentVO.setDeviceName(pqDevService.getById(queryParam.getDeviceId()).getName());
 
         List<Map<String, String>> chnList = new ArrayList<>();
@@ -337,10 +341,19 @@ public class ResultServiceImpl implements IResultService {
     private void dipScriptTypeName(List<PqScriptDtls> subValue, List<TreeDataVO> subTypeList, Map<Integer, Set<Integer>> finalResultMap, Boolean isValueType, String name, Integer start, Integer end) {
         List<TreeDataVO> info = new ArrayList<>();
         List<PqScriptDtls> dip = subValue.stream()
-                .filter(x -> "Dip".equals(x.getValueType()) && "A".equals(x.getPhase()))
+//                .filter(x -> "Dip".equals(x.getValueType()) && "A".equals(x.getPhase()))
+                .filter(x -> "Dip".equals(x.getValueType()))
                 .filter(x -> x.getTransValue() >= start && x.getTransValue() <= end)
                 .sorted(Comparator.comparing(PqScriptDtls::getScriptIndex))
                 .collect(Collectors.toList());
+        LinkedHashMap<Integer, List<PqScriptDtls>> idxDipMap = dip.stream().collect(Collectors.groupingBy(d -> d.getScriptIndex(), LinkedHashMap::new, Collectors.toList()));
+
+        dip.clear();
+        idxDipMap.forEach((idx, scriptDtlList) -> {
+            scriptDtlList.sort(Comparator.comparing(PqScriptDtls::getPhase));
+            dip.add(scriptDtlList.get(0));
+        });
+
         TreeDataVO vo = new TreeDataVO();
         vo.setScriptTypeName(name);
         vo.setScriptTypeCode("Base_" + start + "_" + end);
@@ -394,8 +407,8 @@ public class ResultServiceImpl implements IResultService {
                 double cosValue = Math.cos((aDtl1.get(0).getAngle() - aDtl2.get(0).getAngle()) / 180 * Math.PI);
                 BigDecimal bigDecimal = BigDecimal.valueOf(cosValue).setScale(6, BigDecimal.ROUND_HALF_UP);
 
-                dtlType.setScriptTypeName(ResultUnitEnum.V_RELATIVE.getName() + "=" + v.get(0).getValue().intValue() + unitV
-                        + " " + ResultUnitEnum.I_RELATIVE.getName() + "=" + i.get(0).getValue().intValue() + unitI
+                dtlType.setScriptTypeName(ResultUnitEnum.V_RELATIVE.getName() + "=" + v.get(0).getValue() + unitV
+                        + " " + ResultUnitEnum.I_RELATIVE.getName() + "=" + i.get(0).getValue() + unitI
                         + " cos(φ)=" + bigDecimal.doubleValue());
             }
             break;
@@ -411,7 +424,7 @@ public class ResultServiceImpl implements IResultService {
                     unit = ResultUnitEnum.V_ABSOLUTELY.getUnit();
                 }
                 List<PqScriptDtls> v = scriptDtlIndexList.stream().filter(x -> "VOL".equals(x.getValueType())).collect(Collectors.toList());
-                dtlType.setScriptTypeName(dictTree.getName() + "=" + v.get(0).getValue().intValue() + unit);
+                dtlType.setScriptTypeName(dictTree.getName() + "=" + v.get(0).getValue() + unit);
                 break;
             /**
              * 电流
@@ -425,7 +438,7 @@ public class ResultServiceImpl implements IResultService {
                     unitI = ResultUnitEnum.I_ABSOLUTELY.getUnit();
                 }
                 List<PqScriptDtls> I = scriptDtlIndexList.stream().filter(x -> "CUR".equals(x.getValueType())).collect(Collectors.toList());
-                dtlType.setScriptTypeName(dictTree.getName() + "=" + I.get(0).getValue().intValue() + unitI);
+                dtlType.setScriptTypeName(dictTree.getName() + "=" + I.get(0).getValue() + unitI);
                 break;
             /**
              * 谐波电压
@@ -445,12 +458,12 @@ public class ResultServiceImpl implements IResultService {
                         .collect(Collectors.groupingBy(PqScriptDtls::getHarmNum, LinkedHashMap::new, Collectors.toList()));
                 if (harmNumMap.size() > 1) {
                     //叠加2~50次谐波电压（含有率为GB/T）
-                    dtlType.setScriptTypeName("叠加" + harmNumMap.entrySet().iterator().next().getValue().get(0).getHarmNum().intValue() + "~" +
-                            new ArrayList<>(harmNumMap.entrySet()).get(harmNumMap.size() - 1).getValue().get(0).getHarmNum().intValue()
+                    dtlType.setScriptTypeName("叠加" + harmNumMap.entrySet().iterator().next().getValue().get(0).getHarmNum() + "~" +
+                            new ArrayList<>(harmNumMap.entrySet()).get(harmNumMap.size() - 1).getValue().get(0).getHarmNum()
                             + "次" + dictTree.getName()); // + "（含有率为GB/T）"
                 } else {
                     //叠加5%的2次谐波电压
-                    dtlType.setScriptTypeName("叠加" + hv.get(0).getValue().intValue() + ResultUnitEnum.HV.getUnit() + "的" + hv.get(0).getHarmNum().intValue() + "次" + dictTree.getName());
+                    dtlType.setScriptTypeName("叠加" + hv.get(0).getValue() + ResultUnitEnum.HV.getUnit() + "的" + hv.get(0).getHarmNum() + "次" + dictTree.getName());
                 }
                 break;
             /**
@@ -484,7 +497,7 @@ public class ResultServiceImpl implements IResultService {
                     dtlType.setScriptTypeName(a.toString());
                 } else {
                     //叠加5%的2次谐波电压
-                    dtlType.setScriptTypeName("叠加" + harmInNumList.get(0).getValue().intValue() + ResultUnitEnum.HV.getUnit() + "的" + harmInNumList.get(0).getHarmNum() + "次" + dictTree.getName());
+                    dtlType.setScriptTypeName("叠加" + harmInNumList.get(0).getValue() + ResultUnitEnum.HV.getUnit() + "的" + harmInNumList.get(0).getHarmNum() + "次" + dictTree.getName());
                 }
 
                 break;
@@ -979,10 +992,10 @@ public class ResultServiceImpl implements IResultService {
         DictData dictData = dictDataService.getDictDataById(param.getPatternId());
         if (PatternEnum.CONTRAST.getValue().equals(dictData.getCode())) {
             this.createTempResultTable(param.getCode() + "_temp", true);
-            this.contrastCalculateResult(param.getPlanId(), param.getCode() + "_temp", param.getErrorSysId(), param.getDeviceId());
+            this.contrastCalculateResult(param.getPlanId(), param.getCode() + "_temp", param.getErrorSysId(), param.getDeviceId(), false, param.getDataRuleId());
         } else {
             this.createTempResultTable(param.getCode() + "_temp", false);
-            this.simAndDigCalculateResult(param.getPlanId(), param.getScriptId(), param.getCode() + "_temp", param.getErrorSysId(), param.getDeviceId());
+            this.simAndDigCalculateResult(param.getPlanId(), param.getScriptId(), param.getCode() + "_temp", param.getErrorSysId(), param.getDeviceId(), param.getDataRuleId());
         }
     }
 
@@ -996,9 +1009,9 @@ public class ResultServiceImpl implements IResultService {
     public void reCalculate(ResultParam.ChangeErrorSystemParam param) {
         DictData dictData = dictDataService.getDictDataById(param.getPatternId());
         if (PatternEnum.CONTRAST.getValue().equals(dictData.getCode())) {
-            this.contrastCalculateResult(param.getPlanId(), param.getCode(), param.getErrorSysId(), param.getDeviceId());
+            this.contrastCalculateResult(param.getPlanId(), param.getCode(), param.getErrorSysId(), param.getDeviceId(), true, param.getDataRuleId());
         } else {
-            this.simAndDigCalculateResult(param.getPlanId(), param.getScriptId(), param.getCode(), param.getErrorSysId(), param.getDeviceId());
+            this.simAndDigCalculateResult(param.getPlanId(), param.getScriptId(), param.getCode(), param.getErrorSysId(), param.getDeviceId(), param.getDataRuleId());
         }
     }
 
@@ -1529,8 +1542,7 @@ public class ResultServiceImpl implements IResultService {
 
         AdPlan plan = adPlanService.getById(queryParam.getPlanId());
         PqDev dev = pqDevService.getById(queryParam.getDeviceId());
-        DictData dictData = dictDataService.getById(plan.getDataRule());
-        formContentVO.setDataRule(dictData.getName());
+        formContentVO.setDataRule(plan.getDataRule());
         formContentVO.setDeviceName(dev.getName());
         formContentVO.setErrorSysId(plan.getErrorSysId());
 
@@ -1550,10 +1562,10 @@ public class ResultServiceImpl implements IResultService {
         }
         List<ContrastBaseResult> allResultList = new ArrayList<>();
 
-        List<ContrastNonHarmonicResult> contrastNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, false, queryParam.getDeviceId(), adTypeList);
-        contrastNonHarmonicResults.addAll(contrastNonHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, queryParam.getDeviceId(), adTypeList));
-        List<ContrastHarmonicResult> contrastHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, false, queryParam.getDeviceId(), adTypeList);
-        contrastHarmonicResults.addAll(contrastHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, queryParam.getDeviceId(), adTypeList));
+        List<ContrastNonHarmonicResult> contrastNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, false, null, queryParam.getDeviceId(), adTypeList);
+        contrastNonHarmonicResults.addAll(contrastNonHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, null, queryParam.getDeviceId(), adTypeList));
+        List<ContrastHarmonicResult> contrastHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, false, null, queryParam.getDeviceId(), adTypeList);
+        contrastHarmonicResults.addAll(contrastHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, null, queryParam.getDeviceId(), adTypeList));
         allResultList.addAll(contrastHarmonicResults);
         allResultList.addAll(contrastNonHarmonicResults);
 
@@ -1577,8 +1589,6 @@ public class ResultServiceImpl implements IResultService {
     public ContrastResultVO getContrastResult(ResultParam.QueryParam queryParam) {
         ContrastResultVO contrastResultVO = new ContrastResultVO();
 
-        AdPlan plan = adPlanService.getById(queryParam.getPlanId());
-
         List<DictTree> dictTreeList = dictTreeService.getDictTreeById(Collections.singletonList(queryParam.getScriptType()));
 
         List<String> fatherIdList = dictTreeList.stream().map(DictTree::getId).collect(Collectors.toList());
@@ -1600,8 +1610,8 @@ public class ResultServiceImpl implements IResultService {
             }
         }
 
-        contrastResultVO.setResultMap(this.getResultMap(dictTree, adTypeList, queryParam.getDeviceId() + CnSocketUtil.SPLIT_TAG + queryParam.getChnNum(), unit, queryParam.getNum(), queryParam.getWaveNum(), queryParam.getIsWave(), String.valueOf(plan.getCode())));
-        contrastResultVO.setRawDataMap(this.getRawDataMap(dictTree, adTypeList, queryParam.getDeviceId() + CnSocketUtil.SPLIT_TAG + queryParam.getChnNum(), unit, queryParam.getNum(), queryParam.getWaveNum(), queryParam.getIsWave(), String.valueOf(plan.getCode())));
+        contrastResultVO.setResultMap(this.getResultMap(dictTree, adTypeList, queryParam.getDeviceId() + CnSocketUtil.SPLIT_TAG + queryParam.getChnNum(), unit, queryParam.getNum(), queryParam.getWaveNum(), queryParam.getIsWave(), queryParam.getCode()));
+        contrastResultVO.setRawDataMap(this.getRawDataMap(dictTree, adTypeList, queryParam.getDeviceId() + CnSocketUtil.SPLIT_TAG + queryParam.getChnNum(), unit, queryParam.getNum(), queryParam.getWaveNum(), queryParam.getIsWave(), queryParam.getCode(), contrastResultVO.getResultMap().keySet().stream().collect(Collectors.toList())));
         return contrastResultVO;
     }
 
@@ -1654,6 +1664,26 @@ public class ResultServiceImpl implements IResultService {
                     result.setResultType(resultType + CnSocketUtil.SPLIT_TAG + waveData.get(1));
                     result.setResultOrigin(dataSourceEnum.getMsg() + waveData.get(1));
                     break;
+                case MINUTE_STATISTICS_AVG:
+                    result.setCheckResult(pqMonitor.getStatisticsResult());
+                    result.setWhichTime(pqMonitor.getStatisticsNum());
+                    result.setResultOrigin(dataSourceEnum.getMsg());
+                    break;
+                case MINUTE_STATISTICS_MAX:
+                    result.setCheckResult(pqMonitor.getStatisticsResult());
+                    result.setWhichTime(pqMonitor.getStatisticsNum());
+                    result.setResultOrigin(dataSourceEnum.getMsg());
+                    break;
+                case MINUTE_STATISTICS_MIN:
+                    result.setCheckResult(pqMonitor.getStatisticsResult());
+                    result.setWhichTime(pqMonitor.getStatisticsNum());
+                    result.setResultOrigin(dataSourceEnum.getMsg());
+                    break;
+                case MINUTE_STATISTICS_CP95:
+                    result.setCheckResult(pqMonitor.getStatisticsResult());
+                    result.setWhichTime(pqMonitor.getStatisticsNum());
+                    result.setResultOrigin(dataSourceEnum.getMsg());
+                    break;
                 default:
                     break;
             }
@@ -1679,27 +1709,27 @@ public class ResultServiceImpl implements IResultService {
         }
         AdPlan finalPlan = plan;
         // 实时数据结果
-        List<ContrastNonHarmonicResult> realNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, false, monitorId, null);
-        Map<Integer, List<ContrastNonHarmonicResult>> numNonHarmonicMap = realNonHarmonicResults.stream()
+        List<ContrastNonHarmonicResult> realNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, false, DataSourceEnum.REAL_DATA.getValue(), monitorId, null);
+        Map<Integer, List<ContrastNonHarmonicResult>> realNumNonHarmonicMap = realNonHarmonicResults.stream()
                 .sorted(Comparator.comparing(ContrastNonHarmonicResult::getNum))
                 .collect(Collectors.groupingBy(ContrastNonHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList()));
 
-        List<ContrastHarmonicResult> realHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, false, monitorId, null);
-        Map<Integer, List<ContrastHarmonicResult>> numHarmonicMap = realHarmonicResults.stream()
+        List<ContrastHarmonicResult> realHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, false, DataSourceEnum.REAL_DATA.getValue(), monitorId, null);
+        Map<Integer, List<ContrastHarmonicResult>> realNumHarmonicMap = realHarmonicResults.stream()
                 .sorted(Comparator.comparing(ContrastHarmonicResult::getNum))
                 .collect(Collectors.groupingBy(ContrastHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList()));
 
-        Map<Integer, List<Integer>> numResutMap = new TreeMap<>();
-        numNonHarmonicMap.forEach((num, resultList) -> {
-            numResutMap.put(num, resultList.stream().map(ContrastNonHarmonicResult::getResultFlag).distinct().collect(Collectors.toList()));
+        Map<Integer, List<Integer>> realNumResutMap = new TreeMap<>();
+        realNumNonHarmonicMap.forEach((num, resultList) -> {
+            realNumResutMap.put(num, resultList.stream().map(ContrastNonHarmonicResult::getResultFlag).distinct().collect(Collectors.toList()));
         });
-        numHarmonicMap.forEach((num, resultList) -> {
-            List<Integer> list = numResutMap.getOrDefault(num, new ArrayList<>());
+        realNumHarmonicMap.forEach((num, resultList) -> {
+            List<Integer> list = realNumResutMap.getOrDefault(num, new ArrayList<>());
             list.addAll(resultList.stream().map(ContrastHarmonicResult::getResultFlag).distinct().collect(Collectors.toList()));
-            numResutMap.put(num, list);
+            realNumResutMap.put(num, list);
         });
 
-        numResutMap.forEach((num, resultList) -> {
+        realNumResutMap.forEach((num, resultList) -> {
             List<DataSourceResultVO> dataSourceResultVOList = new ArrayList<>();
             DataSourceResultVO realDataSourceResultVO = new DataSourceResultVO();
             realDataSourceResultVO.setDataSourceCode(DataSourceEnum.REAL_DATA.getValue());
@@ -1710,14 +1740,14 @@ public class ResultServiceImpl implements IResultService {
             result.put(num, dataSourceResultVOList);
         });
 
-        Map<Integer, Map<Integer, List<Integer>>> waveNumMap = new TreeMap<>();
 
         // 录波数据结果
-        List<ContrastNonHarmonicResult> waveNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, true, monitorId, null);
+        Map<Integer, Map<Integer, List<Integer>>> waveNumMap = new TreeMap<>();
+        List<ContrastNonHarmonicResult> waveNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, true, null, monitorId, null);
         Map<Integer, List<ContrastNonHarmonicResult>> waveNumNonHarmonicMap = waveNonHarmonicResults.stream()
                 .sorted(Comparator.comparing(ContrastNonHarmonicResult::getNum))
                 .collect(Collectors.groupingBy(ContrastNonHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList()));
-        List<ContrastHarmonicResult> waveHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, true, monitorId, null);
+        List<ContrastHarmonicResult> waveHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, true, null, monitorId, null);
         Map<Integer, List<ContrastHarmonicResult>> waveNumHarmonicMap = waveHarmonicResults.stream()
                 .sorted(Comparator.comparing(ContrastHarmonicResult::getNum))
                 .collect(Collectors.groupingBy(ContrastHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList()));
@@ -1759,6 +1789,62 @@ public class ResultServiceImpl implements IResultService {
             result.put(num, orDefault);
         });
 
+        String dataRule = finalPlan.getDatasourceId();
+        String[] split1 = dataRule.split(CnSocketUtil.SPLIT_TAG);
+        DataSourceEnum dataType = null;
+        for (String s : split1) {
+            if (MINUTE_STATISTICS_AVG.getValue().equals(s)) {
+                dataType = MINUTE_STATISTICS_AVG;
+                break;
+            }
+            if (MINUTE_STATISTICS_CP95.getValue().equals(s)) {
+                dataType = MINUTE_STATISTICS_CP95;
+                break;
+            }
+            if (MINUTE_STATISTICS_MAX.getValue().equals(s)) {
+                dataType = MINUTE_STATISTICS_MAX;
+                break;
+            }
+            if (MINUTE_STATISTICS_MIN.getValue().equals(s)) {
+                dataType = MINUTE_STATISTICS_MIN;
+                break;
+            }
+        }
+
+        // 统计数据
+        if (ObjectUtil.isNotNull(dataType)) {
+            List<ContrastNonHarmonicResult> statisticsNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, false, dataType.getValue(), monitorId, null);
+            Map<Integer, List<ContrastNonHarmonicResult>> statisticsNumNonHarmonicMap = statisticsNonHarmonicResults.stream()
+                    .sorted(Comparator.comparing(ContrastNonHarmonicResult::getNum))
+                    .collect(Collectors.groupingBy(ContrastNonHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList()));
+
+            List<ContrastHarmonicResult> statisticsHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, false, dataType.getValue(), monitorId, null);
+            Map<Integer, List<ContrastHarmonicResult>> statisticsNumHarmonicMap = statisticsHarmonicResults.stream()
+                    .sorted(Comparator.comparing(ContrastHarmonicResult::getNum))
+                    .collect(Collectors.groupingBy(ContrastHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList()));
+
+            Map<Integer, List<Integer>> statisticsNumResutMap = new TreeMap<>();
+            statisticsNumNonHarmonicMap.forEach((num, resultList) -> {
+                statisticsNumResutMap.put(num, resultList.stream().map(ContrastNonHarmonicResult::getResultFlag).distinct().collect(Collectors.toList()));
+            });
+            statisticsNumHarmonicMap.forEach((num, resultList) -> {
+                List<Integer> list = statisticsNumResutMap.getOrDefault(num, new ArrayList<>());
+                list.addAll(resultList.stream().map(ContrastHarmonicResult::getResultFlag).distinct().collect(Collectors.toList()));
+                statisticsNumResutMap.put(num, list);
+            });
+
+            DataSourceEnum finalDataType = dataType;
+            statisticsNumResutMap.forEach((num, resultList) -> {
+                List<DataSourceResultVO> dataSourceResultVOList = new ArrayList<>();
+                DataSourceResultVO realDataSourceResultVO = new DataSourceResultVO();
+                realDataSourceResultVO.setDataSourceCode(finalDataType.getValue());
+                realDataSourceResultVO.setDataSourceName(finalDataType.getMsg());
+                realDataSourceResultVO.setCheckResult(StorageUtil.getInteger(resultList));
+                dataSourceResultVOList.add(realDataSourceResultVO);
+
+                result.put(num, dataSourceResultVOList);
+            });
+        }
         return result;
     }
 
@@ -1798,20 +1884,23 @@ public class ResultServiceImpl implements IResultService {
             monitor.setRecordedResult(null);
             monitor.setRecordedNum(null);
         }
+        boolean flag = pqMonitorService.updateById(monitor);
 
-        return pqMonitorService.updateById(monitor);
+        pqDevService.updateResult(split[0], null);
+
+        return flag;
     }
 
     @Override
-    public List<ContrastTestItemVO> getCheckItem(String devId, String chnNum, Integer num) {
-        PqDev dev = pqDevService.getById(devId);
-        AdPlan plan = adPlanService.getById(dev.getPlanId());
-        String code = String.valueOf(plan.getCode());
+    public List<ContrastTestItemVO> getCheckItem(String planId, String devId, String chnNum, Integer num, String code) {
+//        PqDev dev = pqDevService.getById(devId);
+        AdPlan plan = adPlanService.getById(planId);
+//        String code = String.valueOf(plan.getCode());
 
         String monitorId = devId + CnSocketUtil.SPLIT_TAG + chnNum;
 
-        List<ContrastNonHarmonicResult> realNoHarmonicResults = contrastNonHarmonicService.listAllResultData(code, num, null, false, monitorId, null);
-        List<ContrastHarmonicResult> realHarmonicResults = contrastHarmonicService.listAllResultData(code, num, null, false, monitorId, null);
+        List<ContrastNonHarmonicResult> realNoHarmonicResults = contrastNonHarmonicService.listAllResultData(code, num, null, false, null, monitorId, null);
+        List<ContrastHarmonicResult> realHarmonicResults = contrastHarmonicService.listAllResultData(code, num, null, false, null, monitorId, null);
 
         Map<String, List<Integer>> checkItemResultMap = realNoHarmonicResults.stream().collect(Collectors.groupingBy(ContrastNonHarmonicResult::getAdType, Collectors.mapping(ContrastNonHarmonicResult::getResultFlag, Collectors.toList())));
         checkItemResultMap.putAll(realHarmonicResults.stream().collect(Collectors.groupingBy(ContrastHarmonicResult::getAdType, Collectors.mapping(ContrastHarmonicResult::getResultFlag, Collectors.toList()))));
@@ -1830,8 +1919,8 @@ public class ResultServiceImpl implements IResultService {
 
         checkItemResultMap.clear();
 
-        List<ContrastNonHarmonicResult> waveNoHarmonicResults = contrastNonHarmonicService.listAllResultData(code, num, null, true, monitorId, null);
-        List<ContrastHarmonicResult> waveHarmonicResults = contrastHarmonicService.listAllResultData(code, num, null, true, monitorId, null);
+        List<ContrastNonHarmonicResult> waveNoHarmonicResults = contrastNonHarmonicService.listAllResultData(code, num, null, true, null, monitorId, null);
+        List<ContrastHarmonicResult> waveHarmonicResults = contrastHarmonicService.listAllResultData(code, num, null, true, null, monitorId, null);
         if (CollUtil.isNotEmpty(waveNoHarmonicResults) && CollUtil.isNotEmpty(waveHarmonicResults)) {
             checkItemResultMap.putAll(waveNoHarmonicResults.stream().collect(Collectors.groupingBy(ContrastNonHarmonicResult::getAdType, Collectors.mapping(ContrastNonHarmonicResult::getResultFlag, Collectors.toList()))));
             checkItemResultMap.putAll(waveHarmonicResults.stream().collect(Collectors.groupingBy(ContrastHarmonicResult::getAdType, Collectors.mapping(ContrastHarmonicResult::getResultFlag, Collectors.toList()))));
@@ -1951,8 +2040,10 @@ public class ResultServiceImpl implements IResultService {
             int totalDataPoints = 0; // 统计总的数据点数
             int zeroFilteredPoints = 0; // 统计双零过滤的数据点数
 
-            // 遍历 2~50 次谐波
-            for (int harmNum = 2; harmNum <= 50; harmNum++) {
+            // 间谐波从1开始，普通谐波从2开始
+            int startHarmNum = isInterHarmonic ? 1 : 2;
+            // 遍历谐波次数
+            for (int harmNum = startHarmNum; harmNum <= 50; harmNum++) {
                 String harmKey = String.valueOf(harmNum);
                 Map<String, Map<String, Map<String, String>>> checkResultHarmonic = new LinkedHashMap<>();
                 List<String> zeroFilteredPhases = new ArrayList<>(); // 当前次数被过滤的相别
@@ -1982,7 +2073,7 @@ public class ResultServiceImpl implements IResultService {
                                 // 双零情况，记录但不加入结果判定
                                 zeroFilteredPhases.add(phase.toUpperCase() + "相");
                                 // 将结果改为特殊标记，不参与整体结论判定
-                                singlePhaseData.put(ItemReportKeyEnum.RESULT.getKey(), "双零过滤");
+                                singlePhaseData.put(ItemReportKeyEnum.RESULT.getKey(), "符合");
                             } else {
                                 // 有非双零数据
                                 hasNonZeroData = true;
@@ -1990,7 +2081,6 @@ public class ResultServiceImpl implements IResultService {
                                 String resultTemp = singlePhaseData.get(ItemReportKeyEnum.RESULT.getKey());
                                 if (StrUtil.isNotBlank(resultTemp)) {
                                     allResult.add(resultTemp);
-
                                     // 收集特殊情况
                                     if ("无法比较".equals(resultTemp)) {
                                         String numOfDataStr = singlePhaseData.get(ItemReportKeyEnum.NUM_OF_DATA.getKey());
@@ -2133,7 +2223,11 @@ public class ResultServiceImpl implements IResultService {
                     String phases = phaseEntry.getKey();
                     List<Integer> harmNums = phaseEntry.getValue();
                     specialCaseDesc.append("第").append(formatHarmNumbers(harmNums, isInterHarmonic)).append("次谐波");
-                    specialCaseDesc.append(phases).append("无样本数据满足误差比较的前置条件，无法执行有效性判定。");
+                    // 如果是T相，则不拼接相别
+                    if (!"T相".equals(phases)) {
+                        specialCaseDesc.append(phases);
+                    }
+                    specialCaseDesc.append("无样本数据满足误差比较的前置条件，无法执行有效性判定。");
                 }
             }
         }
@@ -2294,10 +2388,8 @@ public class ResultServiceImpl implements IResultService {
             contrastTestResult.setHarmonic(false);
             List<String> allResult = new ArrayList<>();
             Map<String, Map<String, String>> checkResultNonHarmonic = new LinkedHashMap<>();
-
             // 根据指标代码确定小数位数
             Integer decimalPlaces = getDecimalPlacesByScriptCode(dictTree.getCode());
-
             try {
                 // 非谐波的需要注意是否为T相还是ABC三相的
                 if (PowerConstant.T_PHASE.contains(dictTree.getCode())) {
@@ -2357,10 +2449,16 @@ public class ResultServiceImpl implements IResultService {
                 // 生成无法比较的描述
                 if (!unComparablePhases.isEmpty()) {
                     specialCaseDesc.append("注：");
-                    if (unComparablePhases.size() == 1) {
-                        specialCaseDesc.append(unComparablePhases.get(0));
+                    // 如果只有T相，则不拼接相别
+                    if (unComparablePhases.size() == 1 && "T相".equals(unComparablePhases.get(0))) {
+                        // T相不拼接相别
                     } else {
-                        specialCaseDesc.append(String.join("、", unComparablePhases));
+                        // 其他情况拼接相别
+                        if (unComparablePhases.size() == 1) {
+                            specialCaseDesc.append(unComparablePhases.get(0));
+                        } else {
+                            specialCaseDesc.append(String.join("、", unComparablePhases));
+                        }
                     }
                     specialCaseDesc.append("无样本数据满足误差比较的前置条件，无法执行有效性判定。");
                 }
@@ -2417,40 +2515,38 @@ public class ResultServiceImpl implements IResultService {
             Map<String, String> dataMap = new LinkedHashMap<>();
             if (CollUtil.isNotEmpty(dataList)) {
                 DetectionData detectionData = dataList.get(0);
-
                 // 相别
                 dataMap.put(ItemReportKeyEnum.PHASE.getKey(), phase);
                 // 有效组数 todo... 目前是对齐组数
                 dataMap.put(ItemReportKeyEnum.NUM_OF_DATA.getKey(), String.valueOf(numOfData));
-
                 // 标准值 - 根据参数决定是否格式化
                 String standardValue = String.valueOf(detectionData.getResultData());
                 if (decimalPlaces != null && detectionData.getResultData() != null) {
                     standardValue = formatSignificantDigits(detectionData.getResultData(), decimalPlaces);
                 }
                 dataMap.put(ItemReportKeyEnum.STANDARD.getKey(), standardValue);
-
                 // 被检值 - 根据参数决定是否格式化
                 String testValue = String.valueOf(detectionData.getData());
                 if (decimalPlaces != null && detectionData.getData() != null) {
                     testValue = formatSignificantDigits(detectionData.getData(), decimalPlaces);
                 }
                 dataMap.put(ItemReportKeyEnum.TEST.getKey(), testValue);
-
                 // 误差 - 根据参数决定是否格式化
                 String errorValue = String.valueOf(detectionData.getErrorData());
                 if (decimalPlaces != null && detectionData.getErrorData() != null) {
                     errorValue = formatSignificantDigits(detectionData.getErrorData().doubleValue(), decimalPlaces);
+                } else {
+                    errorValue = "/";
                 }
                 dataMap.put(ItemReportKeyEnum.ERROR.getKey(), errorValue);
-
                 // 误差范围 - 根据参数决定是否格式化
                 String errorScope = String.valueOf(detectionData.getRadius());
                 if (decimalPlaces != null && detectionData.getRadius() != null) {
                     errorScope = formatErrorRange(detectionData.getRadius(), decimalPlaces);
+                } else {
+                    errorScope = "/";
                 }
                 dataMap.put(ItemReportKeyEnum.A_ERROR_SCOPE.getKey(), errorScope);
-
                 // 结论
                 dataMap.put(ItemReportKeyEnum.RESULT.getKey(), getTestResult(detectionData.getIsData()));
             } else {
@@ -2545,8 +2641,20 @@ public class ResultServiceImpl implements IResultService {
             Map<String, String> dataMap = new LinkedHashMap<>();
             if (CollUtil.isNotEmpty(dataList)) {
                 DetectionData detectionData = dataList.get(0);
-                // 次数
-                dataMap.put(ItemReportKeyEnum.TIME.getKey(), String.valueOf(harmNum));
+                // 次数 - 从数据对象中获取实际次数（间谐波为1.5、2.5等）
+                String timeValue;
+                if (detectionData.getNum() != null) {
+                    double numValue = detectionData.getNum();
+                    // 如果是整数，则只显示整数部分（如2.0显示为2）
+                    if (numValue == Math.floor(numValue)) {
+                        timeValue = String.valueOf((int) numValue);
+                    } else {
+                        timeValue = String.valueOf(numValue);
+                    }
+                } else {
+                    timeValue = String.valueOf(harmNum);
+                }
+                dataMap.put(ItemReportKeyEnum.TIME.getKey(), timeValue);
                 // 相别
                 dataMap.put(ItemReportKeyEnum.PHASE.getKey(), phase);
                 // 有效组数 todo... 目前是对齐组数
@@ -2570,6 +2678,8 @@ public class ResultServiceImpl implements IResultService {
                 String errorValue = String.valueOf(detectionData.getErrorData());
                 if (decimalPlaces != null && detectionData.getErrorData() != null) {
                     errorValue = formatSignificantDigits(detectionData.getErrorData().doubleValue(), decimalPlaces);
+                } else {
+                    errorValue = "/";
                 }
                 dataMap.put(ItemReportKeyEnum.ERROR.getKey(), errorValue);
 
@@ -2577,13 +2687,15 @@ public class ResultServiceImpl implements IResultService {
                 String errorScope = String.valueOf(detectionData.getRadius());
                 if (decimalPlaces != null && detectionData.getRadius() != null) {
                     errorScope = formatErrorRange(detectionData.getRadius(), decimalPlaces);
+                } else {
+                    errorScope = "/";
                 }
                 dataMap.put(ItemReportKeyEnum.A_ERROR_SCOPE.getKey(), errorScope);
 
                 // 结论
                 dataMap.put(ItemReportKeyEnum.RESULT.getKey(), getTestResult(detectionData.getIsData()));
             } else {
-                // 次数
+                // 次数 - 数据为空时用循环变量作为兜底
                 dataMap.put(ItemReportKeyEnum.TIME.getKey(), String.valueOf(harmNum));
                 // 相别
                 dataMap.put(ItemReportKeyEnum.PHASE.getKey(), phase);
@@ -2658,8 +2770,8 @@ public class ResultServiceImpl implements IResultService {
     private Map<String, List<RawResultDataVO>> getResultMap(DictTree dictTree, List<String> adTypeList, String monitorId, String unit, Integer num, Integer waveNum, Boolean isWave, String code) {
         Map<String, List<RawResultDataVO>> resultMap = new LinkedHashMap<>();
 
-        List<ContrastNonHarmonicResult> contrastNonHarmonicResults = contrastNonHarmonicService.listAllResultData(code, num, waveNum, isWave, monitorId, adTypeList);
-        List<ContrastHarmonicResult> contrastHarmonicResults = contrastHarmonicService.listAllResultData(code, num, waveNum, isWave, monitorId, adTypeList);
+        List<ContrastNonHarmonicResult> contrastNonHarmonicResults = contrastNonHarmonicService.listAllResultData(code, num, waveNum, isWave, null, monitorId, adTypeList);
+        List<ContrastHarmonicResult> contrastHarmonicResults = contrastHarmonicService.listAllResultData(code, num, waveNum, isWave, null, monitorId, adTypeList);
 
         if (CollUtil.isNotEmpty(contrastNonHarmonicResults)) {
             ContrastNonHarmonicResult contrastNonHarmonicResult = contrastNonHarmonicResults.get(0);
@@ -2705,7 +2817,7 @@ public class ResultServiceImpl implements IResultService {
         if (CollUtil.isNotEmpty(contrastHarmonicResults)) {
             ContrastHarmonicResult contrastHarmonicResult = contrastHarmonicResults.get(0);
             List<Double> harmonicNum = null;
-            if (DicDataEnum.HV.getCode().equals(dictTree.getCode()) || DicDataEnum.HI.getCode().equals(dictTree.getCode())) {
+            if (DicDataEnum.HV.getCode().equals(dictTree.getCode()) || DicDataEnum.HI.getCode().equals(dictTree.getCode()) || DicDataEnum.HP.getCode().equals(dictTree.getCode())) {
                 harmonicNum = Stream.iterate(2.0, n -> n + 1).limit(49).collect(Collectors.toList());
             }
             if (DicDataEnum.HSV.getCode().equals(dictTree.getCode()) || DicDataEnum.HSI.getCode().equals(dictTree.getCode())) {
@@ -2728,6 +2840,7 @@ public class ResultServiceImpl implements IResultService {
                     List<RawResultDataVO.DetectionData> cList = JSON.parseArray(fieldC.get(contrastHarmonicResult) + "", RawResultDataVO.DetectionData.class);
 
                     List<RawResultDataVO> rawResultDataVOList = new ArrayList<>();
+                    List<Integer> isDataList = new ArrayList<>();
                     for (int j = 0; j < aList.size(); j++) {
                         RawResultDataVO dataVO = new RawResultDataVO();
                         dataVO.setHarmNum(n);
@@ -2737,9 +2850,11 @@ public class ResultServiceImpl implements IResultService {
                         dataVO.setDataC(cList.get(j));
                         dataVO.setRadius(aList.get(j).getRadius());
                         dataVO.setIsData(StorageUtil.setResultFlag(Arrays.asList(aList.get(j), bList.get(j), cList.get(j))));
+                        isDataList.add(dataVO.getIsData());
                         rawResultDataVOList.add(dataVO);
                     }
-                    resultMap.put(String.valueOf(n), rawResultDataVOList);
+                    Integer isData = StorageUtil.getInteger(isDataList);
+                    resultMap.put(n + (isData == ResultEnum.NOT_QUALIFIED.getValue() ? "(不符合)" : (isData == ResultEnum.NO_ERROR_SYS.getValue() ? "(/)" : "")), rawResultDataVOList);
                 } catch (NoSuchFieldException e) {
                     throw new RuntimeException(e);
                 } catch (IllegalAccessException e) {
@@ -2750,36 +2865,36 @@ public class ResultServiceImpl implements IResultService {
         return resultMap;
     }
 
-    private Map<String, List<AlignDataVO.RawData>> getRawDataMap(DictTree dictTree, List<String> adTypeList, String monitorId, String unit, Integer num, Integer waveNum, Boolean isWave, String code) {
+    private Map<String, List<AlignDataVO.RawData>> getRawDataMap(DictTree dictTree, List<String> adTypeList, String monitorId, String unit, Integer num, Integer waveNum, Boolean isWave, String code, List<String> keys) {
         Map<String, List<AlignDataVO.RawData>> rawMap = new LinkedHashMap<>();
 
-        List<ContrastNonHarmonicResult> devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(code, num, waveNum, isWave, 0, monitorId, adTypeList);
-        List<ContrastNonHarmonicResult> stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(code, num, waveNum, isWave, 1, monitorId, adTypeList);
-        List<ContrastHarmonicResult> devHarmonicRawDataList = contrastHarmonicService.listAllRawData(code, num, waveNum, isWave, 0, monitorId, adTypeList);
-        List<ContrastHarmonicResult> stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(code, num, waveNum, isWave, 1, monitorId, adTypeList);
+        List<ContrastNonHarmonicResult> devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(code, num, waveNum, isWave, null, 0, monitorId, adTypeList);
+        List<ContrastNonHarmonicResult> stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(code, num, waveNum, isWave, null, 1, monitorId, adTypeList);
+        List<ContrastHarmonicResult> devHarmonicRawDataList = contrastHarmonicService.listAllRawData(code, num, waveNum, isWave, null, 0, monitorId, adTypeList);
+        List<ContrastHarmonicResult> stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(code, num, waveNum, isWave, null, 1, monitorId, adTypeList);
 
         DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
         List<AlignDataVO.RawData> rawDataVOList = new ArrayList<>();
         for (int i = 0; i < devNonHarmonicRawDataList.size(); i++) {
             AlignDataVO.RawData rawDataVO = new AlignDataVO.RawData();
             rawDataVO.setUnit(unit);
-            ContrastNonHarmonicResult contrastNonHarmonicResult = devNonHarmonicRawDataList.get(i);
-            rawDataVO.setTimeDev(contrastNonHarmonicResult.getTimeId().format(dtf));
+            ContrastNonHarmonicResult contrastNonHarmonicResultDev = devNonHarmonicRawDataList.get(i);
+            rawDataVO.setTimeDev(contrastNonHarmonicResultDev.getTimeId().format(dtf));
 
-            rawDataVO.setUbDev(getValue(contrastNonHarmonicResult.getBValue()));
-            rawDataVO.setUtDev(getValue(contrastNonHarmonicResult.getTValue()));
+            rawDataVO.setUbDev(getValue(contrastNonHarmonicResultDev.getBValue()));
+            rawDataVO.setUtDev(getValue(contrastNonHarmonicResultDev.getTValue()));
 
-            contrastNonHarmonicResult = stdDevNonHarmonicRawDataList.get(i);
-            rawDataVO.setTimeStdDev(contrastNonHarmonicResult.getTimeId().format(dtf));
+            ContrastNonHarmonicResult contrastNonHarmonicResultStdDev = stdDevNonHarmonicRawDataList.get(i);
+            rawDataVO.setTimeStdDev(contrastNonHarmonicResultStdDev.getTimeId().format(dtf));
             if (!DicDataEnum.IMBV.getCode().equals(dictTree.getCode()) && !DicDataEnum.IMBA.getCode().equals(dictTree.getCode())) {
-                rawDataVO.setUaDev(getValue(contrastNonHarmonicResult.getAValue()));
-                rawDataVO.setUcDev(getValue(contrastNonHarmonicResult.getCValue()));
-                rawDataVO.setUaStdDev(getValue(contrastNonHarmonicResult.getAValue()));
-                rawDataVO.setUcStdDev(getValue(contrastNonHarmonicResult.getCValue()));
+                rawDataVO.setUaDev(getValue(contrastNonHarmonicResultDev.getAValue()));
+                rawDataVO.setUcDev(getValue(contrastNonHarmonicResultDev.getCValue()));
+                rawDataVO.setUaStdDev(getValue(contrastNonHarmonicResultStdDev.getAValue()));
+                rawDataVO.setUcStdDev(getValue(contrastNonHarmonicResultStdDev.getCValue()));
             }
 
-            rawDataVO.setUbStdDev(getValue(contrastNonHarmonicResult.getBValue()));
-            rawDataVO.setUtStdDev(getValue(contrastNonHarmonicResult.getTValue()));
+            rawDataVO.setUbStdDev(getValue(contrastNonHarmonicResultStdDev.getBValue()));
+            rawDataVO.setUtStdDev(getValue(contrastNonHarmonicResultStdDev.getTValue()));
 
             rawDataVOList.add(rawDataVO);
         }
@@ -2789,11 +2904,14 @@ public class ResultServiceImpl implements IResultService {
 
         if (CollUtil.isNotEmpty(devHarmonicRawDataList) && CollUtil.isNotEmpty(stdDevHarmonicRawDataList)) {
             List<Double> harmonicNum = null;
-            if (DicDataEnum.HV.getCode().equals(dictTree.getCode()) || DicDataEnum.HI.getCode().equals(dictTree.getCode())) {
+            boolean isHarm = true;
+            if (DicDataEnum.HV.getCode().equals(dictTree.getCode()) || DicDataEnum.HI.getCode().equals(dictTree.getCode()) || DicDataEnum.HP.getCode().equals(dictTree.getCode())) {
                 harmonicNum = Stream.iterate(2.0, n -> n + 1).limit(49).collect(Collectors.toList());
+                isHarm = true;
             }
             if (DicDataEnum.HSV.getCode().equals(dictTree.getCode()) || DicDataEnum.HSI.getCode().equals(dictTree.getCode())) {
                 harmonicNum = Stream.iterate(0.5, n -> n + 1).limit(50).collect(Collectors.toList());
+                isHarm = false;
             }
             for (Double n : harmonicNum) {
                 List<AlignDataVO.RawData> rawDataVOList1 = new ArrayList<>();
@@ -2844,7 +2962,10 @@ public class ResultServiceImpl implements IResultService {
                     }
                     rawDataVOList1.add(rawDataVO);
                 }
-                rawMap.put(String.valueOf(n), rawDataVOList1);
+                int num1 = n.intValue();
+                num1 = isHarm ? num1 - 2 : num1;
+                String key = keys.get(num1);
+                rawMap.put(key, rawDataVOList1);
             }
         }
 
@@ -2921,6 +3042,7 @@ public class ResultServiceImpl implements IResultService {
                                 "A_Value_0 json  NULL COMMENT 'A相基波有效值',\n" +
                                 "B_Value_0 json  NULL COMMENT 'B相基波有效值',\n" +
                                 "C_Value_0 json  NULL COMMENT 'B相基波有效值',\n" +
+                                "Wave_Num tinyint(1) unsigned DEFAULT null COMMENT '录波数据第几组',\n" +
                                 "PRIMARY KEY (Id)\n"
                         :
                         "    Script_Id CHAR(32) NOT NULL COMMENT '检测脚本表Id',\n" +
@@ -2951,7 +3073,7 @@ public class ResultServiceImpl implements IResultService {
      * @param errorSysId
      * @param devId
      */
-    private void simAndDigCalculateResult(String planId, String scriptId, String code, String errorSysId, String devId) {
+    private void simAndDigCalculateResult(String planId, String scriptId, String code, String errorSysId, String devId, String dataRuleId) {
         String oldCode = code.replace("_temp", "");
         PreDetectionParam param = new PreDetectionParam();
         param.setCode(code);
@@ -2969,8 +3091,8 @@ public class ResultServiceImpl implements IResultService {
 //        } else {
 //            dataRule = DictDataEnum.SECTION_VALUE;
 //        }
-        AdPlan plan = adPlanService.getById(planId);
-        DictData dictData = dictDataService.getDictDataById(plan.getDataRule());
+//        AdPlan plan = adPlanService.getById(planId);
+        DictData dictData = dictDataService.getDictDataById(dataRuleId);
         if (ObjectUtil.isNotNull(dictData)) {
             dataRule = DictDataEnum.getDictDataEnumByCode(dictData.getCode());
         } else {
@@ -3018,7 +3140,7 @@ public class ResultServiceImpl implements IResultService {
         checkDataParam.setIsValueTypeName(false);
         List<String> valueType = iPqScriptCheckDataService.getValueType(checkDataParam);
 
-        iPqDevService.updateResult(param.getDevIds(), valueType, param.getCode(), param.getUserId(), param.getTemperature(), param.getHumidity());
+        iPqDevService.updateResult(param.getDevIds(), valueType, param.getCode(), param.getUserId(), param.getTemperature(), param.getHumidity(), false);
     }
 
     /**
@@ -3028,8 +3150,9 @@ public class ResultServiceImpl implements IResultService {
      * @param code
      * @param errorSysId
      * @param deviceId
+     * @param updateResult
      */
-    private void contrastCalculateResult(String planId, String code, String errorSysId, String deviceId) {
+    private void contrastCalculateResult(String planId, String code, String errorSysId, String deviceId, boolean updateResult, String dataRuleId) {
         String oldCode = code.replace("_temp", "");
 
         Map<String, String> devIdMapComm = new HashMap<>();
@@ -3043,18 +3166,19 @@ public class ResultServiceImpl implements IResultService {
 
         DataSourceEnum nonWaveDataSourceEnum = DataSourceEnum.REAL_DATA;
         for (String ds : dataSourceIds) {
-            switch (DataSourceEnum.valueOf(ds)) {
+            DataSourceEnum dataSourceEnum = DataSourceEnum.ofByValue(ds);
+            switch (dataSourceEnum) {
                 case MINUTE_STATISTICS_MIN:
-                    nonWaveDataSourceEnum = DataSourceEnum.MINUTE_STATISTICS_MIN;
+                    nonWaveDataSourceEnum = MINUTE_STATISTICS_MIN;
                     break;
                 case MINUTE_STATISTICS_MAX:
-                    nonWaveDataSourceEnum = DataSourceEnum.MINUTE_STATISTICS_MAX;
+                    nonWaveDataSourceEnum = MINUTE_STATISTICS_MAX;
                     break;
                 case MINUTE_STATISTICS_AVG:
                     nonWaveDataSourceEnum = DataSourceEnum.MINUTE_STATISTICS_AVG;
                     break;
                 case MINUTE_STATISTICS_CP95:
-                    nonWaveDataSourceEnum = DataSourceEnum.MINUTE_STATISTICS_CP95;
+                    nonWaveDataSourceEnum = MINUTE_STATISTICS_CP95;
                     break;
             }
         }
@@ -3071,33 +3195,38 @@ public class ResultServiceImpl implements IResultService {
         }
 
         DictDataEnum dataRule;
-        DictData dictData = dictDataService.getDictDataById(plan.getDataRule());
+        DictData dictData = dictDataService.getDictDataById(dataRuleId);
         if (ObjectUtil.isNotNull(dictData)) {
             dataRule = DictDataEnum.getDictDataEnumByCode(dictData.getCode());
         } else {
             dataRule = DictDataEnum.SECTION_VALUE;
         }
 
-        pqMonitorService.lambdaUpdate().set(PqMonitor::getRecordedResult, null)
-                .set(PqMonitor::getRealtimeNum, null)
-                .set(PqMonitor::getRecordedResult, null)
-                .set(PqMonitor::getRecordedNum, null)
-                .set(PqMonitor::getStatisticsResult, null)
-                .set(PqMonitor::getStatisticsNum, null)
-                .set(PqMonitor::getResultType, null)
-                .set(PqMonitor::getQualifiedNum, 0)
-                .eq(PqMonitor::getDevId, deviceId)
-                .eq(PqMonitor::getCheckFlag, 1)
-                .update();
+        if (updateResult) {
+            pqMonitorService.lambdaUpdate().set(PqMonitor::getRecordedResult, null)
+                    .set(PqMonitor::getRealtimeNum, null)
+                    .set(PqMonitor::getRecordedResult, null)
+                    .set(PqMonitor::getRecordedNum, null)
+                    .set(PqMonitor::getStatisticsResult, null)
+                    .set(PqMonitor::getStatisticsNum, null)
+                    .set(PqMonitor::getResultType, null)
+                    .set(PqMonitor::getQualifiedNum, 0)
+                    .eq(PqMonitor::getDevId, deviceId)
+//                    .eq(PqMonitor::getNum, Integer.parseInt(chnNum))
+                    .eq(PqMonitor::getCheckFlag, 1)
+                    .update();
+        }
+
+//        String monitorId = deviceId + CnSocketUtil.SPLIT_TAG + chnNum;
         List<AdPair> adPairList = adPairService.listByDevIds(Arrays.asList(deviceId));
         Map<Integer, List<AdPair>> numAdPairsMap = adPairList.stream().collect(Collectors.groupingBy(AdPair::getNum, Collectors.toList()));
 
         numAdPairsMap.forEach((num, pairList) -> {
-            BiMap<String, String> parsIp = HashBiMap.create();
-            BiMap<String, String> parsId = HashBiMap.create();
             Map<String, Integer> numMap = new HashMap<>();
             Map<String, List<AdPair>> devMonitroIdMap = pairList.stream().collect(Collectors.groupingBy(AdPair::getDevMonitorId, Collectors.toList()));
             devMonitroIdMap.forEach((devMonitorId, pairList1) -> {
+                BiMap<String, String> parsIp = HashBiMap.create();
+                BiMap<String, String> parsId = HashBiMap.create();
                 String[] split1 = devMonitorId.split(CnSocketUtil.SPLIT_TAG);
                 AdPair adPair = pairList1.get(0);
                 String[] split2 = adPair.getStdDevMonitorId().split(CnSocketUtil.SPLIT_TAG);
@@ -3107,40 +3236,41 @@ public class ResultServiceImpl implements IResultService {
                 parsId.put(dev.getId() + CnSocketUtil.SPLIT_TAG + split1[1], standardDev.getId() + CnSocketUtil.SPLIT_TAG + split2[1]);
                 numMap.put(devMonitorId, num);
                 numMap.put(adPair.getStdDevMonitorId(), num);
-            });
+                devIdMapComm.put(standardDev.getIp(), standardDev.getId());
 
-            List<ContrastNonHarmonicResult> devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, null, false, 0, deviceId, null);
-            List<ContrastNonHarmonicResult> stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, null, false, 1, deviceId, null);
-            List<ContrastHarmonicResult> devHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, null, false, 0, deviceId, null);
-            List<ContrastHarmonicResult> stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, null, false, 1, deviceId, null);
+                List<ContrastNonHarmonicResult> devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, null, false, null, 0, devMonitorId, null);
+                List<ContrastNonHarmonicResult> stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, null, false, null, 1, devMonitorId, null);
+                List<ContrastHarmonicResult> devHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, null, false, null, 0, devMonitorId, null);
+                List<ContrastHarmonicResult> stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, null, false, null, 1, devMonitorId, null);
 
-            List<DevData> devData = contrastToList(devNonHarmonicRawDataList, devHarmonicRawDataList, testItemMap);
-            List<DevData> standardDevData = contrastToList(stdDevNonHarmonicRawDataList, stdDevHarmonicRawDataList, testItemMap);
+                List<DevData> devData = contrastToList(devNonHarmonicRawDataList, devHarmonicRawDataList, testItemMap, 0);
+                List<DevData> standardDevData = contrastToList(stdDevNonHarmonicRawDataList, stdDevHarmonicRawDataList, testItemMap, 1);
 
-            detectionServiceImpl.processing(devData, standardDevData, parsIp, devIdMapComm, testItemMap.keySet().stream().collect(Collectors.toList()), errorSysId, dataRule, numMap, code, null, finalNonWaveDataSourceEnum);
+                if (CollUtil.isNotEmpty(devData) && CollUtil.isNotEmpty(standardDevData)) {
+                    detectionServiceImpl.processing(devData, standardDevData, parsIp, devIdMapComm, testItemMap.keySet().stream().collect(Collectors.toList()), errorSysId, dataRule, numMap, code, null, finalNonWaveDataSourceEnum);
 
-            parsId.forEach((devMonitorId, stdDevMonitorId) -> {
-                String[] split = devMonitorId.split(CnSocketUtil.SPLIT_TAG);
-                pqMonitorService.updateMonitorResult(devMonitorId, null, finalNonWaveDataSourceEnum, num, null, oldCode);
-                pqDevService.updateResult(split[0], null);
-            });
+                    if (updateResult) {
+                        pqMonitorService.updateMonitorResult(devMonitorId, null, finalNonWaveDataSourceEnum, num, null, oldCode);
+                        pqDevService.updateResult(split1[0], null);
+                    }
+                }
 
-            AdPlanTestConfig adPlanTestConfig = adPlanTestConfigService.getByPlanId(planId);
-            for (int i = 1; i <= adPlanTestConfig.getWaveRecord(); i++) {
-                devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, i, true, 0, deviceId, null);
-                stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, i, true, 1, deviceId, null);
-                devHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, 0, deviceId, null);
-                stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, 1, deviceId, null);
+                AdPlanTestConfig adPlanTestConfig = adPlanTestConfigService.getByPlanId(planId);
+                for (int i = 1; i <= adPlanTestConfig.getWaveRecord(); i++) {
+                    devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, i, true, null, 0, devMonitorId, null);
+                    stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, i, true, null, 1, devMonitorId, null);
+                    devHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, null, 0, devMonitorId, null);
+                    stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, null, 1, devMonitorId, null);
 
-                devData = contrastToList(devNonHarmonicRawDataList, devHarmonicRawDataList, testItemMap);
-                standardDevData = contrastToList(stdDevNonHarmonicRawDataList, stdDevHarmonicRawDataList, testItemMap);
-                detectionServiceImpl.processing(devData, standardDevData, parsIp, devIdMapComm, testItemMap.keySet().stream().collect(Collectors.toList()), errorSysId, dataRule, numMap, oldCode, i, DataSourceEnum.WAVE_DATA);
-            }
+                    devData = contrastToList(devNonHarmonicRawDataList, devHarmonicRawDataList, testItemMap, 0);
+                    standardDevData = contrastToList(stdDevNonHarmonicRawDataList, stdDevHarmonicRawDataList, testItemMap, 1);
+                    detectionServiceImpl.processing(devData, standardDevData, parsIp, devIdMapComm, testItemMap.keySet().stream().collect(Collectors.toList()), errorSysId, dataRule, numMap, oldCode, i, DataSourceEnum.WAVE_DATA);
+                }
 
-            parsId.forEach((devMonitorId, stdDevMonitorId) -> {
-                String[] split = devMonitorId.split(CnSocketUtil.SPLIT_TAG);
-                pqMonitorService.updateMonitorResult(devMonitorId, null, finalNonWaveDataSourceEnum, num, adPlanTestConfig.getWaveRecord(), oldCode);
-                pqDevService.updateResult(split[0], null);
+                if (updateResult) {
+                    pqMonitorService.updateMonitorResult(devMonitorId, null, WAVE_DATA, num, adPlanTestConfig.getWaveRecord(), oldCode);
+                    pqDevService.updateResult(split1[0], null);
+                }
             });
         });
     }
@@ -3230,58 +3360,88 @@ public class ResultServiceImpl implements IResultService {
         return info;
     }
 
-    private List<DevData> contrastToList(List<ContrastNonHarmonicResult> nonHarm, List<ContrastHarmonicResult> harm, BiMap<String, String> testItemMap) {
+    private List<DevData> contrastToList(List<ContrastNonHarmonicResult> nonHarm, List<ContrastHarmonicResult> harm, BiMap<String, String> testItemMap, Integer flag) {
         List<DevData> info = new ArrayList<>();
-        if (CollUtil.isNotEmpty(nonHarm)) {
-            Map<String, List<ContrastNonHarmonicResult>> devMonitorIdMap = nonHarm.stream().collect(Collectors.groupingBy(ContrastNonHarmonicResult::getDevMonitorId, Collectors.toList()));
-            devMonitorIdMap.forEach((devMonitorId, value) -> {
+
+        Map<String, List<ContrastNonHarmonicResult>> devMonitorIdMap1 = null;
+        if (flag == 0) {
+            devMonitorIdMap1 = nonHarm.stream().collect(Collectors.groupingBy(ContrastNonHarmonicResult::getDevMonitorId, Collectors.toList()));
+        } else {
+            devMonitorIdMap1 = nonHarm.stream().collect(Collectors.groupingBy(ContrastNonHarmonicResult::getStdDevMonitorId, Collectors.toList()));
+        }
+        devMonitorIdMap1.forEach((devMonitorId, value) -> {
+            Map<LocalDateTime, List<ContrastNonHarmonicResult>> timeListMap = value.stream().collect(Collectors.groupingBy(ContrastNonHarmonicResult::getTimeId, Collectors.toList()));
+            timeListMap.forEach((time, value1) -> {
                 DevData devData = new DevData();
                 String[] split = devMonitorId.split(CnSocketUtil.SPLIT_TAG);
-                PqDev dev = pqDevService.getById(split[0]);
-                devData.setId(dev.getIp() + CnSocketUtil.SPLIT_TAG + split[1]);
-                Map<LocalDateTime, List<ContrastNonHarmonicResult>> timeListMap = value.stream().collect(Collectors.groupingBy(ContrastNonHarmonicResult::getTimeId, Collectors.toList()));
-                timeListMap.forEach((time, value1) -> {
-                    List<DevData.SqlDataDTO> sqlData = new ArrayList<>();
-                    devData.setTime(time.format(DateTimeFormatter.ofPattern(DatePattern.ISO8601_PATTERN)));
+                if (flag == 0) {
+                    PqDev dev = pqDevService.getById(split[0]);
+                    devData.setId(dev.getIp() + CnSocketUtil.SPLIT_TAG + split[1]);
+                } else {
+                    PqStandardDev standardDev = pqStandardDevService.getById(split[0]);
+                    devData.setId(standardDev.getIp() + CnSocketUtil.SPLIT_TAG + split[1]);
+                }
+                devData.setTime(time.format(DateTimeFormatter.ofPattern(DatePattern.ISO8601_PATTERN)));
+                List<DevData.SqlDataDTO> sqlData = new ArrayList<>();
 
-                    value1.forEach(x -> {
-                        DevData.SqlDataDTO sqlDataDTO = new DevData.SqlDataDTO();
-                        DevData.SqlDataDTO.ListDTO listDTO = new DevData.SqlDataDTO.ListDTO();
-                        listDTO.setA(StrUtil.isNotBlank(x.getAValue()) ? Double.valueOf(x.getAValue()) : null);
-                        listDTO.setB(StrUtil.isNotBlank(x.getBValue()) ? Double.valueOf(x.getBValue()) : null);
-                        listDTO.setC(StrUtil.isNotBlank(x.getCValue()) ? Double.valueOf(x.getCValue()) : null);
-                        listDTO.setT(StrUtil.isNotBlank(x.getTValue()) ? Double.valueOf(x.getTValue()) : null);
-                        sqlDataDTO.setType(x.getDataType());
-                        sqlDataDTO.setDesc(testItemMap.inverse().get(x.getAdType()).replace(DetectionCodeEnum.REAL_PREFIX.getCode(), ""));
-                        sqlDataDTO.setList(listDTO);
-                        sqlData.add(sqlDataDTO);
-                    });
-                    devData.setSqlData(sqlData);
+                value1.forEach(x -> {
+                    DevData.SqlDataDTO sqlDataDTO = new DevData.SqlDataDTO();
+                    DevData.SqlDataDTO.ListDTO listDTO = new DevData.SqlDataDTO.ListDTO();
+                    listDTO.setA(StrUtil.isNotBlank(x.getAValue()) ? Double.valueOf(x.getAValue()) : null);
+                    listDTO.setB(StrUtil.isNotBlank(x.getBValue()) ? Double.valueOf(x.getBValue()) : null);
+                    listDTO.setC(StrUtil.isNotBlank(x.getCValue()) ? Double.valueOf(x.getCValue()) : null);
+                    listDTO.setT(StrUtil.isNotBlank(x.getTValue()) ? Double.valueOf(x.getTValue()) : null);
+                    sqlDataDTO.setType(x.getDataType());
+                    sqlDataDTO.setDesc(testItemMap.inverse().get(x.getAdType()).replace(DetectionCodeEnum.REAL_PREFIX.getCode(), ""));
+                    sqlDataDTO.setList(listDTO);
+                    sqlData.add(sqlDataDTO);
                 });
+                devData.setSqlData(sqlData);
                 info.add(devData);
             });
+        });
+
+        Map<String, List<ContrastHarmonicResult>> devMonitorIdMap2 = null;
+        if (flag == 0) {
+            devMonitorIdMap2 = harm.stream().collect(Collectors.groupingBy(ContrastHarmonicResult::getDevMonitorId, Collectors.toList()));
+        } else {
+            devMonitorIdMap2 = harm.stream().collect(Collectors.groupingBy(ContrastHarmonicResult::getStdDevMonitorId, Collectors.toList()));
         }
-        if (CollUtil.isNotEmpty(harm)) {
-            Map<String, List<ContrastHarmonicResult>> devMonitorIdMap = harm.stream().collect(Collectors.groupingBy(ContrastHarmonicResult::getDevMonitorId, Collectors.toList()));
-            devMonitorIdMap.forEach((devMonitorId, value) -> {
-                DevData devData = new DevData();
-                String[] split = devMonitorId.split(CnSocketUtil.SPLIT_TAG);
-                PqDev dev = pqDevService.getById(split[0]);
-                devData.setId(dev.getIp() + CnSocketUtil.SPLIT_TAG + split[1]);
-                Map<LocalDateTime, List<ContrastHarmonicResult>> timeListMap = value.stream().collect(Collectors.groupingBy(ContrastHarmonicResult::getTimeId, Collectors.toList()));
 
-                timeListMap.forEach((time, value1) -> {
+        devMonitorIdMap2.forEach((devMonitorId, value) -> {
+            Map<LocalDateTime, List<ContrastHarmonicResult>> timeListMap = value.stream().collect(Collectors.groupingBy(ContrastHarmonicResult::getTimeId, Collectors.toList()));
+
+            String[] split1 = devMonitorId.split(CnSocketUtil.SPLIT_TAG);
+            timeListMap.forEach((time, value1) -> {
+//                DevData devData = info.stream().filter(x -> x.getTime().equals(time.format(DateTimeFormatter.ofPattern(DatePattern.ISO8601_PATTERN)))).findFirst().orElse(null);
+                DevData devData = null;
+                for (int i = 0; i < info.size(); i++) {
+                    DevData devData1 = info.get(i);
+                    if (time.format(DateTimeFormatter.ofPattern(DatePattern.ISO8601_PATTERN)).equals(devData1.getTime()) && devData1.getId().split(CnSocketUtil.SPLIT_TAG)[1].equals(split1[1])) {
+                        devData = devData1;
+                        break;
+                    }
+                }
+                if (ObjectUtil.isNotNull(devData)) {
+                    String[] split = devMonitorId.split(CnSocketUtil.SPLIT_TAG);
+                    if (flag == 0) {
+                        PqDev dev = pqDevService.getById(split[0]);
+                        devData.setId(dev.getIp() + CnSocketUtil.SPLIT_TAG + split[1]);
+                    } else {
+                        PqStandardDev standardDev = pqStandardDevService.getById(split[0]);
+                        devData.setId(standardDev.getIp() + CnSocketUtil.SPLIT_TAG + split[1]);
+                    }
+
                     devData.setTime(time.format(DateTimeFormatter.ofPattern(DatePattern.ISO8601_PATTERN)));
-                    List<DevData.SqlDataDTO> sqlData = new ArrayList<>();
+                    List<DevData.SqlDataDTO> sqlData = devData.getSqlData();
                     List<DevData.SqlDataHarmDTO> sqlDataHarm = new ArrayList<>();
-
                     value1.forEach(x -> {
                         DevData.SqlDataHarmDTO dataHarmDTO = new DevData.SqlDataHarmDTO();
                         dataHarmDTO.setType(x.getDataType());
                         String desc = testItemMap.inverse().get(x.getAdType()).replace(DetectionCodeEnum.REAL_PREFIX.getCode(), "");
                         dataHarmDTO.setDesc(desc);
                         boolean notContainBaseHarm = false;
-                        if (DetectionCodeEnum.V2_50.getCode().equals(desc) || DetectionCodeEnum.PV2_50.getCode().equals(desc) || DetectionCodeEnum.I2_50.getCode().equals(desc)) {
+                        if (DetectionCodeEnum.V2_50.getCode().equals(desc) || DetectionCodeEnum.PV2_50.getCode().equals(desc) || DetectionCodeEnum.I2_50.getCode().equals(desc) || DetectionCodeEnum.P2_50.getCode().equals(desc)) {
                             dataHarmDTO.setNum(49);
                             notContainBaseHarm = true;
                         }
@@ -3316,12 +3476,13 @@ public class ResultServiceImpl implements IResultService {
                             }
                         }
                     });
+
                     devData.setSqlDataHarm(sqlDataHarm);
                     devData.setSqlData(sqlData);
-                });
-                info.add(devData);
+                }
             });
-        }
+        });
+
         return info;
     }
 
@@ -3450,10 +3611,10 @@ public class ResultServiceImpl implements IResultService {
         switch (scriptCode) {
             // 保留2位小数
             case "FREQ":  // 频率
-                return 2;
+                return 4;
             // 保留3位小数
             case "I":  // 电流
-                return 3;
+                return 5;
             // 保留4位小数
             case "IMBV": // 电压不平衡度
             case "IMBA": // 电流不平衡度

detection/src/main/java/com/njcn/gather/script/controller/PqScriptController.java

@@ -58,7 +58,7 @@ public class PqScriptController extends BaseController {
     @OperateInfo(operateType = OperateType.ADD)
     @PostMapping("/add")
     @ApiOperation("新增检测脚本")
-    @ApiImplicitParam(name = "pqDevParam", value = "检测脚本", required = true)
+    @ApiImplicitParam(name = "param", value = "检测脚本", required = true)
     public HttpResult<String> add(@RequestBody @Validated PqScriptParam param) {
         String methodDescribe = getMethodDescribe("add");
         LogUtil.njcnDebug(log, "{}，新增数据为：{}", methodDescribe, param);
@@ -69,7 +69,7 @@ public class PqScriptController extends BaseController {
     @OperateInfo(operateType = OperateType.UPDATE)
     @PostMapping("/update")
     @ApiOperation("修改检测脚本")
-    @ApiImplicitParam(name = "updateParam", value = "检测脚本", required = true)
+    @ApiImplicitParam(name = "param", value = "检测脚本", required = true)
     public HttpResult<Boolean> update(@RequestBody @Validated PqScriptParam.UpdateParam param) {
         String methodDescribe = getMethodDescribe("update");
         LogUtil.njcnDebug(log, "{}，修改数据为：{}", methodDescribe, param);
@@ -126,10 +126,10 @@ public class PqScriptController extends BaseController {
     @GetMapping("/getAll")
     @ApiOperation("获取指定模式下的所有检测脚本")
     @ApiImplicitParam(name = "patternId", value = "模式Id", required = true)
-    public HttpResult<List<Map<String, Object>>> getAllPqScript(@RequestParam("patternId") String patternId) {
+    public HttpResult<List<PqScript>> getAllPqScript(@RequestParam("patternId") String patternId) {
         String methodDescribe = getMethodDescribe("getAllPqScript");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, patternId);
-        List<Map<String, Object>> result = pqScriptService.listAllPqScript(patternId);
+        List<PqScript> result = pqScriptService.listAllPqScript(patternId);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 

detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptParam.java

@@ -72,6 +72,9 @@ public class PqScriptParam {
     @Max(value = 20, message = DetectionValidMessage.SCRIPT_CURR_FORMAT_ERROR)
     private Double ratedCurr;
 
+    @ApiModelProperty("是否为Fluke专用脚本")
+    private Integer fluke;
+
 
     @Data
     @EqualsAndHashCode(callSuper = true)

detection/src/main/java/com/njcn/gather/script/pojo/po/PqScript.java

@@ -73,6 +73,11 @@ public class PqScript extends BaseEntity implements Serializable {
      */
     private Double ratedCurr;
 
+    /**
+     * 是否为福禄克专用脚本。0-否 1-是
+     */
+    private Integer fluke;
+
     /**
      * 状态：0-删除 1-正常
      */

detection/src/main/java/com/njcn/gather/script/pojo/po/PqScriptDtls.java

@@ -92,6 +92,18 @@ public class PqScriptDtls implements Serializable {
     @TableField("RetainTime")
     private Double retainTime;
 
+    /**
+     * 暂态前延时间（S）
+     */
+    @TableField("FPreTime")
+    private Double fPreTime;
+
+    /**
+     * 暂态后延时间（S）
+     */
+    @TableField("FAfterTime")
+    private Double fAfterTime;
+
     /**
      * 变动频度（次/min）
      */

detection/src/main/java/com/njcn/gather/script/service/IPqScriptService.java

@@ -68,7 +68,7 @@ public interface IPqScriptService extends IService<PqScript> {
      * @param patternId 模式id
      * @return 检测脚本列表
      */
-    List<Map<String, Object>> listAllPqScript(String patternId);
+    List<PqScript> listAllPqScript(String patternId);
 
     /**
      * 根据脚本名称查询脚本

detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java

@@ -13,6 +13,7 @@ import com.njcn.gather.detection.pojo.enums.DetectionCodeEnum;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
 import com.njcn.gather.device.pojo.enums.CommonEnum;
 import com.njcn.gather.device.pojo.po.PqDev;
+import com.njcn.gather.device.pojo.vo.PqDevVO;
 import com.njcn.gather.device.service.IPqDevService;
 import com.njcn.gather.plan.mapper.AdPlanMapper;
 import com.njcn.gather.plan.pojo.po.AdPlan;
@@ -33,6 +34,7 @@ import com.njcn.gather.script.service.IPqScriptCheckDataService;
 import com.njcn.gather.script.service.IPqScriptDtlsService;
 import com.njcn.gather.script.util.ScriptDtlsDesc;
 import com.njcn.gather.script.util.ThreePhaseUnbalance;
+import com.njcn.gather.source.service.IPqSourceService;
 import com.njcn.gather.system.dictionary.pojo.po.DictTree;
 import com.njcn.gather.system.dictionary.service.IDictTreeService;
 import com.njcn.gather.system.pojo.enums.DicDataEnum;
@@ -67,20 +69,17 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
     private final static String INHARM_I = "InHarm_I";
     private final static String DIP = "Dip";
     private final static String FLICKER = "Flicker";
-    @Value("${Dip.fPreTime}")
-    private Double fPreTime;
+    //    @Value("${Dip.fPreTime}")
+//    private Double fPreTime;
     @Value("${Dip.fRampIn}")
     private Double fRampIn;
     @Value("${Dip.fRampOut}")
     private Double fRampOut;
-    @Value("${Dip.fAfterTime}")
-    private Double fAfterTime;
-    @Value("${Flicker.waveFluType}")
-    private String waveFluType;
-    @Value("${Flicker.waveType}")
-    private String waveType;
-    @Value("${Flicker.fDutyCycle}")
-    private Double fDutyCycle;
+    //        @Value("${Dip.fAfterTime}")
+//    private Double fAfterTime;
+    private static final String waveFluType = "SQU";
+    private static final String waveType = "CPM";
+    private static final Double fDutyCycle = 50.0;
 
 
     private final IPqDevService pqDevService;
@@ -90,6 +89,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
     private final IDevTypeService devTypeService;
     private final IDictTreeService dictTreeService;
     private final AdPlanMapper adPlanMapper;
+    private final IPqSourceService pqSourceService;
 
     @Override
     @Transactional
@@ -384,6 +384,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                             dip.setPhase(phase);
                             dip.setTransValue(dipData.getFTransValue());
                             dip.setRetainTime(dipData.getRetainTime());
+                            dip.setFPreTime(dipData.getFPreTime());
+                            dip.setFAfterTime(dipData.getFAfterTime());
                             info.add(dip);
                         }
                     }
@@ -419,7 +421,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
 
     @Override
     public List<PqScriptDtlsParam.CheckData> scriptDtlsCheckDataList(PqScriptDtlsParam sourceIssue) {
-        Boolean valueType = pqScriptMapper.selectScriptIsValueType(sourceIssue.getScriptId());
+//        Boolean valueType = pqScriptMapper.selectScriptIsValueType(sourceIssue.getScriptId());
 
         List<PqScriptDtlsParam.CheckData> info = new ArrayList<>();
         //获取所有下拉值情况
@@ -627,9 +629,9 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                                         checkData.setErrorFlag(channelListDTO.getErrorFlag());
                                         checkData.setEnable(channelListDTO.getEnable());
                                         //电压*电流*cos（电压角度-电流角度）
-                                        checkData.setValue(channelI.get(0).getFAmp() * listDTO.getFAmp() / 10000 * Math.cos((listDTO.getFPhase() - channelI.get(0).getFPhase()) * Math.PI / 180));
+                                        checkData.setValue(channelI.get(0).getFAmp() * listDTO.getFAmp() / 100 * Math.cos((listDTO.getFPhase() - channelI.get(0).getFPhase()) * Math.PI / 180));
 //                                        if (valueType) {
-                                        checkData.setValue(checkData.getValue() * 57.74 * 5);
+//                                        checkData.setValue(checkData.getValue() * 57.74 * 5);
 //                                        }
                                         setCheck(info, checkData, channelListDTO, checkArchive, listDTO);
                                     }
@@ -650,9 +652,9 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                                         checkData.setErrorFlag(channelListDTO.getErrorFlag());
                                         checkData.setEnable(channelListDTO.getEnable());
                                         //电压*电流*cos（电压角度-电流角度）
-                                        checkData.setValue(channelI.get(0).getFAmp() * listDTO.getFAmp() / 10000 * Math.sin((listDTO.getFPhase() - channelI.get(0).getFPhase()) * Math.PI / 180));
+                                        checkData.setValue(channelI.get(0).getFAmp() * listDTO.getFAmp() / 100 * Math.sin((listDTO.getFPhase() - channelI.get(0).getFPhase()) * Math.PI / 180));
 //                                        if (valueType) {
-                                        checkData.setValue(checkData.getValue() * 57.74 * 5);
+//                                        checkData.setValue(checkData.getValue() * 57.74 * 5);
 //                                        }
                                         setCheck(info, checkData, channelListDTO, checkArchive, listDTO);
                                     }
@@ -673,9 +675,9 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                                         checkData.setErrorFlag(channelListDTO.getErrorFlag());
                                         checkData.setEnable(channelListDTO.getEnable());
                                         //电压*电流*cos（电压角度-电流角度）
-                                        checkData.setValue(channelI.get(0).getFAmp() * listDTO.getFAmp() / 10000);
+                                        checkData.setValue(channelI.get(0).getFAmp() * listDTO.getFAmp() / 100);
 //                                        if (valueType) {
-                                        checkData.setValue(checkData.getValue() * 57.74 * 5);
+//                                        checkData.setValue(checkData.getValue() * 57.74 * 5);
 //                                        }
                                         setCheck(info, checkData, channelListDTO, checkArchive, listDTO);
                                     }
@@ -778,7 +780,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
     @Override
     public Set<String> getScriptToIcdCheckInfo(PreDetectionParam param) {
         PqScriptIssueParam issueParam = new PqScriptIssueParam();
-        issueParam.setSourceId(param.getSourceId());
+        issueParam.setSourceId(param.getSourceName());
         issueParam.setDevIds(param.getDevIds());
         issueParam.setScriptId(param.getScriptId());
         issueParam.setIsPhaseSequence(CommonEnum.FORMAL_TEST.getValue());
@@ -959,6 +961,22 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
             queryWrapper.eq(PqScriptDtls::getScriptIndex, -1)
                     .eq(PqScriptDtls::getEnable, 1);
             pqScriptDtls = this.list(queryWrapper);
+            // 相序校验中电流需加量需要依据企标10650.2中章节5.5.3的描述过载能力：2 倍额定电流连续，10 倍额定电流持续 1 s。
+            // 考虑到有可能存在1A的额定电流，本处做特殊处理，加量分别为额定电流的0.2/0.4/0.6的标幺乘积加量
+            // 电压暂不做处理，原因：1、电压的企标描述过载能力为4倍，空间较大；2、额定电压比如57.74V为浮点数，存在不确定小数位，避免引起算术误差；
+            // 1. 获取额定电流,前端已做限制，相同额定电流才能一起检测
+            String deviceId = param.getDevIds().get(0);
+            PqDevVO pqDev = pqDevService.getPqDevById(deviceId);
+            String devTypeId = pqDev.getDevType();
+            DevType devType = devTypeService.getById(devTypeId);
+            Double devCurr = devType.getDevCurr();
+            for (int i = 0; i < pqScriptDtls.size(); i++) {
+                PqScriptDtls scriptDtls = pqScriptDtls.get(i);
+                // 注意此处scriptDtls.getValue() < 1.0,考虑到有些已经投入运行的地方，可能没有改库，避免不必要的异常
+                if (scriptDtls.getValueType().equalsIgnoreCase("CUR") && scriptDtls.getValue() < 1.0) {
+                    scriptDtls.setValue(devCurr * scriptDtls.getValue());
+                }
+            }
         } else if (param.getIsPhaseSequence().equals(CommonEnum.COEFFICIENT_TEST.getValue())) {
             //系数
             queryWrapper.in(PqScriptDtls::getScriptIndex, param.getIndexList())
@@ -1037,18 +1055,25 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
             dipDataDTO.setFTransValue(0.0);
             dipDataDTO.setFRetainTime(0.0);
 
-            dipDataDTO.setFPreTime(fPreTime);
+//            dipDataDTO.setFPreTime(fPreTime);
             dipDataDTO.setFRampIn(fRampIn);
             dipDataDTO.setFRampOut(fRampOut);
-            dipDataDTO.setFAfterTime(fAfterTime);
+//            dipDataDTO.setFAfterTime(fAfterTime);
 
 
             channelListDTO.setDipData(dipDataDTO);
             //闪变数据
             SourceIssue.ChannelListDTO.FlickerDataDTO flickerDataDTO = new SourceIssue.ChannelListDTO.FlickerDataDTO();
-            flickerDataDTO.setWaveFluType(waveFluType);
-            flickerDataDTO.setWaveType(waveType);
-            flickerDataDTO.setFDutyCycle(fDutyCycle);
+            SourceIssue.ChannelListDTO.FlickerDataDTO flickerData = channelListDTO.getFlickerData();
+            if (ObjectUtil.isNotNull(flickerData)) {
+                flickerDataDTO.setWaveFluType(flickerData.getWaveFluType());
+                flickerDataDTO.setWaveType(flickerData.getWaveType());
+                flickerDataDTO.setFDutyCycle(flickerData.getFDutyCycle());
+            } else {
+                flickerDataDTO.setWaveFluType(waveFluType);
+                flickerDataDTO.setWaveType(waveType);
+                flickerDataDTO.setFDutyCycle(fDutyCycle);
+            }
 
             flickerDataDTO.setFChagFre(0.0);
             flickerDataDTO.setFChagValue(0.0);
@@ -1087,6 +1112,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                         if (CollUtil.isNotEmpty(dipList)) {
                             PqScriptDtls dip = dipList.get(0);
                             dipDataDTO.setFTransValue(dip.getTransValue());
+                            dipDataDTO.setFPreTime(dip.getFPreTime());
+                            dipDataDTO.setFAfterTime(dip.getFAfterTime());
                             if (devFly) {
 //                                if (isValueType) {
                                 dipDataDTO.setFTransValue(dip.getTransValue());

detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptServiceImpl.java

@@ -112,15 +112,15 @@ public class PqScriptServiceImpl extends ServiceImpl<PqScriptMapper, PqScript> i
     }
 
     @Override
-    public List<Map<String, Object>> listAllPqScript(String patternId) {
+    public List<PqScript> listAllPqScript(String patternId) {
         List<PqScript> pqScriptList = this.lambdaQuery().eq(StrUtil.isNotBlank(patternId), PqScript::getPattern, patternId).eq(PqScript::getState, DataStateEnum.ENABLE.getCode()).list();
-        List<Map<String, Object>> result = pqScriptList.stream().map(pqScript -> {
-            Map<String, Object> map = new HashMap<>();
-            map.put("id", pqScript.getId());
-            map.put("name", pqScript.getName());
-            return map;
-        }).collect(Collectors.toList());
-        return result;
+//        List<Map<String, Object>> result = pqScriptList.stream().map(pqScript -> {
+//            Map<String, Object> map = new HashMap<>();
+//            map.put("id", pqScript.getId());
+//            map.put("name", pqScript.getName());
+//            return map;
+//        }).collect(Collectors.toList());
+        return pqScriptList;
     }
 
     @Override
@@ -139,7 +139,7 @@ public class PqScriptServiceImpl extends ServiceImpl<PqScriptMapper, PqScript> i
         wrapper.eq("state", DataStateEnum.ENABLE.getCode());
         wrapper.eq("name", param.getName());
         if (isExcludeSelf) {
-            if(param instanceof PqScriptParam.UpdateParam){
+            if (param instanceof PqScriptParam.UpdateParam) {
                 wrapper.ne("id", ((PqScriptParam.UpdateParam) param).getId());
             }
         }

detection/src/main/java/com/njcn/gather/source/controller/PqSourceController.java

@@ -127,17 +127,5 @@ public class PqSourceController extends BaseController {
         List<SourceParam> result = pqSourceService.getSourceParam(sourceId);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
-
-    @OperateInfo
-    @GetMapping("/aa")
-    @ApiOperation("按照检测源ID获取源参数")
-    @ApiImplicitParam(name = "pqSourceId", value = "检测源ID", required = true)
-    public HttpResult<SourceInitialize> aa(@RequestParam("sourceId") String sourceId) {
-        String methodDescribe = getMethodDescribe("getParam");
-        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, sourceId);
-        SourceInitialize sourceInitializeParam = pqSourceService.getSourceInitializeParam(sourceId);
-        String jsonString = JSON.toJSONString(sourceInitializeParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, sourceInitializeParam, methodDescribe);
-    }
 }
 

detection/src/main/java/com/njcn/gather/type/controller/DevTypeController.java

@@ -81,7 +81,7 @@ public class DevTypeController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
     @PostMapping("/update")
     @ApiOperation("修改设备类型")
-    @ApiImplicitParam(name = "devTypeParam", value = "设备类型", required = true)
+    @ApiImplicitParam(name = "updateParam", value = "设备类型参数", required = true)
     public HttpResult<Boolean> update(@RequestBody @Validated DevTypeParam.UpdateParam updateParam) {
         String methodDescribe = getMethodDescribe("update");
         LogUtil.njcnDebug(log, "{}，修改数据为：{}", methodDescribe, updateParam);

detection/src/main/java/com/njcn/gather/type/service/impl/DevTypeServiceImpl.java

@@ -40,7 +40,8 @@ public class DevTypeServiceImpl extends ServiceImpl<DevTypeMapper, DevType> impl
     @Override
     public List<DevType> listAll() {
         LambdaQueryWrapper<DevType> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(DevType::getState, DataStateEnum.ENABLE.getCode());
+        queryWrapper.eq(DevType::getState, DataStateEnum.ENABLE.getCode())
+                .orderByAsc(DevType::getName);
         List<DevType> devTypes = this.baseMapper.selectList(queryWrapper);
         return devTypes;
     }

detection/src/test/java/com/njcn/gather/plan/pojo/vo/PlanStatisticsVOTest.java

@@ -0,0 +1,16 @@
+package com.njcn.gather.plan.pojo.vo;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class PlanStatisticsVOTest {
+
+    @Test
+    public void shouldExposeQualifiedDeviceCount() {
+        PlanStatisticsVO statistics = new PlanStatisticsVO();
+
+        statistics.setQualifiedDeviceCount(6);
+
+        Assert.assertEquals(Integer.valueOf(6), statistics.getQualifiedDeviceCount());
+    }
+}

entrance/src/main/resources/application.yml

@@ -1,15 +1,15 @@
 server:
-  port: 18092
+  port: 18093
 spring:
   application:
     name: entrance
   datasource:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-#      url: jdbc:mysql://192.168.1.24:13306/pqs9100?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
+      url: jdbc:mysql://192.168.1.24:13306/pqs9100?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
 #      username: root
 #      password: njcnpqs
-      url: jdbc:mysql://localhost:13306/pqs9100member?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
+#      url: jdbc:mysql://127.0.0.1:3306/pqs9100?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
       username: root
       password: njcnpqs
       #初始化建立物理连接的个数、最小、最大连接数
@@ -36,9 +36,9 @@ mybatis-plus:
     #驼峰命名
     map-underscore-to-camel-case: true
     #配置sql日志输出
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     #关闭日志输出
-  #    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
   global-config:
     db-config:
       #指定主键生成策略
@@ -60,33 +60,36 @@ socket:
 #    port: 61000
 
 webSocket:
-  port: 7777
+  port: 7778
 
 #源参数下发，暂态数据默认值
 Dip:
-  #暂态前时间（s）
-  fPreTime: 2f
+#  暂态前时间（s）
+#  fPreTime: 2f
   #写入时间（s）
   fRampIn: 0.001f
   #写出时间（s）
   fRampOut: 0.001f
-  #暂态后时间（s）
-  fAfterTime: 3f
+#  暂态后时间（s）
+#  fAfterTime: 3f
 
 
-Flicker:
-  waveFluType: CPM
-  waveType: SQU
-  fDutyCycle: 50f
+#Flicker:
+#  waveFluType: CPM
+#  waveType: SQU
+#  fDutyCycle: 50f
 
-log:
-  homeDir: D:\logs
-  commonLevel: info
+#log:
+#  homeDir: D:\logs
+#  commonLevel: info
 report:
-  template: D:\template
-  reportDir: D:\report
-data:
-  homeDir: D:\data
+#  template: D:\template
+#  reportDir: D:\report
+  dateFormat: yyyy年MM月dd日
+#data:
+#  homeDir: D:\data
+#resource:
+#  videoDir: ${data.homeDir}\resources\videos
 qr:
   cloud: http://pqmcc.com:18082/api/file
   dev:
@@ -118,3 +121,7 @@ power-quality:
     harmonic-times: 50   # 谐波次数
     ib-add: false        # 电流基波叠加标志
     uharm-add: false     # 电压谐波叠加标志
+# 激活配置
+activate:
+  private-key: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcUyYhVqczGxblL+o/xZzF/8nf+LjrfUE/dS1aRHM7uMDD0cgCArhjtfneFePrMxt+Z7W8yNBzSarub8qsfhaVNikV7Es7oaeTygfjQXTi2n4AFkir3fM07J08RpWhl5M8f8uWTCuvFUYAw00gq55typqmnbkmJa2VIUy/iQf+cMCP7abz4/jNhUzUR3qA7TV4oMRgTdIEDUp63YF8dOC+JH8XxYrCVeHXV6fLCwmesdMzl0lB2VTEKMfLbXhOmF5g7P9y/16VCcN8UBuZlbyYfn+GAxJOSbeHi5HshOKfoSuD7Jz+3WQZpNavOWjIFExKIU38/CvnJCOP7XBCqpSTAgMBAAECggEAYeWokWRE3TpvwiOZnUpR/aVMdVi75a3ROL5XIpqPV61B+t/bU3cEpl0GF9C5pUeiRi0IoStZb3mI9D1KPW/REKyUWkhabQO1gFYbTnRlkNOn6MILzKX4cwJjDaZeeo4EBPU7N+qHyOOXrU6hdH5FfxhMdV983ajm5eeuupxER1C2kAcIklTeVpTX6EKOgZb5LBp5ssOVm2P42pOauvcRozRcvZmqnErXmukv0H4l3EVNt4rHpTn9riHUC63e8JfiYzVaF6zuNUxv6nHEft0/SRMw11XSTnNfDzcKqgjz6ksFBS/6eQQYKESk+ONC53HUuYHFAknkwsPupDCT2W8FIQKBgQDLHT/xCU3nxGr4vFKBDNaO2D5oK20ECbBO4oDvLWWmQG7f+6TsMy8PgVdMnoL4RfqGlwFAKEpS6KVFHnBVqnNEhcdy9uCI7x7Xx8UnyUtxj1EDTm76uta9Ki9OrlqB6tImDM9+Ya3vGktW37ht4WOx2OsJRhG1dbf6RLwFlH7DWwKBgQDFBxvi5I1BR6hg6Tj7xd2SqOT2Y+BED3xuSYENhWbmMhLJDResaB7mjztbxlYaY2mOE0holWm2uDmVFFhMh4jYXik4hYH8nmDzq9mDpZCZ9pyjYqnAP8THoAa8EbgrUWB8A6BPH4iL3KbMnBfBKY0pIr2xrvnjQjNBAgta7KDRKQKBgCe6oe4wxrdF2TKsC2tIqpMoQxS3Icy/ZGgZr+SYuaBKTCWtoDW/UT40K3JGMxIDBhzbXphBCUCsVt9tM8Xd4EwP6tJW7dZ7B0pnve2pVwNwaAVAiz6p2yUHIle+jN+Koe5lZRSwYIg7WW81tWpwwsJfzqFyvjYDP6hJV4mz4ROvAoGAaRcdnKvjXApomShMqJ4lTPChD3q+SA8qg3jZSOj6tZXHx00gb2kp8jg7pPvpOTIFPy6x1Ha9aCRjMk0ju84fA6lVuzwa1S907wOehUVuF3Eeo1cgy9Y3k3KbpPyeixxgpkUY4JslLdSHc2NemD0dee951qhJyRmqVOZOQDUuoeECgYEAqBw2cAFk3vM97WY06TSldGA8ajVHx3BYRjj+zl62NTQthy8fw3tqxb3c5e8toOmZWKjZvDhg2TRLhsDDQWEYg3LZG87REqVIjgEPcpjNLidjygGX8n3JF2o0O5I/EMvl0s/+LVQONfduOBvhwDqr8QNisbLsyneiAq7umewMolo="
+  public-key: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnFMmIVanMxsW5S/qP8Wcxf/J3/i4631BP3UtWkRzO7jAw9HIAgK4Y7X53hXj6zMbfme1vMjQc0mq7m/KrH4WlTYpFexLO6Gnk8oH40F04tp+ABZIq93zNOydPEaVoZeTPH/LlkwrrxVGAMNNIKuebcqapp25JiWtlSFMv4kH/nDAj+2m8+P4zYVM1Ed6gO01eKDEYE3SBA1Ket2BfHTgviR/F8WKwlXh11enywsJnrHTM5dJQdlUxCjHy214TpheYOz/cv9elQnDfFAbmZW8mH5/hgMSTkm3h4uR7ITin6Erg+yc/t1kGaTWrzloyBRMSiFN/Pwr5yQjj+1wQqqUkwIDAQAB"

entrance/src/main/resources/logback.xml

@@ -5,7 +5,7 @@
     <!-- 直接使用固定配置，避免Spring配置解析时机问题 -->
     <property name="log.projectName" value="entrance"/>
     <property name="logCommonLevel" value="info"/>
-    <property name="logHomeDir" value="D:\logs"/>
+    <property name="logHomeDir" value="${logHomeDir:-D:\logs}"/>
 
     <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
     <conversionRule conversionWord="wex"