微调

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

@@ -307,7 +307,7 @@ public class SocketContrastResponseService {
         FormalTestManager.numMap.clear();
         FormalTestManager.numMap.putAll(numMap);
         SysTestConfig oneConfig = sysTestConfigService.getOneConfig();
-        if (param.isFormalTestSelected()) {
+        if (param.getTestItemList().get(2)) {
             numMap.forEach((devMonitorId, num) -> {
                 if (oneConfig.getMaxTime() < num) {
                     throw new BusinessException(DetectionResponseEnum.EXCEED_MAX_TIME);
@@ -1154,7 +1154,7 @@ public class SocketContrastResponseService {
 
     private void sendFormalTest(String s, PreDetectionParam param, SourceOperateCodeEnum requestOperateCode, SourceOperateCodeEnum quitOperateCode) {
         // 后续做正式检测
-        if (param.isFormalTestSelected()) {
+        if (param.getTestItemList().get(2)) {
             System.out.println("开始正式检测！");
             if (ObjectUtil.isNotNull(FormalTestManager.nonWaveDataSourceEnum)) {
                 SocketMsg<String> socketMsg = new SocketMsg<>();

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

@@ -398,7 +398,7 @@ public class SocketDevResponseService {
         sendWebSocket(param.getUserPageId(), SourceOperateCodeEnum.Coefficient_Check.getValue(), SourceOperateCodeEnum.small_comp_end.getValue(), XiNumberManager.devParameterList.get(1));
         System.out.println("-------------------------已经全部结束----------------------");
 
-        if (param.isFormalTestSelected()) {
+        if (param.getTestItemList().get(2)) {
             //如果后续做正式检测
             PqScriptIssueParam issueParam = new PqScriptIssueParam();
             issueParam.setSourceId(param.getSourceName());
@@ -912,13 +912,13 @@ public class SocketDevResponseService {
                             socketMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue());
                             List<SourceIssue> sourceIssues;
                             // 做预检测、后续做系数校准
-                            if (param.isPreTestSelected() || param.isCoefficientSelected()) {
+                            if (param.getTestItemList().get(0) || param.getTestItemList().get(1)) {
                                 issueParam.setIsPhaseSequence(CommonEnum.PHASE_TEST.getValue());
                                 sourceIssues = pqScriptDtlsService.listSourceIssue(issueParam);
                                 socketMsg.setRequestId(SourceOperateCodeEnum.YJC_XUJY.getValue());
                                 socketMsg.setData(JSON.toJSONString(sourceIssues.get(0)));
                                 SocketManager.sendMsg(param.getUserPageId() + CnSocketUtil.SOURCE_TAG, JSON.toJSONString(socketMsg));
-                            } else if (param.isFormalTestSelected()) {
+                            } else if (param.getTestItemList().get(2)) {
                                 // 后续做正式检测
                                 if (param.getReCheckType().equals(SourceOperateCodeEnum.RE_ERROR_TEST.getValue())) {
                                     //不合格项复检
@@ -1147,7 +1147,7 @@ public class SocketDevResponseService {
                             }
 
                             // 后续做系数校准
-                            if (param.isCoefficientSelected()) {
+                            if (param.getTestItemList().get(1)) {
                                 WebSocketVO<Object> webSocketVO = new WebSocketVO<>();
                                 webSocketVO.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue());
                                 webSocketVO.setOperateCode(SourceOperateCodeEnum.big_start.getValue());
@@ -1171,7 +1171,7 @@ public class SocketDevResponseService {
                                 XiNumberManager.smallDevXiNumDataMap.clear();
 
                                 System.out.println("开始系数校准》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》");
-                            } else if (param.isFormalTestSelected()) {
+                            } else if (param.getTestItemList().get(2)) {
                                 // 后续做正式检测
                                 PqScriptIssueParam issueParam = new PqScriptIssueParam();
                                 issueParam.setSourceId(param.getSourceName());
@@ -1815,7 +1815,7 @@ public class SocketDevResponseService {
         //字典树
         SocketManager.valueTypeMap = iPqScriptCheckDataService.getValueTypeMap(param.getScriptId());
 
-        if (param.isCoefficientSelected()) {
+        if (param.getTestItemList().get(1)) {
             initXiManager(param);
         }
 

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

@@ -38,31 +38,10 @@ public class ContrastDetectionParam {
     @NotEmpty(message = DetectionValidMessage.PAIRS_NOT_EMPTY)
     private Map<String, String> pairs;
     /**
-     * 检测项列表。第一个元素为预检测、第二个元素为系数校准、第三个元素为守时校验、第四个元素为正式检测。
+     * 检测项列表。第一个元素为预检测、第二个元素为系数校准、第三个元素为正式检测
-     * 比对场景暂不支持系数校准和守时校验，第二、第三个元素固定为 false。
      */
     private List<Boolean> testItemList;
 
-    public boolean isPreTestSelected() {
-        return isTestItemSelected(0);
-    }
-
-    public boolean isCoefficientSelected() {
-        return isTestItemSelected(1);
-    }
-
-    public boolean isTimeCheckSelected() {
-        return isTestItemSelected(2);
-    }
-
-    public boolean isFormalTestSelected() {
-        return isTestItemSelected(3);
-    }
-
-    private boolean isTestItemSelected(int index) {
-        return testItemList != null && testItemList.size() > index && Boolean.TRUE.equals(testItemList.get(index));
-    }
-
     private String userId;
 
     /**

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

@@ -5,6 +5,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author wr
@@ -75,27 +76,7 @@ public class PreDetectionParam {
     private Float humidity;
 
     /**
-     * 检测项列表。第一个元素为预检测、第二个元素为系数校准、第三个元素为守时校验、第四个元素为正式检测
+     * 检测项列表。第一个元素为预检测、第二个元素为系数校准、第三个元素为正式检测
      */
     private List<Boolean> testItemList;
-
-    public boolean isPreTestSelected() {
-        return isTestItemSelected(0);
-    }
-
-    public boolean isCoefficientSelected() {
-        return isTestItemSelected(1);
-    }
-
-    public boolean isTimeCheckSelected() {
-        return isTestItemSelected(2);
-    }
-
-    public boolean isFormalTestSelected() {
-        return isTestItemSelected(3);
-    }
-
-    private boolean isTestItemSelected(int index) {
-        return testItemList != null && testItemList.size() > index && Boolean.TRUE.equals(testItemList.get(index));
-    }
 }

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

@@ -371,7 +371,7 @@ public class WebSocketHandler extends SimpleChannelInboundHandler<TextWebSocketF
             if (ObjectUtil.isNotNull(preDetectionParam)) {
                 // 使用该用户的检测参数关闭Socket连接
                 log.info("使用用户检测参数关闭Socket连接，userId: {}", userId);
-                if (FormalTestManager.patternEnum.equals(PatternEnum.CONTRAST)) {
+                if (PatternEnum.CONTRAST.equals(FormalTestManager.patternEnum)) {
                     CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, false);
                     CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, false);
                     CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, false);