修改 特殊情况的 常量值。

ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/CommConst.java → ruoyi-sim/src/main/java/com/ruoyi/sim/constant/CommConst.java

@@ -1,4 +1,4 @@
-package com.ruoyi.sim.service.impl;
+package com.ruoyi.sim.constant;
 
 public interface CommConst {
 

ruoyi-sim/src/main/java/com/ruoyi/sim/constant/FaultConst.java

@@ -0,0 +1,41 @@
+package com.ruoyi.sim.constant;
+
+import java.util.HashSet;
+
+public class FaultConst {
+
+    /**
+     * 跳过的开始考试检查故障部位 集合。
+     */
+    public static HashSet<String> FAULT_SET_CHECK_PASS = new HashSet<>();
+
+    public static HashSet<String> FAULT_SET_JUDGE_RIGHT_FROM_WRONG_SP2 = new HashSet<>();
+
+    static {
+        {
+            // 1型
+            // 1型不存在
+            // 2型
+            FAULT_SET_CHECK_PASS.add("0002GZBW0001");
+            FAULT_SET_CHECK_PASS.add("0002GZBW0005");
+            FAULT_SET_CHECK_PASS.add("0002GZBW0009");
+            // 3型
+            FAULT_SET_CHECK_PASS.add("0003GZBW0006");
+            FAULT_SET_CHECK_PASS.add("0003GZBW0007");
+        }
+        {
+            // 1型
+            // 1型不存在
+            // 2型
+            FAULT_SET_JUDGE_RIGHT_FROM_WRONG_SP2.add("0002GZBW0001");
+            FAULT_SET_JUDGE_RIGHT_FROM_WRONG_SP2.add("0002GZBW0003");
+            FAULT_SET_JUDGE_RIGHT_FROM_WRONG_SP2.add("0002GZBW0005");
+            FAULT_SET_JUDGE_RIGHT_FROM_WRONG_SP2.add("0002GZBW0009");
+            FAULT_SET_JUDGE_RIGHT_FROM_WRONG_SP2.add("0002GZBW0010");
+            // 3型
+            FAULT_SET_JUDGE_RIGHT_FROM_WRONG_SP2.add("0003GZBW0006");
+            FAULT_SET_JUDGE_RIGHT_FROM_WRONG_SP2.add("0002GZBW0007");
+            FAULT_SET_JUDGE_RIGHT_FROM_WRONG_SP2.add("0002GZBW0008");
+        }
+    }
+}

ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/CommBuildService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.sim.service.impl;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.sim.constant.CommConst;
 import com.ruoyi.sim.domain.SimMsg;
 import com.ruoyi.sim.util.CRC16Modbus;
 import org.apache.commons.lang3.StringUtils;
@@ -10,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import static com.ruoyi.sim.service.impl.CommConst.*;
+import static com.ruoyi.sim.constant.CommConst.*;
 
 @Service
 public class CommBuildService {

ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/CommReceiveService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.sim.service.impl;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.sim.constant.FaultConst;
 import com.ruoyi.sim.domain.*;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -10,7 +11,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.HashSet;
 
-import static com.ruoyi.sim.service.impl.CommConst.*;
+import static com.ruoyi.sim.constant.CommConst.*;
 
 @Service
 // 多实例
@@ -195,20 +196,6 @@ public class CommReceiveService {
         }
     }
 
-    private static HashSet<String> FAULT_CHECK_PASS_SET = new HashSet<>();
-
-    static {
-        // 1型
-        // 1型不存在
-        // 2型
-        FAULT_CHECK_PASS_SET.add("0002GZBW0001");
-        FAULT_CHECK_PASS_SET.add("0002GZBW0005");
-        FAULT_CHECK_PASS_SET.add("0002GZBW0009");
-        // 3型
-        FAULT_CHECK_PASS_SET.add("0003GZBW0006");
-        FAULT_CHECK_PASS_SET.add("0003GZBW0007");
-    }
-
     /**
      * 是否在故障部位白名单中。
      *
@@ -219,6 +206,6 @@ public class CommReceiveService {
      */
     public boolean isFaultCheckPass(SimMsg sm, Sim s, Fault f) {
         String faultRealGZBWId = f.getFaultId();
-        return FAULT_CHECK_PASS_SET.contains(faultRealGZBWId);
+        return FaultConst.FAULT_SET_CHECK_PASS.contains(faultRealGZBWId);
     }
 }

ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/CommSendService.java

@@ -5,7 +5,6 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.sim.config.SimConfig;
 import com.ruoyi.sim.config.SimDebugConfig;
 import com.ruoyi.sim.domain.*;
-import com.ruoyi.sim.domain.vo.SelectSysDeptVo;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
@@ -21,7 +20,7 @@ import java.net.Socket;
 import java.net.UnknownHostException;
 import java.util.*;
 
-import static com.ruoyi.sim.service.impl.CommConst.*;
+import static com.ruoyi.sim.constant.CommConst.*;
 
 /**
  * 硬件通信