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 {
 
@@ -40,6 +40,10 @@ public interface CommConst {
     String CMD_READ_FAULT_RESISTANCE = "03";
 
     String CMD_ID_GET_SN = "B1";
+
+    String ANSWER_RIGHT = "00000000";
+    String ANSWER_WRONG = "00000001";
+
     int LENGTH_2 = 2;
     int LENGTH_8 = 8;
     /**

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/controller/ConfigController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.*;
 public class ConfigController {
 
     /**
+     * http://192.168.1.151:8080/sim/config/set?key=CHECK_REPLACE_EMPTY&value=false
      * http://192.168.1.60:8080/sim/config/set?key=CHECK_REPLACE_EMPTY&value=false
      * http://192.168.1.60:8080/sim/config/set?key=SCHEDULED_CONNECT&value=false
      *

ruoyi-sim/src/main/java/com/ruoyi/sim/controller/SimController.java

@@ -63,7 +63,6 @@ public class SimController extends BaseController {
      * 新增模拟器
      */
     // @PreAuthorize("@ss.hasPermi('sim:sim:add')")
-    // @Log(title = "模拟器", businessType = BusinessType.INSERT)
     // @PostMapping
     public AjaxResult add(@RequestBody Sim sim) {
         return toAjax(simService.insertSim(sim));
@@ -73,7 +72,6 @@ public class SimController extends BaseController {
      * 修改模拟器
      */
     // @PreAuthorize("@ss.hasPermi('sim:sim:edit')")
-    // @Log(title = "模拟器", businessType = BusinessType.UPDATE)
     // @PutMapping
     public AjaxResult edit(@RequestBody Sim sim) {
         return toAjax(simService.updateSim(sim));
@@ -82,8 +80,6 @@ public class SimController extends BaseController {
     /**
      * 删除模拟器
      */
-    // @PreAuthorize("@ss.hasPermi('sim:sim:remove')")
-    // @Log(title = "模拟器", businessType = BusinessType.DELETE)
     // @DeleteMapping("/{simIds}")
     public AjaxResult remove(@PathVariable Long[] simIds) {
         return toAjax(simService.deleteSimBySimIds(simIds));
@@ -96,4 +92,10 @@ public class SimController extends BaseController {
     public AjaxResult listAllEnable() {
         return simService.listAllEnableAj();
     }
+
+    @GetMapping("/listAllEnable")
+    @ApiOperation("获取所有在线的模拟器列表")
+    public AjaxResult listAllOnline() {
+        return simService.listAllOnlineAj();
+    }
 }

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,7 +1,7 @@
 package com.ruoyi.sim.service.impl;
 
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.sim.constant.FaultConst;
 import com.ruoyi.sim.domain.*;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -11,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
 // 多实例
@@ -205,28 +205,7 @@ public class CommReceiveService {
      * @return true 在白名单中。
      */
     public boolean isFaultCheckPass(SimMsg sm, Sim s, Fault f) {
-        String simType = s.getSimType();
         String faultRealGZBWId = f.getFaultId();
-        if (Sim.TYPE_0001.equals(simType)) {
-
-        }
-        if (Sim.TYPE_0002.equals(simType)) {
-            // 0002型 01故障部位进行特殊处理。
-            if ("0002GZBW0001".equals(faultRealGZBWId)) {
-                return true;
-            }
-        }
-        if (Sim.TYPE_0003.equals(simType)) {
-            // 干燥管
-            if ("0003GZBW0007".equals(faultRealGZBWId)) {
-                return true;
-            }
-            // 检测剂
-            if ("0003GZBW0006".equals(faultRealGZBWId)) {
-                return true;
-            }
-        }
-        // finally
-        return false;
+        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.*;
 
 /**
  * 硬件通信

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

@@ -147,6 +147,15 @@ public class SimService {
         return list;
     }
 
+    /**
+     * 获取所有在线的模拟器列表
+     *
+     * @return
+     */
+    public AjaxResult listAllOnlineAj() {
+        return AjaxResult.success(listAllOnline());
+    }
+
     public List<Sim> listAllOnline() {
         List<Sim> list = new ArrayList<>();
         listAll()