Merge remote-tracking branch 'origin/qr_branch' into qr_branch

2、检测结果原始数据时间展示毫秒值

detection/pom.xml

@@ -74,6 +74,56 @@
             <artifactId>poi-ooxml</artifactId>
             <version>4.1.2</version>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.docx4j/docx4j -->
+<!--        <dependency>-->
+<!--            <groupId>org.docx4j</groupId>-->
+<!--            <artifactId>docx4j-core</artifactId>-->
+<!--            <version>8.3.8</version>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>2.3.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>2.3.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.docx4j</groupId>
+            <artifactId>docx4j</artifactId>
+            <version>6.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.12.0</version> <!-- 您可以根据需要选择其他版本 -->
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.12.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>RestTemplate-plugin</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+            <version>3.10.0</version>
+        </dependency>
+
     </dependencies>
 
 

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

@@ -3,14 +3,12 @@ package com.njcn.gather.detection.controller;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.gather.detection.handler.SocketDevResponseService;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
+import com.njcn.gather.detection.pojo.param.SimulateDetectionParam;
 import com.njcn.gather.detection.service.PreDetectionService;
 import com.njcn.gather.detection.service.impl.DetectionServiceImpl;
-import com.njcn.gather.detection.util.socket.MsgUtil;
-import com.njcn.gather.device.pojo.vo.PreDetection;
 import com.njcn.gather.device.service.IPqDevService;
-import com.njcn.gather.script.pojo.param.PqScriptIssueParam;
-import com.njcn.gather.script.pojo.po.SourceIssue;
 import com.njcn.gather.script.service.IPqScriptDtlsService;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.utils.HttpResultUtil;
@@ -22,11 +20,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 
+/**
+ * @author chendaofei
+ */
 @Slf4j
 @Api(tags = "预检测")
 @RestController
@@ -36,29 +33,62 @@ public class PreDetectionController extends BaseController {
 
     private final PreDetectionService preDetectionService;
 
-    private final DetectionServiceImpl detectionServiceImpl;
-
-    private final IPqScriptDtlsService pqScriptDtlsService;
-
-    private final IPqDevService iPqDevService;
-
-
-
-
-
     /**
-     * 开始检测
+     * 开始检测通用入口
+     * @param param 实体参数
      */
     @PostMapping("/startPreTest")
     @OperateInfo
     @ApiOperation("开始检测")
     @ApiImplicitParam(name = "param", value = "查询参数", required = true)
-    public HttpResult<String> startPreTest(@RequestBody @Validated PreDetectionParam param){
+    public HttpResult<String> startPreTest(@RequestBody @Validated PreDetectionParam param) {
         String methodDescribe = getMethodDescribe("startPreTest");
         preDetectionService.sourceCommunicationCheck(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    /**
+     * 程控源-源通讯校验
+     *
+     * @param param
+     * @return
+     */
+    @PostMapping("/ytxCheckSimulate")
+    @OperateInfo
+    @ApiOperation("源通讯校验")
+    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
+    public HttpResult<String> ytxCheckSimulate(@RequestBody @Validated SimulateDetectionParam param) {
+        String methodDescribe = getMethodDescribe("ytxCheckSimulate");
+        preDetectionService.ytxCheckSimulate(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    /**
+     * 程控源检测
+     */
+    @PostMapping("/startSimulateTest")
+    @OperateInfo
+    @ApiOperation("启动")
+    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
+    public HttpResult<String> startTestSimulate(@RequestBody @Validated SimulateDetectionParam param) {
+        String methodDescribe = getMethodDescribe("startTestSimulate");
+        preDetectionService.sendScript(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    /**
+     * 关闭检测-程控源
+     */
+    @PostMapping("/closeSimulateTest")
+    @OperateInfo
+    @ApiOperation("停止")
+    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
+    public HttpResult<String> closeSimulateTest(@RequestBody @Validated SimulateDetectionParam param) {
+        String methodDescribe = getMethodDescribe("closeSimulateTest");
+        preDetectionService.closeTestSimulate(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
 
     /**
      * 系数校验
@@ -67,7 +97,7 @@ public class PreDetectionController extends BaseController {
     @OperateInfo
     @ApiOperation("系数校验")
     @ApiImplicitParam(name = "param", value = "查询参数", required = true)
-    public HttpResult<String> coefficientCheck(@RequestBody PreDetectionParam param){
+    public HttpResult<String> coefficientCheck(@RequestBody PreDetectionParam param) {
         String methodDescribe = getMethodDescribe("coefficientCheck");
         preDetectionService.coefficientCheck(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
@@ -81,7 +111,7 @@ public class PreDetectionController extends BaseController {
     @OperateInfo
     @ApiOperation("暂停检测")
     @ApiImplicitParam(name = "param", value = "参数", required = true)
-    public HttpResult<String> temStopTest(){
+    public HttpResult<String> temStopTest() {
         String methodDescribe = getMethodDescribe("temStopTest");
         preDetectionService.temStopTest();
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
@@ -94,126 +124,9 @@ public class PreDetectionController extends BaseController {
     @OperateInfo
     @ApiOperation("重新开始检测")
     @ApiImplicitParam(name = "param", value = "参数", required = true)
-    public HttpResult<String> restartTemTest(@RequestBody PreDetectionParam param){
+    public HttpResult<String> restartTemTest(@RequestBody PreDetectionParam param) {
         String methodDescribe = getMethodDescribe("restartTemTest");
         preDetectionService.restartTemTest(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
-
-
-
-    /**
-     * 测试
-     */
-    @PostMapping("/startTest")
-    @OperateInfo
-    @ApiOperation("测试")
-    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
-    public HttpResult<String> startTest(@RequestBody PreDetectionParam param){
-        String methodDescribe = getMethodDescribe("startTest");
-        //preDetectionService.startTest(param);
-
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:49:50.815\",\"ID\":\"172.17.102.204_2\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:49:50.815\",\"ID\":\"172.17.102.204_3\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001100\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:49:50.815\",\"ID\":\"172.17.102.204_4\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001100\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:49:53.815\",\"ID\":\"172.17.102.204_1\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:49:53.815\",\"ID\":\"172.17.102.204_2\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:49:53.815\",\"ID\":\"172.17.102.204_3\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:49:53.815\",\"ID\":\"172.17.102.204_4\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:49:56.815\",\"ID\":\"172.17.102.204_1\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:49:56.815\",\"ID\":\"172.17.102.204_2\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:49:56.815\",\"ID\":\"172.17.102.204_3\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:49:56.815\",\"ID\":\"172.17.102.204_4\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:49:59.815\",\"ID\":\"172.17.102.204_1\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001100\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:49:59.815\",\"ID\":\"172.17.102.204_2\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:49:59.815\",\"ID\":\"172.17.102.204_3\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:49:59.815\",\"ID\":\"172.17.102.204_4\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:02.8\",\"ID\":\"172.17.102.204_1\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:02.8\",\"ID\":\"172.17.102.204_2\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:02.8\",\"ID\":\"172.17.102.204_3\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:02.8\",\"ID\":\"172.17.102.204_4\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:03\",\"ID\":\"172.17.102.204_1\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:03\",\"ID\":\"172.17.102.204_2\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:03\",\"ID\":\"172.17.102.204_3\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:03\",\"ID\":\"172.17.102.204_4\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:06\",\"ID\":\"172.17.102.204_1\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001100\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:06\",\"ID\":\"172.17.102.204_2\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001100\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:06\",\"ID\":\"172.17.102.204_3\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:06\",\"ID\":\"172.17.102.204_4\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001100\"}}],\"SqlDataHarm\":[]}");
-
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:09\",\"ID\":\"172.17.102.204_1\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:09\",\"ID\":\"172.17.102.204_2\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:09\",\"ID\":\"172.17.102.204_3\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:09\",\"ID\":\"172.17.102.204_4\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:12\",\"ID\":\"172.17.102.204_1\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:12\",\"ID\":\"172.17.102.204_2\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:12\",\"ID\":\"172.17.102.204_3\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:12\",\"ID\":\"172.17.102.204_4\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:15\",\"ID\":\"172.17.102.204_1\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001100\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:15\",\"ID\":\"172.17.102.204_2\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001100\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:15\",\"ID\":\"172.17.102.204_3\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:15\",\"ID\":\"172.17.102.204_4\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001100\"}}],\"SqlDataHarm\":[]}");
-
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:18\",\"ID\":\"172.17.102.204_1\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:18\",\"ID\":\"172.17.102.204_2\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:18\",\"ID\":\"172.17.102.204_3\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:18\",\"ID\":\"172.17.102.204_4\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:21\",\"ID\":\"172.17.102.204_1\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:21\",\"ID\":\"172.17.102.204_2\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:21\",\"ID\":\"172.17.102.204_3\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:21\",\"ID\":\"172.17.102.204_4\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:24\",\"ID\":\"172.17.102.204_1\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:24\",\"ID\":\"172.17.102.204_2\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:24\",\"ID\":\"172.17.102.204_3\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001100\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:24\",\"ID\":\"172.17.102.204_4\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:27\",\"ID\":\"172.17.102.204_1\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:27\",\"ID\":\"172.17.102.204_2\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:27\",\"ID\":\"172.17.102.204_3\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:27\",\"ID\":\"172.17.102.204_4\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:30\",\"ID\":\"172.17.102.204_1\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:30\",\"ID\":\"172.17.102.204_2\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:30\",\"ID\":\"172.17.102.204_3\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:30\",\"ID\":\"172.17.102.204_4\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:33\",\"ID\":\"172.17.102.204_1\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:33\",\"ID\":\"172.17.102.204_2\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:33\",\"ID\":\"172.17.102.204_3\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:33\",\"ID\":\"172.17.102.204_4\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:36\",\"ID\":\"172.17.102.204_1\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:36\",\"ID\":\"172.17.102.204_2\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:36\",\"ID\":\"172.17.102.204_3\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:36\",\"ID\":\"172.17.102.204_4\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:39\",\"ID\":\"172.17.102.204_1\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:39\",\"ID\":\"172.17.102.204_2\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:39\",\"ID\":\"172.17.102.204_3\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:39\",\"ID\":\"172.17.102.204_4\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:42.001\",\"ID\":\"172.17.102.204_1\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:42.001\",\"ID\":\"172.17.102.204_2\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:42.001\",\"ID\":\"172.17.102.204_3\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:42.001\",\"ID\":\"172.17.102.204_4\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:45.001\",\"ID\":\"172.17.102.204_1\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:45.001\",\"ID\":\"172.17.102.204_2\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:45.001\",\"ID\":\"172.17.102.204_3\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001000\"}}],\"SqlDataHarm\":[]}");
-        MsgUtil.socketDataMsg("{\"Time\":\"2025-01-15T15:50:45.001\",\"ID\":\"172.17.102.204_4\",\"result\":false,\"SqlData\":[{\"type\":\"real\",\"desc\":\"FREQ\",\"list\":{\"A\":null,\"B\":null,\"C\":null,\"T\":\"50.001100\"}}],\"SqlDataHarm\":[]}");
-
-
-        PqScriptIssueParam issueParam = new PqScriptIssueParam();
-        issueParam.setPlanId(param.getPlanId());
-        issueParam.setSourceId(param.getSourceId());
-        issueParam.setDevIds(param.getDevIds());
-        issueParam.setScriptId("a303b2224845fcc6f60198b8ca23dca9");
-        //issueParam.setIsPhaseSequence(false);
-        SourceIssue sourceIssues = pqScriptDtlsService.listSourceIssue(issueParam).get(0);
-
-        List<PreDetection> pqDevList = iPqDevService.getDevInfo(param.getDevIds());
-        Map<String, String> devIdMapComm = pqDevList.stream().collect(Collectors.toMap(PreDetection::getDevIP, PreDetection::getDevId));
-
-        //detectionServiceImpl.processing(devDataList,param,devIdMapComm,sourceIssues, DictDataEnum.AT_WILL_VALUE);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-    }
-    
-    
-    
 }

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

@@ -1,41 +0,0 @@
-package com.njcn.gather.detection.controller;
-
-import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.web.controller.BaseController;
-import com.njcn.web.utils.HttpResultUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author wr
- * @description
- * @date 2024/12/10 14:25
- */
-@Slf4j
-@Api(tags = "守时检测")
-@RestController
-@RequestMapping("/punctuality")
-@RequiredArgsConstructor
-public class PunctualityController extends BaseController {
-
-//    private final PunctualityService punctualityService;
-
-    @OperateInfo
-    @PostMapping("/deliveryTime")
-    @ApiOperation("下发守时检测")
-    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
-    public HttpResult<?> list(@RequestBody Object param) {
-        String methodDescribe = getMethodDescribe("list");
-//        punctualityService.triggerTimeMark();
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-    }
-}

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

@@ -10,10 +10,7 @@ import com.njcn.gather.detection.pojo.vo.DevLineTestResult;
 import com.njcn.gather.detection.pojo.vo.SocketDataMsg;
 import com.njcn.gather.detection.pojo.vo.SocketMsg;
 import com.njcn.gather.detection.pojo.vo.WebSocketVO;
-import com.njcn.gather.detection.util.socket.CnSocketUtil;
-import com.njcn.gather.detection.util.socket.MsgUtil;
-import com.njcn.gather.detection.util.socket.SocketManager;
-import com.njcn.gather.detection.util.socket.WebServiceManager;
+import com.njcn.gather.detection.util.socket.*;
 import com.njcn.gather.detection.util.socket.cilent.NettyClient;
 import com.njcn.gather.detection.util.socket.cilent.NettyDevClientHandler;
 import com.njcn.gather.device.pojo.vo.PreDetection;
@@ -21,6 +18,7 @@ import com.njcn.gather.device.service.IPqDevService;
 import com.njcn.gather.script.pojo.po.SourceIssue;
 import com.njcn.gather.system.pojo.enums.DicDataEnum;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -64,7 +62,12 @@ public class SocketSourceResponseService {
             switch (enumByCode) {
                 //源初始化
                 case YJC_YTXJY:
-                    detectionDev(param, socketDataMsg);
+                    if (ObjectUtil.isNotNull(param.getPlanId())) {
+                        detectionDev(param, socketDataMsg);
+                    } else {
+                        // 程控源-源通信校验
+                        handleYtxjySimulate(param, socketDataMsg);
+                    }
                     break;
                 //相序检测
                 case YJC_XUJY:
@@ -72,7 +75,11 @@ public class SocketSourceResponseService {
                     break;
                 //正式检测
                 case FORMAL_REAL:
-                    senParamToDev(param, socketDataMsg);
+                    if (ObjectUtil.isNotNull(param.getPlanId())) {
+                        senParamToDev(param, socketDataMsg);
+                    } else {
+                        handleSimulateTest(param, socketDataMsg);
+                    }
                     break;
                 //系数校验
                 case Coefficient_Check:
@@ -83,13 +90,89 @@ public class SocketSourceResponseService {
                     break;
                 case YXT:
                     break;
-
             }
         } else {
             System.out.println("fggggggggggggggggggggg" + enumByCode);
         }
+    }
 
+    private void handleYtxjySimulate(PreDetectionParam param, SocketDataMsg socketDataMsg) {
 
+        SourceResponseCodeEnum dictDataEnumByCode = SourceResponseCodeEnum.getDictDataEnumByCode(socketDataMsg.getCode());
+        if (ObjectUtil.isNotNull(dictDataEnumByCode)) {
+            switch (dictDataEnumByCode) {
+                case SUCCESS:
+                    if (param.getSendWebMsg()) {
+                        WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
+                    }
+                    System.out.println(param.getSendWebMsg() + "模拟检测-源初始化成功");
+                    break;
+                case UNPROCESSED_BUSINESS:
+                    WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
+                    break;
+                case SOURCE_CONNECTION_ERROR:
+                    CnSocketUtil.quitSendSource(param);
+                    WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
+                    break;
+                case CONTROLLED_SOURCE_ERROR:
+                    CnSocketUtil.quitSendSource(param);
+                    WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
+                    break;
+                case TEST_ITEM_PARSING_ERROR:
+                    CnSocketUtil.quitSendSource(param);
+                    WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
+                    break;
+                case SOURCE_CONTROL_ERROR:
+                    CnSocketUtil.quitSendSource(param);
+                    WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
+                    break;
+                case TARGET_SOURCE_ERROR:
+                    CnSocketUtil.quitSendSource(param);
+                    WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
+                    break;
+                case NOT_INITIALIZED:
+                    CnSocketUtil.quitSendSource(param);
+                    WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
+                    break;
+                case UNABLE_TO_RESPOND:
+                    CnSocketUtil.quitSendSource(param);
+                    WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
+                    break;
+                default:
+                    CnSocketUtil.sendUnSocket(param.getUserPageId());
+                    WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
+                    break;
+            }
+        }
+    }
+
+    /**
+     * 处理模拟检测时，通信模块返回报文
+     *
+     * @param param
+     * @param socketDataMsg
+     */
+    private void handleSimulateTest(PreDetectionParam param, SocketDataMsg socketDataMsg) {
+        SourceResponseCodeEnum dictDataEnumByCode = SourceResponseCodeEnum.getDictDataEnumByCode(socketDataMsg.getCode());
+        if (ObjectUtil.isNotNull(dictDataEnumByCode)) {
+            switch (dictDataEnumByCode) {
+                case SUCCESS:
+                    WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
+                    System.out.println("模拟检测-源成功执行脚本" + JSON.toJSONString(socketDataMsg));
+                    break;
+                case UNPROCESSED_BUSINESS:
+                    WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
+                    break;
+                default:
+                    CnSocketUtil.quitSendSource(param);
+                    SocketMsg<String> socketMsg = new SocketMsg<>();
+                    socketMsg.setRequestId(socketDataMsg.getRequestId());
+                    socketMsg.setOperateCode(socketDataMsg.getOperateCode());
+                    socketMsg.setData(dictDataEnumByCode.getMessage());
+                    WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketMsg));
+                    break;
+            }
+        }
     }
 
 
@@ -111,12 +194,13 @@ public class SocketSourceResponseService {
                     DevPhaseSequenceParam phaseSequenceParam = new DevPhaseSequenceParam();
                     phaseSequenceParam.setMoniterIdList(monitorIdList);
                     phaseSequenceParam.setDataType(Arrays.asList("real$VRMS", "real$IRMS"));
-                    phaseSequenceParam.setReadCount(10);
-                    phaseSequenceParam.setIgnoreCount(7);
+                    // 读取3次数据用于系数计算
+                    phaseSequenceParam.setReadCount(7); //3
+                    // 忽略前4次数据，等待测量稳定
+                    phaseSequenceParam.setIgnoreCount(3); //4
                     socketMsg.setData(JSON.toJSONString(phaseSequenceParam));
                     SocketManager.sendMsg(s, JSON.toJSONString(socketMsg));
 
-
                     break;
                 case UNPROCESSED_BUSINESS:
                     WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
@@ -135,8 +219,8 @@ public class SocketSourceResponseService {
     /**
      * 装置检测(当源初始化成功后，直接向装置通道向装置服务器发送，装置检测)
      *
-     * @param param
-     * @param socketDataMsg
+     * @param param         参数
+     * @param socketDataMsg 消息
      */
     private void detectionDev(PreDetectionParam param, SocketDataMsg socketDataMsg) {
         SourceResponseCodeEnum dictDataEnumByCode = SourceResponseCodeEnum.getDictDataEnumByCode(socketDataMsg.getCode());
@@ -149,9 +233,9 @@ public class SocketSourceResponseService {
                     WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
                     String s = param.getUserPageId() + DEV;
                     //开始设备通讯检测(发送设备初始化)
-                    List<PreDetection> devList = iPqDevService.getDevInfo(param.getDevIds());
+                    //List<PreDetection> devList = iPqDevService.getDevInfo(param.getDevIds());
                     Map<String, List<PreDetection>> map = new HashMap<>(1);
-                    map.put("deviceList", devList);
+                    map.put("deviceList", FormalTestManager.devList);
                     String jsonString = JSON.toJSONString(map);
                     socketMsg.setRequestId(SourceOperateCodeEnum.YJC_SBTXJY.getValue());
                     socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_INIT_GATHER_01.getValue());
@@ -166,6 +250,7 @@ public class SocketSourceResponseService {
                 case SOURCE_CONNECTION_ERROR:
                     CnSocketUtil.quitSendSource(param);
                     WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
+                    break;
                 case CONTROLLED_SOURCE_ERROR:
                     CnSocketUtil.quitSendSource(param);
                     WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
@@ -267,19 +352,15 @@ public class SocketSourceResponseService {
 
                     String s = param.getUserPageId() + DEV;
                     SourceIssue sourceIssue = SocketManager.getSourceList().get(0);
-                    List<String> comm = sourceIssue.getDevValueTypeList();
+                    List<String> comm = sourceIssue.getDevValueTypeList(); //形如：类型&小项code这种形式。例如：real$VRMS、real$IRMS
                     System.out.println("向装置下发的参数>>>>>>>>" + comm);
                     socketMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue() + stepTag + sourceIssue.getType());
                     int ignoreCount;
                     int readData;
-                    if (sourceIssue.getType().equals(DicDataEnum.F.getCode())) {
+                    if (DicDataEnum.F.getCode().equals(sourceIssue.getType())) {
                         ignoreCount = 1;
                         readData = 2;
                         socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_01.getValue());
-                    } else if (sourceIssue.getType().equals(DicDataEnum.HP.getCode())) {
-                        ignoreCount = 2;
-                        readData = 5;
-                        socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_01.getValue());
                     } else if (DicDataEnum.VOLTAGE.getCode().equals(sourceIssue.getType())) {
                         ignoreCount = 5;
                         readData = 1;
@@ -287,12 +368,18 @@ public class SocketSourceResponseService {
                     } else {
                         ignoreCount = 5;
                         readData = 5;
-                        socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_02.getValue());
+                        //区分实时数据还是分钟数据
+                        if ("real".equals(sourceIssue.getDataType())) {
+                            socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_02.getValue());
+                        } else {
+                            socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_01.getValue());
+                        }
                     }
+                    System.out.println("devList is empty:" + CollectionUtils.isEmpty(devList));
 
-                    List<String> moniterIdList = devList.stream().flatMap(x -> x.getMonitorList().stream()).map(PreDetection.MonitorListDTO::getLineId).collect(Collectors.toList());
+                    //List<String> moniterIdList = devList.stream().flatMap(x -> x.getMonitorList().stream()).map(PreDetection.MonitorListDTO::getLineId).collect(Collectors.toList());
                     DevPhaseSequenceParam phaseSequenceParam = new DevPhaseSequenceParam();
-                    phaseSequenceParam.setMoniterIdList(moniterIdList);
+                    phaseSequenceParam.setMoniterIdList(monitorIdList);
                     phaseSequenceParam.setDataType(comm);
                     phaseSequenceParam.setReadCount(readData);
                     phaseSequenceParam.setIgnoreCount(ignoreCount);
@@ -337,6 +424,7 @@ public class SocketSourceResponseService {
             case SUCCESS:
                 //通讯校验成功
                 SocketManager.removeUser(param.getUserPageId() + source);
+                WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
                 break;
             case UNPROCESSED_BUSINESS:
                 break;
@@ -361,6 +449,7 @@ public class SocketSourceResponseService {
         this.monitorIdList = devList.stream().flatMap(x -> x.getMonitorList().stream())
                 .map(PreDetection.MonitorListDTO::getLineId)
                 .collect(Collectors.toList());
+        XiNumberManager.xiDevList = devList;
     }
 
 }

detection/src/main/java/com/njcn/gather/detection/pojo/constant/DetectionCommunicateConstant.java

@@ -0,0 +1,22 @@
+package com.njcn.gather.detection.pojo.constant;
+
+/**
+ * 通信相关的常量
+ *
+ * @author hongawen
+ * @version 1.0
+ * @data 2025/4/15 14:11
+ */
+public interface DetectionCommunicateConstant {
+
+    String SOURCE_CHANNEL_NAME = "AUTO_DETECTION_SOURCE";
+
+    String DEVICE_CHANNEL_NAME = "AUTO_DETECTION_DEV";
+
+    String DEV = "_Dev";
+
+    String SOURCE = "_Source";
+
+
+
+}

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

@@ -0,0 +1,58 @@
+package com.njcn.gather.detection.pojo.enums;
+
+import cn.hutool.core.util.ObjectUtil;
+import lombok.Getter;
+
+/**
+ * @Description:
+ * @Author: wr
+ * @Date: 2025/2/12 10:15
+ */
+@Getter
+public enum DetectionCodeEnum {
+
+    FREQ("FREQ", "频率"),
+    VRMS("VRMS", "相电压有效值"),
+    DELTA_V("DELTA_V", "电压偏差"),
+    VA("VA", "电压相角"),
+    U1("U1", "基波电压"),
+    V2_50("V2-50", "谐波电压"),
+    I2_50("I2-50", "谐波电流"),
+    P2_50("P2-50", "谐波有功功率"),
+    SV_1_49("SV_1-49", "间谐波电压"),
+    SI_1_49("SI_1-49", "间谐波电流"),
+    MAG("MAG", "电压幅值"),
+    DUR("DUR", "持续时间"),
+    IRMS("IRMS", "电流有效值"),
+    IA("IA", "电流相角"),
+    V_UNBAN("V_UNBAN", "三相电压负序不平衡度"),
+    I_UNBAN("I_UNBAN", "三相电流负序不平衡度"),
+    PST("PST", "短时间闪变"),
+    P("P", "功率"),
+
+
+    I1("I1", "基波电流"),
+
+
+
+
+    UNKNOWN_ERROR("-1", "未知异常"),
+
+    ;
+
+    private final String code;
+    private final String message;
+
+    DetectionCodeEnum(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+    public static DetectionCodeEnum getDetectionCodeByCode(String code) {
+        for (DetectionCodeEnum detectionCodeEnum : DetectionCodeEnum.values()) {
+            if (ObjectUtil.equals(code, detectionCodeEnum.getCode())) {
+                return detectionCodeEnum;
+            }
+        }
+        return UNKNOWN_ERROR;
+    }
+}

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

@@ -9,11 +9,15 @@ import lombok.Getter;
 @Getter
 public enum DetectionResponseEnum {
     PLAN_PATTERN_NOT("A020001", "计划模式查询为空"),
+    SCRIPT_PATTERN_NOT("A020001", "检测脚本查询为空"),
     SOURCE_INFO_NOT("A020002", "源表信息不存在"),
     PLAN_AND_SOURCE_NOT("A020003", "计划和源关系不存在"),
     ITEM_TEST_NOT("A020004", "检测项为空"),
-    PLAN_DEV_IP_HAS("A20005","当前计划检测装置ip重复")
-    ;
+    PLAN_DEV_IP_HAS("A20005","当前计划检测装置ip重复"),
+    SOURCE_NOT_CONNECT("A020006", "源未连接"),
+
+
+    SCRIPT_CHECK_DATA_NOT_EXIST("A020040","测试脚本项暂无配置" );
 
     private final String code;
     private final String message;

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

@@ -38,6 +38,8 @@ public enum SourceOperateCodeEnum {
     DATA_CHNFACTOR$01("DATA_CHNFACTOR$01","校验系数获取"),
     DATA_CHNFACTOR$02("DATA_CHNFACTOR$02","校验系数下发"),
 
+    VERIFY_MAPPING$01("VERIFY_MAPPING$01","脚本与icd校验"),
+
 
     /**
      * 请求操作类型对应实体中 requestId
@@ -47,16 +49,19 @@ public enum SourceOperateCodeEnum {
     YJC_XYJY("yjc_xyjy", "协议校验"),
     YJC_XUJY("YJC_xujy", "相序校验"),
     FORMAL_REAL("formal_real","正式检测"),
+//    SIMULATE_REAL("simulate_real","模拟检测"),
     Coefficient_Check("Coefficient_Check","系数校验"),
     QUITE("quit","关闭设备通讯初始化"),
     QUITE_SOURCE("close_source","关闭源通讯"),
     ERROR_FLOW_END("error_flow_end","当前流程存在异常结束"),
     YXT("yxt","心跳"),
+    REPORT_CAT("FTP_SEND$01","处理报告"),
 
     UNKNOWN_OPERATE("unknown_operate","未知的操作返回,请联系管理员排查"),
     SOCKET_TIMEOUT("socket_timeout","与源或者装置通讯等待超时"),
     STOP_TIMEOUT("stop_timeout","暂停时间超过十分钟"),
     SERVER_ERROR("server_error","服务端主动关闭连接,请稍后再试"),
+    DEVICE_ERROR("device_error","设备主动关闭连接,请稍后再试"),
 
 
 
@@ -65,16 +70,18 @@ public enum SourceOperateCodeEnum {
     /**
      *
      */
-    COEFFICIENT_TEST("0","系数校验"),
-    PRE_TEST("1","预检测"),
-    FORMAL_TEST("2","正式检测"),
-    TIME_TEST("3","守时检测"),
-    PHASE_TEST("4","相序检测"),
-    TEST_TEM_STOP("5","临时停止"),
-    TEST_TEM_START("6","继续检测"),
-    TEST_STOP("7","停止检测"),
-    RE_ERROR_TEST("8","不合格项复检"),
-
+//    COEFFICIENT_TEST("0","系数校验"),
+//    PRE_TEST("1","预检测"),
+//    FORMAL_TEST("2","正式检测"),
+//    TIME_TEST("3","守时检测"),
+//    PHASE_TEST("4","相序检测"),
+//    TEST_TEM_STOP("5","临时停止"),
+    ALL_TEST("1","全部检测"),
+    RE_ERROR_TEST("2","不合格项复检"),
+    TEST_TEM_START("3","继续检测"),
+    SIMULATE_TEST("4","模拟检测"),
+    //TEST_STOP("7","停止检测"),
+    //FAST_TEST("10","一键检测"),
 
     /**
      * 系数校验步骤
@@ -89,6 +96,11 @@ public enum SourceOperateCodeEnum {
     small_comp_end("small_comp_end","小电压校准结束"),
 
 
+    /**
+     * ftp文件传送指令
+     */
+    FTP_SEND_01("FTP_SEND$01", "发送文件")
+
 
     ;
 

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

@@ -13,6 +13,7 @@ public enum SourceResponseCodeEnum {
     SUCCESS(10200, "请求成功"),
     UNPROCESSED_BUSINESS(10201, "立即响应，业务还未处理，类似肯定应答"),
     NORMAL_RESPONSE(10202, "正常响应中间状态码"),
+    ICD_NOT_FOUND(10500, "未找到对应ICD"),
     MESSAGE_PARSING_ERROR(10520, "报文解析有误"),
     CONTROLLED_SOURCE_ERROR(10521, "程控源参数有误"),
     TEST_ITEM_PARSING_ERROR(10522, "测试项解析有误"),

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

@@ -14,10 +14,7 @@ import java.util.List;
 @Data
 public class PreDetectionParam {
 
-    /**
-     * 操作类型 0.预检测 1.正式检测 2.系数校验
-     */
-    private String operateType = "0";
+    private String operateType;
 
     /**
      * 检测计划id
@@ -25,10 +22,6 @@ public class PreDetectionParam {
     @NotBlank(message = "计划id不可为空")
     private String planId;
 
-    /**
-     * 检测计划code
-     */
-    private String planCode;
 
     /**
      * 数字、模拟、比对
@@ -65,4 +58,23 @@ public class PreDetectionParam {
      * 自动生成，用于生成数据表后缀
      */
     private String code;
+
+    private Boolean sendWebMsg;
+
+    private String userId;
+
+    /**
+     * 温度
+     */
+    private Float temperature;
+
+    /**
+     * 相对湿度
+     */
+    private Float humidity;
+
+    /**
+     * 检测项列表。第一个元素为预检测、第二个元素为系数校准、第三个元素为正式检测
+     */
+    private List<Boolean> testItemList;
 }

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

@@ -0,0 +1,40 @@
+package com.njcn.gather.detection.pojo.param;
+
+import com.njcn.gather.pojo.constant.DetectionValidMessage;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author caozehui
+ * @data 2025-03-06
+ */
+@Data
+public class SimulateDetectionParam {
+
+    /**
+     * 操作类型 9.模拟检测
+     */
+    private String operateType = "9";
+
+
+    /**
+     * 用户功能组成唯一标识 zhangsan_test
+     */
+    private String userPageId;
+
+    /**
+     * 检测脚本Id
+     */
+    private String scriptId;
+
+    @NotNull(message = DetectionValidMessage.INDEX_NOT_NULL)
+    private Integer scriptIndex;
+
+    /**
+     * 源id
+     */
+    @NotBlank(message = DetectionValidMessage.SOURCE_ID_NOT_BLANK)
+    private String sourceId;
+}

detection/src/main/java/com/njcn/gather/detection/pojo/po/IcdCheckData.java

@@ -0,0 +1,29 @@
+package com.njcn.gather.detection.pojo.po;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author caozehui
+ * @data 2025-04-10
+ */
+@NoArgsConstructor
+@Data
+public class IcdCheckData {
+
+    private String icdType;
+
+    private List<ResultData> resultData;
+
+    @NoArgsConstructor
+    @Data
+    public static class ResultData {
+        private String type;
+
+        private String desc;
+
+        private DevData.SqlDataDTO.ListDTO phaseResult;
+    }
+}

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

@@ -3,6 +3,8 @@ package com.njcn.gather.detection.pojo.vo;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @author wr
  * @description
@@ -18,7 +20,7 @@ public class DetectionData {
     private Double num;
 
     /**
-     * 是否是符合数据
+     * 1.合格 2.不合格 3.网络超时  4.无法处理 5.不参与误差比较
      */
     private Integer isData;
 
@@ -37,4 +39,13 @@ public class DetectionData {
      */
     private String radius;
 
+    /**
+     * 误差值
+     */
+    private BigDecimal errorData;
+
+    /**
+     * 单位
+     */
+    private String unit;
 }

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

@@ -1,7 +1,7 @@
 package com.njcn.gather.detection.service;
 
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
-
+import com.njcn.gather.detection.pojo.param.SimulateDetectionParam;
 
 
 /**
@@ -13,7 +13,8 @@ public interface PreDetectionService {
 
     /**
      * 源通讯校验socket入参拼接
-     * @param  param
+     *
+     * @param param
      * @Author: wr
      * @Date: 2024/12/11 13:26
      */
@@ -23,14 +24,29 @@ public interface PreDetectionService {
     void coefficientCheck(PreDetectionParam param);
 
 
-    boolean startTest(PreDetectionParam param);
-
-
     boolean temStopTest();
 
 
     boolean restartTemTest(PreDetectionParam param);
 
+    /**
+     * 模拟测试-源通讯校验
+     *
+     * @param param
+     */
+    void ytxCheckSimulate(SimulateDetectionParam param);
 
+    /**
+     * 模拟测试-向源发送脚本
+     *
+     * @param param
+     */
+    void sendScript(SimulateDetectionParam param);
 
+    /**
+     * 模拟测试-停止
+     *
+     * @param param
+     */
+    void closeTestSimulate(SimulateDetectionParam param);
 }

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

@@ -1,14 +0,0 @@
-package com.njcn.gather.detection.service;
-
-/**
- * @Description: 守时检测流程
- * @Author: wr
- * @Date: 2024/12/10 14:23
- */
-public interface PunctualityService {
-
-    /**
-     * 触发时间标识
-     */
-    void triggerTimeMark();
-}

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

@@ -8,34 +8,38 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.gather.detection.handler.SocketDevResponseService;
 import com.njcn.gather.detection.handler.SocketSourceResponseService;
+import com.njcn.gather.detection.pojo.constant.DetectionCommunicateConstant;
 import com.njcn.gather.detection.pojo.enums.DetectionResponseEnum;
 import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
+import com.njcn.gather.detection.pojo.param.SimulateDetectionParam;
 import com.njcn.gather.detection.pojo.vo.SocketMsg;
 import com.njcn.gather.detection.service.PreDetectionService;
-
+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.WebServiceManager;
 import com.njcn.gather.detection.util.socket.cilent.NettyClient;
 import com.njcn.gather.detection.util.socket.cilent.NettySourceClientHandler;
-import com.njcn.gather.device.pojo.enums.DevResponseEnum;
 import com.njcn.gather.device.pojo.po.PqDev;
 import com.njcn.gather.device.service.IPqDevService;
+import com.njcn.gather.plan.pojo.po.AdPlan;
+import com.njcn.gather.plan.pojo.po.AdPlanSource;
+import com.njcn.gather.plan.service.IAdPlanService;
+import com.njcn.gather.plan.service.IAdPlanSourceService;
 import com.njcn.gather.script.pojo.param.PqScriptCheckDataParam;
+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.pojo.po.SourceInitialize;
 import com.njcn.gather.source.service.IPqSourceService;
-import com.njcn.gather.plan.pojo.po.AdPlan;
-import com.njcn.gather.plan.pojo.po.AdPlanSource;
-import com.njcn.gather.plan.service.IAdPlanService;
-import com.njcn.gather.plan.service.IAdPlanSourceService;
 import com.njcn.gather.system.dictionary.pojo.enums.DictDataEnum;
 import com.njcn.gather.system.dictionary.service.IDictDataService;
 import io.netty.channel.Channel;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -46,10 +50,11 @@ import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class PreDetectionServiceImpl implements PreDetectionService {
 
-    private final String source = "_Source";
-    private final String dev = "_Dev";
+    private final String stepTag = "&&";
+    private final String handlerSourceStr = "_Source";
 
     private final IPqDevService iPqDevService;
     private final IDictDataService dictDataService;
@@ -62,10 +67,10 @@ public class PreDetectionServiceImpl implements PreDetectionService {
     private final SocketSourceResponseService socketSourceResponseService;
     private final IPqScriptCheckDataService iPqScriptCheckDataService;
 
-    @Value("${socket.source.ip:192.168.1.136}")
+    @Value("${socket.source.ip:192.168.1.138}")
     private String ip;
 
-    @Value("${socket.source.port:10086}")
+    @Value("${socket.source.port:61000}")
     private Integer port;
 
     private final SocketSourceResponseService sourceResponseService;
@@ -73,13 +78,18 @@ public class PreDetectionServiceImpl implements PreDetectionService {
 
     @Override
     public void sourceCommunicationCheck(PreDetectionParam param) {
-        commCheck(param);
-        specialDeal(param);
+        // 参数校验，目前仅检查IP是否重复，后续可在里面扩展
+        checkDevIp(param);
+        //用于处理异常导致的socket通道未关闭，socket交互异常
+        DetectionCommunicateUtil.checkCommunicateChannel(param);
         /*
         先组装源通讯协议
         查询计划什么模式的（除了对比式，其他都是一个计划对应一个源）
         */
         AdPlan plan = iAdPlanService.getById(param.getPlanId());
+        param.setScriptId(plan.getScriptId());
+        param.setErrorSysId(plan.getErrorSysId());
+        param.setCode(String.valueOf(plan.getCode()));
         if (ObjectUtil.isNotNull(plan)) {
             String code = dictDataService.getDictDataById(plan.getPattern()).getCode();
             DictDataEnum dictDataEnumByCode = DictDataEnum.getDictDataEnumByCode(code);
@@ -100,7 +110,8 @@ public class PreDetectionServiceImpl implements PreDetectionService {
 
     @Override
     public void coefficientCheck(PreDetectionParam param) {
-        specialDeal(param);
+        // 检测是否存在连接的通道，后期需要做成动态，如果组合中不是第一位，则不需要关闭，也不用初始化 todo....
+        DetectionCommunicateUtil.checkCommunicateChannel(param);
         AdPlanSource planSource = adPlanSourceService.getOne(new LambdaQueryWrapper<AdPlanSource>()
                 .eq(AdPlanSource::getPlanId, param.getPlanId())
         );
@@ -126,24 +137,22 @@ public class PreDetectionServiceImpl implements PreDetectionService {
 
 
     private void sendYtxSocket(PreDetectionParam param) {
-        AdPlan plan = iAdPlanService.getById(param.getPlanId());
+        WebServiceManager.addPreDetectionParam(param);
         AdPlanSource planSource = adPlanSourceService.getOne(new LambdaQueryWrapper<AdPlanSource>().eq(AdPlanSource::getPlanId, param.getPlanId()));
         param.setSourceId(planSource.getSourceId());
-        param.setScriptId(plan.getScriptId());
-        param.setErrorSysId(plan.getErrorSysId());
-        param.setCode(String.valueOf(plan.getCode()));
         if (ObjectUtil.isNotNull(planSource)) {
+            //获取源初始化参数
             SourceInitialize sourceParam = pqSourceService.getSourceInitializeParam(planSource.getSourceId());
             if (ObjectUtil.isNotNull(sourceParam)) {
                 //开始组装socket报文请求头
                 socketDevResponseService.initList(param);
                 socketSourceResponseService.initList(param);
-                SocketMsg<String> msg = new SocketMsg<>();
-                msg.setRequestId(SourceOperateCodeEnum.YJC_YTXJY.getValue());
-                msg.setOperateCode(SourceOperateCodeEnum.INIT_GATHER.getValue());
-                msg.setData(JSON.toJSONString(sourceParam));
-
-                NettyClient.socketClient(ip, port, param, JSON.toJSONString(msg), new NettySourceClientHandler(param, sourceResponseService));
+                SocketMsg<String> socketMsg = new SocketMsg<>();
+                socketMsg.setRequestId(SourceOperateCodeEnum.YJC_YTXJY.getValue());
+                socketMsg.setOperateCode(SourceOperateCodeEnum.INIT_GATHER.getValue());
+                socketMsg.setData(JSON.toJSONString(sourceParam));
+                //建立与源控程序的socket连接，
+                NettyClient.socketClient(ip, port, param, JSON.toJSONString(socketMsg), new NettySourceClientHandler(param, sourceResponseService));
             } else {
                 throw new BusinessException(DetectionResponseEnum.SOURCE_INFO_NOT);
             }
@@ -152,13 +161,19 @@ public class PreDetectionServiceImpl implements PreDetectionService {
         }
     }
 
-
-    @Override
-    public boolean startTest(PreDetectionParam param) {
-        socketDevResponseService.initList(param);
-        NettyClient.socketClient(ip, port, param, "start\n", new NettySourceClientHandler(param, sourceResponseService));
-
-        return true;
+    private void sendYtxSocketSimulate(PreDetectionParam param) {
+        SourceInitialize sourceParam = pqSourceService.getSourceInitializeParam(param.getSourceId());
+        param.setSourceId(sourceParam.getSourceId());
+        WebServiceManager.addPreDetectionParam(param);
+        if (ObjectUtil.isNotNull(sourceParam)) {
+            SocketMsg<String> socketMsg = new SocketMsg<>();
+            socketMsg.setRequestId(SourceOperateCodeEnum.YJC_YTXJY.getValue());
+            socketMsg.setOperateCode(SourceOperateCodeEnum.INIT_GATHER.getValue());
+            socketMsg.setData(JSON.toJSONString(sourceParam));
+            NettyClient.socketClient(ip, port, param, JSON.toJSONString(socketMsg), new NettySourceClientHandler(param, sourceResponseService));
+        } else {
+            throw new BusinessException(DetectionResponseEnum.SOURCE_INFO_NOT);
+        }
     }
 
     @Override
@@ -170,6 +185,7 @@ public class PreDetectionServiceImpl implements PreDetectionService {
     @Override
     public boolean restartTemTest(PreDetectionParam param) {
         FormalTestManager.stopFlag = false;
+        socketDevResponseService.initRestart();
         List<SourceIssue> sourceIssueList = SocketManager.getSourceList();
         if (CollUtil.isNotEmpty(sourceIssueList)) {
             SourceIssue sourceIssues = SocketManager.getSourceList().get(0);
@@ -177,56 +193,88 @@ public class PreDetectionServiceImpl implements PreDetectionService {
             xuMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue());
             xuMsg.setData(JSON.toJSONString(sourceIssues));
             xuMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue() + "&&" + sourceIssues.getType());
-            SocketManager.sendMsg(param.getUserPageId() + source, JSON.toJSONString(xuMsg));
+            SocketManager.sendMsg(param.getUserPageId() + DetectionCommunicateConstant.SOURCE, JSON.toJSONString(xuMsg));
         } else {
             //TODO 是否最终检测完成需要推送给用户
-            PqScriptCheckDataParam checkDataParam=new PqScriptCheckDataParam();
+            PqScriptCheckDataParam checkDataParam = new PqScriptCheckDataParam();
             checkDataParam.setScriptId(param.getScriptId());
             checkDataParam.setIsValueTypeName(false);
             List<String> valueType = iPqScriptCheckDataService.getValueType(checkDataParam);
 
-            iPqDevService.updateResult(param.getDevIds(), valueType,param.getCode());
+            iPqDevService.updateResult(param.getDevIds(), valueType, param.getCode(), param.getUserId(), param.getTemperature(), param.getHumidity());
             CnSocketUtil.quitSend(param);
         }
 
         return true;
     }
 
+    @Override
+    public void ytxCheckSimulate(SimulateDetectionParam param) {
+        PreDetectionParam preDetectionParam = new PreDetectionParam();
+        preDetectionParam.setSourceId(param.getSourceId());
+        preDetectionParam.setUserPageId(param.getUserPageId());
+        preDetectionParam.setSendWebMsg(true);
 
-    /**
-     * 对重复发起或者异常发起的检测进行关闭源操作
-     * @param param
-     */
-    private void specialDeal(PreDetectionParam param) {
-        Channel channel = SocketManager.getChannelByUserId(param.getUserPageId() + source);
-        if (Objects.nonNull(channel) && channel.isActive()) {
-            System.out.println("进入关闭源。。//////");
-            CnSocketUtil.quitSendSource(param);
+        DetectionCommunicateUtil.checkCommunicateChannel(preDetectionParam);
+        sendYtxSocketSimulate(preDetectionParam);
+    }
 
-            try {
-                Thread.sleep(2000);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-            SocketManager.removeUser(param.getUserPageId() + source);
-            SocketManager.removeUser(param.getUserPageId() + dev);
-
-            try {
-                Thread.sleep(2000);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
+    @Override
+    public void sendScript(SimulateDetectionParam param) {
+        Channel channel = SocketManager.getChannelByUserId(param.getUserPageId() + DetectionCommunicateConstant.SOURCE);
+        if (Objects.isNull(channel) || !channel.isActive()) {
+            // 进行源通信连接
+            PreDetectionParam preDetectionParam = new PreDetectionParam();
+            preDetectionParam.setSourceId(param.getSourceId());
+            preDetectionParam.setUserPageId(param.getUserPageId());
+            preDetectionParam.setSendWebMsg(false);
+            this.sendYtxSocketSimulate(preDetectionParam);
         }
+        //组装源控制脚本
+        PqScriptIssueParam issueParam = new PqScriptIssueParam();
+        issueParam.setSourceId(param.getSourceId());
+        issueParam.setScriptId(param.getScriptId());
+        issueParam.setType(1);
+        issueParam.setIsPhaseSequence(SourceOperateCodeEnum.SIMULATE_TEST.getValue());
+
+        List<SourceIssue> sourceIssues = pqScriptDtlsService.listSourceIssue(issueParam);
+        sourceIssues = sourceIssues.stream()
+                .filter(s -> s.getIndex().equals(param.getScriptIndex()))
+                .collect(Collectors.toList());
+
+        SourceIssue sourceIssue = sourceIssues.get(0);
+        List<String> comm = sourceIssue.getDevValueTypeList();
+        System.out.println("向装置下发的参数ddd>>>>>>>>" + comm);
+
+        SocketMsg<String> socketMsg = new SocketMsg<>();
+        socketMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue());
+        socketMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue() + stepTag + sourceIssue.getType());
+        socketMsg.setData(JSON.toJSONString(sourceIssues.get(0)));
+        SocketManager.sendMsg(param.getUserPageId() + handlerSourceStr, JSON.toJSONString(socketMsg));
+    }
+
+    @Override
+    public void closeTestSimulate(SimulateDetectionParam param) {
+        Channel channel = SocketManager.getChannelByUserId(param.getUserPageId() + DetectionCommunicateConstant.SOURCE);
+        if (Objects.isNull(channel) || !channel.isActive()) {
+            throw new BusinessException(DetectionResponseEnum.SOURCE_NOT_CONNECT);
+        }
+        SourceInitialize sourceParam = pqSourceService.getSourceInitializeParam(param.getSourceId());
+        PreDetectionParam preDetectionParam = new PreDetectionParam();
+        preDetectionParam.setSourceId(sourceParam.getSourceId());
+        preDetectionParam.setUserPageId(param.getUserPageId());
+        CnSocketUtil.quitSendSource(preDetectionParam);
+        WebServiceManager.removePreDetectionParam();
     }
 
 
     /**
-     * 校验
+     * 校验被检设备中是否存在IP重复的
      */
-    private void commCheck(PreDetectionParam param){
+    private void checkDevIp(PreDetectionParam param) {
         List<PqDev> pqDevList = iPqDevService.listByIds(param.getDevIds());
         List<String> ipList = pqDevList.stream().map(PqDev::getIp).distinct().collect(Collectors.toList());
-        if(ipList.size()!=param.getDevIds().size()){
+        if (ipList.size() != param.getDevIds().size()) {
             throw new BusinessException(DetectionResponseEnum.PLAN_DEV_IP_HAS);
         }
     }

detection/src/main/java/com/njcn/gather/detection/util/business/DetectionCommunicateUtil.java

@@ -0,0 +1,57 @@
+package com.njcn.gather.detection.util.business;
+
+import com.njcn.gather.detection.pojo.constant.DetectionCommunicateConstant;
+import com.njcn.gather.detection.pojo.param.PreDetectionParam;
+import com.njcn.gather.detection.util.socket.CnSocketUtil;
+import com.njcn.gather.detection.util.socket.SocketManager;
+import io.netty.channel.Channel;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Objects;
+
+/**
+ * 检测通讯工具类
+ *
+ * @author hongawen
+ * @version 1.0
+ * @data 2025/4/15 15:24
+ */
+@Slf4j
+public class DetectionCommunicateUtil {
+
+
+    /**
+     * 检测是否存在连接的源、设备通讯的模块通道
+     * 有则强行关闭
+     */
+    public static void checkCommunicateChannel(PreDetectionParam param) {
+        Channel channelSource = SocketManager.getChannelByUserId(param.getUserPageId() + DetectionCommunicateConstant.SOURCE);
+        Channel channelDev = SocketManager.getChannelByUserId(param.getUserPageId() + DetectionCommunicateConstant.DEV);
+
+        if (Objects.nonNull(channelSource) && channelSource.isActive()) {
+            System.out.println("发送关闭源指令。。。。。。。。");
+            CnSocketUtil.quitSendSource(param);
+        }
+        if (Objects.nonNull(channelDev) && channelDev.isActive()) {
+            System.out.println("发送关闭设备通讯指令。。。。。。。。");
+            CnSocketUtil.quitSend(param);
+        }
+
+        try {
+            Thread.sleep(4000);
+        } catch (InterruptedException e) {
+            log.error(e.getMessage());
+        }
+
+        SocketManager.removeUser(param.getUserPageId() + DetectionCommunicateConstant.SOURCE);
+        SocketManager.removeUser(param.getUserPageId() + DetectionCommunicateConstant.DEV);
+
+        try {
+            Thread.sleep(2000);
+        } catch (InterruptedException e) {
+            log.error(e.getMessage());
+        }
+    }
+
+
+}

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

@@ -25,6 +25,7 @@ public class CnSocketUtil {
         socketMsg.setRequestId(SourceOperateCodeEnum.QUITE.getValue());
         socketMsg.setOperateCode(SourceOperateCodeEnum.QUIT_INIT_03.getValue());
         SocketManager.sendMsg(param.getUserPageId() + devTag, JSON.toJSONString(socketMsg));
+        WebServiceManager.removePreDetectionParam();
     }
 
     /**
@@ -38,6 +39,7 @@ public class CnSocketUtil {
         jsonObject.put("sourceId", param.getSourceId());
         socketMsg.setData(jsonObject.toJSONString());
         SocketManager.sendMsg(param.getUserPageId() + sourceTag, JSON.toJSONString(socketMsg));
+        WebServiceManager.removePreDetectionParam();
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package com.njcn.gather.detection.util.socket;
 
+import com.njcn.gather.detection.pojo.po.DevData;
 import com.njcn.gather.device.pojo.vo.PreDetection;
 
 import java.util.ArrayList;
@@ -33,7 +34,8 @@ public class FormalTestManager {
 
 
 
-
+    //用于存储所有测点的实时数据
+    public static List<DevData> realDataXiList = new ArrayList<>();
 
 
     /**
@@ -64,4 +66,10 @@ public class FormalTestManager {
     public static Integer stopTime = 0;
 
 
+    /**
+     * 强行赋值关系
+     */
+    public static Map<String,String> harmonicRelationMap = new HashMap<>();
+
+
 }

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

@@ -3,10 +3,7 @@ package com.njcn.gather.detection.util.socket;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum;
-import com.njcn.gather.detection.pojo.param.PreDetectionParam;
 import com.njcn.gather.detection.pojo.vo.SocketDataMsg;
-import com.njcn.gather.detection.pojo.vo.SocketMsg;
 
 import java.util.Map;
 
@@ -19,9 +16,8 @@ import java.util.Map;
 public class MsgUtil {
 
 
-
-    public static SocketDataMsg socketDataMsg(String textMsg){
-        return JSON.parseObject(textMsg,SocketDataMsg.class);
+    public static SocketDataMsg socketDataMsg(String textMsg) {
+        return JSON.parseObject(textMsg, SocketDataMsg.class);
     }
 
     /**
@@ -46,13 +42,12 @@ public class MsgUtil {
 
 
     /**
-     *
      * @param socketDataMsg
      * @param devMap
-     * @param type 0.装置 1.监测点
+     * @param type          0.装置 1.监测点
      * @return
      */
-    public static String msgToWebData(SocketDataMsg socketDataMsg, Map<String,String> devMap,Integer type){
+    public static String msgToWebData(SocketDataMsg socketDataMsg, Map<String, String> devMap, Integer type) {
         String data = socketDataMsg.getData();
         if (StrUtil.isNotBlank(data)) {
             String[] parts = data.split("_");
@@ -60,17 +55,14 @@ public class MsgUtil {
                 String key = parts[0];
                 String newValue = devMap.get(key);
                 if (newValue != null) {
-                    if(type == 0) {
+                    if (type == 0) {
                         socketDataMsg.setData(newValue);
-                    }else {
-                        socketDataMsg.setData(newValue+"_"+parts[1]+"路");
+                    } else {
+                        socketDataMsg.setData(newValue + "_" + parts[1] + "路");
                     }
                 }
             }
         }
         return JSON.toJSONString(socketDataMsg);
     }
-
-
-
 }

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

@@ -1,7 +1,6 @@
 package com.njcn.gather.detection.util.socket;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.njcn.gather.device.pojo.vo.PreDetection;
 import com.njcn.gather.script.pojo.po.SourceIssue;
 import io.netty.channel.Channel;
 import io.netty.channel.nio.NioEventLoopGroup;
@@ -19,7 +18,14 @@ import java.util.concurrent.CopyOnWriteArrayList;
  */
 public class SocketManager {
 
+    /**
+     * key为userId（xxx_Source、xxx_Dev），value为channel
+     */
     private static final Map<String, Channel> socketSessions = new ConcurrentHashMap<>();
+
+    /**
+     * key为userId（xxx_Source、xxx_Dev），value为group
+     */
     private static final Map<String, NioEventLoopGroup> socketGroup = new ConcurrentHashMap<>();
 
     public static void addUser(String userId, Channel channel) {

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

@@ -0,0 +1,63 @@
+package com.njcn.gather.detection.util.socket;
+
+import com.njcn.gather.detection.pojo.enums.DetectionCodeEnum;
+
+import java.util.Arrays;
+
+/**
+ * @author wr
+ * @description
+ * @date 2025/3/27 14:58
+ */
+public class UnitUtil {
+    public static String unit(String code, Integer fly) {
+        String unit = "";
+        if (Arrays.asList(0, 1).contains(fly)) {
+            if (DetectionCodeEnum.FREQ.getCode().equals(code)) {
+                unit = "Hz";
+            }
+            if (DetectionCodeEnum.VRMS.getCode().equals(code)) {
+                unit = "V";
+            }
+            if (DetectionCodeEnum.IRMS.getCode().equals(code)) {
+                unit = "A";
+            }
+            if (DetectionCodeEnum.V2_50.getCode().equals(code) ||
+                    DetectionCodeEnum.SV_1_49.getCode().equals(code)||
+                    DetectionCodeEnum.V_UNBAN.getCode().equals(code) ||
+                    DetectionCodeEnum.I_UNBAN.getCode().equals(code)
+            ) {
+                unit = "%";
+            }
+            if (DetectionCodeEnum.I2_50.getCode().equals(code) ||
+                    DetectionCodeEnum.SI_1_49.getCode().equals(code)
+            ) {
+                unit = "A";
+            }
+            if (DetectionCodeEnum.P2_50.getCode().equals(code)) {
+                unit = "W";
+            }
+            if (DetectionCodeEnum.P.getCode().equals(code)) {
+                unit = "P";
+            }
+            if (DetectionCodeEnum.MAG.getCode().equals(code)) {
+                unit = "V";
+            }
+            if (DetectionCodeEnum.DUR.getCode().equals(code)) {
+                unit = "s";
+            }
+            if (DetectionCodeEnum.VA.getCode().equals(code) ||
+                    DetectionCodeEnum.IA.getCode().equals(code)
+            ) {
+                unit = "°";
+            }
+            if (DetectionCodeEnum.DELTA_V.getCode().equals(code)
+            ) {
+                unit = "%";
+            }
+        }else{
+            unit = "%";
+        }
+        return unit;
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.njcn.gather.detection.util.socket;
 
 import com.alibaba.fastjson.JSON;
+import com.njcn.gather.detection.pojo.param.PreDetectionParam;
 import com.njcn.gather.detection.pojo.vo.WebSocketVO;
 import io.netty.channel.Channel;
 import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
@@ -24,6 +25,8 @@ public class WebServiceManager {
     //key:页面 value:channel
     private static final Map<String, Channel> userSessions = new ConcurrentHashMap<>();
 
+    // 检测参数。key固定为preDetectionParam, value:检测参数
+    private static final Map<String, PreDetectionParam> preDetectionParamMap = new ConcurrentHashMap<>();
 
     public static void addUser(String userId, Channel channel) {
         userSessions.put(userId, channel);
@@ -35,7 +38,7 @@ public class WebServiceManager {
         Iterator<Map.Entry<String, Channel>> iterator = userSessions.entrySet().iterator();
         while (iterator.hasNext()) {
             Map.Entry<String, Channel> entry = iterator.next();
-            if (entry.getValue().id().equals(channelId)) {
+            if (entry.getValue().id().toString().equals(channelId)) {
                 iterator.remove();
             }
         }
@@ -52,6 +55,9 @@ public class WebServiceManager {
             channel.writeAndFlush(wd);
         }else {
             log.error("{}-websocket推送消息失败;当前用户-{}-客户端已经断开连接", LocalDateTime.now(),userId);
+//            PreDetectionParam param = preDetectionParamMap.get("preDetectionParam");
+//            CnSocketUtil.quitSend(param);
+//            CnSocketUtil.quitSendSource(param);
         }
 
     }
@@ -66,5 +72,15 @@ public class WebServiceManager {
         }
 
     }
+
+    public static void addPreDetectionParam(PreDetectionParam preDetectionParam) {
+        preDetectionParamMap.put("preDetectionParam", preDetectionParam);
+    }
+    public static PreDetectionParam getPreDetectionParam() {
+        return preDetectionParamMap.get("preDetectionParam");
+    }
+    public static void removePreDetectionParam() {
+        preDetectionParamMap.clear();
+    }
 }
     

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

@@ -2,6 +2,7 @@ package com.njcn.gather.detection.util.socket;
 
 import com.njcn.gather.detection.pojo.dto.DevXiNumData;
 import com.njcn.gather.detection.pojo.vo.CoefficientVO;
+import com.njcn.gather.device.pojo.vo.PreDetection;
 import com.njcn.gather.script.pojo.po.SourceIssue;
 
 import java.util.ArrayList;
@@ -27,7 +28,7 @@ public class XiNumberManager {
     public static List<String> devXiList = new ArrayList<>();
 
     /**
-     * 存储所有测点的大电压系数
+     * 最开始存储装置通道原始系数，后续存储大电压计算出来的系数。key为装置ip
      */
     public static Map<String, DevXiNumData> devXiNumDataMap = new ConcurrentHashMap<>();
 
@@ -42,10 +43,19 @@ public class XiNumberManager {
     public static Integer stepNumber = 0;
 
 
+    // 存放大电压、小电压、大电流、小电流的数值
     public static List<CoefficientVO.DevParameter> devParameterList = new ArrayList<>();
 
 
 
 
+    /**
+     * 因为只支持单台装置获取系数，用于记录未获取到系数的装置，获取到一个删除一个
+     */
+    public static List<PreDetection> xiDevList = new ArrayList<>();
+
+
+
+
 
 }

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

@@ -0,0 +1,116 @@
+package com.njcn.gather.detection.util.socket.cilent;
+
+import com.alibaba.fastjson.JSON;
+import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum;
+import com.njcn.gather.detection.pojo.param.PreDetectionParam;
+import com.njcn.gather.detection.pojo.vo.SocketDataMsg;
+import com.njcn.gather.detection.pojo.vo.SocketMsg;
+import com.njcn.gather.detection.util.socket.CnSocketUtil;
+import com.njcn.gather.detection.util.socket.MsgUtil;
+import com.njcn.gather.detection.util.socket.SocketManager;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+
+import java.time.LocalDateTime;
+import java.util.Objects;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @Author: cdf
+ * @CreateTime: 2025-02-11
+ * @Description: 心跳处理类
+ */
+
+
+public class HeartbeatHandler extends SimpleChannelInboundHandler<String> {
+    private final ScheduledExecutorService heartbeatExecutor = Executors.newScheduledThreadPool(1);
+
+    private final String dev = "_Dev";
+    private final String sourceTag = "_Source";
+
+    private final PreDetectionParam param;
+    private final String handlerType;
+
+    // 允许连续未收到心跳响应的最大次数
+    private static final int MAX_HEARTBEAT_MISSES = 3;
+    // 连续未收到心跳响应的次数
+    private int consecutiveHeartbeatMisses = 0;
+
+
+    public HeartbeatHandler(PreDetectionParam param, String type) {
+        this.param = param;
+        this.handlerType = type;
+    }
+
+
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) {
+        // 启动心跳定时任务
+        scheduleHeartbeat(ctx);
+        ctx.fireChannelActive();
+    }
+
+    @Override
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+        heartbeatExecutor.shutdown();
+        super.channelInactive(ctx);
+    }
+
+    // 每30秒发送一次心跳
+    private void scheduleHeartbeat(ChannelHandlerContext ctx) {
+        heartbeatExecutor.scheduleAtFixedRate(() -> {
+            if (ctx.channel().isActive()) {
+                // 发送心跳包
+                SocketMsg<String> msg = new SocketMsg<>();
+                msg.setRequestId("yxt");
+                msg.setOperateCode(SourceOperateCodeEnum.HEARTBEAT.getValue());
+                msg.setData("");
+                ctx.channel().writeAndFlush(JSON.toJSONString(msg) + "\n");
+
+                System.out.println(handlerType + "♥♥♥♥♥♥♥♥♥♥♥♥♥♥♥♥♥♥♥send" + LocalDateTime.now());
+                consecutiveHeartbeatMisses++;
+                if (consecutiveHeartbeatMisses >= MAX_HEARTBEAT_MISSES) {
+                    // 连续三次未收到心跳响应，断开连接
+                    System.out.println(handlerType + "连续三次未收到心跳响应，断开连接");
+                    if (dev.equals(handlerType)) {
+                        //CnSocketUtil.sendToWebSocket(param.getUserPageId(),);
+                        CnSocketUtil.quitSend(param);
+                    } else {
+                        CnSocketUtil.quitSendSource(param);
+                    }
+                    try {
+                        Thread.sleep(3000);
+                    } catch (InterruptedException e) {
+                        Thread.currentThread().interrupt();
+                        System.err.println("线程中断异常: " + e.getMessage());
+                    }
+                    String key = dev.equals(handlerType) ? param.getUserPageId() + dev : param.getUserPageId() + sourceTag;
+                    SocketManager.removeUser(key);
+                    consecutiveHeartbeatMisses = 0; // 重置连续心跳丢失次数
+                }
+            }
+        }, 3, 10, TimeUnit.SECONDS);
+    }
+
+
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, String msg) throws Exception {
+        // 过滤心跳包，避免进入业务逻辑
+        if (isHeartbeatPacket(msg)) {
+            System.out.println(handlerType + "♥♥♥♥♥♥♥♥♥♥♥♥♥♥♥♥♥♥♥response" + LocalDateTime.now());
+            consecutiveHeartbeatMisses = 0;
+            return;
+        }
+        // 处理业务数据
+        ctx.fireChannelRead(msg);
+
+    }
+
+    private boolean isHeartbeatPacket(String msg) {
+        // 判断是否为心跳包
+        SocketDataMsg socketDataMsg = MsgUtil.socketDataMsg(msg);
+        return !Objects.isNull(socketDataMsg.getOperateCode()) && socketDataMsg.getOperateCode().equals(SourceOperateCodeEnum.HEARTBEAT.getValue());
+    }
+}

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

@@ -31,6 +31,9 @@ import java.util.concurrent.TimeUnit;
 @Getter
 public class NettyClient {
 
+    private static final String dev = "_Dev";
+    private static final String source = "_Source";
+
     public static void socketClient(String ip, Integer port, PreDetectionParam param, String msg, SimpleChannelInboundHandler<String> handler) {
         NioEventLoopGroup group = new NioEventLoopGroup();
         Bootstrap bootstrap = new Bootstrap();
@@ -46,18 +49,21 @@ public class NettyClient {
                                         //空闲状态的handler
                                         // 添加LineBasedFrameDecoder来按行分割数据
                                         .addLast(new LineBasedFrameDecoder(10240))
-                                        .addLast(new IdleStateHandler(0, 10, 0, TimeUnit.SECONDS))
+                                        // .addLast(new IdleStateHandler(0, 10, 0, TimeUnit.SECONDS))
                                         .addLast(new StringDecoder(CharsetUtil.UTF_8))
                                         .addLast(new StringEncoder(CharsetUtil.UTF_8))
+                                        .addLast(new HeartbeatHandler(param, source))
                                         .addLast(handler);
                             } else {
                                 ch.pipeline()
-                                        //空闲状态的handler
+
                                         // 添加LineBasedFrameDecoder来按行分割数据
                                         .addLast(new LineBasedFrameDecoder(10240))
-                                         .addLast(new IdleStateHandler(60, 0, 0, TimeUnit.SECONDS))
                                         .addLast(new StringDecoder(CharsetUtil.UTF_8))
                                         .addLast(new StringEncoder(CharsetUtil.UTF_8))
+                                        .addLast(new HeartbeatHandler(param, dev))
+                                        //空闲状态的handler
+                                        .addLast(new IdleStateHandler(60, 0, 0, TimeUnit.SECONDS))
                                         .addLast(handler);
                             }
 
@@ -67,22 +73,28 @@ public class NettyClient {
             channelFuture.addListener((ChannelFutureListener) ch -> {
                 if (!ch.isSuccess()) {
                     System.out.println("链接服务端失败...");
+                    // 连接失败时关闭 group
+                    group.shutdownGracefully();
                 } else {
                     System.out.println("链接服务端成功...");
-                    System.out.println("客户端向服务端发送消息："+msg);
-                    channelFuture.channel().writeAndFlush(msg+"\n");
+                    if (handler instanceof NettySourceClientHandler) {
+                        NioEventLoopGroup groupByUserId = SocketManager.getGroupByUserId(param.getUserPageId() + source);
+                        if(ObjectUtil.isNotNull(groupByUserId)){
+                            groupByUserId.shutdownGracefully().sync();
+                        }
+                        SocketManager.addGroup(param.getUserPageId() + source, group);
+                    } else {
+                        NioEventLoopGroup groupByUserId = SocketManager.getGroupByUserId(param.getUserPageId() + dev);
+                        if(ObjectUtil.isNotNull(groupByUserId)){
+                            groupByUserId.shutdownGracefully().sync();
+                        }
+                        SocketManager.addGroup(param.getUserPageId() + dev, group);
+                    }
+
+                    System.out.println("客户端向服务端发送消息：" + port + msg);
+                    channelFuture.channel().writeAndFlush(msg + "\n");
                 }
             });
-            NioEventLoopGroup groupByUserId = SocketManager.getGroupByUserId(param.getUserPageId() + "_Dev");
-            if(ObjectUtil.isNotNull(groupByUserId)){
-                groupByUserId.shutdownGracefully();
-            }else{
-                if (handler instanceof NettySourceClientHandler) {
-                    SocketManager.addGroup(param.getUserPageId()+"_Source",group);
-                }else{
-                    SocketManager.addGroup(param.getUserPageId()+"_Dev",group);
-                }
-            }
         } catch (Exception e) {
             System.out.println("连接socket服务端发送异常............" + e.getMessage());
             group.shutdownGracefully();
@@ -94,7 +106,7 @@ public class NettyClient {
             socketDataMsg.setRequestId("connect");
             if (handler instanceof NettySourceClientHandler) {
                 socketDataMsg.setOperateCode("Source");
-            }else{
+            } else {
                 CnSocketUtil.quitSendSource(param);
                 socketDataMsg.setOperateCode("Dev");
             }

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

@@ -6,6 +6,8 @@ import com.njcn.gather.detection.handler.SocketDevResponseService;
 import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
 import com.njcn.gather.detection.pojo.vo.DevLineTestResult;
+import com.njcn.gather.detection.pojo.vo.SocketDataMsg;
+import com.njcn.gather.detection.pojo.vo.SocketMsg;
 import com.njcn.gather.detection.pojo.vo.WebSocketVO;
 import com.njcn.gather.detection.util.socket.*;
 import com.njcn.gather.device.pojo.vo.PreDetection;
@@ -22,9 +24,12 @@ import lombok.RequiredArgsConstructor;
 import java.io.IOException;
 import java.net.ConnectException;
 import java.net.ProtocolException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 
 /**
@@ -102,7 +107,8 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
         Boolean fly = false;
         if (evt instanceof IdleStateEvent) {
             if (((IdleStateEvent) evt).state() == IdleState.READER_IDLE) {
-                if(!FormalTestManager.hasStopFlag) {
+                System.out.println(LocalDateTime.now() + "devHandler触发读超时函数**************************************");
+                if (!FormalTestManager.hasStopFlag) {
                     if (CollUtil.isNotEmpty(SocketManager.getSourceList())) {
                         SourceIssue sourceIssue = SocketManager.getSourceList().get(0);
                         if (SocketManager.clockMap.containsKey(sourceIssue.getIndex())) {
@@ -114,7 +120,7 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
                         if (sourceIssue.getType().equals(DicDataEnum.F.getCode())) {
                             //闪变,正常抛一轮最大等待20分钟超时
                             if (SocketManager.clockMap.get(sourceIssue.getIndex()) > 1300) {
-                                fly=true;
+                                fly = true;
                                 System.out.println("超时处理-----》" + sourceIssue.getType() + "已超时----------------关闭");
                                 CnSocketUtil.quitSend(param);
                                 timeoutSend(sourceIssue);
@@ -122,37 +128,36 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
                         } else if (sourceIssue.getType().equals(DicDataEnum.VOLTAGE.getCode()) || sourceIssue.getType().equals(DicDataEnum.HP.getCode())) {
                             //统计数据项，正常抛一轮数据，超时
                             if (SocketManager.clockMap.get(sourceIssue.getIndex()) > 180) {
-                                fly=true;
+                                fly = true;
                                 CnSocketUtil.quitSend(param);
                                 System.out.println("超时处理-----》" + sourceIssue.getType() + "已超时----------------关闭");
                                 timeoutSend(sourceIssue);
                             }
-
                         } else {
                             //实时数据
                             if (SocketManager.clockMap.get(sourceIssue.getIndex()) > 60) {
-                                fly=true;
+                                fly = true;
                                 CnSocketUtil.quitSend(param);
                                 System.out.println("超时处理-----》" + sourceIssue.getType() + "已超时----------------关闭");
                                 timeoutSend(sourceIssue);
                             }
                         }
                     } else {
-                        fly=true;
+                        fly = true;
                         //为空则认为是常规步骤，设定一分钟超时
                         CnSocketUtil.quitSend(param);
+                        CnSocketUtil.sendToWebSocket(param.getUserPageId(), SourceOperateCodeEnum.SOCKET_TIMEOUT.getValue(), SourceOperateCodeEnum.SOCKET_TIMEOUT.getValue(), SourceOperateCodeEnum.SOCKET_TIMEOUT.getMsg(), null);
                     }
-                    if(fly){
+                    if (fly) {
                         socketResponseService.backCheckState(param);
                     }
-                    System.out.println("已经等了一分钟了。。。。。。。。。。。。");
-                }else {
+                } else {
                     //如果是暂停操作后
-                    FormalTestManager.stopTime+=60;
-                    System.out.println("当前进入暂停操作超时函数-----------------"+FormalTestManager.stopTime);
-                    if(FormalTestManager.stopTime > 600){
+                    FormalTestManager.stopTime += 60;
+                    System.out.println("当前进入暂停操作超时函数-----------------" + FormalTestManager.stopTime);
+                    if (FormalTestManager.stopTime > 600) {
                         CnSocketUtil.quitSend(param);
-                        CnSocketUtil.sendToWebSocket(param.getUserPageId(),SourceOperateCodeEnum.FORMAL_REAL.getValue(),SourceOperateCodeEnum.STOP_TIMEOUT.getValue(),SourceOperateCodeEnum.STOP_TIMEOUT.getMsg(),null);
+                        CnSocketUtil.sendToWebSocket(param.getUserPageId(), SourceOperateCodeEnum.FORMAL_REAL.getValue(), SourceOperateCodeEnum.STOP_TIMEOUT.getValue(), SourceOperateCodeEnum.STOP_TIMEOUT.getMsg(), null);
                     }
                 }
             }
@@ -162,8 +167,6 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
     }
 
 
-
-
     @Override
     public void handlerAdded(ChannelHandlerContext ctx) {
         System.out.println("有通道准备接入" + ctx.channel());
@@ -183,7 +186,7 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
         } else if (cause instanceof IOException) {
             // 处理I/O异常，例如读写错误
             System.out.println("IOException caught: There was an I/O error.");
-            CnSocketUtil.sendToWebSocket(param.getUserPageId(),SourceOperateCodeEnum.SERVER_ERROR.getValue(),SourceOperateCodeEnum.SERVER_ERROR.getValue(),SourceOperateCodeEnum.SERVER_ERROR.getMsg(),null );
+            CnSocketUtil.sendToWebSocket(param.getUserPageId(), SourceOperateCodeEnum.DEVICE_ERROR.getValue(), SourceOperateCodeEnum.DEVICE_ERROR.getValue(), SourceOperateCodeEnum.DEVICE_ERROR.getMsg(), null);
 
             // 例如，可以记录更详细的I/O错误信息
         } else if (cause instanceof TimeoutException) {
@@ -197,18 +200,37 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
         } else {
             // 处理其他类型的异常
             System.out.println("Unknown exception caught: " + cause.getMessage());
+            CnSocketUtil.sendToWebSocket(param.getUserPageId(), SourceOperateCodeEnum.DEVICE_ERROR.getValue(), SourceOperateCodeEnum.DEVICE_ERROR.getValue(), SourceOperateCodeEnum.DEVICE_ERROR.getMsg(), null);
             // 可以记录未知异常信息
         }
         CnSocketUtil.quitSend(param);
+        CnSocketUtil.quitSendSource(param);
         socketResponseService.backCheckState(param);
         ctx.close();
     }
 
 
     /**
-     *
+     * 发送业务消息时候开启计时器，
+     * @param requestId
      */
-    private void timeoutSend(SourceIssue sourceIssue){
+/*    private void scheduleTimeoutTask(String requestId) {
+        ScheduledFuture<?> future = scheduler.schedule(() -> {
+            if (requestTimeoutTasks.containsKey(requestId)) {
+                // 处理超时逻辑
+                System.out.println("Business request with ID " + requestId + " timed out.");
+                requestTimeoutTasks.remove(requestId);
+                ctx.close();
+            }
+        }, BUSINESS_REQUEST_TIMEOUT, TimeUnit.MILLISECONDS);
+        requestTimeoutTasks.put(requestId, future);
+    }*/
+
+
+    /**
+     * 超时后的处理
+     */
+    private void timeoutSend(SourceIssue sourceIssue) {
         List<DevLineTestResult> devListRes = new ArrayList<>();
         FormalTestManager.devList.forEach(dev -> {
             DevLineTestResult devLineTestResult = new DevLineTestResult();
@@ -221,7 +243,7 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
             devListRes.add(devLineTestResult);
         });
         WebSocketVO<List<DevLineTestResult>> socketVO = new WebSocketVO<>();
-        socketVO.setRequestId(sourceIssue.getType()+"_End");
+        socketVO.setRequestId(sourceIssue.getType() + "_End");
         socketVO.setOperateCode(sourceIssue.getType());
         socketVO.setData(devListRes);
         WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketVO));

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

@@ -95,11 +95,11 @@ public class NettySourceClientHandler extends SimpleChannelInboundHandler<String
         if (evt instanceof IdleStateEvent) {
             if (((IdleStateEvent) evt).state() == IdleState.WRITER_IDLE) {
                 //发送ping 保持心跳链接
-                SocketMsg msg = new SocketMsg();
+            /*    SocketMsg<String> msg = new SocketMsg<>();
                 msg.setRequestId("yxt");
                 msg.setOperateCode(SourceOperateCodeEnum.HEARTBEAT.getValue());
                 msg.setData("");
-                ctx.writeAndFlush(JSON.toJSONString(msg)+"\n");
+                ctx.writeAndFlush(JSON.toJSONString(msg)+"\n");*/
             }
         } else {
             //防止堆栈溢出
@@ -126,6 +126,7 @@ public class NettySourceClientHandler extends SimpleChannelInboundHandler<String
         } else if (cause instanceof IOException) {
             // 处理I/O异常，例如读写错误
             CnSocketUtil.sendToWebSocket(webUser.getUserPageId(),SourceOperateCodeEnum.SERVER_ERROR.getValue(),SourceOperateCodeEnum.SERVER_ERROR.getValue(),SourceOperateCodeEnum.SERVER_ERROR.getMsg(),null );
+
             // 例如，可以记录更详细的I/O错误信息
         } else if (cause instanceof TimeoutException) {
             // 处理超时异常

detection/src/main/java/com/njcn/gather/detection/util/socket/service/DevNettyServerHandler.java

@@ -0,0 +1,149 @@
+package com.njcn.gather.detection.util.socket.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum;
+import com.njcn.gather.detection.pojo.vo.SocketDataMsg;
+import com.njcn.gather.detection.util.socket.MsgUtil;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+
+import java.util.Objects;
+
+/**
+ * @Description: 客户端业务处理
+ * @Author: wr
+ * @Date: 2024/12/10 14:18
+ */
+
+public class DevNettyServerHandler extends SimpleChannelInboundHandler<String> {
+
+    private final String DEV = "_Dev";
+    private final String source = "_Source";
+
+    private final String stepTag = "&&";
+    private final String stepBegin = "_Start";
+    private final String stepEnd = "_End";
+
+
+    public static final DevNettyServerHandler INSTANCE = new DevNettyServerHandler();
+
+    /**
+     * @Description: 当通道进行连接时推送消息
+     * @Author: wr
+     * @Date: 2024/12/10 14:19
+     */
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) throws Exception {
+        System.out.println("服务端监听到" + ctx.channel().id() + "连接");
+        super.channelActive(ctx);
+    }
+
+    /**
+     * 处理消息信息
+     */
+    @Override
+    public void channelRead0(ChannelHandlerContext ctx, String msg) {
+        System.out.println(ctx.channel().id() + "NettyServer服务端接收到客户端消息：" + msg);
+        Channel channel = ctx.channel();
+        SocketDataMsg socketDataMsg = MsgUtil.socketDataMsg(msg);
+        String[] tem = socketDataMsg.getRequestId().split(stepTag);
+        SourceOperateCodeEnum sourceOperateCodeEnum = SourceOperateCodeEnum.getDictDataEnumByCode(tem[0]);
+
+        switch (Objects.requireNonNull(sourceOperateCodeEnum)) {
+            //设备通讯校验
+            case YJC_SBTXJY:
+                String aa = "{\"requestId\":\"yjc_sbtxjy\",\"operateCode\":\"INIT_GATHER$01\",\"data\":null,\"code\":10201}";
+                String bb = "{\"requestId\":\"yjc_sbtxjy\",\"operateCode\":\"INIT_GATHER$01\",\"data\":null,\"code\":10201}";
+                String cc = "{\"requestId\":\"yjc_sbtxjy\",\"operateCode\":\"INIT_GATHER$01\",\"data\":\"192.168.1.237_1\",\"code\":10200}";
+                channel.writeAndFlush(aa+"\n");
+                channel.writeAndFlush(bb+"\n");
+                channel.writeAndFlush(cc+"\n");
+                break;
+            //协议校验
+            case YJC_XYJY:
+               String dd="{\"requestId\":\"yjc_xyjy\",\"operateCode\":\"INIT_GATHER$02\",\"data\":null,\"code\":10201}";
+               String ee = "{\"requestId\":\"yjc_xyjy\",\"operateCode\":\"INIT_GATHER$02\",\"data\":\"192.168.1.237_1\",\"code\":10200}";
+                channel.writeAndFlush(dd+"\n");
+                channel.writeAndFlush(ee+"\n");
+
+                String ff = "{\"requestId\":\"yjc_xyjy\",\"operateCode\":\"INIT_GATHER$03\",\"data\":null,\"code\":10201}";
+                String gg ="{\"requestId\":\"yjc_xyjy\",\"operateCode\":\"INIT_GATHER$03\",\"data\":\"192.168.1.237_1\",\"code\":10200}";
+                channel.writeAndFlush(ff+"\n");
+                channel.writeAndFlush(gg+"\n");
+                break;
+            //相序校验
+            case YJC_XUJY:
+                String hh = "{\"requestId\":\"YJC_xujy\",\"operateCode\":\"DATA_REQUEST$02\",\"data\":null,\"code\":10201}";
+                String ii = "{\"requestId\":\"YJC_xujy\",\"operateCode\":\"DATA_REQUEST$02\",\"data\":\"{\\\"Time\\\":\\\"2025-02-14T15:09:06.004\\\",\\\"ID\\\":\\\"192.168.1.237_1\\\",\\\"result\\\":false,\\\"SqlData\\\":[{\\\"type\\\":\\\"real\\\",\\\"desc\\\":\\\"VRMS\\\",\\\"list\\\":{\\\"A\\\":\\\"59.969920\\\",\\\"B\\\":\\\"49.963360\\\",\\\"C\\\":\\\"39.971470\\\",\\\"T\\\":null}},{\\\"type\\\":\\\"real\\\",\\\"desc\\\":\\\"VA\\\",\\\"list\\\":{\\\"A\\\":\\\"0.000000\\\",\\\"B\\\":\\\"-119.864000\\\",\\\"C\\\":\\\"120.052000\\\",\\\"T\\\":null}},{\\\"type\\\":\\\"real\\\",\\\"desc\\\":\\\"IRMS\\\",\\\"list\\\":{\\\"A\\\":\\\"1.000979\\\",\\\"B\\\":\\\"1.998939\\\",\\\"C\\\":\\\"3.000807\\\",\\\"T\\\":null}},{\\\"type\\\":\\\"real\\\",\\\"desc\\\":\\\"IA\\\",\\\"list\\\":{\\\"A\\\":\\\"-0.038000\\\",\\\"B\\\":\\\"-120.052000\\\",\\\"C\\\":\\\"119.941000\\\",\\\"T\\\":null}}],\\\"SqlDataHarm\\\":[]}\",\"code\":10200}\n";
+                channel.writeAndFlush(hh+"\n");
+                channel.writeAndFlush(ii+"\n");
+                break;
+            //正式检测
+            case FORMAL_REAL:
+
+                break;
+            //系数校验
+            case Coefficient_Check:
+                String a = "{\"requestId\":\"Coefficient_Check\",\"operateCode\":\"DATA_CHNFACTOR$01\",\"data\":null,\"code\":10201}";
+                String b = "{\"requestId\":\"Coefficient_Check\",\"operateCode\":\"DATA_CHNFACTOR$01\",\"data\":\"[{\\\"uMonitorPoint\\\":0,\\\"f\\\":{\\\"Ua_gain\\\":9999,\\\"Ub_gain\\\":10008,\\\"Uc_gain\\\":10000,\\\"U0_gain\\\":10000,\\\"Ia_gain\\\":9997,\\\"Ib_gain\\\":9997,\\\"Ic_gain\\\":10001,\\\"I0_gain\\\":10000,\\\"Uab_gain\\\":9999,\\\"Ubc_gain\\\":10008,\\\"Uca_gain\\\":10000}}]\",\"code\":10200}";
+                channel.writeAndFlush(a+"\n");
+                channel.writeAndFlush(b+"\n");
+
+                switch (Objects.requireNonNull(sourceOperateCodeEnum)) {
+                    case DATA_CHNFACTOR$01:
+                        break;
+                }
+
+
+                break;
+            //退出关闭
+            case QUITE:
+              //  quitDeal(socketDataMsg, param, msg);
+                break;
+            case YXT:
+                break;
+        }
+
+
+    }
+
+    @Override
+    public void handlerAdded(ChannelHandlerContext ctx) {
+        System.out.println("有新连接加入了++++......" + ctx.channel());
+    }
+
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
+        cause.printStackTrace();
+        ctx.close();
+    }
+
+    @Override
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+        // Client disconnected, close the server-side channel too
+        System.out.println("NettyServer服务端监听到" + ctx.channel().id() + "关闭连接");
+        ctx.close();  // This will trigger the close event on the server side
+        super.channelInactive(ctx);
+    }
+
+    /**
+     * 用户事件的回调方法（自定义事件用于心跳机制）
+     */
+    @Override
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+        //空闲状态的事件
+//        if (evt instanceof IdleStateEvent) {
+//            IdleStateEvent event = (IdleStateEvent) evt;
+//            System.out.println(event.state() + ">>>" + ctx.channel().id());
+//            //已经10秒钟没有读时间了
+//            if (event.state().equals(IdleState.READER_IDLE)){
+//                // 心跳包丢失，10秒没有收到客户端心跳 (断开连接)
+//                ctx.channel().close().sync();
+//                System.out.println("已与 "+ctx.channel().remoteAddress()+" 断开连接");
+//            }
+//        }
+    }
+
+}

detection/src/main/java/com/njcn/gather/detection/util/socket/service/NettyServer.java

@@ -6,6 +6,11 @@ import io.netty.channel.ChannelInitializer;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.ServerSocketChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.handler.codec.LineBasedFrameDecoder;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.util.CharsetUtil;
 
 
 /**
@@ -25,11 +30,17 @@ public class NettyServer {
 
     public static void main(String[] args) {
         NettyServer nettyServer = new NettyServer();
-        nettyServer.run();
+        nettyServer.runSource();
     }
 
 
-    private void run() {
+    public static void sourceMain(String[] args) {
+        NettyServer nettyServer = new NettyServer();
+        nettyServer.runDev();
+    }
+
+
+    private void runSource() {
         NioEventLoopGroup boss = new NioEventLoopGroup(1);
         NioEventLoopGroup work = new NioEventLoopGroup();
         try {
@@ -39,19 +50,30 @@ public class NettyServer {
                     .handler(new ChannelInitializer<ServerSocketChannel>() {
                         @Override
                         protected void initChannel(ServerSocketChannel ch) {
-                            System.out.println("服务正在启动中......");
+                            System.out.println("源通讯服务正在启动中......");
                         }
                     })
                     //业务处理
-                    .childHandler(NettyServerChannelInitializer.INSTANCE);
+                    .childHandler(new ChannelInitializer<NioSocketChannel>() {
+                        @Override
+                        protected void initChannel(NioSocketChannel ch) {
+                                ch.pipeline()
+                                        //空闲状态的handler
+                                        // 添加LineBasedFrameDecoder来按行分割数据
+                                        .addLast(new LineBasedFrameDecoder(10240))
+                                        .addLast(new StringDecoder(CharsetUtil.UTF_8))
+                                        .addLast(new StringEncoder(CharsetUtil.UTF_8))
+                                        .addLast(new DevNettyServerHandler());
+                        }
+                    });
 
             ChannelFuture future = bootstrap.bind(port).sync();
 
             future.addListener(f -> {
                 if (future.isSuccess()) {
-                    System.out.println("服务启动成功");
+                    System.out.println("源通讯服务启动成功");
                 } else {
-                    System.out.println("服务启动失败");
+                    System.out.println("源通讯服务启动失败");
                 }
             });
             future.channel().closeFuture().sync();
@@ -63,4 +85,52 @@ public class NettyServer {
             work.shutdownGracefully();
         }
     }
+
+
+    private void runDev() {
+        NioEventLoopGroup boss = new NioEventLoopGroup(1);
+        NioEventLoopGroup work = new NioEventLoopGroup();
+        try {
+            ServerBootstrap bootstrap = new ServerBootstrap().group(boss, work);
+            bootstrap.channel(NioServerSocketChannel.class)
+                    //这个处理器可以不写
+                    .handler(new ChannelInitializer<ServerSocketChannel>() {
+                        @Override
+                        protected void initChannel(ServerSocketChannel ch) {
+                            System.out.println("设备通讯服务正在启动中......");
+                        }
+                    })
+                    //业务处理
+                    .childHandler(new ChannelInitializer<NioSocketChannel>() {
+                        @Override
+                        protected void initChannel(NioSocketChannel ch) {
+                            ch.pipeline()
+                                    //空闲状态的handler
+                                    // 添加LineBasedFrameDecoder来按行分割数据
+                                    .addLast(new LineBasedFrameDecoder(10240))
+                                    .addLast(new StringDecoder(CharsetUtil.UTF_8))
+                                    .addLast(new StringEncoder(CharsetUtil.UTF_8))
+                                    .addLast(new SourceNettyServerHandler());
+                        }
+                    });
+
+            ChannelFuture future = bootstrap.bind(port).sync();
+
+            future.addListener(f -> {
+                if (future.isSuccess()) {
+                    System.out.println("设备通讯服务启动成功");
+                } else {
+                    System.out.println("设备通讯服务启动失败");
+                }
+            });
+            future.channel().closeFuture().sync();
+
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        } finally {
+            boss.shutdownGracefully();
+            work.shutdownGracefully();
+        }
+    }
+
 }

detection/src/main/java/com/njcn/gather/detection/util/socket/service/NettyServerChannelInitializer.java

@@ -23,7 +23,7 @@ public class NettyServerChannelInitializer extends ChannelInitializer<NioSocketC
 //                .addLast(new IdleStateHandler(10, 0, 0, TimeUnit.SECONDS))
                 .addLast(new StringDecoder(CharsetUtil.UTF_8))
                 .addLast(new StringEncoder(CharsetUtil.UTF_8))
-                .addLast(new NettyServerHandler());
+                .addLast(new DevNettyServerHandler());
     }
 
 

detection/src/main/java/com/njcn/gather/detection/util/socket/service/NettyServerHandler.java

@@ -1,130 +0,0 @@
-package com.njcn.gather.detection.util.socket.service;
-
-import com.alibaba.fastjson.JSONObject;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-
-/**
- * @Description: 客户端业务处理
- * @Author: wr
- * @Date: 2024/12/10 14:18
- */
-
-public class NettyServerHandler extends SimpleChannelInboundHandler<String> {
-
-    public static final NettyServerHandler INSTANCE = new NettyServerHandler();
-
-    /**
-     * @Description: 当通道进行连接时推送消息
-     * @Author: wr
-     * @Date: 2024/12/10 14:19
-     */
-    @Override
-    public void channelActive(ChannelHandlerContext ctx) throws Exception {
-        System.out.println("服务端监听到"+ctx.channel().id()+"连接");
-        super.channelActive(ctx);
-    }
-
-    /**
-     * 处理消息信息
-     */
-    @Override
-    public void channelRead0(ChannelHandlerContext ctx, String msg) {
-        System.out.println(ctx.channel().id()+"NettyServer服务端接收到客户端消息："+msg);
-            Channel channel = ctx.channel();
-          /*
-            if(msg.endsWith("结束")) {
-                channel.writeAndFlush("socket指令结果："+msg);
-                for (int i = 0; i < 5; i++) {
-                    channel.writeAndFlush("socket指令结果："+msg);
-                }
-            }else{
-                channel.writeAndFlush("socket指令结果：成功指令");
-            }*/
-        if(!msg.contains("HeartBeat")){
-            if(msg.contains("start")){
-                JSONObject jsonObject1 = new JSONObject();
-                jsonObject1.put("requestId","yjc_ytxjy");
-                jsonObject1.put("operateCode","INIT_GATHER");
-                jsonObject1.put("code","10201");
-                channel.writeAndFlush(jsonObject1.toJSONString()+'\n');
-
-                try {
-                    Thread.sleep(1000);
-                } catch (InterruptedException e) {
-                    throw new RuntimeException(e);
-                }
-
-                JSONObject jsonObject = new JSONObject();
-                jsonObject.put("requestId","yjc_ytxjy");
-                jsonObject.put("operateCode","INIT_GATHER");
-                jsonObject.put("code","10200");
-                channel.writeAndFlush(jsonObject.toJSONString()+'\n');
-            }else if(msg.contains("YJC_xujy")){
-                JSONObject jsonObject = new JSONObject();
-                jsonObject.put("requestId","YJC_xujy");
-                jsonObject.put("operateCode","OPER_GATHER");
-                jsonObject.put("code","10201");
-                channel.writeAndFlush(jsonObject.toJSONString()+'\n');
-
-                try {
-                    Thread.sleep(1000);
-                } catch (InterruptedException e) {
-                    throw new RuntimeException(e);
-                }
-
-                JSONObject jsonObject1 = new JSONObject();
-                jsonObject1.put("requestId","YJC_xujy");
-                jsonObject1.put("operateCode","OPER_GATHER");
-                jsonObject1.put("code","10200");
-                channel.writeAndFlush(jsonObject1.toJSONString()+'\n');
-
-
-            }
-
-
-        }
-
-
-    }
-
-    @Override
-    public void handlerAdded(ChannelHandlerContext ctx) {
-        System.out.println("有新连接加入了++++......" + ctx.channel());
-    }
-
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
-        cause.printStackTrace();
-        ctx.close();
-    }
-
-    @Override
-    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-        // Client disconnected, close the server-side channel too
-        System.out.println("NettyServer服务端监听到"+ctx.channel().id()+"关闭连接");
-        ctx.close();  // This will trigger the close event on the server side
-        super.channelInactive(ctx);
-    }
-
-    /**
-     * 用户事件的回调方法（自定义事件用于心跳机制）
-     */
-    @Override
-    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
-        //空闲状态的事件
-//        if (evt instanceof IdleStateEvent) {
-//            IdleStateEvent event = (IdleStateEvent) evt;
-//            System.out.println(event.state() + ">>>" + ctx.channel().id());
-//            //已经10秒钟没有读时间了
-//            if (event.state().equals(IdleState.READER_IDLE)){
-//                // 心跳包丢失，10秒没有收到客户端心跳 (断开连接)
-//                ctx.channel().close().sync();
-//                System.out.println("已与 "+ctx.channel().remoteAddress()+" 断开连接");
-//            }
-//        }
-    }
-
-}

detection/src/main/java/com/njcn/gather/detection/util/socket/service/SourceNettyServerHandler.java

@@ -0,0 +1,133 @@
+package com.njcn.gather.detection.util.socket.service;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum;
+import com.njcn.gather.detection.pojo.vo.SocketDataMsg;
+import com.njcn.gather.detection.util.socket.MsgUtil;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+
+/**
+ * @Description: 客户端业务处理
+ * @Author: wr
+ * @Date: 2024/12/10 14:18
+ */
+
+public class SourceNettyServerHandler extends SimpleChannelInboundHandler<String> {
+
+    private final String DEV = "_Dev";
+    private final String source = "_Source";
+
+    private final String stepTag = "&&";
+    private final String stepBegin = "_Start";
+    private final String stepEnd = "_End";
+
+    public static final SourceNettyServerHandler INSTANCE = new SourceNettyServerHandler();
+
+    /**
+     * @Description: 当通道进行连接时推送消息
+     * @Author: wr
+     * @Date: 2024/12/10 14:19
+     */
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) throws Exception {
+        System.out.println("服务端监听到" + ctx.channel().id() + "连接");
+        super.channelActive(ctx);
+    }
+
+    /**
+     * 处理消息信息
+     */
+    @Override
+    public void channelRead0(ChannelHandlerContext ctx, String msg) {
+        System.out.println(ctx.channel().id() + "NettyServer服务端接收到客户端消息：" + msg);
+        Channel channel = ctx.channel();
+        SocketDataMsg socketDataMsg = MsgUtil.socketDataMsg(msg);
+        String[] tem = socketDataMsg.getRequestId().split(stepTag);
+        SourceOperateCodeEnum enumByCode = SourceOperateCodeEnum.getDictDataEnumByCode(tem[0]);
+        JSONObject jsonObject1 = new JSONObject();
+        if (ObjectUtil.isNotNull(enumByCode)) {
+            switch (enumByCode) {
+                //源初始化
+                case YJC_YTXJY:
+              String aa = "{\"requestId\":\"yjc_ytxjy\",\"operateCode\":\"INIT_GATHER\",\"data\":null,\"code\":10201}";
+              String bb = "{\"requestId\":\"yjc_ytxjy\",\"operateCode\":\"INIT_GATHER\",\"data\":null,\"code\":10200}";
+                    channel.writeAndFlush(aa+"/n");
+                    channel.writeAndFlush(bb+"/n");
+                    break;
+                //相序检测
+                case YJC_XUJY:
+                    String hh = "{\"requestId\":\"YJC_xujy\",\"operateCode\":\"OPER_GATHER\",\"data\":null,\"code\":10201}";
+                    String ii = "{\"requestId\":\"YJC_xujy\",\"operateCode\":\"OPER_GATHER\",\"data\":null,\"code\":10200}";
+                    channel.writeAndFlush(hh+"\n");
+                    channel.writeAndFlush(ii+"\n");
+                    break;
+                //正式检测
+                case FORMAL_REAL:
+
+                    break;
+                //系数校验
+                case Coefficient_Check:
+                    String a = "{\"requestId\":\"Coefficient_Check\",\"operateCode\":\"OPER_GATHER\",\"data\":null,\"code\":10201}";
+                    String b= "{\"requestId\":\"Coefficient_Check\",\"operateCode\":\"OPER_GATHER\",\"data\":null,\"code\":10200}";
+
+                    break;
+                case QUITE_SOURCE:
+
+                    break;
+                case YXT:
+                    jsonObject1.put("requestId", "yjc_ytxjy");
+                    jsonObject1.put("operateCode", "INIT_GATHER");
+                    jsonObject1.put("code", "10201");
+                    channel.writeAndFlush(jsonObject1.toJSONString() + '\n');
+
+                    break;
+            }
+        } else {
+            System.out.println("未知异常" + enumByCode);
+        }
+
+
+    }
+
+    @Override
+    public void handlerAdded(ChannelHandlerContext ctx) {
+        System.out.println("有新连接加入了++++......" + ctx.channel());
+    }
+
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
+        cause.printStackTrace();
+        ctx.close();
+    }
+
+    @Override
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+        // Client disconnected, close the server-side channel too
+        System.out.println("NettyServer服务端监听到" + ctx.channel().id() + "关闭连接");
+        ctx.close();  // This will trigger the close event on the server side
+        super.channelInactive(ctx);
+    }
+
+    /**
+     * 用户事件的回调方法（自定义事件用于心跳机制）
+     */
+    @Override
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+        //空闲状态的事件
+//        if (evt instanceof IdleStateEvent) {
+//            IdleStateEvent event = (IdleStateEvent) evt;
+//            System.out.println(event.state() + ">>>" + ctx.channel().id());
+//            //已经10秒钟没有读时间了
+//            if (event.state().equals(IdleState.READER_IDLE)){
+//                // 心跳包丢失，10秒没有收到客户端心跳 (断开连接)
+//                ctx.channel().close().sync();
+//                System.out.println("已与 "+ctx.channel().remoteAddress()+" 断开连接");
+//            }
+//        }
+    }
+
+}

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

@@ -1,19 +1,15 @@
 package com.njcn.gather.detection.util.socket.web;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
 import com.njcn.gather.detection.util.socket.CnSocketUtil;
-import com.njcn.gather.detection.util.socket.SocketManager;
 import com.njcn.gather.detection.util.socket.WebServiceManager;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
 import io.netty.handler.timeout.IdleStateEvent;
-import io.netty.util.CharsetUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
 
 
 /**
@@ -57,11 +53,13 @@ public class WebSocketHandler extends SimpleChannelInboundHandler<TextWebSocketF
         } else if (msg instanceof TextWebSocketFrame) {
             //正常的TEXT消息类型
             TextWebSocketFrame frame = (TextWebSocketFrame) msg;
-            log.info("webSocket服务器收到客户端心跳信息：{}", frame.text());
-            /*if ("alive".equals(frame.text())) {
+            //log.info("webSocket服务器收到客户端心跳信息：{}", frame.text());
+            if ("alive".equals(frame.text())) {
+                //System.out.println("webSocket心跳收到时间………………………………………………………………"+LocalDateTime.now());
+                times = 0;
                 TextWebSocketFrame wd = new TextWebSocketFrame("over");
-                ctx.writeAndFlush(wd);
-            }*/
+                ctx.channel().writeAndFlush(wd);
+            }
         }
         super.channelRead(ctx, msg);
 
@@ -69,6 +67,7 @@ public class WebSocketHandler extends SimpleChannelInboundHandler<TextWebSocketF
 
     /**
      * 根据用户地址获取用户名 ws://127.0.0.1:7777/hello?name=aa
+     *
      * @param url
      * @return
      */
@@ -108,7 +107,7 @@ public class WebSocketHandler extends SimpleChannelInboundHandler<TextWebSocketF
     }
 
     @Override
-    public void handlerRemoved(ChannelHandlerContext ctx){
+    public void handlerRemoved(ChannelHandlerContext ctx) {
         // 假设用户 ID 是从某个地方获取的，这里简单示例为 "userId"
         System.out.println("weoSocket客户端退出: " + ctx.channel().id());
         WebServiceManager.removeChannel(ctx.channel().id().toString());
@@ -120,9 +119,15 @@ public class WebSocketHandler extends SimpleChannelInboundHandler<TextWebSocketF
         System.out.println("weoSocket断线" + ctx.channel().id());
         ctx.close();
 
-        PreDetectionParam param = new PreDetectionParam();
-        param.setUserPageId("cdf");
-        CnSocketUtil.quitSend(param);
+        PreDetectionParam preDetectionParam = WebServiceManager.getPreDetectionParam();
+        if (ObjectUtil.isNotNull(preDetectionParam)) {
+            CnSocketUtil.quitSendSource(preDetectionParam); // 能否在这里关闭源socket连接？
+            CnSocketUtil.quitSend(preDetectionParam);
+        } else {
+            preDetectionParam = new PreDetectionParam();
+            preDetectionParam.setUserPageId("cdf");
+            CnSocketUtil.quitSend(preDetectionParam);
+        }
     }
 
 
@@ -133,11 +138,12 @@ public class WebSocketHandler extends SimpleChannelInboundHandler<TextWebSocketF
         switch (event.state()) {
             case READER_IDLE:
                 eventDesc = "读空闲";
-                System.out.println(ctx.channel().remoteAddress() + "发生超时事件--" + eventDesc);
+                System.out.println("c端心跳检测发生超时事件--" + eventDesc);
                 times++;
                 if (times > 3) {
-                    System.out.println("空闲次数超过三次 关闭连接");
+                    System.out.println("c端心跳检测空闲次数超过三次 关闭连接");
                     ctx.channel().close();
+                    WebServiceManager.removeChannel(ctx.channel().id().toString());
                 }
                 break;
             case WRITER_IDLE:
@@ -153,12 +159,6 @@ public class WebSocketHandler extends SimpleChannelInboundHandler<TextWebSocketF
 
     }
 
-    /**
-     * 推送数据至前台
-     */
-    public void sendMsgToUser(String userId, String msg) {
-        WebServiceManager.sendMsg(userId, msg);
-    }
 
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {

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

@@ -1,12 +1,8 @@
 package com.njcn.gather.device.controller;
 
-import cn.afterturn.easypoi.excel.ExcelImportUtil;
-import cn.afterturn.easypoi.excel.entity.ImportParams;
-import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
@@ -15,37 +11,26 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.LogUtil;
-import com.njcn.gather.device.pojo.enums.DevResponseEnum;
-import com.njcn.gather.device.pojo.enums.PatternEnum;
 import com.njcn.gather.device.pojo.param.PqDevParam;
 import com.njcn.gather.device.pojo.po.PqDev;
-import com.njcn.gather.device.pojo.vo.CNDevExcel;
-import com.njcn.gather.device.pojo.vo.PqDevExcel;
 import com.njcn.gather.device.pojo.vo.PqDevVO;
-import com.njcn.gather.device.pojo.vo.PreDetection;
 import com.njcn.gather.device.service.IPqDevService;
-import com.njcn.gather.system.dictionary.pojo.po.DictData;
-import com.njcn.gather.system.dictionary.service.IDictDataService;
 import com.njcn.gather.type.pojo.po.DevType;
 import com.njcn.gather.type.service.IDevTypeService;
 import com.njcn.web.controller.BaseController;
-import com.njcn.web.utils.ExcelUtil;
 import com.njcn.web.utils.FileUtil;
 import com.njcn.web.utils.HttpResultUtil;
-import com.njcn.web.utils.PoiUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -62,24 +47,8 @@ import java.util.Map;
 public class PqDevController extends BaseController {
 
     private final IPqDevService pqDevService;
-    private final IDictDataService dictDataService;
     private final IDevTypeService devTypeService;
 
-
-    @OperateInfo
-    @GetMapping("/aaa")
-    @ApiOperation("分页查询被检设备")
-    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
-    public HttpResult<List<PreDetection>> aaa() {
-        String methodDescribe = getMethodDescribe("list");
-        List<PreDetection> devInfo = pqDevService.getDevInfo(Arrays.asList("578c142b7e4e4978a35bd6225aa62a23", "393504f55f1f79bce255bfc195cfdb56"));
-        Map<String, List<PreDetection>> map = new HashMap();
-        map.put("deviceList", devInfo);
-        String jsonString = JSON.toJSONString(map);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, devInfo, methodDescribe);
-    }
-
-
     @OperateInfo
     @PostMapping("/list")
     @ApiOperation("分页查询被检设备")
@@ -106,14 +75,14 @@ public class PqDevController extends BaseController {
     @PostMapping("/add")
     @ApiOperation("新增被检设备")
     @ApiImplicitParam(name = "pqDevParam", value = "被检设备", required = true)
-    public HttpResult<Object> add(@RequestBody @Validated PqDevParam pqDevParam) {
+    public HttpResult<Boolean> add(@RequestBody @Validated PqDevParam pqDevParam) {
         String methodDescribe = getMethodDescribe("add");
         LogUtil.njcnDebug(log, "{}，新增数据为：{}", methodDescribe, pqDevParam);
         boolean result = pqDevService.addPqDev(pqDevParam);
         if (result) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
         } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
         }
     }
 
@@ -121,14 +90,14 @@ public class PqDevController extends BaseController {
     @PostMapping("/update")
     @ApiOperation("修改被检设备")
     @ApiImplicitParam(name = "updateParam", value = "被检设备", required = true)
-    public HttpResult<Object> update(@RequestBody @Validated PqDevParam.UpdateParam updateParam) {
+    public HttpResult<Boolean> update(@RequestBody @Validated PqDevParam.UpdateParam updateParam) {
         String methodDescribe = getMethodDescribe("update");
         LogUtil.njcnDebug(log, "{}，修改数据为：{}", methodDescribe, updateParam);
         boolean result = pqDevService.updatePqDev(updateParam);
         if (result) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
         } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
         }
     }
 
@@ -136,35 +105,25 @@ public class PqDevController extends BaseController {
     @PostMapping("/delete")
     @ApiOperation("删除被检设备")
     @ApiImplicitParam(name = "ids", value = "被检设备id", required = true)
-    public HttpResult<Object> delete(@RequestBody @Validated PqDevParam.DeleteParam param) {
+    public HttpResult<Boolean> delete(@RequestBody @Validated PqDevParam.DeleteParam param) {
         String methodDescribe = getMethodDescribe("delete");
         LogUtil.njcnDebug(log, "{}，删除ID数据为：{}", methodDescribe, String.join(StrUtil.COMMA, param.getIds()));
         boolean result = pqDevService.deletePqDev(param);
         if (result) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
         } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
         }
     }
 
-
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DOWNLOAD)
     @PostMapping("/export")
-    @ApiOperation("导出被检设备数据")
+    @ApiOperation("批量导出被检设备")
     @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
-    public void export(@RequestBody @Validated PqDevParam.QueryParam queryParam) {
-        String methodDescribe = getMethodDescribe("export");
+    public void exportDev(@RequestBody @Validated PqDevParam.QueryParam queryParam) {
+        String methodDescribe = getMethodDescribe("exportDev");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
-        DictData dictData = dictDataService.getDictDataById(queryParam.getPattern());
-        if (ObjectUtil.isNotNull(dictData)) {
-            if (PatternEnum.CONTRAST.getValue().equals(dictData.getCode())) {
-                List<PqDevExcel.ContrastExportData> data = pqDevService.getContrastExportData(queryParam);
-                ExcelUtil.exportExcel("被检设备导出数据.xlsx", PqDevExcel.ContrastExportData.class, data);
-            } else {
-                List<PqDevExcel.SimulateOrDigitalExportData> data = pqDevService.getSimulateOrDigitExportData(queryParam);
-                ExcelUtil.exportExcel("被检设备导出数据.xlsx", PqDevExcel.SimulateOrDigitalExportData.class, data);
-            }
-        }
+        pqDevService.exportDev(queryParam);
     }
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DOWNLOAD)
@@ -175,102 +134,20 @@ public class PqDevController extends BaseController {
     }
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD)
-    @PostMapping(value = "/importContrast")
-    @ApiOperation("批量导入被检设备数据")
-    @ApiImplicitParam(name = "file", value = "被检设备数据文件", required = true)
-    public HttpResult<Object> importContrastData(@RequestParam("file") MultipartFile file, HttpServletResponse response) {
-        String methodDescribe = getMethodDescribe("importContrastData");
+    @PostMapping(value = "/import")
+    @ApiOperation("批量导入被检设备")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "被检设备数据文件", required = true),
+            @ApiImplicitParam(name = "patternId", value = "模式id", required = true)
+    })
+    public HttpResult<Object> importDev(@RequestParam("file") MultipartFile file, @RequestParam("patternId") String patternId, HttpServletResponse response) {
+        String methodDescribe = getMethodDescribe("importDev");
         LogUtil.njcnDebug(log, "{}，上传文件为：{}", methodDescribe, file.getOriginalFilename());
-        ImportParams params = new ImportParams();
-        params.setHeadRows(2);
-        params.setNeedVerify(true);
-        params.setStartSheetIndex(0);
-        params.setSheetNum(1);
-        try {
-            ExcelImportResult<PqDevExcel.ContrastImportData> excelImportResult = ExcelImportUtil.importExcelMore(file.getInputStream(), PqDevExcel.ContrastImportData.class, params);
-            //如果存在非法数据，将不合格的数据导出
-            if (excelImportResult.isVerifyFail()) {
-                // 此处前端要做特殊处理，具体可以参考技术监督的数据导入
-                Workbook failWorkbook = excelImportResult.getFailWorkbook();
-                PoiUtil.exportFileByWorkbook(failWorkbook, "非法被检设备数据.xlsx", response);
-            } else {
-                //批量录入数据
-                List<PqDevExcel.ContrastImportData> list = excelImportResult.getList();
-                pqDevService.importContrastData(list);
-            }
-        } catch (Exception e) {
-            throw new BusinessException(DevResponseEnum.IMPORT_DATA_FAIL);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-    }
-
-    /**
-     * 导出灿能二楼设备
-     *
-     * @param queryParam
-     */
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DOWNLOAD)
-    @PostMapping("/exportCNDev")
-    @ApiOperation("导出被检设备数据")
-    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
-    public void exportCNDev(@RequestBody @Validated PqDevParam.QueryParam queryParam) {
-        String methodDescribe = getMethodDescribe("exportCNDev");
-        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
-
-        pqDevService.exportCNDev(queryParam);
-    }
-
-    /**
-     * 下载灿能二楼设备导入文件模板
-     */
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DOWNLOAD)
-    @PostMapping("/downloadCNDevTemplate")
-    @ApiOperation("下载被检设备导入文件模板")
-    public void downloadCNDevTemplate() {
-        pqDevService.downloadCNDevTemplate();
-    }
-
-
-    /**
-     * 导入灿能二楼设备
-     */
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD)
-    @PostMapping(value = "/importCNDev")
-    @ApiOperation("批量导入设备数据")
-    @ApiImplicitParam(name = "file", value = "被检设备数据文件", required = true)
-    public HttpResult<String> importCNDev(@RequestParam("file") MultipartFile file, String patternId, HttpServletResponse response) {
-        String methodDescribe = getMethodDescribe("importCNDev");
-        LogUtil.njcnDebug(log, "{}，上传文件为：{}", methodDescribe, file.getOriginalFilename());
-
         boolean fileType = FileUtil.judgeFileIsExcel(file.getOriginalFilename());
         if (!fileType) {
             throw new BusinessException(CommonResponseEnum.FILE_XLSX_ERROR);
         }
-
-        ImportParams params = new ImportParams();
-        params.setStartSheetIndex(0);
-        params.setSheetNum(1);
-        params.setHeadRows(1);
-        params.setNeedVerify(true);
-
-        List<CNDevExcel> cnDevExcelList;
-        try {
-            ExcelImportResult<CNDevExcel> excelImportResult = ExcelImportUtil.importExcelMore(file.getInputStream(), CNDevExcel.class, params);
-            if (excelImportResult.isVerifyFail()) {
-                // 此处前端要做特殊处理，具体可以参考技术监督的数据导入
-                Workbook failWorkbook = excelImportResult.getFailWorkbook();
-                PoiUtil.exportFileByWorkbook(failWorkbook, "非法被检设备数据.xlsx", response);
-//                throw new BusinessException(DevResponseEnum.IMPORT_DATA_FORMAT_FAIL);
-                return null;
-            } else {
-                cnDevExcelList = excelImportResult.getList();
-            }
-        } catch (Exception e) {
-            throw new BusinessException(DevResponseEnum.IMPORT_DATA_FAIL);
-        }
-        if (ObjectUtil.isNotEmpty(cnDevExcelList)) {
-            pqDevService.importCNDev(cnDevExcelList, patternId);
-        }
+        pqDevService.importDev(file, patternId, null, response);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
@@ -305,34 +182,4 @@ public class PqDevController extends BaseController {
         });
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
-
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
-    @PostMapping("/documented")
-    @ApiOperation("设备归档")
-    @ApiImplicitParam(name = "id", value = "设备id", required = true)
-    public HttpResult<List<PqDev>> documented(@RequestBody List<String> ids) {
-        String methodDescribe = getMethodDescribe("documented");
-        LogUtil.njcnDebug(log, "{}，设备id为：{}", methodDescribe, ids);
-        boolean result = pqDevService.documented(ids);
-        if (result) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-        }
-    }
-
-//    @OperateInfo(operateType = OperateType.UPDATE)
-//    @PostMapping("/bindDev")
-//    @ApiOperation("检测计划绑定设备")
-//    @ApiImplicitParam(name = "bindPlanParam", value = "绑定参数", required = true)
-//    public HttpResult<Object> bindDev(@RequestBody @Validated PqDevParam.BindPlanParam bindPlanParam) {
-//        String methodDescribe = getMethodDescribe("bindDev");
-//        LogUtil.njcnDebug(log, "{}，绑定计划数据为：planId={}, pqDevIds={}", methodDescribe, bindPlanParam.getPlanId(), String.join(StrUtil.COMMA, bindPlanParam.getPqDevIds()));
-//        boolean result = pqDevService.bind(bindPlanParam.getPlanId(), bindPlanParam.getPqDevIds());
-//        if (result) {
-//            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-//        } else {
-//            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-//        }
-//    }
 }

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

@@ -26,8 +26,27 @@ public interface PqDevMapper extends MPJBaseMapper<PqDev> {
 
     void updateReportState(@Param("id")String id);
 
+    /**
+     * 修改检测计划的检测结果
+     *
+     * @param planId
+     * @param checkResult
+     */
     void updatePlanCheckResult(@Param("planId")String planId, @Param("checkResult")Integer checkResult);
 
+    /**
+     * 修改检测计划的检测状态
+     *
+     * @param planId
+     * @param testState
+     */
     void updatePlanTestState(@Param("planId")String planId, @Param("testState")Integer testState);
+
+    /**
+     * 根据计划id获取脚本id
+     *
+     * @param planId
+     */
+    String getScriptIdByPlanId(String planId);
 }
 

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

@@ -66,6 +66,8 @@
         update ad_plan set Test_State = #{testState} where id = #{planId}
     </update>
 
-
+    <select id="getScriptIdByPlanId" resultType="java.lang.String">
+        SELECT Script_Id FROM ad_plan WHERE id = #{planId}
+    </select>
 </mapper>
 

detection/src/main/java/com/njcn/gather/device/pojo/enums/DevReportStateEnum.java

@@ -10,6 +10,7 @@ import lombok.Getter;
 public enum DevReportStateEnum {
     NOT_GENERATED("未生成", 0),
     GENERATED("已生成", 1),
+    GENERATED_UPLOADED("已生成且已上传", 3),
     UNCHECKED("未检", 2);
 
     private final Integer value;

detection/src/main/java/com/njcn/gather/device/pojo/enums/DevResponseEnum.java

@@ -1,37 +0,0 @@
-package com.njcn.gather.device.pojo.enums;
-
-import lombok.Getter;
-
-@Getter
-public enum DevResponseEnum {
-    //NAME_REPEAT("A001001", "名称重复"),
-
-    IMPORT_DATA_FAIL("A001002", "导入数据失败"),
-    SERIES_AND_DEVKEY_NOT_BLANK("A001003", "当为加密设备时，加密设备的序列号和设备密钥不能为空"),
-    PQ_SOURCE_GEN_NAME_ERROR("A001004", "检测源生成名称出错"),
-    ERR_SOURCE_GEN_NAME_ERROR("A001005", "误差体系生成名称出错"),
-    PQ_ERRSYS_GEN_NAME_ERROR("A001005", "误差体系生成名称出错"),
-    PLAN_HAS_DEVICE_BIND("A001006", "检测计划下已绑定设备，请先解绑设备"),
-    PQ_DEV_REPEAT("A001007", "重复的被检设备"),
-    PQ_DEV_HAS_MONITOR("A001008", "该设备下关联有监测点，请先移除监测点"),
-    HAS_NOT_UNCHECKED_DEVICE("A001009", "设备在检测中或已被检测过，请勿解除绑定"),
-    IMPORT_PLAN_DATA_FAIL("A001010", "导入的检测计划为空"),
-    IMPORT_DATA_FORMAT_FAIL("A001011", "导入数据格式错误"),
-    IMPORT_SOURCE_ERROR("A001012","当前模式下一个检测计划只能有一个检测源" ),
-    IMPORT_DATASOURCE_ERROR("A001013","当前模式下一个检测计划只能有一个数据源" ),
-    DEV_UN_CHECKED("A001013","装置还未检测完成！" ),
-    DEV_UN_REPORT("A001013","装置报告未生成！" ),
-    DEVICE_DIS_ERROR("A001014","装置配置异常" ),
-    DEVICE_DELETE("A001015","设备无法删除，已绑定计划！" )
-
-    ;
-
-    private final String message;
-    private final String code;
-
-
-    DevResponseEnum(String code, String message) {
-        this.code = code;
-        this.message = message;
-    }
-}

detection/src/main/java/com/njcn/gather/device/pojo/param/PqDevParam.java

@@ -2,7 +2,7 @@ package com.njcn.gather.device.pojo.param;
 
 import com.njcn.common.pojo.constant.PatternRegex;
 import com.njcn.gather.monitor.pojo.param.PqMonitorParam;
-import com.njcn.gather.device.pojo.constant.DevValidMessage;
+import com.njcn.gather.pojo.constant.DetectionValidMessage;
 import com.njcn.web.pojo.annotation.DateTimeStrValid;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.ApiModelProperty;
@@ -22,61 +22,55 @@ import java.util.List;
 public class PqDevParam {
 
     @ApiModelProperty(value = "名称", required = true)
-    //@NotBlank(message = DevValidMessage.NAME_NOT_BLANK)
-    //@Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = DevValidMessage.NAME_FORMAT_ERROR)
+    @NotBlank(message = DetectionValidMessage.NAME_NOT_BLANK)
     private String name;
 
     @ApiModelProperty(value = "设备模式，字典表（数字、模拟、比对）", required = true)
-    @NotBlank(message = DevValidMessage.PATTERN_NOT_BLANK)
-    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.PATTERN_FORMAT_ERROR)
+    @NotBlank(message = DetectionValidMessage.PATTERN_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.PATTERN_FORMAT_ERROR)
     private String pattern;
 
     @ApiModelProperty(value = "设备类型，字典表", required = true)
-    @NotBlank(message = DevValidMessage.DEV_TYPE_NOT_BLANK)
-    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.DEV_TYPE_FORMAT_ERROR)
+    @NotBlank(message = DetectionValidMessage.DEV_TYPE_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.DEV_TYPE_FORMAT_ERROR)
     private String devType;
 
     @ApiModelProperty(value = "设备厂家，字典表", required = true)
-    //@NotBlank(message = DevValidMessage.MANUFACTURER_NOT_BLANK)
-    //@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.MANUFACTURER_FORMAT_ERROR)
     private String manufacturer;
 
     @ApiModelProperty(value = "出厂日期", required = true)
-    //@NotBlank(message = DevValidMessage.CREATEDATETIME_NOT_NULL)
-    //@DateTimeStrValid(format = "yyyy-MM-dd", message = DevValidMessage.CREATEDATETIME_FORMAT_ERROR)
     private String createDate;
 
-    @ApiModelProperty(value = "设备序列号", required = true)
-    @NotBlank(message = DevValidMessage.FACTORYNO_NOT_BLANK)
+    @ApiModelProperty(value = "装置编号", required = true)
+    @NotBlank(message = DetectionValidMessage.FACTORYNO_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.DEV_CREATE_ID_REGEX, message = DetectionValidMessage.DEV_CREATE_ID_FORMAT_ERROR)
     private String createId;
 
     @ApiModelProperty(value = "固件版本", required = true)
-    //@NotBlank(message = DevValidMessage.FIRMWARE_NOT_BLANK)
     private String hardwareVersion;
 
     @ApiModelProperty(value = "软件版本", required = true)
-    //@NotBlank(message = DevValidMessage.SOFTWARE_NOT_BLANK)
     private String softwareVersion;
 
     @ApiModelProperty(value = "通讯协议", required = true)
-    @NotBlank(message = DevValidMessage.PROTOCOL_NOT_BLANK)
-    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.PROTOCOL_FORMAT_ERROR)
+    @NotBlank(message = DetectionValidMessage.PROTOCOL_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.PROTOCOL_FORMAT_ERROR)
     private String protocol;
 
     @ApiModelProperty(value = "IP地址", required = true)
-    @NotBlank(message = DevValidMessage.IP_NOT_BLANK)
-    @Pattern(regexp = PatternRegex.IP_REGEX, message = DevValidMessage.IP_FORMAT_ERROR)
+    @NotBlank(message = DetectionValidMessage.IP_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.IP_REGEX, message = DetectionValidMessage.IP_FORMAT_ERROR)
     private String ip;
 
     @ApiModelProperty(value = "端口号", required = true)
-    @NotNull(message = DevValidMessage.PORT_NOT_NULL)
-    @Range(min = 1, max = 65535, message = DevValidMessage.PORT_RANGE_ERROR)
+    @NotNull(message = DetectionValidMessage.PORT_NOT_NULL)
+    @Range(min = 1, max = 65535, message = DetectionValidMessage.PORT_RANGE_ERROR)
     private Integer port;
 
     @ApiModelProperty(value = "装置是否为加密版本", required = true)
-    @NotNull(message = DevValidMessage.ENCRYPTION_NOT_NULL)
-    @Min(value = 0, message = DevValidMessage.ENCRYPTION_FLAG_FORMAT_ERROR)
-    @Max(value = 1, message = DevValidMessage.ENCRYPTION_FLAG_FORMAT_ERROR)
+    @NotNull(message = DetectionValidMessage.ENCRYPTION_NOT_NULL)
+    @Min(value = 0, message = DetectionValidMessage.ENCRYPTION_FLAG_FORMAT_ERROR)
+    @Max(value = 1, message = DetectionValidMessage.ENCRYPTION_FLAG_FORMAT_ERROR)
     private Integer encryptionFlag;
 
     @ApiModelProperty("装置识别码（3ds加密）")
@@ -89,7 +83,7 @@ public class PqDevParam {
     private String sampleId;
 
     @ApiModelProperty(value = "送样日期")
-    @DateTimeStrValid(message = DevValidMessage.ARRIVE_DATE_FORMAT_ERROR)
+    @DateTimeStrValid(message = DetectionValidMessage.ARRIVE_DATE_FORMAT_ERROR)
     private String arrivedDate;
 
     @ApiModelProperty("所属地市名称")
@@ -108,14 +102,12 @@ public class PqDevParam {
     private String qrCode;
 
     @ApiModelProperty(value = "检测次数,默认为0", required = true)
-    @NotNull(message = DevValidMessage.RECHECK_NUM_NOT_NULL)
-    @Min(value = 0, message = DevValidMessage.RECHECK_NUM_FORMAT_ERROR)
+    @NotNull(message = DetectionValidMessage.RECHECK_NUM_NOT_NULL)
+    @Min(value = 0, message = DetectionValidMessage.RECHECK_NUM_FORMAT_ERROR)
     private Integer reCheckNum;
 
     @ApiModelProperty("是否支持系数校准")
-    @Min(value = 0, message = DevValidMessage.FACTOR_FLAG_FORMAT_ERROR)
-    @Max(value = 1, message = DevValidMessage.FACTOR_FLAG_FORMAT_ERROR)
-    private String factorFlag;
+    private Integer factorFlag;
 
     @ApiModelProperty("监测点台账列表")
     @Valid
@@ -123,13 +115,13 @@ public class PqDevParam {
 
     @ApiModelProperty("icdId")
     private String icdId;
-//
-//    @ApiModelProperty("power")
-//    private String power;
 
     @ApiModelProperty("预投计划")
     private String preinvestmentPlan;
 
+    @ApiModelProperty("委托方")
+    private String delegate;
+
     /**
      * 更新操作实体
      */
@@ -138,29 +130,9 @@ public class PqDevParam {
     public static class UpdateParam extends PqDevParam {
 
         @ApiModelProperty(value = "id", required = true)
-        @NotBlank(message = DevValidMessage.ID_NOT_BLANK)
-        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.ID_FORMAT_ERROR)
+        @NotBlank(message = DetectionValidMessage.ID_NOT_BLANK)
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.ID_FORMAT_ERROR)
         private String id;
-
-//        @ApiModelProperty("检测状态")
-//        @Min(value = 0, message = DevValidMessage.CHECK_STATE_FORMAT_ERROR)
-//        @Max(value = 3, message = DevValidMessage.CHECK_STATE_FORMAT_ERROR)
-//        private Integer checkState;
-//
-//        @ApiModelProperty("检测结果")
-//        @Min(value = 0, message = DevValidMessage.CHECK_RESULT_FORMAT_ERROR)
-//        @Max(value = 2, message = DevValidMessage.CHECK_RESULT_FORMAT_ERROR)
-//        private Integer checkResult;
-//
-//        @ApiModelProperty("报告状态")
-//        @Min(value = 0, message = DevValidMessage.REPORT_STATE_FORMAT_ERROR)
-//        @Max(value = 2, message = DevValidMessage.REPORT_STATE_FORMAT_ERROR)
-//        private Integer reportState;
-//
-//        @ApiModelProperty("归档状态")
-//        @Min(value = 0, message = DevValidMessage.DOCUMENT_STATE_FORMAT_ERROR)
-//        @Max(value = 1, message = DevValidMessage.DOCUMENT_STATE_FORMAT_ERROR)
-//        private Integer documentState;
     }
 
     /**
@@ -170,7 +142,6 @@ public class PqDevParam {
     @EqualsAndHashCode(callSuper = true)
     public static class QueryParam extends BaseParam {
         @ApiModelProperty("名称")
-//        @Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = DevValidMessage.NAME_FORMAT_ERROR)
         private String name;
 
         @ApiModelProperty(value = "设备模式，字典表（数字、模拟、比对）")
@@ -180,22 +151,21 @@ public class PqDevParam {
         private String manufacturer;
 
         @ApiModelProperty("检测计划ID")
-        //@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.PLAN_ID_FORMAT_ERROR)
         private String planId;
 
         @ApiModelProperty("检测状态列表")
         private List<
-                @Min(value = 0, message = DevValidMessage.CHECK_STATE_FORMAT_ERROR)
-                @Max(value = 3, message = DevValidMessage.CHECK_STATE_FORMAT_ERROR) Integer> checkStateList;
+                @Min(value = 0, message = DetectionValidMessage.CHECK_STATE_FORMAT_ERROR)
+                @Max(value = 3, message = DetectionValidMessage.CHECK_STATE_FORMAT_ERROR) Integer> checkStateList;
 
         @ApiModelProperty("检测结果")
-        @Min(value = 0, message = DevValidMessage.CHECK_RESULT_FORMAT_ERROR)
-        @Max(value = 2, message = DevValidMessage.CHECK_RESULT_FORMAT_ERROR)
+        @Min(value = 0, message = DetectionValidMessage.CHECK_RESULT_FORMAT_ERROR)
+        @Max(value = 2, message = DetectionValidMessage.CHECK_RESULT_FORMAT_ERROR)
         private Integer checkResult;
 
         @ApiModelProperty("报告状态")
-        @Min(value = 0, message = DevValidMessage.REPORT_STATE_FORMAT_ERROR)
-        @Max(value = 2, message = DevValidMessage.REPORT_STATE_FORMAT_ERROR)
+        @Min(value = 0, message = DetectionValidMessage.REPORT_STATE_FORMAT_ERROR)
+        @Max(value = 2, message = DetectionValidMessage.REPORT_STATE_FORMAT_ERROR)
         private Integer reportState;
 
     }
@@ -203,23 +173,23 @@ public class PqDevParam {
     @Data
     public static class DeleteParam {
         @ApiModelProperty(value = "ids")
-        private List<@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.ID_FORMAT_ERROR) String> ids;
+        private List<@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.ID_FORMAT_ERROR) String> ids;
 
         @ApiModelProperty(value = "设备模式，字典表（数字、模拟、比对）", required = true)
-        @NotBlank(message = DevValidMessage.PATTERN_NOT_BLANK)
-        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.PATTERN_FORMAT_ERROR)
+        @NotBlank(message = DetectionValidMessage.PATTERN_NOT_BLANK)
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.PATTERN_FORMAT_ERROR)
         private String pattern;
     }
 
     @Data
     public static class BindPlanParam {
         @ApiModelProperty("检测计划ID")
-        @NotNull(message = DevValidMessage.PLAN_ID_NOT_NULL)
-        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.PLAN_ID_FORMAT_ERROR)
+        @NotNull(message = DetectionValidMessage.PLAN_ID_NOT_NULL)
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.PLAN_ID_FORMAT_ERROR)
         private String planId;
 
         @ApiModelProperty("被检设备ID列表")
-        @NotNull(message = DevValidMessage.PQ_DEV_IDS_NOT_NULL)
+        @NotNull(message = DetectionValidMessage.PQ_DEV_IDS_NOT_NULL)
         private List<String> pqDevIds;
     }
 }

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

@@ -195,8 +195,25 @@ public class PqDev extends BaseEntity implements Serializable {
     @TableField("Check_Time")
     private LocalDateTime checkTime;
 
+    @TableField("Check_By")
+    private String checkBy;
+
     @TableField("Preinvestment_Plan")
     private String preinvestmentPlan;
 
+    /**
+     * 温度
+     */
+    private Float temperature;
+
+    /**
+     * 相对湿度
+     */
+    private Float humidity;
+
+    /**
+     * 委托方
+     */
+    private String delegate;
 }
 

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

@@ -2,9 +2,8 @@ package com.njcn.gather.device.pojo.vo;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.gather.device.pojo.constant.DevValidMessage;
+import com.njcn.gather.pojo.constant.DetectionValidMessage;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.NotBlank;
@@ -19,41 +18,42 @@ import javax.validation.constraints.Pattern;
 public class CNDevExcel {
 
     @Excel(name = "预投计划*", width = 20, orderNum = "1")
+    @NotBlank(message = DetectionValidMessage.PREINVESTMENT_PLAN_NOT_BLANK)
     private String preinvestmentPlan;
 
-    @Excel(name = "设备编号（开始编号-结束编号，编号为数字）*", width = 50, orderNum = "2")
-    @NotBlank(message = DevValidMessage.NAME_NOT_BLANK)
-    @Pattern(regexp = PatternRegex.CN_DEV_NAME_REGEX, message = DevValidMessage.NAME_FORMAT_ERROR)
+    @Excel(name = "装置编号（开始编号-结束编号，编号为数字）*", width = 50, orderNum = "2")
+    @NotBlank(message = DetectionValidMessage.NAME_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.CN_DEV_NAME_REGEX_IMPORT, message = DetectionValidMessage.CN_DEV_NAME_FORMAT_ERROR)
     private String name;
 
     @Excel(name = "设备类型*", width = 20, orderNum = "3")
-    @NotBlank(message = DevValidMessage.DEV_TYPE_NOT_BLANK)
+    @NotBlank(message = DetectionValidMessage.DEV_TYPE_NOT_BLANK)
     private String devType;
 
     @Excel(name = "通讯协议*", width = 15, orderNum = "4")
-    @NotBlank(message = DevValidMessage.PROTOCOL_NOT_BLANK)
+    @NotBlank(message = DetectionValidMessage.PROTOCOL_NOT_BLANK)
     private String protocol;
 
     @Excel(name = "是否加密*", width = 20, replace = {"否_0", "是_1"}, orderNum = "5")
-    @NotNull(message = DevValidMessage.ENCRYPTION_NOT_NULL)
+    @NotNull(message = DetectionValidMessage.ENCRYPTION_NOT_NULL)
     private Integer encryptionFlag;
 
-    @Excel(name = "识别码", width = 30, orderNum = "6")
+    @Excel(name = "识别码（当加密时必填）", width = 30, orderNum = "6")
     private String series;
 
-    @Excel(name = "秘钥", width = 30, orderNum = "7")
+    @Excel(name = "秘钥（当加密时必填）", width = 30, orderNum = "7")
     private String devKey;
 
     @Excel(name = "是否支持系数校准*", width = 25, replace = {"否_0", "是_1"}, orderNum = "8")
     private Integer factorFlag;
 
-    @Excel(name = "IP地址*", width = 20, replace = {"否_0", "是_1"}, orderNum = "9")
-    @NotBlank(message = DevValidMessage.IP_NOT_BLANK)
-    @Pattern(regexp = PatternRegex.IP_REGEX, message = DevValidMessage.IP_FORMAT_ERROR)
+    @Excel(name = "IP地址*", width = 20, orderNum = "9")
+    @NotBlank(message = DetectionValidMessage.IP_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.IP_REGEX, message = DetectionValidMessage.IP_FORMAT_ERROR)
     private String ip;
 
     @Excel(name = "端口号*", width = 15, orderNum = "10")
-    @NotNull(message = DevValidMessage.PORT_NOT_NULL)
-    @Range(min = 1, max = 65535, message = DevValidMessage.PORT_RANGE_ERROR)
+    @NotNull(message = DetectionValidMessage.PORT_NOT_NULL)
+    @Range(min = 1, max = 65535, message = DetectionValidMessage.PORT_RANGE_ERROR)
     private Integer port;
 }

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

@@ -1,211 +0,0 @@
-package com.njcn.gather.device.pojo.vo;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.gather.monitor.pojo.vo.PqMonitorExcel;
-import com.njcn.gather.device.pojo.constant.DevValidMessage;
-import com.njcn.web.pojo.annotation.DateTimeStrValid;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.validator.constraints.Range;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import java.io.Serializable;
-import java.time.LocalDate;
-import java.util.List;
-
-/**
- * @author caozehui
- * @data 2024/11/7
- */
-@Data
-public class PqDevExcel implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @Excel(name = "名称", width = 20, needMerge = true)
-    @NotBlank(message = DevValidMessage.NAME_NOT_BLANK)
-    @Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = DevValidMessage.NAME_FORMAT_ERROR)
-    private String name;
-
-    @Excel(name = "设备类型", width = 20, orderNum = "2", needMerge = true)
-    @NotBlank(message = DevValidMessage.DEV_TYPE_NOT_BLANK)
-    private String devType;
-
-    @Excel(name = "设备通道数", width = 20, orderNum = "3", needMerge = true)
-    @NotNull(message = DevValidMessage.DEV_CHNS_NOT_NULL)
-    private Integer devChns;
-
-    @Excel(name = "额定电压（V）", width = 15, orderNum = "4", needMerge = true)
-    @NotNull(message = DevValidMessage.DEV_VOLT_NOT_NULL)
-    private Float devVolt;
-
-    @Excel(name = "额定电流（A）", width = 15, orderNum = "5", needMerge = true)
-    @NotNull(message = DevValidMessage.DEV_CURR_NOT_NULL)
-    private Float devCurr;
-
-    @Excel(name = "设备厂家", width = 20, orderNum = "6", needMerge = true)
-    @NotBlank(message = DevValidMessage.MANUFACTURER_NOT_BLANK)
-    private String manufacturer;
-
-    @Excel(name = "设备序列号", width = 40, orderNum = "8", needMerge = true)
-    @NotBlank(message = DevValidMessage.FACTORYNO_NOT_BLANK)
-    private String createId;
-
-    @Excel(name = "固件版本", width = 15, orderNum = "9", needMerge = true)
-    @NotBlank(message = DevValidMessage.FIRMWARE_NOT_BLANK)
-    private String hardwareVersion;
-
-    @Excel(name = "软件版本", width = 15, orderNum = "10", needMerge = true)
-    @NotBlank(message = DevValidMessage.SOFTWARE_NOT_BLANK)
-    private String softwareVersion;
-
-    @Excel(name = "通讯协议", width = 15, orderNum = "11", needMerge = true)
-    @NotBlank(message = DevValidMessage.PROTOCOL_NOT_BLANK)
-    private String protocol;
-
-    @Excel(name = "IP地址", width = 20, orderNum = "12", needMerge = true)
-    @NotBlank(message = DevValidMessage.IP_NOT_BLANK)
-    @Pattern(regexp = PatternRegex.IP_REGEX, message = DevValidMessage.IP_FORMAT_ERROR)
-    private String ip;
-
-    @Excel(name = "端口号", orderNum = "13", needMerge = true)
-    @NotNull(message = DevValidMessage.PORT_NOT_NULL)
-    @Range(min = 1, max = 65535, message = DevValidMessage.PORT_RANGE_ERROR)
-    private Integer port;
-
-    @Excel(name = "是否为加密版本（否\\是）", width = 20, replace = {"否_0", "是_1"}, orderNum = "14", needMerge = true)
-    @NotNull(message = DevValidMessage.ENCRYPTION_NOT_NULL)
-    private Integer encryptionFlag;
-
-    @Excel(name = "识别码（当为加密版本时必填）", width = 30, orderNum = "15", needMerge = true)
-    private String series;
-
-    @Excel(name = "秘钥（当为加密版本时必填）", width = 30, orderNum = "16", needMerge = true)
-    private String devKey;
-
-    @Excel(name = "所属地市名称", width = 20, orderNum = "19", needMerge = true)
-    private String cityName;
-
-    @Excel(name = "所属供电公司名称", width = 20, orderNum = "20", needMerge = true)
-    private String gdName;
-
-    @Excel(name = "所属电站名称", width = 20, orderNum = "21", needMerge = true)
-    private String subName;
-
-    @Excel(name = "关键信息二维码", width = 20, orderNum = "30", needMerge = true)
-    private String qrCode;
-
-    @Excel(name = "检测次数", width = 15, orderNum = "31", needMerge = true)
-    @NotNull(message = DevValidMessage.RECHECK_NUM_NOT_NULL)
-    private Integer reCheckNum;
-
-
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class ExportData extends PqDevExcel {
-
-        @Excel(name = "设备模式", width = 20, orderNum = "1", needMerge = true)
-        @NotBlank(message = DevValidMessage.PATTERN_NOT_BLANK)
-        private String pattern;
-
-        @Excel(name = "出厂日期（yyyy-MM-dd）", width = 25, format = "yyyy-MM-dd", orderNum = "7", needMerge = true)
-        @NotNull(message = DevValidMessage.CREATEDATETIME_NOT_NULL)
-        private LocalDate createDate;
-
-        @Excel(name = "是否支持系数校准（否\\是）", width = 15, replace = {"否_0", "是_1"}, orderNum = "22", needMerge = true)
-        private Integer factorFlag;
-
-        @Excel(name = "守时检测结果（不合格\\合格\\/）", replace = {"不合格_0", "合格_1", "/_2"}, width = 15, orderNum = "23", needMerge = true)
-        private Integer timeCheckResult;
-
-        @Excel(name = "系数校准结果（不合格\\合格\\/）", width = 15, replace = {"不合格_0", "合格_1", "/_2"}, orderNum = "24", needMerge = true)
-        private Integer factorCheckResult;
-
-        @Excel(name = "检测状态（未检\\检测中\\检测完成\\归档）", width = 15, replace = {"未检_0", "检测中_1", "检测完成_2", "归档_3"}, orderNum = "25", needMerge = true)
-        private Integer checkState;
-
-        @Excel(name = "检测结果（不符合\\符合\\未检）", width = 15, replace = {"不符合_0", "符合_1", "未检_2"}, orderNum = "26", needMerge = true)
-        private Integer checkResult;
-
-        @Excel(name = "报告状态（未生成\\已生成\\未检）", width = 15, replace = {"未生成_0", "已生成_1", "未检_2"}, orderNum = "27", needMerge = true)
-        private Integer reportState;
-
-//        @Excel(name = "归档状态（未归档\\归档）", width = 15, replace = {"未归档_0", "归档_1"}, orderNum = "28", needMerge = true)
-//        private Integer documentState;
-
-        @Excel(name = "报告路径", width = 20, orderNum = "29", needMerge = true)
-        private String reportPath;
-
-    }
-
-    /**
-     * 模拟式和比对式设备导出数据
-     */
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class SimulateOrDigitalExportData extends ExportData {
-        @Excel(name = "样品编号", width = 40, orderNum = "17", needMerge = true)
-        private String sampleId;
-
-        @Excel(name = "送样日期（yyyy-MM-dd）", width = 25, format = "yyyy-MM-dd", orderNum = "18", needMerge = true)
-        private LocalDate arrivedDate;
-    }
-
-    /**
-     * 比对式设备导出数据
-     */
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class ContrastExportData extends ExportData {
-        @ExcelCollection(name = "检测点台账", orderNum = "32")
-        List<PqMonitorExcel.ExportData> monitorList;
-    }
-
-    /**
-     * 被检设备导入数据
-     */
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class ImportData extends PqDevExcel {
-
-        @Excel(name = "出厂日期（yyyy-MM-dd）", width = 25, format = "yyyy-MM-dd", orderNum = "7", needMerge = true)
-        @NotNull(message = DevValidMessage.CREATEDATETIME_NOT_NULL)
-        @DateTimeStrValid(message = DevValidMessage.CREATEDATETIME_FORMAT_ERROR)
-        private String createDate;
-
-
-        @Excel(name = "是否支持系数校准（否\\是）", width = 15, replace = {"否_0", "是_1"}, orderNum = "22", needMerge = true)
-        @NotBlank(message = DevValidMessage.FACTOR_FLAG_NOT_BLANK)
-        private String factorFlag;
-
-    }
-
-    /**
-     * 模拟式和比对式设备导入数据
-     */
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class SimulateOrDigitalImportData extends ImportData {
-        @Excel(name = "样品编号", width = 40, orderNum = "17", needMerge = true)
-        private String sampleId;
-
-        @Excel(name = "送样日期（yyyy-MM-dd）", width = 25, format = "yyyy-MM-dd", orderNum = "18", needMerge = true)
-        @DateTimeStrValid(message = DevValidMessage.ARRIVE_DATE_FORMAT_ERROR)
-        private String arrivedDate;
-    }
-
-    /**
-     * 对比式设备导入数据
-     */
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class ContrastImportData extends ImportData {
-        @ExcelCollection(name = "检测点台账", orderNum = "32")
-        List<PqMonitorExcel.ImportData> monitorList;
-    }
-
-}

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

@@ -103,7 +103,7 @@ public class PreDetection {
         /**
          * 监测点线路号
          */
-        @JSONField(name = "pt")
+        @JSONField(name = "pt") //todo 是否改为ct
         private Integer ct;
     }
 

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

@@ -0,0 +1,87 @@
+package com.njcn.gather.device.pojo.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.njcn.common.pojo.constant.PatternRegex;
+import com.njcn.gather.pojo.constant.DetectionValidMessage;
+import lombok.Data;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @author caozehui
+ * @data 2024/11/7
+ * @description 省级平台设备Excel导入导出实体类
+ */
+@Data
+public class ProvinceDevExcel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Excel(name = "装置编号*", width = 20)
+    @NotBlank(message = DetectionValidMessage.FACTORYNO_NOT_BLANK)
+    private String createId;
+
+    @Excel(name = "设备名称*", width = 20, orderNum = "2")
+    @NotBlank(message = DetectionValidMessage.NAME_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = DetectionValidMessage.NAME_FORMAT_ERROR)
+    private String name;
+
+    @Excel(name = "设备类型*", width = 20, orderNum = "3")
+    @NotBlank(message = DetectionValidMessage.DEV_TYPE_NOT_BLANK)
+    private String devType;
+
+    @Excel(name = "设备厂家*", width = 20, orderNum = "7")
+    @NotBlank(message = DetectionValidMessage.MANUFACTURER_NOT_BLANK)
+    private String manufacturer;
+
+    @Excel(name = "出厂日期（yyyy-MM-dd）*", width = 25, format = "yyyy-MM-dd", orderNum = "8")
+    @NotNull(message = DetectionValidMessage.CREATEDATETIME_NOT_NULL)
+    private LocalDate createDate;
+
+    @Excel(name = "固件版本", width = 15, orderNum = "9")
+    private String hardwareVersion;
+
+    @Excel(name = "软件版本", width = 15, orderNum = "10")
+    private String softwareVersion;
+
+    @Excel(name = "通讯协议*", width = 15, orderNum = "11")
+    @NotBlank(message = DetectionValidMessage.PROTOCOL_NOT_BLANK)
+    private String protocol;
+
+    @Excel(name = "是否加密*", width = 20, replace = {"否_0", "是_1"}, orderNum = "12")
+    @NotNull(message = DetectionValidMessage.ENCRYPTION_NOT_NULL)
+    private Integer encryptionFlag;
+
+    @Excel(name = "识别码（当加密时必填）", width = 30, orderNum = "13")
+    private String series;
+
+    @Excel(name = "秘钥（当加密时必填）", width = 30, orderNum = "14")
+    private String devKey;
+
+//    @Excel(name = "是否支持系数校准*", width = 25, replace = {"否_0", "是_1"}, orderNum = "15")
+//    private Integer factorFlag;
+
+    @Excel(name = "IP地址*", width = 20, orderNum = "15")
+    @NotBlank(message = DetectionValidMessage.IP_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.IP_REGEX, message = DetectionValidMessage.IP_FORMAT_ERROR)
+    private String ip;
+
+    @Excel(name = "端口号*", width = 15, orderNum = "16")
+    @NotNull(message = DetectionValidMessage.PORT_NOT_NULL)
+    @Range(min = 1, max = 65535, message = DetectionValidMessage.PORT_RANGE_ERROR)
+    private Integer port;
+
+    @Excel(name = "样品编号", width = 20, orderNum = "17")
+    private String sampleId;
+
+    @Excel(name = "送样日期（yyyy-MM-dd）", width = 25, format = "yyyy-MM-dd", orderNum = "18")
+    private LocalDate arrivedDate;
+
+    @Excel(name="委托方", width = 40, orderNum = "19")
+    private String delegate;
+}

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

@@ -2,15 +2,18 @@ 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.gather.device.pojo.enums.TimeCheckResultEnum;
 import com.njcn.gather.device.pojo.param.PqDevParam;
 import com.njcn.gather.device.pojo.po.PqDev;
 import com.njcn.gather.device.pojo.vo.CNDevExcel;
-import com.njcn.gather.device.pojo.vo.PqDevExcel;
 import com.njcn.gather.device.pojo.vo.PqDevVO;
 import com.njcn.gather.device.pojo.vo.PreDetection;
+import com.njcn.gather.device.pojo.vo.ProvinceDevExcel;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -67,7 +70,7 @@ public interface IPqDevService extends IService<PqDev> {
      * @param queryParam 查询参数
      * @return
      */
-    List<PqDevExcel.SimulateOrDigitalExportData> getSimulateOrDigitExportData(PqDevParam.QueryParam queryParam);
+    //List<PqDevExcel.SimulateOrDigitalExportData> getSimulateOrDigitExportData(PqDevParam.QueryParam queryParam);
 
     /**
      * 获取比对式设备导出时所需的数据
@@ -75,26 +78,21 @@ public interface IPqDevService extends IService<PqDev> {
      * @param queryParam 查询参数
      * @return 比对式设备导出时所需的数据
      */
-    List<PqDevExcel.ContrastExportData> getContrastExportData(PqDevParam.QueryParam queryParam);
-
-    /**
-     * 下载模板文件
-     */
-    void downloadTemplate();
+    //List<PqDevExcel.ContrastExportData> getContrastExportData(PqDevParam.QueryParam queryParam);
 
     /**
      * 批量导入被检设备信息
      *
      * @param sgEventExcels 批量导入的数据
      */
-    void importContrastData(List<PqDevExcel.ContrastImportData> sgEventExcels);
+    //void importContrastData(List<PqDevExcel.ContrastImportData> sgEventExcels);
 
     /**
      * 批量导入被检设备信息
      *
      * @param sgEventExcels 批量导入的数据
      */
-    void importSimulateAndDigitalData(List<PqDevExcel.SimulateOrDigitalImportData> sgEventExcels);
+    //void importSimulateAndDigitalData(List<PqDevExcel.SimulateOrDigitalImportData> sgEventExcels);
 
     /**
      * 获取所有未绑定的设备
@@ -121,14 +119,6 @@ public interface IPqDevService extends IService<PqDev> {
      */
     Integer bind(String planId, List<String> devIds);
 
-    /**
-     * 获取饼图数据
-     *
-     * @param planId 检测计划id
-     * @return 饼图数据
-     */
-    //List<List<Map<String, Object>>> getPieData(String planId);
-
     /**
      * 根据id获取被检设备信息
      *
@@ -137,25 +127,6 @@ public interface IPqDevService extends IService<PqDev> {
      */
     PqDevVO getPqDevById(String id);
 
-    /**
-     * 获取所有非未检测状态的设备
-     *
-     * @return 所有非未检测状态的设备列表
-     */
-    List<PqDev> listUnchecked();
-
-    /**
-     * 可视化，各种id回显字典值，解码等操作
-     *
-     * @param sourceList
-     */
-    void visualize(List<PqDev> sourceList);
-
-    /**
-     * 逆向可视化
-     */
-    void reverseVisualize(List<PqDev> sourceList);
-
     /**
      * 获取装置信息和装置下监测点信息
      *
@@ -166,14 +137,6 @@ public interface IPqDevService extends IService<PqDev> {
      */
     List<PreDetection> getDevInfo(@Param("devIds") List<String> devIds);
 
-    /**
-     * 设备归档操作
-     *
-     * @param id 设备id
-     * @return 归档成功返回true，否则返回false
-     */
-    boolean documented(List<String> id);
-
 
     /**
      * 正式监测完成，修改中断状态
@@ -181,31 +144,127 @@ public interface IPqDevService extends IService<PqDev> {
      * @param ids
      * @param valueType
      * @param code
+     * @param userId
+     * @param temperature
+     * @param humidity
      * @return
      */
-    boolean updateResult(List<String> ids, List<String> valueType, String code);
+    boolean updateResult(List<String> ids, List<String> valueType, String code, String userId, Float temperature, Float humidity);
 
     void updatePqDevReportState(String devId, int i);
 
     int countUnReportDev(String planId);
 
     /**
-     * 导出灿能二楼设备数据
+     * 根据计划id列表获取设备列表
+     *
+     * @param planIds
+     * @return
+     */
+    List<PqDev> listByPlanIds(List<String> planIds);
+
+    /**
+     * 导出设备数据
      *
      * @param queryParam
      */
-    void exportCNDev(PqDevParam.QueryParam queryParam);
+    void exportDev(PqDevParam.QueryParam queryParam);
 
     /**
-     * 下载灿能二楼设备模板文件
+     * 下载模板文件
      */
-    void downloadCNDevTemplate();
+    void downloadTemplate();
+
+    /**
+     * 导入设备数据
+     *
+     * @param file      上传的文件
+     * @param patternId 模式Id
+     * @param planId    计划Id
+     * @param response  响应
+     */
+    void importDev(MultipartFile file, String patternId, String planId, HttpServletResponse response);
 
     /**
      * 导入灿能二楼设备数据
      *
-     * @param cnDevExcelList 灿能二楼设备数据列表
-     * @param patternId      模式Id
+     * @param file      上传的文件
+     * @param patternId 模式Id
+     * @param planId    计划Id
+     * @param response  响应
      */
-    void importCNDev(List<CNDevExcel> cnDevExcelList, String patternId);
+    void importCNDev(MultipartFile file, String patternId, String planId, HttpServletResponse response);
+
+    /**
+     * 导入灿能二楼设备数据
+     *
+     * @param cnDevExcelList
+     * @param patternId
+     * @param planId
+     */
+    void importCNDev(List<CNDevExcel> cnDevExcelList, String patternId, String planId);
+
+    /**
+     * 可视化-灿能二楼设备
+     *
+     * @param pqDevs
+     */
+    void visualizeCNDev(List<PqDev> pqDevs);
+
+    /**
+     * 逆向可视化-灿能二楼设备
+     *
+     * @param pqDevs    设备列表
+     * @param patternId 模式Id
+     */
+    void reverseVisualizeCNDev(List<PqDev> pqDevs, String patternId);
+
+    /**
+     * 导入省级平台设备数据
+     *
+     * @param file      上传的文件
+     * @param patternId 模式Id
+     * @param planId    计划Id
+     * @param response  响应
+     */
+    void importProvinceDev(MultipartFile file, String patternId, String planId, HttpServletResponse response);
+
+    /**
+     * 导入省级平台设备数据
+     *
+     * @param proviceDevExcelList
+     * @param patternId
+     * @param planId
+     */
+    void importProvinceDev(List<ProvinceDevExcel> proviceDevExcelList, String patternId, String planId);
+
+    /**
+     * 可视化-省级平台设备
+     *
+     * @param pqDevs
+     */
+    void visualizeProvinceDev(List<PqDev> pqDevs);
+
+    /**
+     * 逆向可视化-省级平台设备
+     *
+     * @param pqDevs    设备列表
+     * @param patternId 模式Id
+     */
+    void reverseVisualizeProvinceDev(List<PqDev> pqDevs, String patternId);
+
+    /**
+     * 获取省级平台设备导出、导出文件模板的下拉列表
+     *
+     * @return
+     */
+    List<PullDown> getProvinceDevPullDownList(int startCol);
+
+    /**
+     * 获取灿能二楼设备导出、导出文件模板的下拉列表
+     *
+     * @param startCol 开始列
+     * @return
+     */
+    List<PullDown> getCNDevPullDownList(int startCol);
 }

detection/src/main/java/com/njcn/gather/err/controller/PqErrSysController.java

@@ -63,14 +63,14 @@ public class PqErrSysController extends BaseController {
     @PostMapping("/add")
     @ApiOperation("新增误差体系")
     @ApiImplicitParam(name = "param", value = "误差体系", required = true)
-    public HttpResult<Object> add(@RequestBody @Validated PqErrSysParam param) {
+    public HttpResult<Boolean> add(@RequestBody @Validated PqErrSysParam param) {
         String methodDescribe = getMethodDescribe("add");
         LogUtil.njcnDebug(log, "{}，新增数据为：{}", methodDescribe, param);
         boolean result = pqErrSysService.addPqErrSys(param);
         if (result) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
         } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
         }
     }
 
@@ -78,14 +78,14 @@ public class PqErrSysController extends BaseController {
     @PostMapping("/update")
     @ApiOperation("修改误差体系")
     @ApiImplicitParam(name = "param", value = "误差体系", required = true)
-    public HttpResult<Object> update(@RequestBody @Validated PqErrSysParam.UpdateParam param) {
+    public HttpResult<Boolean> update(@RequestBody @Validated PqErrSysParam.UpdateParam param) {
         String methodDescribe = getMethodDescribe("update");
         LogUtil.njcnDebug(log, "{}，修改数据为：{}", methodDescribe, param);
         boolean result = pqErrSysService.updatePqErrSys(param);
         if (result) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
         } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
         }
     }
 
@@ -93,14 +93,14 @@ public class PqErrSysController extends BaseController {
     @PostMapping("/delete")
     @ApiOperation("删除误差体系")
     @ApiImplicitParam(name = "ids", value = "误差体系id", required = true)
-    public HttpResult<Object> delete(@RequestBody List<String> ids) {
+    public HttpResult<Boolean> delete(@RequestBody List<String> ids) {
         String methodDescribe = getMethodDescribe("delete");
         LogUtil.njcnDebug(log, "{}，删除ID数据为：{}", methodDescribe, String.join(StrUtil.COMMA, ids));
         boolean result = pqErrSysService.deletePqErrSys(ids);
         if (result) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
         } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
         }
     }
 
@@ -125,19 +125,19 @@ public class PqErrSysController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
-//    @OperateInfo(operateType = OperateType.ADD)
-//    @GetMapping("/copy")
-//    @ApiOperation("复制误差体系")
-//    @ApiImplicitParam(name = "id", value = "误差体系id", required = true)
-//    public HttpResult<Object> copy(@RequestParam("id") String id) {
-//        String methodDescribe = getMethodDescribe("copy");
-//        LogUtil.njcnDebug(log, "{}，复制ID为：{}", methodDescribe, id);
-//        boolean result = pqErrSysService.copyPqErrSys(id);
-//        if (result) {
-//            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-//        } else {
-//            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-//        }
-//    }
+    @OperateInfo(operateType = OperateType.ADD)
+    @GetMapping("/copy")
+    @ApiOperation("复制误差体系")
+    @ApiImplicitParam(name = "id", value = "误差体系id", required = true)
+    public HttpResult<Boolean> copy(@RequestParam("id") String id) {
+        String methodDescribe = getMethodDescribe("copy");
+        LogUtil.njcnDebug(log, "{}，复制ID为：{}", methodDescribe, id);
+        boolean result = pqErrSysService.copyPqErrSys(id);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
+        }
+    }
 }
 

detection/src/main/java/com/njcn/gather/err/mapper/PqErrSysMapper.java

@@ -2,12 +2,20 @@ package com.njcn.gather.err.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
 import com.njcn.gather.err.pojo.po.PqErrSys;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @author caozehui
  * @date 2024-11-27
  */
 public interface PqErrSysMapper extends MPJBaseMapper<PqErrSys> {
-
+    /**
+     * 根据ids获取绑定的计划数量
+     * @param ids
+     * @return
+     */
+    Integer getCountBoundByIds(@Param("ids") List<String> ids);
 }
 

detection/src/main/java/com/njcn/gather/err/mapper/mapping/PqErrSysMapper.xml

@@ -3,5 +3,16 @@
 <mapper namespace="com.njcn.gather.err.mapper.PqErrSysMapper">
 
 
+    <select id="getCountBoundByIds" resultType="java.lang.Integer">
+        SELECT COUNT(*) FROM ad_plan
+        <if test="ids!= null and ids.size() > 0">
+            <where>
+                AND Error_Sys_Id IN
+                <foreach collection="ids" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </where>
+        </if>
+    </select>
 </mapper>
 

detection/src/main/java/com/njcn/gather/err/pojo/param/PqErrSysDtlsParam.java

@@ -1,7 +1,7 @@
 package com.njcn.gather.err.pojo.param;
 
 import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.gather.device.pojo.constant.DevValidMessage;
+import com.njcn.gather.pojo.constant.DetectionValidMessage;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -17,13 +17,13 @@ import javax.validation.constraints.Pattern;
 public class PqErrSysDtlsParam {
 
     @ApiModelProperty(value = "误差项类型", required = true)
-    @NotBlank(message = DevValidMessage.ERR_SYS_DTLS_ERROR_TYPE_NOT_BLANK)
-    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.ERR_SYS_DTLS_ERROR_TYPE_FORMAT_ERROR)
+    @NotBlank(message = DetectionValidMessage.ERR_SYS_DTLS_ERROR_TYPE_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.ERR_SYS_DTLS_ERROR_TYPE_FORMAT_ERROR)
     private String errorType;
 
     @ApiModelProperty(value = "脚本项类型", required = true)
-    @NotBlank(message = DevValidMessage.ERR_SYS_DTLS_SCRIPT_TYPE_NOT_BLANK)
-    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.ERR_SYS_DTLS_SCRIPT_TYPE_FORMAT_ERROR)
+    @NotBlank(message = DetectionValidMessage.ERR_SYS_DTLS_SCRIPT_TYPE_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.ERR_SYS_DTLS_SCRIPT_TYPE_FORMAT_ERROR)
     private String scriptType;
 
     @ApiModelProperty(value = "误差判断起始值", required = true)
@@ -38,24 +38,25 @@ public class PqErrSysDtlsParam {
     @ApiModelProperty(value = "是否包含结束值", required = true)
     private Integer endFlag;
 
-//    @ApiModelProperty(value = "单位", required = true)
-//    @NotBlank(message = DeviceValidMessage.UNIT_NOT_BLANK)
-//    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DeviceValidMessage.UNIT_FORMAT_ERROR)
-//    private String unit;
-
     @ApiModelProperty(value = "判断条件值类型", required = true)
     private Integer conditionType;
 
     @ApiModelProperty(value = "最大值误差", required = true)
-    @NotNull(message = DevValidMessage.MAX_ERROR_VALUE_NOT_NULL)
+    @NotNull(message = DetectionValidMessage.MAX_ERROR_VALUE_NOT_NULL)
     private Double maxErrorValue;
 
     @ApiModelProperty(value = "误差值类型", required = true)
-    @NotNull(message = DevValidMessage.ERROR_VALUE_TYPE_NOT_BLANK)
+    @NotNull(message = DetectionValidMessage.ERROR_VALUE_TYPE_NOT_BLANK)
     private Integer errorValueType;
 
     @ApiModelProperty("排序")
-    @NotNull(message = DevValidMessage.SORT_NOT_NULL)
+    @NotNull(message = DetectionValidMessage.SORT_NOT_NULL)
     private Integer sort;
 
+    @ApiModelProperty("1绝对值、2相对值")
+    private Integer valueType;
+
+    @ApiModelProperty("误差单位")
+    private String errorUnit;
+
 }

detection/src/main/java/com/njcn/gather/err/pojo/param/PqErrSysParam.java

@@ -1,7 +1,7 @@
 package com.njcn.gather.err.pojo.param;
 
 import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.gather.device.pojo.constant.DevValidMessage;
+import com.njcn.gather.pojo.constant.DetectionValidMessage;
 import com.njcn.web.pojo.annotation.DateTimeStrValid;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.ApiModelProperty;
@@ -20,39 +20,38 @@ import java.util.List;
 public class PqErrSysParam {
 
     @ApiModelProperty(value = "参照标准名称", required = true)
-    @NotBlank(message = DevValidMessage.STANDARD_NAME_NOT_BLANK)
-    @Pattern(regexp = PatternRegex.ERR_SYS_NAME, message = DevValidMessage.STANDARD_NAME_FORMAT_ERROR)
+    @NotBlank(message = DetectionValidMessage.STANDARD_NAME_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.ERR_SYS_NAME_REGEX, message = DetectionValidMessage.STANDARD_NAME_FORMAT_ERROR)
     private String standardName;
 
     @ApiModelProperty(value = "标准实施年份", required = true)
-    @NotBlank(message = DevValidMessage.STANDARD_TIME_NOT_BLANK)
-    @DateTimeStrValid(format = "yyyy", message = DevValidMessage.STANDARD_TIME_FORMAT_ERROR)
+    @NotBlank(message = DetectionValidMessage.STANDARD_TIME_NOT_BLANK)
+    @DateTimeStrValid(format = "yyyy", message = DetectionValidMessage.STANDARD_TIME_FORMAT_ERROR)
     private String standardTime;
 
     @ApiModelProperty(value = "设备等级", required = true)
-    @NotBlank(message = DevValidMessage.DEV_LEVEL_NOT_BLANK)
-    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.DEV_LEVEL_FORMAT_ERROR)
+    @NotBlank(message = DetectionValidMessage.DEV_LEVEL_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.DEV_LEVEL_FORMAT_ERROR)
     private String devLevel;
 
     @ApiModelProperty("状态")
-    @NotNull(message = DevValidMessage.ENABLE_NOT_NULL)
-    @Min(value = 0, message = DevValidMessage.ENABLE_FORMAT_ERROR)
-    @Max(value = 1, message = DevValidMessage.ENABLE_FORMAT_ERROR)
+    @NotNull(message = DetectionValidMessage.ENABLE_NOT_NULL)
+    @Min(value = 0, message = DetectionValidMessage.ENABLE_FORMAT_ERROR)
+    @Max(value = 1, message = DetectionValidMessage.ENABLE_FORMAT_ERROR)
     private Integer enable;
 
     @ApiModelProperty(value = "误差详情列表", required = true)
-    @Valid
     private List<PqErrSysDtlsParam> pqErrSysDtlsList;
 
     @Data
     @EqualsAndHashCode(callSuper = false)
     public static class QueryParam extends BaseParam {
         @ApiModelProperty("标准实施年份")
-        @DateTimeStrValid(format = "yyyy", message = DevValidMessage.STANDARD_TIME_FORMAT_ERROR)
+        @DateTimeStrValid(format = "yyyy", message = DetectionValidMessage.STANDARD_TIME_FORMAT_ERROR)
         private String standardTime;
 
         @ApiModelProperty("设备等级")
-        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.DEV_LEVEL_FORMAT_ERROR)
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.DEV_LEVEL_FORMAT_ERROR)
         private String devLevel;
     }
 
@@ -60,14 +59,14 @@ public class PqErrSysParam {
     @EqualsAndHashCode(callSuper = false)
     public static class UpdateParam extends PqErrSysParam {
         @ApiModelProperty("id")
-        @NotBlank(message = DevValidMessage.ID_NOT_BLANK)
-        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.ID_FORMAT_ERROR)
+        @NotBlank(message = DetectionValidMessage.ID_NOT_BLANK)
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.ID_FORMAT_ERROR)
         private String id;
     }
 
     @Data
     @EqualsAndHashCode(callSuper = false)
-    public static class DetectionParam{
+    public static class DetectionParam {
         @ApiModelProperty("所属误差体系ID")
         private String errorSysId;
 
@@ -76,6 +75,14 @@ public class PqErrSysParam {
 
         @ApiModelProperty("所属检测脚本")
         private String scriptId;
+
+
+        @ApiModelProperty("电压")
+        private Double un;
+
+        @ApiModelProperty("电流")
+        private Double in;
+
     }
 
 }

detection/src/main/java/com/njcn/gather/err/pojo/po/PqErrSysDtls.java

@@ -60,10 +60,6 @@ public class PqErrSysDtls implements Serializable {
      */
     private Integer endFlag;
 
-    /**
-     * 单位
-     */
-//    private String unit;
 
     /**
      * 判断条件值类型（包括值类型，绝对值、相对值）
@@ -77,7 +73,7 @@ public class PqErrSysDtls implements Serializable {
     private Double maxErrorValue;
 
     /**
-     * 误差值类型
+     * 误差值类型(绝对值:0:标称值	1:标准值 2:值比较 	相对值:0标称值 1:标准值)
      */
     private Integer errorValueType;
 
@@ -86,5 +82,14 @@ public class PqErrSysDtls implements Serializable {
      */
     private Integer sort;
 
+    /**
+     * 1绝对值、2相对值
+     */
+    private Integer valueType;
+
+    /**
+     * 误差单位
+     */
+    private String errorUnit;
 }
 

detection/src/main/java/com/njcn/gather/err/pojo/vo/ErrDtlsCheckDataVO.java

@@ -38,6 +38,11 @@ public class ErrDtlsCheckDataVO implements Serializable {
      */
     private String phase;
 
+    /**
+     * 默认参与比较值（4.不参与值  5.不参与误差比较）
+     */
+    private Integer isQualified;
+
     /**
      * 误差体系
      */

detection/src/main/java/com/njcn/gather/err/service/IPqErrSysService.java

@@ -78,5 +78,5 @@ public interface IPqErrSysService extends IService<PqErrSys> {
      * @param id 误差体系id
      * @return 成功返回true，失败返回false
      */
-    //boolean copyPqErrSys(String id);
+    boolean copyPqErrSys(String id);
 }

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

@@ -4,12 +4,14 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.njcn.gather.detection.pojo.enums.DetectionCodeEnum;
 import com.njcn.gather.err.mapper.PqErrSysDtlsMapper;
 import com.njcn.gather.err.pojo.param.PqErrSysDtlsParam;
 import com.njcn.gather.err.pojo.param.PqErrSysParam;
 import com.njcn.gather.err.pojo.po.PqErrSysDtls;
 import com.njcn.gather.err.pojo.vo.ErrDtlsCheckDataVO;
 import com.njcn.gather.err.service.IPqErrSysDtlsService;
+import com.njcn.gather.script.mapper.PqScriptMapper;
 import com.njcn.gather.script.pojo.param.PqScriptCheckDataParam;
 import com.njcn.gather.script.pojo.po.PqScriptCheckData;
 import com.njcn.gather.script.service.IPqScriptCheckDataService;
@@ -20,6 +22,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -33,7 +36,7 @@ import java.util.stream.Collectors;
 public class PqErrSysDtlsServiceImpl extends ServiceImpl<PqErrSysDtlsMapper, PqErrSysDtls> implements IPqErrSysDtlsService {
 
     private final IPqScriptCheckDataService pqScriptCheckDataService;
-
+    private final PqScriptMapper pqScriptMapper;
 
     @Override
     public List<PqErrSysDtls> listPqErrSysDtlsByPqErrSysId(String pqErrSysId) {
@@ -41,7 +44,7 @@ public class PqErrSysDtlsServiceImpl extends ServiceImpl<PqErrSysDtlsMapper, PqE
     }
 
     @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
     public boolean addPqErrSysDtls(String pqErrSysId, List<PqErrSysDtlsParam> list) {
         List<PqErrSysDtls> data = new ArrayList<>();
         for (PqErrSysDtlsParam param : list) {
@@ -54,7 +57,7 @@ public class PqErrSysDtlsServiceImpl extends ServiceImpl<PqErrSysDtlsMapper, PqE
     }
 
     @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
     public boolean updatePqErrSysDtls(String pqErrSysId, List<PqErrSysDtlsParam> list) {
         //先按照pqErrSysId全部删除
         this.deletePqErrSysDtlsByPqErrSysId(Collections.singletonList(pqErrSysId));
@@ -64,7 +67,7 @@ public class PqErrSysDtlsServiceImpl extends ServiceImpl<PqErrSysDtlsMapper, PqE
     }
 
     @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
     public boolean deletePqErrSysDtlsByPqErrSysId(List<String> pqErrSysIds) {
         QueryWrapper<PqErrSysDtls> queryWrapper = new QueryWrapper<>();
         queryWrapper.in("pq_err_sys_dtls.Error_Sys_Id", pqErrSysIds);
@@ -91,34 +94,62 @@ public class PqErrSysDtlsServiceImpl extends ServiceImpl<PqErrSysDtlsMapper, PqE
 
     @Override
     public List<ErrDtlsCheckDataVO> listByPqErrSysIdAndTypes(PqErrSysParam.DetectionParam param) {
-        List<ErrDtlsCheckDataVO> info=new ArrayList<>();
+        List<ErrDtlsCheckDataVO> info = new ArrayList<>();
         PqScriptCheckDataParam checkDataParam = new PqScriptCheckDataParam();
         checkDataParam.setScriptId(param.getScriptId());
         checkDataParam.setIndex(param.getIndex());
+        //获取检测脚本中所有装置下发的测试项
         List<PqScriptCheckData> list = pqScriptCheckDataService.listCheckDataCode(checkDataParam);
+        Boolean isValueType = pqScriptMapper.selectScriptIsValueType(param.getScriptId());
 
-        List<String> valueType = list.stream().filter(x->x.getErrorFlag()!=0).map(PqScriptCheckData::getValueType).collect(Collectors.toList());
-        Map<String, List<PqErrSysDtls>> errMap =new HashMap<>(3);
-        if(CollUtil.isNotEmpty(valueType)){
+        Map<String, Integer> valueType = list.stream().collect(Collectors.toMap(PqScriptCheckData::getValueType, PqScriptCheckData::getErrorFlag,
+                (key1, key2) -> key1));
+
+        //获取误差体系
+        Map<String, List<PqErrSysDtls>> errMap = new HashMap<>(3); //key为误差详情的ScriptType，value为List<PqErrSysDtls>
+        if (CollUtil.isNotEmpty(valueType)) {
             List<PqErrSysDtls> errSysDtls = this.list(new MPJLambdaWrapper<PqErrSysDtls>().selectAll(PqErrSysDtls.class)
                     .selectAll(PqErrSysDtls.class)
                     .selectAs(DictTree::getCode, PqErrSysDtls::getScriptCode)
                     .leftJoin(DictTree.class, DictTree::getId, PqErrSysDtls::getScriptType)
                     .eq(PqErrSysDtls::getErrorSysId, param.getErrorSysId())
-                    .in(PqErrSysDtls::getScriptType, valueType)
+                    .in(PqErrSysDtls::getScriptType, valueType.keySet())
             );
-            errMap= errSysDtls.stream().collect(Collectors.groupingBy(PqErrSysDtls::getScriptType));
+            errMap = errSysDtls.stream().collect(Collectors.groupingBy(PqErrSysDtls::getScriptType));
         }
         ErrDtlsCheckDataVO dataVO;
         for (PqScriptCheckData script : list) {
-            dataVO=new ErrDtlsCheckDataVO();
+            dataVO = new ErrDtlsCheckDataVO();
             dataVO.setCheckDataId(script.getScriptId());
             dataVO.setValueTypeCode(script.getValueTypeCode());
             dataVO.setValueType(script.getValueType());
             dataVO.setValue(script.getValue());
             dataVO.setPhase(script.getPhase());
-            if(errMap.containsKey(script.getValueType())){
-                dataVO.setErrSysDtls(errMap.get(script.getValueType()));
+            if (isValueType) {
+                if (DetectionCodeEnum.VRMS.getCode().equals(script.getValueTypeCode())) {
+                    BigDecimal volValue = new BigDecimal(script.getValue());
+                    BigDecimal result = volValue.multiply(new BigDecimal(param.getUn().toString()))
+                            .divide(new BigDecimal(100), 4, BigDecimal.ROUND_HALF_UP);
+                    dataVO.setValue(result.doubleValue());
+                }
+                if (DetectionCodeEnum.IRMS.getCode().equals(script.getValueTypeCode())) {
+                    BigDecimal volValue = new BigDecimal(script.getValue());
+                    BigDecimal result = volValue.multiply(new BigDecimal(param.getIn().toString()))
+                            .divide(new BigDecimal(100), 4, BigDecimal.ROUND_HALF_UP);
+                    dataVO.setValue(result.doubleValue());
+                }
+            }
+            if (valueType.containsKey(script.getValueType())) {
+                //默认值4.无法处理 5.不参与误差比较
+                Integer i = valueType.get(script.getValueType());
+                if (i == 1) { //参与误差比较
+                    dataVO.setIsQualified(4);
+                    if (errMap.containsKey(script.getValueType())) {
+                        dataVO.setErrSysDtls(errMap.get(script.getValueType()));
+                    }
+                } else { //不参与误差比较
+                    dataVO.setIsQualified(5);
+                }
             }
             info.add(dataVO);
         }

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

@@ -1,5 +1,6 @@
 package com.njcn.gather.err.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.text.StrPool;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,13 +9,14 @@ 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.err.mapper.PqErrSysMapper;
+import com.njcn.gather.err.pojo.param.PqErrSysDtlsParam;
 import com.njcn.gather.err.pojo.param.PqErrSysParam;
 import com.njcn.gather.err.pojo.po.PqErrSys;
 import com.njcn.gather.err.pojo.po.PqErrSysDtls;
 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.device.pojo.enums.DevResponseEnum;
+import com.njcn.gather.pojo.enums.DetectionResponseEnum;
 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;
@@ -22,7 +24,6 @@ import com.njcn.gather.system.dictionary.service.IDictTreeService;
 import com.njcn.web.factory.PageFactory;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -64,8 +65,10 @@ public class PqErrSysServiceImpl extends ServiceImpl<PqErrSysMapper, PqErrSys> i
     }
 
     @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
     public boolean addPqErrSys(PqErrSysParam param) {
+        param.setStandardName(param.getStandardName().trim());
+        this.checkRepeat(param, false);
         PqErrSys pqErrSys = new PqErrSys();
         BeanUtils.copyProperties(param, pqErrSys);
         String id = UUID.randomUUID().toString().replaceAll("-", "");
@@ -78,9 +81,12 @@ public class PqErrSysServiceImpl extends ServiceImpl<PqErrSysMapper, PqErrSys> i
         return result1 && result2;
     }
 
+
     @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
     public boolean updatePqErrSys(PqErrSysParam.UpdateParam param) {
+        param.setStandardName(param.getStandardName().trim());
+        this.checkRepeat(param, true);
         PqErrSys pqErrSys = new PqErrSys();
         BeanUtils.copyProperties(param, pqErrSys);
         pqErrSys.setName(generateErrSysName(param));
@@ -91,8 +97,12 @@ public class PqErrSysServiceImpl extends ServiceImpl<PqErrSysMapper, PqErrSys> i
     }
 
     @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
     public boolean deletePqErrSys(List<String> ids) {
+        Integer count = this.baseMapper.getCountBoundByIds(ids);
+        if (count > 0) {
+            throw new BusinessException(DetectionResponseEnum.ERR_SYS_BOUND_NOT_DELETE);
+        }
         pqErrSysDtlsService.deletePqErrSysDtlsByPqErrSysId(ids);
         this.lambdaUpdate().in(PqErrSys::getId, ids).set(PqErrSys::getState, DataStateEnum.DELETED.getCode()).update();
         return true;
@@ -116,9 +126,10 @@ public class PqErrSysServiceImpl extends ServiceImpl<PqErrSysMapper, PqErrSys> i
     }
 
     @Override
-    @Transactional(rollbackFor = {Exception.class})
     public List<Map<String, Object>> listAllPqErrSys() {
-        List<PqErrSys> pqErrSysList = this.lambdaQuery().eq(PqErrSys::getState, DataStateEnum.ENABLE.getCode()).list();
+        List<PqErrSys> pqErrSysList = this.lambdaQuery()
+                .eq(PqErrSys::getEnable,DataStateEnum.ENABLE.getCode())
+                .eq(PqErrSys::getState, DataStateEnum.ENABLE.getCode()).list();
         List<Map<String, Object>> result = pqErrSysList.stream().map(pqErrSys -> {
             Map<String, Object> map = new HashMap<>();
             map.put("id", pqErrSys.getId());
@@ -182,29 +193,41 @@ public class PqErrSysServiceImpl extends ServiceImpl<PqErrSysMapper, PqErrSys> i
         if (ObjectUtil.isNotNull(devLevelDictData)) {
             return param.getStandardName() + "-" + param.getStandardTime() + "-" + devLevelDictData.getName();
         }
-        throw new BusinessException(DevResponseEnum.PQ_ERRSYS_GEN_NAME_ERROR);
+        throw new BusinessException(DetectionResponseEnum.PQ_ERRSYS_GEN_NAME_ERROR);
     }
 
-//    @Override
-//    public boolean copyPqErrSys(String id) {
-//        PqErrSys pqErrSys = this.getPqErrSysById(id);
-//        pqErrSys.setId(UUID.randomUUID().toString().replaceAll("-", ""));
-//        pqErrSys.setName(pqErrSys.getName() + "_副本");
-//        pqErrSys.setStandardTime(LocalDate.of(pqErrSys.getStandardTime().getYear(), 1, 1));
-//        pqErrSys.getPqErrSysDtlsList().forEach(pqErrSysDtls -> pqErrSysDtls.setId(UUID.randomUUID().toString().replaceAll("-", "")));
-//        return this.save(pqErrSys);
-//    }
+    @Override
+    public boolean copyPqErrSys(String id) {
+        PqErrSys pqErrSys = this.getPqErrSysById(id);
+        pqErrSys.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+        pqErrSys.setName(pqErrSys.getName() + "_copy");
+        pqErrSys.setStandardName(pqErrSys.getStandardName() + "_copy");
+        pqErrSys.setStandardTime(LocalDate.of(pqErrSys.getStandardTime().getYear(), 1, 1));
+        List<PqErrSysDtlsParam> pqErrSysDtlsParams = BeanUtil.copyToList(pqErrSys.getPqErrSysDtlsList(), PqErrSysDtlsParam.class);
+        pqErrSysDtlsService.addPqErrSysDtls(pqErrSys.getId(), pqErrSysDtlsParams);
+        return this.save(pqErrSys);
+    }
 
     /**
-     * 生成误差体系名称（标准号+年份+设备等级）
+     * 检查重复
      *
-     * @return 检测源名称
+     * @param param 检测参数
+     * @param isExcludeSelf 是否排除自己
      */
-    private String generatePqSourceName(PqErrSysParam param) {
-        DictData devLevel = dictDataService.getDictDataById(param.getDevLevel());
-        if (ObjectUtils.allNotNull(param.getStandardName(), param.getStandardTime(), devLevel)) {
-            return param.getStandardName() + "-" + param.getStandardTime() + "-" + devLevel.getName();
+    private void checkRepeat(PqErrSysParam param, boolean isExcludeSelf) {
+        QueryWrapper<PqErrSys> wrapper = new QueryWrapper<>();
+        wrapper.eq("Standard_Name", param.getStandardName())
+                .eq("Standard_Time",param.getStandardTime()+"-01-01")
+                .eq("Dev_Level",param.getDevLevel())
+                .eq("state", DataStateEnum.ENABLE.getCode());
+        if (isExcludeSelf) {
+            if(param instanceof PqErrSysParam.UpdateParam){
+                wrapper.ne("Id", ((PqErrSysParam.UpdateParam) param).getId());
+            }
+        }
+        int count = this.count(wrapper);
+        if (count > 0) {
+            throw new BusinessException(DetectionResponseEnum.ERR_SYS_REPEAT);
         }
-        throw new BusinessException(DevResponseEnum.ERR_SOURCE_GEN_NAME_ERROR);
     }
 }

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

@@ -11,8 +11,6 @@ import com.njcn.common.utils.LogUtil;
 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.type.pojo.param.DevTypeParam;
-import com.njcn.gather.type.pojo.po.DevType;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.utils.HttpResultUtil;
 import io.swagger.annotations.Api;
@@ -27,16 +25,15 @@ import java.util.List;
 
 
 /**
- *
  * @author caozehui
  * @date 2025-02-10
  */
 @Slf4j
-@Api(tags="icd管理")
+@Api(tags = "icd管理")
 @RestController
 @RequestMapping("/icd")
 @RequiredArgsConstructor
-public class PqIcdPathController extends BaseController{
+public class PqIcdPathController extends BaseController {
     private final IPqIcdPathService pqIcdPathService;
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -63,15 +60,15 @@ public class PqIcdPathController extends BaseController{
     @PostMapping("/add")
     @ApiOperation("新增icd")
     @ApiImplicitParam(name = "param", value = "icd新增参数", required = true)
-    public HttpResult<String> add(@RequestBody @Validated PqIcdPathParam param) {
+    public HttpResult<Boolean> add(@RequestBody @Validated PqIcdPathParam param) {
         String methodDescribe = getMethodDescribe("add");
         LogUtil.njcnDebug(log, "{}，新增数据为：{}", methodDescribe, param);
 
         boolean result = pqIcdPathService.addIcd(param);
         if (result) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
         } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
         }
     }
 
@@ -79,15 +76,15 @@ public class PqIcdPathController extends BaseController{
     @PostMapping("/update")
     @ApiOperation("修改icd")
     @ApiImplicitParam(name = "param", value = "icd修改参数", required = true)
-    public HttpResult<String> update(@RequestBody @Validated PqIcdPathParam.UpdateParam param) {
+    public HttpResult<Boolean> update(@RequestBody @Validated PqIcdPathParam.UpdateParam param) {
         String methodDescribe = getMethodDescribe("update");
         LogUtil.njcnDebug(log, "{}，修改数据为：{}", methodDescribe, param);
 
         boolean result = pqIcdPathService.updateIcd(param);
         if (result) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
         } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
         }
     }
 
@@ -95,14 +92,14 @@ public class PqIcdPathController extends BaseController{
     @PostMapping("/delete")
     @ApiOperation("删除icd")
     @ApiImplicitParam(name = "ids", value = "icd的id列表", required = true)
-    public HttpResult<String> delete(@RequestBody List<String> ids) {
+    public HttpResult<Boolean> delete(@RequestBody List<String> ids) {
         String methodDescribe = getMethodDescribe("delete");
         LogUtil.njcnDebug(log, "{}，删除数据为：{}", methodDescribe, String.join(StrUtil.COMMA, ids));
         boolean result = pqIcdPathService.deleteIcd(ids);
         if (result) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
         } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
         }
     }
 

detection/src/main/java/com/njcn/gather/icd/mapper/PqIcdPathMapper.java

@@ -2,6 +2,7 @@ package com.njcn.gather.icd.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
 import com.njcn.gather.icd.pojo.po.PqIcdPath;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @author caozehui
@@ -9,5 +10,12 @@ import com.njcn.gather.icd.pojo.po.PqIcdPath;
  */
 public interface PqIcdPathMapper extends MPJBaseMapper<PqIcdPath> {
 
+    /**
+     * 根据设备类型id获取Icd
+     *
+     * @param devTypeId
+     * @return
+     */
+    PqIcdPath selectIcdByDevType(@Param("devTypeId") String devTypeId);
 }
 

detection/src/main/java/com/njcn/gather/icd/mapper/mapping/PqIcdPathMapper.xml

@@ -3,5 +3,11 @@
 <mapper namespace="com.njcn.gather.icd.mapper.PqIcdPathMapper">
 
 
+    <select id="selectIcdByDevType" resultType="com.njcn.gather.icd.pojo.po.PqIcdPath">
+        select *
+        from pq_icd_path path
+                 inner join pq_dev_type type on path.id = type.icd
+        where type.id = #{devTypeId}
+    </select>
 </mapper>
 

detection/src/main/java/com/njcn/gather/icd/pojo/constant/PqIcdPathValidMessage.java

@@ -1,12 +0,0 @@
-package com.njcn.gather.icd.pojo.constant;
-
-/**
- * @author caozehui
- * @data 2025-02-11
- */
-public interface PqIcdPathValidMessage {
-    String ID_NOT_BLANK = "id不能为空，请检查id参数";
-    String ID_FORMAT_ERROR = "id格式错误，请检查id参数";
-    String NAME_NOT_BLANK = "名称不能为空";
-    String PATH_NOT_BLANK = "icd存储路径不能为空";
-}

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

@@ -1,21 +0,0 @@
-package com.njcn.gather.icd.pojo.enums;
-
-import lombok.Getter;
-
-/**
- * @author caozehui
- * @data 2025-02-11
- */
-@Getter
-public enum IcdPathResponseEnum {
-
-    ICD_PATH_NAME_REPEAT("A004007", "icd名称重复");
-
-    private final String code;
-    private final String message;
-
-    IcdPathResponseEnum(String code, String message) {
-        this.message = message;
-        this.code = code;
-    }
-}

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

@@ -1,8 +1,7 @@
 package com.njcn.gather.icd.pojo.param;
 
 import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.gather.icd.pojo.constant.PqIcdPathValidMessage;
-import com.njcn.gather.type.pojo.constant.DevTypeValidMessage;
+import com.njcn.gather.pojo.constant.DetectionValidMessage;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,11 +17,13 @@ import javax.validation.constraints.Pattern;
 @Data
 public class PqIcdPathParam {
     @ApiModelProperty(value = "名称", required = true)
-    @NotBlank(message = PqIcdPathValidMessage.NAME_NOT_BLANK)
+    @NotBlank(message = DetectionValidMessage.NAME_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.ICD_NAME_REGEX, message = DetectionValidMessage.ICD_NAME_FORMAT_ERROR)
     private String name;
 
     @ApiModelProperty(value = "存储路径", required = true)
-    @NotBlank(message = PqIcdPathValidMessage.PATH_NOT_BLANK)
+    @NotBlank(message = DetectionValidMessage.ICD_PATH_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.ICD_PATH_REGEX, message = DetectionValidMessage.ICD_PATH_FORMAT_ERROR)
     private String path;
 
     /**
@@ -43,8 +44,8 @@ public class PqIcdPathParam {
     @EqualsAndHashCode(callSuper = true)
     public static class UpdateParam extends PqIcdPathParam {
         @ApiModelProperty(value = "id", required = true)
-        @NotBlank(message = PqIcdPathValidMessage.ID_NOT_BLANK)
-        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = PqIcdPathValidMessage.ID_FORMAT_ERROR)
+        @NotBlank(message = DetectionValidMessage.ID_NOT_BLANK)
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.ID_FORMAT_ERROR)
         private String id;
     }
 }

detection/src/main/java/com/njcn/gather/icd/service/IPqIcdPathService.java

@@ -51,4 +51,12 @@ public interface IPqIcdPathService extends IService<PqIcdPath> {
      * @return 成功返回true，失败返回false
      */
     boolean deleteIcd(List<String> ids);
+
+    /**
+     * 根据设备类型id获取Icd
+     *
+     * @param devTypeId
+     * @return
+     */
+    PqIcdPath getIcdByDevType(String devTypeId);
 }

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

@@ -7,16 +7,16 @@ 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.IcdPathResponseEnum;
 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.type.pojo.po.DevType;
+import com.njcn.gather.pojo.enums.DetectionResponseEnum;
 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 java.util.List;
 
@@ -45,7 +45,9 @@ public class PqIcdPathServiceImpl extends ServiceImpl<PqIcdPathMapper, PqIcdPath
     }
 
     @Override
+    @Transactional
     public boolean addIcd(PqIcdPathParam param) {
+        param.setName(param.getName().trim());
         this.checkRepeat(param, false);
         PqIcdPath pqIcdPath = new PqIcdPath();
         BeanUtils.copyProperties(param, pqIcdPath);
@@ -54,7 +56,9 @@ public class PqIcdPathServiceImpl extends ServiceImpl<PqIcdPathMapper, PqIcdPath
     }
 
     @Override
+    @Transactional
     public boolean updateIcd(PqIcdPathParam.UpdateParam param) {
+        param.setName(param.getName().trim());
         this.checkRepeat(param, true);
         PqIcdPath pqIcdPath = new PqIcdPath();
         BeanUtils.copyProperties(param, pqIcdPath);
@@ -62,10 +66,16 @@ public class PqIcdPathServiceImpl extends ServiceImpl<PqIcdPathMapper, PqIcdPath
     }
 
     @Override
+    @Transactional
     public boolean deleteIcd(List<String> ids) {
         return this.lambdaUpdate().in(PqIcdPath::getId, ids).set(PqIcdPath::getState, DataStateEnum.DELETED.getCode()).update();
     }
 
+    @Override
+    public PqIcdPath getIcdByDevType(String devTypeId) {
+        return this.baseMapper.selectIcdByDevType(devTypeId);
+    }
+
     private void checkRepeat(PqIcdPathParam param, boolean isExcludeSelf) {
         LambdaQueryWrapper<PqIcdPath> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(PqIcdPath::getName, param.getName())
@@ -77,7 +87,7 @@ public class PqIcdPathServiceImpl extends ServiceImpl<PqIcdPathMapper, PqIcdPath
         }
         int count = this.count(wrapper);
         if (count > 0) {
-            throw new BusinessException(IcdPathResponseEnum.ICD_PATH_NAME_REPEAT);
+            throw new BusinessException(DetectionResponseEnum.ICD_PATH_NAME_REPEAT);
         }
     }
 }

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

@@ -1,10 +1,9 @@
 package com.njcn.gather.monitor.pojo.param;
 
 import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.gather.device.pojo.constant.DevValidMessage;
+import com.njcn.gather.pojo.constant.DetectionValidMessage;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -21,24 +20,24 @@ public class PqMonitorParam {
     private String code;
 
     @ApiModelProperty(value = "所属母线")
-    @NotBlank(message = DevValidMessage.BELONG_LINE_NOT_BLANK)
+    @NotBlank(message = DetectionValidMessage.BELONG_LINE_NOT_BLANK)
     private String name;
 
     @ApiModelProperty(value = "监测点序号")
-    @NotNull(message = DevValidMessage.MONITOR_NUM_NOT_NULL)
+    @NotNull(message = DetectionValidMessage.MONITOR_NUM_NOT_NULL)
     private Integer num;
 
     @ApiModelProperty(value = "PT变比")
-    @NotNull(message = DevValidMessage.PT_NOT_NULL)
+    @NotNull(message = DetectionValidMessage.PT_NOT_NULL)
     private Float pt;
 
     @ApiModelProperty(value = "CT变比")
-    @NotNull(message = DevValidMessage.CT_NOT_NULL)
+    @NotNull(message = DetectionValidMessage.CT_NOT_NULL)
     private Float ct;
 
     @ApiModelProperty(value = "接线方式")
-    @NotBlank(message = DevValidMessage.WIRING_TYPE_NOT_BLANK)
-    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.WIRING_TYPE_FORMAT_ERROR)
+    @NotBlank(message = DetectionValidMessage.WIRING_TYPE_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.WIRING_TYPE_FORMAT_ERROR)
     private String ptType;
 
 }

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

@@ -2,7 +2,7 @@ package com.njcn.gather.monitor.pojo.vo;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.gather.device.pojo.constant.DevValidMessage;
+import com.njcn.gather.pojo.constant.DetectionValidMessage;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -18,24 +18,24 @@ import javax.validation.constraints.Pattern;
 public class PqMonitorExcel {
 
     @Excel(name = "监测点序号", width = 20, orderNum = "1")
-    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.MONITOR_NUM_FORMAT_ERROR)
+    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.MONITOR_NUM_FORMAT_ERROR)
     private Integer num;
 
     @Excel(name = "所属母线", width = 20, orderNum = "2")
-    @NotBlank(message = DevValidMessage.BELONG_LINE_NOT_BLANK)
+    @NotBlank(message = DetectionValidMessage.BELONG_LINE_NOT_BLANK)
     private String name;
 
     @Excel(name = "PT变比", width = 20, orderNum = "3")
-    @NotNull(message = DevValidMessage.PT_NOT_NULL)
+    @NotNull(message = DetectionValidMessage.PT_NOT_NULL)
     private Float pt;
 
     @Excel(name = "CT变比", width = 20, orderNum = "4")
-    @NotNull(message = DevValidMessage.CT_NOT_NULL)
+    @NotNull(message = DetectionValidMessage.CT_NOT_NULL)
     private Float ct;
 
     @Excel(name = "接线方式", width = 20, orderNum = "5")
-    @NotBlank(message = DevValidMessage.WIRING_TYPE_NOT_BLANK)
-    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.WIRING_TYPE_FORMAT_ERROR)
+    @NotBlank(message = DetectionValidMessage.WIRING_TYPE_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.WIRING_TYPE_FORMAT_ERROR)
     private String ptType;
 
     @Data

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

@@ -3,7 +3,6 @@ package com.njcn.gather.monitor.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.gather.device.pojo.po.PqDev;
 import com.njcn.gather.monitor.mapper.PqMonitorMapper;
 import com.njcn.gather.monitor.pojo.param.PqMonitorParam;
 import com.njcn.gather.monitor.pojo.po.PqMonitor;
@@ -33,7 +32,7 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
     }
 
     @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
     public boolean addPqMonitorByDevId(String devId, List<PqMonitorParam> pqMonitorParamList) {
         List<PqMonitor> pqMonitorList = BeanUtil.copyToList(pqMonitorParamList, PqMonitor.class);
         pqMonitorList.forEach(pqMonitor -> pqMonitor.setDevId(devId));
@@ -41,7 +40,7 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
     }
 
     @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
     public boolean deletePqMonitorByDevId(String devId) {
         QueryWrapper<PqMonitor> wrapper = new QueryWrapper<>();
         wrapper.eq("pq_monitor.Dev_Id", devId);
@@ -49,7 +48,7 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
     }
 
     @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
     public boolean updatePqMonitorByDevId(String devId, List<PqMonitorParam> paramList) {
         // 先删除原有数据
         this.deletePqMonitorByDevId(devId);

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

@@ -1,9 +1,5 @@
 package com.njcn.gather.plan.controller;
 
-import cn.afterturn.easypoi.excel.ExcelImportUtil;
-import cn.afterturn.easypoi.excel.entity.ImportParams;
-import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -13,16 +9,12 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.LogUtil;
-import com.njcn.gather.device.service.IPqDevService;
-import com.njcn.gather.device.pojo.enums.DevResponseEnum;
 import com.njcn.gather.plan.pojo.param.AdPlanParam;
-import com.njcn.gather.plan.pojo.vo.AdPlanExcel;
 import com.njcn.gather.plan.pojo.vo.AdPlanVO;
 import com.njcn.gather.plan.service.IAdPlanService;
 import com.njcn.web.controller.BaseController;
-import com.njcn.web.utils.ExcelUtil;
+import com.njcn.web.utils.FileUtil;
 import com.njcn.web.utils.HttpResultUtil;
-import com.njcn.web.utils.PoiUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -51,7 +43,7 @@ public class AdPlanController extends BaseController {
 
     private final IAdPlanService adPlanService;
 
-    @OperateInfo
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/list")
     @ApiOperation("分页查询检测计划")
     @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
@@ -62,53 +54,53 @@ public class AdPlanController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
-    @OperateInfo(operateType = OperateType.ADD)
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
     @PostMapping("/add")
     @ApiOperation("新增检测计划")
     @ApiImplicitParam(name = "param", value = "检测计划", required = true)
-    public HttpResult<Object> add(@RequestBody @Validated AdPlanParam param) {
+    public HttpResult<Boolean> add(@RequestBody @Validated AdPlanParam param) {
         String methodDescribe = getMethodDescribe("add");
         LogUtil.njcnDebug(log, "{}，新增数据为：{}", methodDescribe, param);
         boolean result = adPlanService.addAdPlan(param);
         if (result) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
         } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
         }
     }
 
-    @OperateInfo(operateType = OperateType.UPDATE)
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
     @PostMapping("/update")
     @ApiOperation("修改检测计划")
     @ApiImplicitParam(name = "updateParam", value = "检测计划", required = true)
-    public HttpResult<Object> update(@RequestBody @Validated AdPlanParam.UpdateParam updateParam) {
+    public HttpResult<Boolean> update(@RequestBody @Validated AdPlanParam.UpdateParam updateParam) {
         String methodDescribe = getMethodDescribe("update");
         LogUtil.njcnDebug(log, "{}，修改数据为：{}", methodDescribe, updateParam);
         boolean result = adPlanService.updateAdPlan(updateParam);
         if (result) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
         } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
         }
     }
 
-    @OperateInfo(operateType = OperateType.DELETE)
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DELETE)
     @PostMapping("/delete")
     @ApiOperation("删除检测计划")
     @ApiImplicitParam(name = "ids", value = "检测计划id", required = true)
-    public HttpResult<Object> delete(@RequestBody List<String> ids) {
+    public HttpResult<Boolean> delete(@RequestBody List<String> ids) {
         String methodDescribe = getMethodDescribe("delete");
         LogUtil.njcnDebug(log, "{}，删除ID数据为：{}", methodDescribe, String.join(StrUtil.COMMA, ids));
         boolean result = adPlanService.deleteAdPlan(ids);
         if (result) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
         } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
         }
     }
 
 
-    @OperateInfo
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @GetMapping("/listByPattern")
     @ApiOperation("按照模式查询检测计划")
     @ApiImplicitParam(name = "pattern", value = "模式Id", required = true)
@@ -119,79 +111,62 @@ public class AdPlanController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DOWNLOAD)
-    @PostMapping("/downloadTemplate")
-    @ApiOperation("下载监测计划导入文件模板")
-    public void downloadTemplate() {
-        adPlanService.downloadTemplate();
-    }
-
     @OperateInfo(operateType = OperateType.DOWNLOAD)
     @PostMapping("/export")
     @ApiOperation("导出检测计划")
     @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
-    public void export(@RequestBody @Validated AdPlanParam.QueryParam queryParam) {
-        String methodDescribe = getMethodDescribe("export");
+    public void exportPlan(@RequestBody @Validated AdPlanParam.QueryParam queryParam) {
+        String methodDescribe = getMethodDescribe("exportPlan");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
-        List<AdPlanExcel.ExportData> data = adPlanService.getExportData(queryParam);
-        ExcelUtil.exportExcel("检测计划导出数据.xlsx", AdPlanExcel.ExportData.class, data);
+
+        adPlanService.exportPlan(queryParam);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DOWNLOAD)
+    @PostMapping("/downloadTemplate")
+    @ApiOperation("下载检测计划导出模板")
+    public void downloadTemplate(@RequestBody AdPlanParam.QueryParam queryParam) {
+        adPlanService.downloadTemplate(queryParam.getPatternId());
     }
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD)
     @PostMapping(value = "/import")
-    @ApiOperation("批量导入检测计划数据")
+    @ApiOperation("导入检测计划数据")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "file", value = "检测计划数据文件", required = true),
             @ApiImplicitParam(name = "pattern", value = "模式Id", required = true)
     })
-    public HttpResult<Object> importData(@RequestParam("file") MultipartFile file, @RequestParam("patternId") String patternId, HttpServletResponse response) {
-        String methodDescribe = getMethodDescribe("importData");
-        LogUtil.njcnDebug(log, "{}，上传文件为：{}, 模式Id为：{}", methodDescribe, file.getOriginalFilename(), patternId);
+    public HttpResult<Object> importPlan(@RequestParam("file") MultipartFile file, @RequestParam("patternId") String patternId, HttpServletResponse response) {
+        String methodDescribe = getMethodDescribe("importCNPlan");
+        LogUtil.njcnDebug(log, "{}，上传文件为：{}", methodDescribe, file.getOriginalFilename());
 
-        ImportParams params = new ImportParams();
-        params.setHeadRows(2);
-        params.setNeedVerify(true);
-        params.setStartSheetIndex(0);
-        params.setSheetNum(1);
-
-        try {
-            ExcelImportResult<AdPlanExcel.ImportData> adPlanExcelResult = ExcelImportUtil.importExcelMore(file.getInputStream(), AdPlanExcel.ImportData.class, params);
-            if (adPlanExcelResult.isVerifyFail()) {
-                // 此处前端要做特殊处理，具体可以参考技术监督的数据导入
-                PoiUtil.exportFileByWorkbook(adPlanExcelResult.getFailWorkbook(), "非法检测计划数据.xlsx", response);
-            } else {
-                List<AdPlanExcel.ImportData> adPlanExcelList = adPlanExcelResult.getList();
-                if (ObjectUtil.isNotEmpty(adPlanExcelList)) {
-                    adPlanService.importData(patternId, adPlanExcelList);
-                }
-            }
-        } catch (Exception e) {
-            throw new BusinessException(DevResponseEnum.IMPORT_DATA_FAIL, e.getMessage());
+        boolean fileType = FileUtil.judgeFileIsExcel(file.getOriginalFilename());
+        if (!fileType) {
+            throw new BusinessException(CommonResponseEnum.FILE_XLSX_ERROR);
         }
+        adPlanService.importPlan(file, patternId, response);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
-//    @OperateInfo
-//    @GetMapping("/getPieData")
-//    @ApiOperation("获取饼状图数据")
-//    @ApiImplicitParam(name = "id", value = "检测计划id", required = true)
-//    public HttpResult<List<List<Map<String, Object>>>> getPieData(@RequestParam("planId") String planId) {
-//        String methodDescribe = getMethodDescribe("getPieData");
-//        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, planId);
-//        List<List<Map<String, Object>>> result = pqDevService.getPieData(planId);
-//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
-//    }
-
-    @OperateInfo
-    @GetMapping("/getBigTestItem")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getBigTestItem")
     @ApiOperation("获取检测大项数据")
     @ApiImplicitParam(name = "id", value = "检测计划id", required = true)
-    public HttpResult<List<Map<String, String>>> getBigTestItem(@RequestParam("planId") String planId) {
+    public HttpResult<List<Map<String, String>>> getBigTestItem(@RequestBody AdPlanParam.CheckParam checkParam) {
         String methodDescribe = getMethodDescribe("getBigTestItem");
-        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, planId);
-        List<Map<String, String>> result = adPlanService.getBigTestItem(planId);
+        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, checkParam);
+        List<Map<String, String>> result = adPlanService.getBigTestItem(checkParam.getReCheckType(), checkParam.getPlanId(), checkParam.getDevIds());
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DOWNLOAD)
+    @PostMapping("/analyse")
+    @ApiOperation("检测数据分析")
+    @ApiImplicitParam(name = "planId", 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);
+    }
 }
 

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

@@ -2,6 +2,10 @@ package com.njcn.gather.plan.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
 import com.njcn.gather.plan.pojo.po.AdPlan;
+import com.njcn.gather.report.pojo.po.PqReport;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @author caozehui
@@ -9,5 +13,29 @@ import com.njcn.gather.plan.pojo.po.AdPlan;
  */
 public interface AdPlanMapper extends MPJBaseMapper<AdPlan> {
 
+    /**
+     * 根据名称和版本获取报告id
+     *
+     * @param name
+     * @param version
+     * @return
+     */
+    String getReportIdByNameAndVersion(@Param("name") String name, @Param("version") String version);
+
+    /**
+     * 根据id获取报告模板
+     *
+     * @param id
+     * @return
+     */
+    PqReport getPqReportById(String id);
+
+    /**
+     * 获取所有报告模板名称
+     *
+     * @return
+     */
+    List<String> listAllReportTemplateName();
+
 }
 

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

@@ -3,5 +3,24 @@
 <mapper namespace="com.njcn.gather.plan.mapper.AdPlanMapper">
 
 
+    <select id="getReportIdByNameAndVersion" resultType="java.lang.String">
+        SELECT id
+        FROM pq_report
+        WHERE name = #{name}
+          AND version = #{version}
+          and state = 1
+    </select>
+
+    <select id="getPqReportById" resultType="com.njcn.gather.report.pojo.po.PqReport">
+        SELECT *
+        FROM pq_report
+        WHERE id = #{id}
+          and state = 1
+    </select>
+    <select id="listAllReportTemplateName" resultType="java.lang.String">
+        SELECT concat(name, '_', version) as name
+        FROM pq_report
+        WHERE state = 1
+    </select>
 </mapper>
 

detection/src/main/java/com/njcn/gather/plan/pojo/enums/DataSourceEnum.java

@@ -8,13 +8,13 @@ import lombok.Getter;
  */
 @Getter
 public enum DataSourceEnum {
-    THREE_SENSE_ACTUAL_TIME_DATA("0", "3秒实时数据"),
+    THREE_SENSE_ACTUAL_TIME_DATA("real", "3s实时数据"),
 
-    MINUTE_STATISTICS_MAX("1", "分钟统计数据-最大"),
-    MINUTE_STATISTICS_MIN("2", "分钟统计数据-最小"),
-    MINUTE_STATISTICS_AVG("3", "分钟统计数据-平均"),
-    MINUTE_STATISTICS_CP95("4", "分钟统计数据-CP95"),
-    RECORDED_DATA("5", "录播数据");
+    MINUTE_STATISTICS_MAX("max", "分钟统计数据-最大"),
+    MINUTE_STATISTICS_MIN("min", "分钟统计数据-最小"),
+    MINUTE_STATISTICS_AVG("avg", "分钟统计数据-平均"),
+    MINUTE_STATISTICS_CP95("cp95", "分钟统计数据-CP95"),
+    RECORDED_DATA("Recorded_data", "录播数据");
 
     private String value;
     private String msg;

detection/src/main/java/com/njcn/gather/plan/pojo/enums/PlanResponseEnum.java

@@ -1,23 +0,0 @@
-package com.njcn.gather.plan.pojo.enums;
-
-import lombok.Getter;
-
-/**
- * @author caozehui
- * @data 2025-01-16
- */
-@Getter
-public enum PlanResponseEnum {
-    PLAN_REPEATED("A003014", "当前模式下，该计划已存在"),
-    PLAN_NOT_EXIST("A003015", "该计划不存在"),
-    SCRIPT_RELATE_DICT_NOT_EXIST("A003016","脚本关联的字典不存在");
-
-    private final String message;
-    private final String code;
-
-
-    PlanResponseEnum(String code, String message) {
-        this.code = code;
-        this.message = message;
-    }
-}

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

@@ -1,7 +1,7 @@
 package com.njcn.gather.plan.pojo.param;
 
 import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.gather.device.pojo.constant.DevValidMessage;
+import com.njcn.gather.pojo.constant.DetectionValidMessage;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,47 +18,58 @@ import java.util.List;
 public class AdPlanParam {
 
     @ApiModelProperty(value = "名称", required = true)
-    @NotBlank(message = DevValidMessage.NAME_NOT_BLANK)
-    @Pattern(regexp = PatternRegex.PLAN_NAME_REGEX, message = DevValidMessage.NAME_FORMAT_ERROR)
+    @NotBlank(message = DetectionValidMessage.NAME_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.PLAN_NAME_REGEX, message = DetectionValidMessage.NAME_FORMAT_ERROR)
     private String name;
 
     @ApiModelProperty(value = "模式", required = true)
-    @NotBlank(message = DevValidMessage.PATTERN_NOT_BLANK)
-    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.PATTERN_FORMAT_ERROR)
+    @NotBlank(message = DetectionValidMessage.PATTERN_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.PATTERN_FORMAT_ERROR)
     private String pattern;
 
 //    @ApiModelProperty(value = "父计划ID")
 //    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DeviceValidMessage.PATTERN_FORMAT_ERROR)
 //    private String fatherPlanId;
 
-    @ApiModelProperty(value = "检测源ID列表",required = true)
-    @NotEmpty(message = DevValidMessage.SOURCE_IDS_NOT_EMPTY)
-    private List<@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.SOURCE_ID_FORMAT_ERROR)String> sourceIds;
+    @ApiModelProperty(value = "检测源ID列表", required = true)
+    @NotEmpty(message = DetectionValidMessage.SOURCE_IDS_NOT_EMPTY)
+    private List<@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.SOURCE_ID_FORMAT_ERROR) String> sourceIds;
 
     @ApiModelProperty(value = "数据源ID列表", required = true)
-    @NotEmpty(message = DevValidMessage.DATASOURCE_ID_NOT_EMPTY)
+    @NotEmpty(message = DetectionValidMessage.DATASOURCE_ID_NOT_EMPTY)
     private List<String> datasourceIds;
 
     @ApiModelProperty(value = "检测脚本ID", required = true)
-    @NotBlank(message = DevValidMessage.SCRIPT_ID_NOT_BLANK)
-    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.SCRIPT_ID_FORMAT_ERROR)
+    @NotBlank(message = DetectionValidMessage.SCRIPT_ID_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.SCRIPT_ID_FORMAT_ERROR)
     private String scriptId;
 
     @ApiModelProperty(value = "误差体系ID", required = true)
-    @NotBlank(message = DevValidMessage.ERROR_SYS_ID_NOT_BLANK)
-    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.ERROR_SYS_ID_FORMAT_ERROR)
+    @NotBlank(message = DetectionValidMessage.ERROR_SYS_ID_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.ERROR_SYS_ID_FORMAT_ERROR)
     private String errorSysId;
 
     @ApiModelProperty(value = "守时检测")
-    @NotNull(message = DevValidMessage.TIME_CHECK_NOT_NULL)
-    @Min(value = 0, message = DevValidMessage.TIME_CHECK_FORMAT_ERROR)
-    @Max(value = 1, message = DevValidMessage.TIME_CHECK_FORMAT_ERROR)
+    @NotNull(message = DetectionValidMessage.TIME_CHECK_NOT_NULL)
+    @Min(value = 0, message = DetectionValidMessage.TIME_CHECK_FORMAT_ERROR)
+    @Max(value = 1, message = DetectionValidMessage.TIME_CHECK_FORMAT_ERROR)
     private Integer timeCheck;
 
     @ApiModelProperty("被检设备ID列表")
-    @NotNull(message = DevValidMessage.PQ_DEV_IDS_NOT_NULL)
+    @NotNull(message = DetectionValidMessage.PQ_DEV_IDS_NOT_NULL)
     private List<String> devIds;
 
+    @ApiModelProperty(value = "是否关联报告")
+    @NotNull(message = DetectionValidMessage.ASSOCIATE_REPORT_NOT_NULL)
+    private Integer associateReport;
+
+    @ApiModelProperty(value = "报告模板名称")
+    private String reportTemplateName;
+
+    @ApiModelProperty(value = "数据处理原则")
+    @NotBlank(message = DetectionValidMessage.DATA_RULE_NOT_BLANK)
+    private String dataRule;
+
     /**
      * 分页查询实体
      */
@@ -66,27 +77,27 @@ public class AdPlanParam {
     @EqualsAndHashCode(callSuper = true)
     public static class QueryParam extends BaseParam {
         @ApiModelProperty("名称")
-        @Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = DevValidMessage.NAME_FORMAT_ERROR)
+        @Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = DetectionValidMessage.NAME_FORMAT_ERROR)
         private String name;
 
         @ApiModelProperty(value = "模式，字典表（数字、模拟、比对）")
-        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.PATTERN_FORMAT_ERROR)
-        @NotBlank(message = DevValidMessage.PATTERN_NOT_BLANK)
-        private String pattern;
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.PATTERN_FORMAT_ERROR)
+        @NotBlank(message = DetectionValidMessage.PATTERN_NOT_BLANK)
+        private String patternId;
 
         @ApiModelProperty(value = "检测状态")
-        @Min(value = 0, message = DevValidMessage.TEST_STATE_FORMAT_ERROR)
-        @Max(value = 2, message = DevValidMessage.TEST_STATE_FORMAT_ERROR)
+        @Min(value = 0, message = DetectionValidMessage.TEST_STATE_FORMAT_ERROR)
+        @Max(value = 2, message = DetectionValidMessage.TEST_STATE_FORMAT_ERROR)
         private Integer testState;
 
         @ApiModelProperty(value = "报告生成状态")
-        @Min(value = 0, message = DevValidMessage.REPORT_STATE_FORMAT_ERROR)
-        @Max(value = 2, message = DevValidMessage.REPORT_STATE_FORMAT_ERROR)
+        @Min(value = 0, message = DetectionValidMessage.REPORT_STATE_FORMAT_ERROR)
+        @Max(value = 2, message = DetectionValidMessage.REPORT_STATE_FORMAT_ERROR)
         private Integer reportState;
 
         @ApiModelProperty(value = "检测结果")
-        @Min(value = 0, message = DevValidMessage.CHECK_RESULT_STATE_FORMAT_ERROR)
-        @Max(value = 2, message = DevValidMessage.CHECK_RESULT_STATE_FORMAT_ERROR)
+        @Min(value = 0, message = DetectionValidMessage.CHECK_RESULT_STATE_FORMAT_ERROR)
+        @Max(value = 2, message = DetectionValidMessage.CHECK_RESULT_STATE_FORMAT_ERROR)
         private Integer result;
     }
 
@@ -94,36 +105,16 @@ public class AdPlanParam {
     @EqualsAndHashCode(callSuper = true)
     public static class UpdateParam extends AdPlanParam {
         @ApiModelProperty(value = "id", required = true)
-        @NotBlank(message = DevValidMessage.ID_NOT_BLANK)
-        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.ID_FORMAT_ERROR)
+        @NotBlank(message = DetectionValidMessage.ID_NOT_BLANK)
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.ID_FORMAT_ERROR)
         private String id;
-
-        /**
-         * 检测状态，字典表（未检、检测中、检测完成）
-         */
-//        @ApiModelProperty(value = "检测状态")
-//        @NotNull(message = DeviceValidMessage.TEST_STATE_NOT_NULL)
-//        @Min(value = 0, message = DeviceValidMessage.TEST_STATE_FORMAT_ERROR)
-//        @Max(value = 2, message = DeviceValidMessage.TEST_STATE_FORMAT_ERROR)
-//        private Integer testState;
-
-        /**
-         * 报告生成状态，字典表（未生成、部分生成、全部生成）
-         */
-//        @ApiModelProperty(value = "报告生成状态")
-//        @NotNull(message = DeviceValidMessage.REPORT_STATE_NOT_NULL)
-//        @Min(value = 0, message = DeviceValidMessage.REPORT_STATE_FORMAT_ERROR)
-//        @Max(value = 2, message = DeviceValidMessage.REPORT_STATE_FORMAT_ERROR)
-//        private Integer reportState;
-
-        /**
-         * 检测结果，字典表（符合、不符合、/）
-         */
-//        @ApiModelProperty(value = "检测结果")
-//        @NotNull(message = DeviceValidMessage.CHECK_RESULT_STATE_NOT_NULL)
-//        @Min(value = 0, message = DeviceValidMessage.CHECK_RESULT_STATE_FORMAT_ERROR)
-//        @Max(value = 2, message = DeviceValidMessage.CHECK_RESULT_STATE_FORMAT_ERROR)
-//        private Integer result;
     }
 
+    @Data
+    public static class CheckParam {
+        // 0:不合格项复检 1:全部复检
+        private Integer reCheckType;
+        private String planId;
+        private List<String> devIds;
+    }
 }

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

@@ -1,8 +1,9 @@
 package com.njcn.gather.plan.pojo.po;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.mybatisplus.bo.BaseEntity;
-import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -78,9 +79,25 @@ public class AdPlan extends BaseEntity implements Serializable {
      */
     private Integer code;
 
+    /**
+     * 是否关联报告，0-不关联 1-关联
+     */
+    private Integer associateReport;
+
+    /**
+     * 报告模板ID，关联PQ_Report表
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String reportTemplateId;
+
     /**
      * 状态：0-删除 1-正常
      */
     private Integer state;
+
+    /**
+     * 数据处理原则。任意值、部分值、所有值、cp95值、平均值
+     */
+    private String dataRule;
 }
 

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

@@ -1,19 +1,11 @@
 package com.njcn.gather.plan.pojo.vo;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.gather.device.pojo.constant.DevValidMessage;
-import com.njcn.web.pojo.annotation.DateTimeStrValid;
+import com.njcn.gather.pojo.constant.DetectionValidMessage;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import java.time.LocalDate;
-import java.util.List;
 
 /**
  * @author caozehui
@@ -21,164 +13,50 @@ import java.util.List;
  */
 @Data
 public class AdPlanExcel {
-    @Excel(name = "名称", width = 40, needMerge = true, orderNum = "0")
-    @NotBlank(message = DevValidMessage.NAME_NOT_BLANK)
+    @Excel(name = "名称*", width = 40, needMerge = true, orderNum = "0")
+    @NotBlank(message = DetectionValidMessage.NAME_NOT_BLANK)
     private String name;
 
-    @Excel(name = "检测源", width = 40, needMerge = true, orderNum = "1")
-    @NotBlank(message = DevValidMessage.SOURC_NOT_BLANK)
+    @Excel(name = "检测源*", width = 40, needMerge = true, orderNum = "1")
+    @NotBlank(message = DetectionValidMessage.SOURC_NOT_BLANK)
     private String source;
 
-    @Excel(name = "数据源", width = 20, needMerge = true, orderNum = "2")
-    @NotBlank(message = DevValidMessage.DATASOURCE_NOT_BLANK)
+    @Excel(name = "数据源*", width = 20, needMerge = true, orderNum = "2")
+    @NotBlank(message = DetectionValidMessage.DATASOURCE_NOT_BLANK)
     private String datasourceId;
 
-    @Excel(name = "脚本", width = 50, needMerge = true, orderNum = "3")
-    @NotBlank(message = DevValidMessage.SCRIPT_NOT_BLANK)
+    @Excel(name = "脚本*", width = 40, needMerge = true, orderNum = "3")
+    @NotBlank(message = DetectionValidMessage.SCRIPT_NOT_BLANK)
     private String scriptId;
 
-    @Excel(name = "误差体系", width = 30, needMerge = true, orderNum = "4")
-    @NotBlank(message = DevValidMessage.ERRORSYS_NOT_BLANK)
+    @Excel(name = "误差体系*", width = 40, needMerge = true, orderNum = "4")
+    @NotBlank(message = DetectionValidMessage.ERRORSYS_NOT_BLANK)
     private String errorSysId;
 
+    @Excel(name = "数据处理原则*", width = 20, needMerge = true, orderNum = "5")
+    @NotBlank(message = DetectionValidMessage.DATA_RULE_NOT_BLANK)
+    private String dataRule;
 
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class ExportData extends AdPlanExcel {
-//        @Excel(name = "模式", width = 20, needMerge = true, orderNum = "1")
-//        @NotBlank(message = DevValidMessage.PATTERN_NOT_BLANK)
-//        private String pattern;
+    @Excel(name = "是否做守时检测*", width = 20, replace = {"否_0", "是_1"}, needMerge = true, orderNum = "6")
+    @NotNull(message = DetectionValidMessage.TIMECHECK_NOT_NULL)
+    private Integer timeCheck;
 
-//        @Excel(name = "父计划id", width = 25, needMerge = true, orderNum = "3")
-//        private String fatherPlanId;
+    @Excel(name = "关联报告模版*", width = 20, replace = {"否_0", "是_1"}, needMerge = true, orderNum = "7")
+    @NotNull(message = DetectionValidMessage.ASSOCIATE_REPORT_NOT_NULL)
+    private Integer associateReport;
 
-        @Excel(name = "是否做守时检测（否\\是）", width = 15, replace = {"否_0", "是_1"}, needMerge = true, orderNum = "5")
-        private Integer timeCheck;
+    @Excel(name = "报告模版（当关联报告模版为是时必填）", width = 40, needMerge = true, orderNum = "8")
+    private String reportTemplateId;
 
-        @Excel(name = "检测状态（未检\\检测中\\检测完成）", width = 10, replace = {"未检_0", "检测中_1", "检测完成_2"}, needMerge = true, orderNum = "6")
-        private Integer testState;
-
-        @Excel(name = "报告生成状态（未生成\\部分生成\\全部生成）", width = 15, replace = {"未生成_0", "部分生成_1", "全部生成_2"}, needMerge = true, orderNum = "7")
-        private Integer reportState;
-
-        @Excel(name = "检测结果（不符合\\符合\\未检）", width = 10, replace = {"不符合_0", "符合_1", "未检_2"}, needMerge = true, orderNum = "8")
-        private Integer result;
-
-//        @Excel(name = "数据表后缀", width = 20, needMerge = true, orderNum = "11")
-//        private Integer code;
-
-        @ExcelCollection(name = "绑定的设备", orderNum = "9")
-        private List<BoundExportData> devices;
-    }
-
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class ImportData extends AdPlanExcel {
-        @Excel(name = "是否做守时检测（否\\是）", width = 15, replace = {"否_0", "是_1"}, needMerge = true, orderNum = "5")
-        @NotBlank(message = DevValidMessage.TIMECHECK_NOT_BLANK)
-        private String timeCheck;
-
-        @Excel(name = "检测状态（未检\\检测中\\检测完成）", width = 10, replace = {"未检_0", "检测中_1", "检测完成_2"}, needMerge = true, orderNum = "6")
-        @NotBlank(message = DevValidMessage.TEST_STATE_NOT_NULL)
-        private String testState;
-
-        @Excel(name = "报告生成状态（未生成\\部分生成\\全部生成）", width = 15, replace = {"未生成_0", "部分生成_1", "全部生成_2"}, needMerge = true, orderNum = "7")
-        @NotBlank(message = DevValidMessage.REPORT_STATE_NOT_NULL)
-        private String reportState;
-
-        @Excel(name = "检测结果（不符合\\符合\\未检）", width = 10, replace = {"不符合_0", "符合_1", "未检_2"}, needMerge = true, orderNum = "8")
-        @NotBlank(message = DevValidMessage.CHECK_RESULT_STATE_NOT_NULL)
-        private String result;
-
-        @ExcelCollection(name = "绑定的设备", orderNum = "9")
-        private List<BoundImportData> devices;
-    }
-
-    @Data
-    public static class BoundData {
-        @Excel(name = "名称", width = 20)
-        @NotBlank(message = DevValidMessage.NAME_NOT_BLANK)
-        @Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = DevValidMessage.NAME_FORMAT_ERROR)
-        private String name;
-
-        @Excel(name = "设备类型", width = 20, orderNum = "2")
-        @NotBlank(message = DevValidMessage.DEV_TYPE_NOT_BLANK)
-        private String devType;
-
-        @Excel(name = "设备通道数", width = 20, orderNum = "3")
-        @NotNull(message = DevValidMessage.DEV_CHNS_NOT_NULL)
-        private Integer devChns;
-
-        @Excel(name = "额定电压（V）", width = 15, orderNum = "4")
-        @NotNull(message = DevValidMessage.DEV_VOLT_NOT_NULL)
-        private Float devVolt;
-
-        @Excel(name = "额定电流（A）", width = 15, orderNum = "5")
-        @NotNull(message = DevValidMessage.DEV_CURR_NOT_NULL)
-        private Float devCurr;
-
-        @Excel(name = "设备厂家", width = 20, orderNum = "6")
-        @NotBlank(message = DevValidMessage.MANUFACTURER_NOT_BLANK)
-        private String manufacturer;
-
-        @Excel(name = "设备序列号", width = 40, orderNum = "8")
-        @NotBlank(message = DevValidMessage.FACTORYNO_NOT_BLANK)
-        private String createId;
-
-        @Excel(name = "固件版本", width = 15, orderNum = "9")
-        @NotBlank(message = DevValidMessage.FIRMWARE_NOT_BLANK)
-        private String hardwareVersion;
-
-        @Excel(name = "软件版本", width = 15, orderNum = "10")
-        @NotBlank(message = DevValidMessage.SOFTWARE_NOT_BLANK)
-        private String softwareVersion;
-
-        @Excel(name = "通讯协议", width = 15, orderNum = "11")
-        @NotBlank(message = DevValidMessage.PROTOCOL_NOT_BLANK)
-        private String protocol;
-
-        @Excel(name = "IP地址", width = 20, orderNum = "12")
-        @NotBlank(message = DevValidMessage.IP_NOT_BLANK)
-        @Pattern(regexp = PatternRegex.IP_REGEX, message = DevValidMessage.IP_FORMAT_ERROR)
-        private String ip;
-
-        @Excel(name = "端口号", orderNum = "13")
-        @NotNull(message = DevValidMessage.PORT_NOT_NULL)
-        @Range(min = 1, max = 65535, message = DevValidMessage.PORT_RANGE_ERROR)
-        private Integer port;
-
-        @Excel(name = "是否为加密版本（否\\是）", width = 20, replace = {"否_0", "是_1"}, orderNum = "14")
-        @NotNull(message = DevValidMessage.ENCRYPTION_NOT_NULL)
-        private Integer encryptionFlag;
-
-        @Excel(name = "识别码（当为加密版本时必填）", width = 30, orderNum = "15")
-        private String series;
-
-        @Excel(name = "秘钥（当为加密版本时必填）", width = 30, orderNum = "16")
-        private String devKey;
-    }
-
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class BoundExportData extends BoundData {
-        @Excel(name = "出厂日期（yyyy-MM-dd）", width = 25, format = "yyyy-MM-dd", orderNum = "7")
-        @NotNull(message = DevValidMessage.CREATEDATETIME_NOT_NULL)
-        private LocalDate createDate;
-
-        @Excel(name = "是否支持系数校准（否\\是）", width = 20, replace = {"否_0", "是_1"}, orderNum = "17", needMerge = true)
-        private Integer factorFlag;
-    }
-
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class BoundImportData extends BoundData {
-        @Excel(name = "出厂日期（yyyy-MM-dd）", width = 25, format = "yyyy-MM-dd", orderNum = "7", needMerge = true)
-        @NotNull(message = DevValidMessage.CREATEDATETIME_NOT_NULL)
-        @DateTimeStrValid(message = DevValidMessage.CREATEDATETIME_FORMAT_ERROR)
-        private String createDate;
-
-        @Excel(name = "是否支持系数校准（否\\是）", width = 20, replace = {"否_0", "是_1"}, orderNum = "17", needMerge = true)
-        @NotBlank(message = DevValidMessage.FACTOR_FLAG_NOT_BLANK)
-        private String factorFlag;
-    }
+//    @Excel(name = "检测状态*", width = 10, replace = {"未检_0", "检测中_1", "检测完成_2"}, needMerge = true, orderNum = "9")
+//    @NotNull(message = DetectionValidMessage.TEST_STATE_NOT_NULL)
+//    private Integer testState;
+//
+//    @Excel(name = "报告生成状态*", width = 15, replace = {"未生成_0", "部分生成_1", "全部生成_2"}, needMerge = true, orderNum = "10")
+//    @NotNull(message = DetectionValidMessage.REPORT_STATE_NOT_NULL)
+//    private Integer reportState;
+//
+//    @Excel(name = "检测结果*", width = 10, replace = {"不符合_0", "符合_1", "未检_2"}, needMerge = true, orderNum = "11")
+//    @NotNull(message = DetectionValidMessage.CHECK_RESULT_STATE_NOT_NULL)
+//    private Integer result;
 }

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

@@ -1,5 +1,6 @@
 package com.njcn.gather.plan.pojo.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -97,4 +98,16 @@ public class AdPlanVO {
      * 创建时间
      */
     private String createTime;
+
+    /**
+     * 是否关联报告，0-不关联 1-关联
+     */
+    private Integer associateReport;
+
+    /**
+     * 报告模板名称
+     */
+    private String reportTemplateName;
+
+    private String dataRule;
 }

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

@@ -0,0 +1,19 @@
+package com.njcn.gather.plan.pojo.vo;
+
+import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
+import com.njcn.gather.device.pojo.vo.CNDevExcel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author caozehui
+ * @data 2025-03-25
+ */
+@Data
+public class CNPlanExcel extends AdPlanExcel {
+
+
+    @ExcelCollection(name = "绑定的设备", orderNum = "9")
+    private List<CNDevExcel> devices;
+}

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

@@ -0,0 +1,19 @@
+package com.njcn.gather.plan.pojo.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
+import com.njcn.gather.device.pojo.vo.ProvinceDevExcel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author caozehui
+ * @data 2025-03-25
+ */
+@Data
+public class ProvincePlanExcel extends AdPlanExcel {
+
+    @ExcelCollection(name = "绑定的设备", orderNum = "9")
+    private List<ProvinceDevExcel> devices;
+}

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

@@ -3,10 +3,12 @@ package com.njcn.gather.plan.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.gather.plan.pojo.param.AdPlanParam;
-import com.njcn.gather.plan.pojo.vo.AdPlanVO;
 import com.njcn.gather.plan.pojo.po.AdPlan;
 import com.njcn.gather.plan.pojo.vo.AdPlanExcel;
+import com.njcn.gather.plan.pojo.vo.AdPlanVO;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -56,28 +58,6 @@ public interface IAdPlanService extends IService<AdPlan> {
      */
     List<Map<String, Object>> listByPattern(String pattern);
 
-    /**
-     * 下载检测计划模板
-     */
-    void downloadTemplate();
-
-    /**
-     * 获取检测计划导出数据
-     *
-     * @param queryParam 查询参数
-     * @return 检测计划导出数据
-     */
-    List<AdPlanExcel.ExportData> getExportData(AdPlanParam.QueryParam queryParam);
-
-    /**
-     * 导入检测计划
-     * @param patternId 模式Id
-     * @param adPlanExcelList 检测计划Excel列表
-     * @return 导入成功则返回true，否则返回false
-     */
-    void importData(String patternId, List<AdPlanExcel.ImportData> adPlanExcelList);
-
-
     /**
      * 可视化
      *
@@ -88,26 +68,60 @@ public interface IAdPlanService extends IService<AdPlan> {
     /**
      * 获取检测大项
      *
+     * @param reCheckType  0:不合格项复检 1:全部复检
      * @param planId 检测计划Id
+     * @param devIds  设备Id列表
      * @return
      */
-    List<Map<String, String>> getBigTestItem(String planId);
+    List<Map<String, String>> getBigTestItem(Integer reCheckType, String planId, List<String> devIds);
 
     /**
      * 修改计划状态
+     *
      * @param planId
      * @param devIds
      * @return
      */
-    boolean updateTestState(String planId,List<String> devIds);
+    boolean updateTestState(String planId, List<String> devIds);
 
     /**
      * 数据状态回退
+     *
      * @param planId
      * @param devIds
      * @return
      */
-    boolean updateBackTestState(String planId,List<String> devIds);
+    boolean updateBackTestState(String planId, List<String> devIds);
 
     void finishPlan(String planId);
+
+    /**
+     * 数据分析
+     *
+     * @param ids
+     */
+    void analyse(List<String> ids);
+
+    /**
+     * 导出检测计划数据
+     *
+     * @param queryParam
+     */
+    void exportPlan(AdPlanParam.QueryParam queryParam);
+
+    /**
+     * 下载检测计划模板
+     *
+     * @param patternId
+     */
+    void downloadTemplate(String patternId);
+
+    /**
+     * 导入检测计划数据
+     *
+     * @param file
+     * @param patternId
+     * @param response
+     */
+    void importPlan(MultipartFile file, String patternId, HttpServletResponse response);
 }

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

@@ -32,7 +32,7 @@ public class AdPlanSourceServiceImpl extends ServiceImpl<AdPlanSourceMapper, AdP
     }
 
     @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
     public boolean addAdPlanSource(String planId, List<String> sourceIds) {
         List<AdPlanSource> adPlanSourceList = new ArrayList<>();
         for (String sourceId : sourceIds) {
@@ -42,7 +42,7 @@ public class AdPlanSourceServiceImpl extends ServiceImpl<AdPlanSourceMapper, AdP
     }
 
     @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
     public boolean deleteAdPlanSourceByPlanIds(List<String> planIds) {
         QueryWrapper<AdPlanSource> queryWrapper = new QueryWrapper<>();
         queryWrapper.in("ad_plan_source.Plan_Id", planIds);
@@ -50,7 +50,7 @@ public class AdPlanSourceServiceImpl extends ServiceImpl<AdPlanSourceMapper, AdP
     }
 
     @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
     public boolean updateAdPlanSource(String planId, List<String> sourceIds) {
         this.deleteAdPlanSourceByPlanIds(Collections.singletonList(planId));
         this.addAdPlanSource(planId, sourceIds);

detection/src/main/java/com/njcn/gather/pojo/constant/DetectionValidMessage.java

@@ -1,43 +1,45 @@
-package com.njcn.gather.device.pojo.constant;
+package com.njcn.gather.pojo.constant;
 
 /**
  * @author caozehui
- * @date 2024/11/06
+ * @data 2025-03-28
  */
-public interface DevValidMessage {
+public interface DetectionValidMessage {
 
+    String SOURCE_ID_NOT_BLANK = "检测源id不能为空";
     String ID_NOT_BLANK = "id不能为空，请检查id参数";
-
     String ID_FORMAT_ERROR = "id格式错误，请检查id参数";
-
+    String NAME_NOT_BLANK = "名称不能为空";
+    String ICD_NAME_FORMAT_ERROR = "名称格式错误，只能包含字母、数字、中文、下划线、中划线、点号、空格、英文括号，长度为1-32个字符";
+    String ICD_PATH_NOT_BLANK = "icd存储路径不能为空";
+    String ICD_PATH_FORMAT_ERROR = "ICD路径格式错误，只能包含字母、数字、下划线、中划线、空格，长度为1-50个字符";
+    String ICD_NOT_BLANK = "ICD不能为空";
+    String POWER_NOT_BLANK = "工作电源不能为空";
+    String VOLT_NOT_BLANK = "额定电压不能为空";
+    String CURR_NOT_BLANK = "额定电流不能为空";
+    String CHNS_NOT_BLANK = "通道数不能为空";
+    String DEV_CHNS_RANGE_ERROR = "通道数格式错误";
+    String INDEX_NOT_NULL = "index不能为空";
+    String VALUE_TYPE_NOT_BLANK = "脚本值类型不能为空";
+    String SCRIPT_NAME_FORMAT_ERROR = "脚本名称格式错误，只能包含字母、数字、中文、下划线、中划线、点号、空格，长度为1-32个字符";
+    String SCRIPT_VOLT_FORMAT_ERROR = "检测脚本额定电压格式错误，请检查ratedVolt参数";
+    String SCRIPT_CURR_FORMAT_ERROR = "检测脚本额定电流格式错误，请检查ratedCurr参数";
     String PORT_RANGE_ERROR = "端口号范围错误，请检查port参数";
 
-    String NAME_NOT_BLANK = "名称不能为空，请检查name参数";
+    String NAME_FORMAT_ERROR = "名称格式错误，只能包含字母、数字、中文、下划线、中划线、点号、空格，长度为1-32个字符";
 
-    String NAME_FORMAT_ERROR = "名称格式错误，请检查name参数";
+    String PATTERN_NOT_BLANK = "模式不能为空，请检查patternId参数";
 
-    String PATTERN_NOT_BLANK = "模式不能为空，请检查pattern参数";
+    String DEV_TYPE_NOT_BLANK = "设备类型不能为空";
 
-    String DEV_TYPE_NOT_BLANK = "设备类型不能为空，请检查devType参数";
-
-    String DEV_CHNS_NOT_NULL = "设备通道系数不能为空，请检查devChns参数";
-
-    String DEV_VOLT_NOT_NULL = "额定电压不能为空，请检查devVolt参数";
-
-    String DEV_CURR_NOT_NULL = "额定电流不能为空，请检查devCurr参数";
 
     String MANUFACTURER_NOT_BLANK = "设备厂家不能为空，请检查manufacturer参数";
 
     String CREATEDATETIME_NOT_NULL = "出厂日期不能为空，请检查producedDate参数";
 
-    String CREATEDATETIME_FORMAT_ERROR = "出厂日期格式错误，请检查createDateTime参数";
 
     String FACTORYNO_NOT_BLANK = "出厂编号不能为空，请检查factoryNo参数";
 
-    String FIRMWARE_NOT_BLANK = "固件版本不能为空，请检查firmware参数";
-
-    String SOFTWARE_NOT_BLANK = "软件版本不能为空，请检查software参数";
-
     String PROTOCOL_NOT_BLANK = "通讯协议不能为空，请检查protocol参数";
 
     String IP_NOT_BLANK = "IP地址不能为空，请检查ip参数";
@@ -60,7 +62,7 @@ public interface DevValidMessage {
 
     String RECHECK_NUM_FORMAT_ERROR = "检测次数格式错误，请检查recheckNum参数";
 
-    String PATTERN_FORMAT_ERROR = "模式格式错误，请检查pattern参数";
+    String PATTERN_FORMAT_ERROR = "模式格式错误，请检查patternId参数";
 
     String SOURCE_IDS_NOT_EMPTY = "检测源ID不能为空，请检查sourceIds参数";
 
@@ -74,15 +76,15 @@ public interface DevValidMessage {
 
     String PLAN_ID_FORMAT_ERROR = "检测计划ID格式错误，请检查planId参数";
 
-    String STANDARD_TIME_FORMAT_ERROR = "标准推行时间格式错误，请检查standardTime参数";
+    String STANDARD_TIME_FORMAT_ERROR = "标准推行年份格式错误，请检查standardTime参数";
 
     String SCRIPT_TYPE_NOT_BLANK = "检测脚本类型不能为空，请检查scriptType参数";
 
-    String STANDARD_NAME_NOT_BLANK = "参照标准名称不能为空，请检查standardName参数";
+    String STANDARD_NAME_NOT_BLANK = "标准号不能为空，请检查standardName参数";
 
-    String STANDARD_NAME_FORMAT_ERROR = "参照标准名称格式错误，请检查standardName参数";
+    String STANDARD_NAME_FORMAT_ERROR = "标准号格式错误，只能包含字母、数字、中文、下划线、中划线、点号、空格、斜杠、反斜杠，长度为1-32个字符";
 
-    String STANDARD_TIME_NOT_BLANK = "标准推行时间不能为空，请检查standardTime参数";
+    String STANDARD_TIME_NOT_BLANK = "标准推行年份不能为空，请检查standardTime参数";
 
     String SCRIPT_TYPE_FORMAT_ERROR = "检测脚本类型格式错误，请检查scriptType参数";
 
@@ -102,18 +104,6 @@ public interface DevValidMessage {
 
     String ERR_SYS_DTLS_SCRIPT_TYPE_FORMAT_ERROR = "脚本项类型格式错误，请检查scriptType参数";
 
-    String START_VALUE_NOT_NULL = "起始值不能为空，请检查startValue参数";
-
-    String START_FLAG_NOT_NULL = "是否包含起始值不能为空，请检查startFlag参数";
-
-    String END_VALUE_NOT_NULL = "结束值不能为空，请检查endValue参数";
-
-    String END_FLAG_NOT_NULL = "是否包含结束值不能为空，请检查endFlag参数";
-
-    String CONDITION_TYPE_NOT_BLANK = "判断条件类型不能为空，请检查conditionType参数";
-
-    String ERROR_VALUE_FORMAT_ERROR = "误差值格式错误，请检查errorValue参数";
-
     String MAX_ERROR_VALUE_NOT_NULL = "最大误差值不能为空，请检查maxErrorValue参数";
 
     String ERROR_VALUE_TYPE_NOT_BLANK = "误差值类型不能为空，请检查errorValueType参数";
@@ -124,18 +114,6 @@ public interface DevValidMessage {
 
     String ENABLE_NOT_NULL = "状态不能为空，请检查enable参数";
 
-    String PQ_SOURCE_NAME_FORMAT_ERROR = "检测源名称格式错误，请检查pqSourceName参数";
-
-    String PQ_SOURCE_PARAMETER_ID_NOT_BLANK = "检测源参数ID不能为空，请检查pqSourceParameterId参数";
-
-    String PQ_SOURCE_PARAMETER_PID_NOT_BLANK = "检测源参数PID不能为空，请检查pqSourceParameterId参数";
-
-    String PQ_SOURCE_PARAMETER_TYPE_NOT_BLANK = "检测源参数类型不能为空，请检查pqSourceParameterType参数";
-
-    String PQ_SOURCE_PARAMETER_REMARK_NOT_BLANK = "检测源参数描述不能为空，请检查pqSourceParameterRemark参数";
-
-    String PQ_SOURCE_PARAMETER_VALUE_NOT_BLANK = "参数值不能为空，请检查pqSourceParameterValue参数";
-
     String DEV_ID_NOT_BLANK = "设备ID不能为空";
 
     String DEV_ID_FORMAT_ERROR = "设备ID格式错误";
@@ -180,10 +158,6 @@ public interface DevValidMessage {
 
     String CHECK_RESULT_FORMAT_ERROR = "检测结果格式错误";
 
-    String DOCUMENT_STATE_FORMAT_ERROR = "归档状态格式错误";
-
-    String MONITOR_CODE_FORMAT_ERROR = "监测点编码格式错误";
-
     String MONITOR_NUM_NOT_NULL = "监测点序号不能为空";
 
     String FACTOR_FLAG_FORMAT_ERROR = "是否支持系数校准格式错误";
@@ -195,14 +169,16 @@ public interface DevValidMessage {
     String DATASOURCE_NOT_BLANK = "数据源不能为空";
 
     String SCRIPT_NOT_BLANK = "检测脚本不能为空";
-
     String ERRORSYS_NOT_BLANK = "误差体系不能为空";
 
-    String TIMECHECK_NOT_BLANK = "是否做守时检测不能为空";
-
-    String FACTOR_FLAG_NOT_BLANK = "是否支持系数校准不能为空";
-
-    String CONDITION_TYPE_FORMAT_ERROR = "判断条件类型格式错误，请检查conditionType参数";
-
     String SORT_NOT_NULL = "排序不能为空";
+    String PREINVESTMENT_PLAN_NOT_BLANK = "预投资计划不能为空";
+    String TIMECHECK_NOT_NULL = "是否做守时检测不能为空";
+    String CN_DEV_NAME_FORMAT_ERROR = "设备名称格式错误，只能包含数字、中划线，长度为1-32个字符";
+    String DEV_CREATE_ID_FORMAT_ERROR = "装置编号格式错误，只能包含字母、数字、中文、下划线、中划线、空格，长度为1-32位";
+
+    String DEV_TYPE_NAME_FORMAT_ERROR = "设备类型名称格式错误，只能包含字母、数字、中文、下划线、中划线、点号、空格，长度为1-32个字符";
+    String REPORT_NAME_NOT_BLANK = "报告模板不能为空";
+    String DATA_RULE_NOT_BLANK = "数据处理原则不能为空";
+    String ASSOCIATE_REPORT_NOT_NULL = "是否关联报告模板不能为空";
 }

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

@@ -0,0 +1,75 @@
+package com.njcn.gather.pojo.enums;
+
+import lombok.Getter;
+
+/**
+ * @author caozehui
+ * @data 2025-03-26
+ */
+@Getter
+public enum DetectionResponseEnum {
+    /**
+     * 检测模块异常响应码的范围：
+     * A02000 ~ A02
+     */
+    DEV_TYPE_NAME_REPEAT("A02000", "设备类型名称重复"),
+    SOURCE_BOUND_NOT_DELETE("A02001", "源已被计划所绑定，无法删除！"),
+    SCRIPT_BOUND_NOT_DELETE("A02003", "脚本已被计划所绑定，无法删除！"),
+    RAW_DATA_NOT_EXIST("A02004", "原始数据不存在"),
+    PLAN_REPEATED("A02005", "当前模式下，该计划已存在"),
+    PLAN_NOT_EXIST("A02006", "该计划不存在"),
+    SCRIPT_RELATE_DICT_NOT_EXIST("A02007", "脚本关联的字典不存在"),
+    NOT_CHECKED_PLAN_CANNOT_ANALYSE("A02008", "只有检测状态为检测完成的计划才能进行统计分析"),
+    CANNOT_CHANGE_SCRIPT_WHEN_CHECKING("A02009", "只有检测状态为未检时，才能修改检测脚本"),
+    CANNOT_CHANGE_ERROR_SYS_WHEN_CHECKING("A02010", "只有检测状态为未检时，才能修改误差体系"),
+    CANNOT_CHANGE_REPORT_WHEN_CHECKING("A02011", "只有检测状态为未检时，才能修改绑定报告模板"),
+    ICD_PATH_NAME_REPEAT("A02012", "icd名称重复"),
+    ERR_SYS_BOUND_NOT_DELETE("A02013", "误差体系已被计划所绑定，无法删除！"),
+    ERR_SYS_REPEAT("A02014", "已存在相同标准号、标准推行年份、适用设备等级的误差体系！"),
+    SCRIPT_NAME_REPEAT("A02015", "脚本名称重复"),
+
+
+    IMPORT_DATA_FAIL("A02040", "导入数据失败"),
+    SERIES_AND_DEVKEY_NOT_BLANK("A02041", "当为加密设备时，加密设备的序列号和设备密钥不能为空"),
+    PQ_SOURCE_GEN_NAME_ERROR("A02042", "检测源生成名称出错"),
+    ERR_SOURCE_GEN_NAME_ERROR("A02043", "误差体系生成名称出错"),
+    PQ_ERRSYS_GEN_NAME_ERROR("A02044", "误差体系生成名称出错"),
+    PLAN_HAS_DEVICE_BIND("A02045", "检测计划下已绑定设备，请先解绑设备"),
+    PQ_DEV_REPEAT("A02046", "重复的被检设备"),
+    PQ_DEV_HAS_MONITOR("A02047", "该设备下关联有监测点，请先移除监测点"),
+    HAS_NOT_UNCHECKED_DEVICE("A02048", "设备在检测中或已被检测过，请勿解除绑定"),
+    IMPORT_PLAN_DATA_FAIL("A02049", "导入的检测计划为空"),
+    IMPORT_DATA_FORMAT_FAIL("A02050", "导入数据格式错误"),
+    IMPORT_SOURCE_ERROR("A02051", "当前模式下一个检测计划只能有一个检测源"),
+    IMPORT_DATASOURCE_ERROR("A02052", "当前模式下一个检测计划只能有一个数据源"),
+    DEV_UN_CHECKED("A02053", "装置还未检测完成！"),
+    DEV_UN_REPORT("A02054", "装置报告未生成！"),
+    DEVICE_DIS_ERROR("A02055", "装置配置异常"),
+    DEVICE_DELETE("A02056", "设备无法删除，已绑定计划！"),
+    CREATE_DIRECTORY_FAILED("A02057", "创建目录失败"),
+    DELETE_DIRECTORY_FAILED("A02058", "删除目录失败"),
+    CN_DEV_NAME_FORMAT_ERROR("A02059", "设备名称格式错误，只能包含数字，长度为1-32位"),
+    PROVINCE_DEV_NAME_FORMAT_ERROR("A02060", "设备名称格式错误，只能包含字母、数字、下划线、中划线、空格，长度为1-32位"),
+    IMPORT_REPORT_TEMPLATE_ERROR("A02061", "当关联报告模板为是时，报告模板不能为空"),
+    DEV_TYPE_NOT_EXIST("A02062", "设备类型不存在，请先添加设备类型"),
+    MANUFACTURER_NOT_EXIST("A02063", "该设备厂家不存在，请先在\"设备厂家\"字典中添加"),
+    PROTOCOL_NOT_EXIST("A02064", "该协议不存在，请先在\"通讯协议\"字典中添加"),
+    DELEGATE_NOT_EXIST("A02065", "该委托方不存在，请先在\"委托方\"字典中添加"),
+    PREINVESTMENT_PLAN_NOT_EXIST("A02066", "该预投计划不存在，请先在\"预投计划\"字典中添加"),
+    DATA_SOURCE_NOT_EXIST("A02067", "该数据源不存在，请先在\"数据源\"字典中添加"),
+    SCRIPT_NOT_EXIST("A02068", "该脚本不存在，请先添加该脚本"),
+    ERROR_SYSTEM_NOT_EXIST("A02069", "该误差体系不存在，请先添加该误差体系"),
+    DATA_RULE_NOT_EXIST("A02070", "该数据处理原则不存在，请先在\"数据处理原则\"字典中添加"),
+    REPORT_TEMPLATE_NOT_EXIST("A02071", "该报告模板不存在，请先添加该报告模板"),
+    LACK_REPORT_TEMPLATE_ID("A02072","当关联报告模板为\"是\"时，报告模板不能为空" ),
+    NAME_OR_CREATEID_REPEAT("A02073","名称或装置编号重复" );
+
+    private final String code;
+
+    private final String message;
+
+    DetectionResponseEnum(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

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

@@ -1,11 +1,16 @@
 package com.njcn.gather.report.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.report.pojo.DevReportParam;
-import com.njcn.gather.report.service.IReportService;
+import com.njcn.gather.report.pojo.param.ReportParam;
+import com.njcn.gather.report.pojo.vo.PqReportVO;
+import com.njcn.gather.report.service.IPqReportService;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.utils.HttpResultUtil;
 import io.swagger.annotations.Api;
@@ -13,9 +18,11 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 
 /**
@@ -30,7 +37,7 @@ import javax.servlet.http.HttpServletResponse;
 @RequiredArgsConstructor
 public class ReportController extends BaseController {
 
-    private final IReportService reportService;
+    private final IPqReportService pqReportService;
 
     /**
      * 此方法临时的，给楼下使用，实际需要优化
@@ -44,7 +51,7 @@ public class ReportController extends BaseController {
     public HttpResult<Object> generateReport(@RequestBody DevReportParam devReportParam) {
         String methodDescribe = getMethodDescribe("generateReport");
         LogUtil.njcnDebug(log, "{}，终端参数为：{}", methodDescribe, devReportParam);
-        reportService.generateReport(devReportParam);
+        pqReportService.generateReport(devReportParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
@@ -58,9 +65,106 @@ public class ReportController extends BaseController {
     public void downloadReport(@RequestBody DevReportParam devReportParam, HttpServletResponse response) {
         String methodDescribe = getMethodDescribe("downloadReport");
         LogUtil.njcnDebug(log, "{}，终端参数为：{}", methodDescribe, devReportParam);
-        reportService.downloadReport(devReportParam,response);
+        pqReportService.downloadReport(devReportParam, response);
     }
 
+    @OperateInfo
+    @PostMapping("/list")
+    @ApiOperation("分页查询报告模板")
+    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
+    public HttpResult<Page<PqReportVO>> list(@RequestBody @Validated ReportParam.QueryParam queryParam) {
+        String methodDescribe = getMethodDescribe("list");
+        LogUtil.njcnDebug(log, "{}，查询参数为：{}", methodDescribe, queryParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pqReportService.list(queryParam), methodDescribe);
+    }
 
+    @OperateInfo
+    @GetMapping("/getById")
+    @ApiOperation("查询报告模板详情")
+    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
+    public HttpResult<PqReportVO> getById(@RequestParam("id") String id) {
+        String methodDescribe = getMethodDescribe("getById");
+        LogUtil.njcnDebug(log, "{}，查询参数为：{}", methodDescribe, id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pqReportService.getByReportId(id), methodDescribe);
+    }
 
+    @OperateInfo(operateType = OperateType.ADD)
+    @PostMapping("/add")
+    @ApiOperation("新增报告模板")
+    @ApiImplicitParam(name = "param", value = "报告模板参数", required = true)
+    public HttpResult<Boolean> add(ReportParam reportParam) {
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，新增参数为：{}", methodDescribe, reportParam);
+        boolean result = pqReportService.add(reportParam);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
+        }
+    }
+
+    @OperateInfo(operateType = OperateType.UPDATE)
+    @PostMapping("/update")
+    @ApiOperation("更新报告模板")
+    @ApiImplicitParam(name = "param", value = "报告模板参数", required = true)
+    public HttpResult<Boolean> update(ReportParam.UpdateParam reportParam) {
+        String methodDescribe = getMethodDescribe("update");
+        LogUtil.njcnDebug(log, "{}，修改参数为：{}", methodDescribe, reportParam);
+        boolean result = pqReportService.update(reportParam);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
+        }
+    }
+
+    @OperateInfo(operateType = OperateType.DELETE)
+    @PostMapping("/delete")
+    @ApiOperation("删除报告模板")
+    @ApiImplicitParam(name = "param", value = "报告模板参数", required = true)
+    public HttpResult<Boolean> delete(@RequestBody List<String> ids) {
+        String methodDescribe = getMethodDescribe("delete");
+        LogUtil.njcnDebug(log, "{}，删除参数为：{}", methodDescribe, ids);
+        boolean result = pqReportService.delete(ids);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
+        }
+    }
+
+    @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);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
+    @PostMapping("/documented")
+    @ApiOperation("设备归档")
+    @ApiImplicitParam(name = "id", value = "设备id", required = true)
+    public HttpResult<Boolean> documented(@RequestBody List<String> ids) {
+        String methodDescribe = getMethodDescribe("documented");
+        LogUtil.njcnDebug(log, "{}，设备id为：{}", methodDescribe, ids);
+        boolean result = pqReportService.documented(ids);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
+        }
+    }
+
+    @OperateInfo
+    @PostMapping("/uploadReportToCloud")
+    @ApiOperation("批量上传检测报告到云端")
+    @ApiImplicitParam(name = "deviceIds", value = "被检设备ID列表，为空时上传所有已生成报告的设备", required = false)
+    public HttpResult<Object> uploadReportToCloud(@RequestBody(required = false) List<String> deviceIds) {
+        String methodDescribe = getMethodDescribe("uploadReportToCloud");
+        LogUtil.njcnDebug(log, "{}，设备ID列表为：{}", methodDescribe, deviceIds);
+        pqReportService.uploadReportToCloud(deviceIds);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
 }

detection/src/main/java/com/njcn/gather/report/mapper/PqReportMapper.java

@@ -0,0 +1,19 @@
+package com.njcn.gather.report.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.njcn.gather.report.pojo.po.PqReport;
+
+import java.util.List;
+
+/**
+ * @author makejava
+ * @date 2025-03-19
+ */
+public interface PqReportMapper extends MPJBaseMapper<PqReport> {
+    /**
+     * 获取所有已被计划绑定的报告模板id
+     * @return
+     */
+    List<String> getBoundReportIds();
+}
+

detection/src/main/java/com/njcn/gather/report/mapper/mapping/PqReportMapper.xml

@@ -0,0 +1,10 @@
+<?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.report.mapper.PqReportMapper">
+
+
+    <select id="getBoundReportIds" resultType="java.lang.String">
+        select distinct Report_Template_Id from ad_plan where state = 1
+    </select>
+</mapper>
+

detection/src/main/java/com/njcn/gather/report/pojo/DevReportParam.java

@@ -3,6 +3,7 @@ package com.njcn.gather.report.pojo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author hongawen
@@ -19,9 +20,20 @@ public class DevReportParam implements Serializable {
      */
     private String planId;
 
+    /**
+     * 计划所对应的表code
+     */
+    private String planCode;
+
+    /**
+     * 脚本ID
+     */
+    private String scriptId;
+
     /**
      * 被检设备ID
      */
     private String devId;
 
+    private List<String> devIdList;
 }

detection/src/main/java/com/njcn/gather/report/pojo/constant/PowerConstant.java

@@ -0,0 +1,77 @@
+package com.njcn.gather.report.pojo.constant;
+
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 电能质量指标常用的一些常量池
+ *
+ * @author hongawen
+ * @version 1.0
+ * @data 2025/3/27 11:11
+ */
+public interface PowerConstant {
+
+    /**
+     * 有三相的指标
+     */
+    List<String> THREE_PHASE = Arrays.asList("V", "HV", "HI", "HP", "HSV", "HSI", "I", "P", "F");
+
+    /**
+     * T相指标
+     */
+    List<String> T_PHASE = Arrays.asList("VOLTAGE", "IMBV", "IMBA", "FREQ");
+
+
+    /**
+     * 有次数的指标
+     */
+    List<String> TIME = Arrays.asList("HV", "HI", "HP", "HSV", "HSI");
+
+    /**
+     * 没有次数的指标
+     */
+    List<String> NO_TIME = Arrays.asList("V", "I", "P", "VOLTAGE", "IMBV", "IMBA", "F", "FREQ");
+
+    /**
+     * 有数据范围
+     */
+    List<Integer> DATA_RANGE = Arrays.asList(1, 2);
+
+    /**
+     * 暂态符号
+     */
+    String VOLTAGE = "VOLTAGE";
+
+    /**
+     * A相
+     */
+    String PHASE_A = "A";
+
+    /**
+     * B相
+     */
+    String PHASE_B = "B";
+
+    /**
+     * C相
+     */
+    String PHASE_C = "C";
+
+    /**
+     * T相
+     */
+    String PHASE_T = "T";
+
+    /**
+     * 电流单位
+     */
+    String CURRENT_UNIT = "A";
+
+    /**
+     * 电压单位
+     */
+    String VOLTAGE_UNIT = "V";
+
+}

detection/src/main/java/com/njcn/gather/report/pojo/constant/ReportConstant.java

@@ -0,0 +1,22 @@
+package com.njcn.gather.report.pojo.constant;
+
+/**
+ *
+ * 报告相关的一些常量
+ *
+ * @author hongawen
+ * @version 1.0
+ * @data 2025/4/3 13:44
+ */
+public interface ReportConstant {
+
+    /**
+     * docx文档后缀
+     */
+    String DOCX = ".docx";
+
+    /**
+     * 报告模板中书签的起始标识
+     */
+    String BOOKMARK_START = "#{";
+}

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

@@ -0,0 +1,43 @@
+package com.njcn.gather.report.pojo.enums;
+
+import lombok.Getter;
+
+/**
+ * 影响量枚举
+ * @author hongawen
+ * @version 1.0
+ * @data 2025/3/27 21:07
+ */
+@Getter
+public enum AffectEnum {
+
+
+    BASE("base", "额定工作条件下的检测"),
+    VOL("vol", "电压对XX测量的影响"),
+    FREQ("freq", "频率对XX测量的影响"),
+    HARM("harm", "谐波对XX测量的影响");
+
+    private String key;
+
+    private String desc;
+
+    AffectEnum(String key, String desc) {
+        this.key = key;
+        this.desc = desc;
+    }
+
+    /**
+     * 根据key找到适配的枚举
+     *
+     * @param key 枚举的key
+     * @return 匹配的枚举实例，如果没有找到则返回null
+     */
+    public static AffectEnum getByKey(String key) {
+        for (AffectEnum affectEnum : AffectEnum.values()) {
+            if (affectEnum.getKey().equalsIgnoreCase(key)) {
+                return affectEnum;
+            }
+        }
+        return null;
+    }
+}

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

@@ -0,0 +1,48 @@
+package com.njcn.gather.report.pojo.enums;
+
+import lombok.Getter;
+
+/**
+ *
+ * 本枚举用于记录模板中关键字的含义
+ * 比如 ${manufacturer} 对应的设备厂家
+ *
+ * @author hongawen
+ * @version 1.0
+ * @data 2025/3/24 14:34
+ *
+ * */
+@Getter
+public enum BaseReportKeyEnum {
+
+    DEV_TYPE("devType","设备型号、规格"),
+    DEV_CODE("createId","装置编号"),
+    POWER("power","工作电源"),
+    DEV_CURR("devCurr","额定电流"),
+    DEV_VOLT("devVolt","额定电压"),
+    COUNT("count","通道数"),
+    MANUFACTURER("manufacturer","设备厂家、制造厂商"),
+    SAMPLE_ID("sampleId","样品编号"),
+    ARRIVED_DATE("arrivedDate","收样日期"),
+    TEST_DATE("testDate","检测日期"),
+    INSPECTOR("inspector","检测员"),
+    YEAR("year","年份"),
+    MONTH("month","月份"),
+    DAY("day","日"),
+    YEAR_MONTH_DAY("year-month-day","年-月-日"),
+    TEMPERATURE("temp","温度"),
+    HUMIDITY("hum","相对湿度"),
+    DELEGATE("delegate","委托方"),
+    CREATEDATE("createDate","出厂日期"),
+    HW_VERSION("hardwareVersion","硬件版本"),
+    SW_VERSION("softwareVersion","软件版本");
+
+    private String key;
+
+    private String desc;
+
+    BaseReportKeyEnum(String key, String desc) {
+        this.key = key;
+        this.desc = desc;
+    }
+}

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

@@ -0,0 +1,56 @@
+package com.njcn.gather.report.pojo.enums;
+
+/**
+ * @author hongawen
+ * @version 1.0
+ * @data 2025/5/22 9:46
+ */
+
+import lombok.Getter;
+
+/**
+ * 统计文档锚点类型
+ *
+ * @author hongawen
+ * @version 1.0
+ * @data 2025/3/24 18:42
+ */
+@Getter
+public enum BookmarkEnum {
+
+
+    DATA_LINE("data_line", "准确度数据展示区域，以测试回路维度展示", 1),
+    DATA_SCRIPT("data_script", "准确度数据展示区域，以检测项维度展示", 1),
+    TEST_RESULT_DEV("testResult_dev", "检测结论，仅有设备结论", 2),
+    TEST_RESULT_LINE("testResult_line", "检测结论，仅有回路结论", 2),
+    TEST_RESULT_DETAIL("testResult_detail", "检测结论，包含回路、设备结论", 2),
+    CATALOG("catalog", "目录信息", 3);
+
+    private String key;
+
+    private String desc;
+
+    private Integer sort;
+
+    BookmarkEnum(String key, String desc, Integer sort) {
+        this.key = key;
+        this.desc = desc;
+        this.sort = sort;
+    }
+
+    /**
+     * 根据key找到适配的枚举
+     *
+     * @param key 枚举的key
+     * @return 匹配的枚举实例，如果没有找到则返回null
+     */
+    public static BookmarkEnum getByKey(String key) {
+        for (BookmarkEnum bookmarkEnum : BookmarkEnum.values()) {
+            if (bookmarkEnum.getKey().equalsIgnoreCase(key)) {
+                return bookmarkEnum;
+            }
+        }
+        return null;
+    }
+
+}

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

@@ -0,0 +1,50 @@
+package com.njcn.gather.report.pojo.enums;
+
+import lombok.Getter;
+
+/**
+ * 统计文档锚点类型
+ *
+ * @author hongawen
+ * @version 1.0
+ * @data 2025/3/24 18:42
+ */
+@Getter
+public enum DocAnchorEnum {
+
+
+    DATA_LINE("#{data:line}", "准确度数据展示区域，以测试回路维度展示", 1),
+    DATA_SCRIPT("#{data:script}", "准确度数据展示区域，以检测项维度展示", 1),
+    TEST_RESULT_DEV("#{testResult:dev}", "检测结论，仅有设备结论", 2),
+    TEST_RESULT_LINE("#{testResult:line}", "检测结论，仅有回路结论", 2),
+    TEST_RESULT_DETAIL("#{testResult:detail}", "检测结论，包含回路、设备结论", 2),
+    CATALOG("#{catalog}", "目录信息", 3);
+
+    private String key;
+
+    private String desc;
+
+    private Integer sort;
+
+    DocAnchorEnum(String key, String desc, Integer sort) {
+        this.key = key;
+        this.desc = desc;
+        this.sort = sort;
+    }
+
+    /**
+     * 根据key找到适配的枚举
+     *
+     * @param key 枚举的key
+     * @return 匹配的枚举实例，如果没有找到则返回null
+     */
+    public static DocAnchorEnum getByKey(String key) {
+        for (DocAnchorEnum docAnchorEnum : DocAnchorEnum.values()) {
+            if (docAnchorEnum.getKey().equalsIgnoreCase(key)) {
+                return docAnchorEnum;
+            }
+        }
+        return null;
+    }
+
+}

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

@@ -0,0 +1,71 @@
+package com.njcn.gather.report.pojo.enums;
+
+import lombok.Getter;
+
+/**
+ * 检测项模版枚举
+ * @author hongawen
+ * @version 1.0
+ * @data 2025/3/27 10:24
+ */
+@Getter
+public enum ItemReportKeyEnum {
+
+    NAME("name", "检测项，比如：频率"),
+    NAME_DETAIL("nameDetail", "检测项详细，比如：频率测量准确度"),
+    INFLUENCE("influence", "影响量的描述，比如额定工作条件、谐波对电压的影响等等"),
+    ERROR_SCOPE("errorScope", "误差范围，注：在段落中时需加上（），表格中无需添加"),
+    ERROR_SCOPE_MAG("errorScopeMag", "特征幅值：误差范围"),
+    ERROR_SCOPE_DUR("errorScopeDur", "持续时间：误差范围"),
+    SCRIPT_DETAIL("scriptDetail", "脚本输出明细。比如：基波电压UN=57.74V，f=50Hz，谐波含有率Uh=10%UN=5.774V"),
+    TIME("time", "次数"),
+    STANDARD("standard", "标准值"),
+    STANDARD_A("standardA", "A相标准值"),
+    STANDARD_B("standardB", "B相标准值"),
+    STANDARD_C("standardC", "C相标准值"),
+    STANDARD_MAG("standardMag", "特征幅值的标准值"),
+    STANDARD_DUR("standardDur_ms", "持续时间的标准值"),
+    TEST("test", "测试值"),
+    TEST_MAG("testMag", "特征幅值测试值"),
+    TEST_DUR("testDur_ms", "持续时间测试值"),
+    TEST_A("testA", "A相测试值"),
+    TEST_B("testB", "B相测试值"),
+    TEST_C("testC", "C相测试值"),
+    ERROR("error", "误差"),
+    ERROR_MAG("errorMag", "特征幅值误差"),
+    ERROR_DUR("errorDur_ms", "持续时间误差"),
+    ERROR_A("errorA", "A相误差"),
+    ERROR_B("errorB", "B相误差"),
+    ERROR_C("errorC", "C相误差"),
+    RESULT("result", "结论 比如：合格/不合格"),
+    RESULT_A("resultA", "结论 比如：合格/不合格"),
+    RESULT_B("resultB", "结论 比如：合格/不合格"),
+    RESULT_C("resultC", "结论 比如：合格/不合格"),
+    RESULT_MAG("resultMag", "特征幅值结论 比如：合格/不合格"),
+    RESULT_DUR("resultDur", "持续时间结论 比如：合格/不合格");
+
+    private String key;
+
+    private String desc;
+
+    ItemReportKeyEnum(String key, String desc) {
+        this.key = key;
+        this.desc = desc;
+    }
+
+    /**
+     * 根据key找到适配的枚举
+     *
+     * @param key 枚举的key
+     * @return 匹配的枚举实例，如果没有找到则返回null
+     */
+    public static ItemReportKeyEnum getByKey(String key) {
+        for (ItemReportKeyEnum itemReportKetEnum : ItemReportKeyEnum.values()) {
+            if (itemReportKetEnum.getKey().equalsIgnoreCase(key)) {
+                return itemReportKetEnum;
+            }
+        }
+        return null;
+    }
+
+}

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

@@ -0,0 +1,52 @@
+package com.njcn.gather.report.pojo.enums;
+
+import lombok.Getter;
+
+/**
+ * 电能质量测试大项枚举
+ * @author hongawen
+ * @version 1.0
+ * @data 2025/3/27 18:29
+ */
+@Getter
+public enum PowerIndexEnum {
+
+
+    UNKNOWN("UNKNOWN", "未知指标"),
+    FREQ("FREQ", "频率"),
+    V("V", "电压"),
+    I("I", "电流"),
+    IMBV("IMBV", "负序电压不平衡度"),
+    IMBA("IMBA", "负序电流不平衡度"),
+    F("F", "短时电压闪变"),
+    HP("HP", "谐波有功功率"),
+    HV("HV", "谐波电压"),
+    HI("HI", "谐波电流"),
+    HSV("HSV", "间谐波电压"),
+    HSI("HSI", "间谐波电流"),
+    VOLTAGE("VOLTAGE", "电压暂降、暂升及短时中断");
+
+    private String key;
+
+    private String desc;
+
+    PowerIndexEnum(String key, String desc) {
+        this.key = key;
+        this.desc = desc;
+    }
+
+    /**
+     * 根据key找到适配的枚举
+     *
+     * @param key 枚举的key
+     * @return 匹配的枚举实例，如果没有找到则返回null
+     */
+    public static PowerIndexEnum getByKey(String key) {
+        for (PowerIndexEnum powerIndexEnum : PowerIndexEnum.values()) {
+            if (powerIndexEnum.getKey().equalsIgnoreCase(key)) {
+                return powerIndexEnum;
+            }
+        }
+        return null;
+    }
+}

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

@@ -0,0 +1,36 @@
+package com.njcn.gather.report.pojo.enums;
+
+import lombok.Getter;
+
+/**
+ * @author caozehui
+ * @data 2025-03-19
+ */
+@Getter
+public enum ReportResponseEnum {
+
+    FILE_UPLOAD_FAILED("A012001", "文件上传失败"),
+    FILE_SUFFIX_ERROR("A012002", "文件后缀错误,请上传.docx文件"),
+    REPORT_REPEATED("A012003", "已存在相同版本、相同名称的报告"),
+    FILE_NOT_NULL("A012004", "上传的文件不能为空"),
+    DELETE_BOUND_REPORT_ERROR("A012005", "已被计划绑定模板的报告不能删除"),
+    FILE_NAME_SAME_ERROR("A012006", "文件名不能相同"),
+    DEVICE_NOT_EXIST("A012007", "请检查装置是否存在！"),
+    DEVICE_TYPE_NOT_EXIST("A012008", "设备类型缺失，请联系管理员！"),
+    REPORT_TEMPLATE_NOT_EXIST("A012009", "报告模板缺失，请联系管理员！"),
+    NO_CHECK_DATA("A012010", "没有检测数据，无法生成报告！"),
+    FILE_RENAME_FAILED("A012011", "文件重命名失败"),
+    REPORT_NAME_PATTERN_ERROR("A012012", "报告名称格式错误，可包含中文、字母、数字、中划线、点号、空格，长度不能超过32个字符"),
+    REPORT_VERSION_PATTERN_ERROR("A012013", "报告版本号格式错误，可包含中文、字母、数字、中划线、点号、空格，长度不能超过32个字符"),
+    FILE_SIZE_ERROR("A012014", "文件大小不能超过5MB"),
+    GENERATE_REPORT_ERROR("A012015", "生成报告失败"),
+    FTP_CONNECTION_FAILED("A012016", "FTP连接失败，无法将二维码文件上传至装置");
+
+    private String code;
+    private String message;
+
+    ReportResponseEnum(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

detection/src/main/java/com/njcn/gather/report/pojo/param/ReportParam.java

@@ -0,0 +1,47 @@
+package com.njcn.gather.report.pojo.param;
+
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * @author caozehui
+ * @data 2025-03-19
+ */
+@Data
+public class ReportParam {
+
+    @ApiModelProperty(value = "报告模板名称", required = true)
+    private String name;
+
+    @ApiModelProperty(value = "版本号", required = true)
+    private String version;
+
+    @ApiModelProperty(value = "描述信息", required = true)
+    private String description;
+
+    @ApiModelProperty(value = "基础模板文件", required = true)
+    private MultipartFile baseFile;
+
+    @ApiModelProperty(value = "检测项模版文件", required = true)
+    private MultipartFile detailFile;
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class QueryParam extends BaseParam {
+        @ApiModelProperty(value = "报告模板名称", required = true)
+        private String name;
+
+        @ApiModelProperty(value = "版本号", required = true)
+        private String version;
+    }
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class UpdateParam extends ReportParam {
+        @ApiModelProperty(value = "id", required = true)
+        private String id;
+    }
+}