修改可换件ID值检查。

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -11,6 +11,10 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  */
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 public class RuoYiApplication {
+
+    /**
+     * start ok logo！
+     */
     public static final String START_OK = " ________  ___  __       \n" +
             "|\\   __  \\|\\  \\|\\  \\     \n" +
             "\\ \\  \\|\\  \\ \\  \\/  /|_   \n" +

ruoyi-admin/src/main/resources/application-druid.yml

@@ -23,14 +23,13 @@ spring:
                 # password: 8M6ahN7BXsXXDccR
 
                 # server-现场实验室
-                # url: jdbc:mysql://192.168.1.61:4886/pla-chem-sim-dev-1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 url: jdbc:mysql://192.168.1.61:4886/pla-chem-sim-dev-2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: 7ZNo#9Arn3DFBN8N
 
-                # url: jdbc:mysql://127.0.0.1:3306/pla-chem-sim-dev-1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                # url: jdbc:mysql://127.0.0.1:3306/pla-chem-sim-dev-2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 # username: root
-                # password: my123456
+                # password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-sim/src/main/java/com/ruoyi/sim/config/SimDebugConfig.java

@@ -15,7 +15,12 @@ public class SimDebugConfig {
     public static boolean SCHEDULED_CONNECT = true;
 
 
+    public static final String KEY_CHECK_MIN_OR_MAX = "CHECK_ID_MIN_OR_MAX";
+
+    public static boolean CHECK_ID_MIN_OR_MAX = true;
+
     public static final String KEY_TCP_LOCAL_PORT = "TCP_LOCAL_PORT";
+
     /**
      * 本地TCP端口
      */

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

@@ -83,14 +83,14 @@ public interface ErrorConst {
      */
     Integer T20011 = 20011;
 
-    String M20011 = "可换件id异常";
+    String M20011 = "可换件ID值为空。请检查可换件安装情况。";
 
     /**
      * 可换件 ID超过MAX
      */
     Integer T20012 = 20012;
 
-    String M20012 = "可换件id异常";
+    String M20012 = "可换件ID值异常。请检查可换件情况。请尝试更换配件。";
 
     /**
      * 模拟器类型错误

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

@@ -17,6 +17,7 @@ public class ConfigController {
      * http://192.168.1.110:8080/sim/config/set?key=CHECK_REPLACE_EMPTY&value=false
      * http://192.168.1.60:8080/sim/config/set?key=SCHEDULED_CONNECT&value=false
      *
+     * http://192.168.1.60:8080/sim/config/set?key=CHECK_ID_MIN_OR_MAX&value=false
      * @param key
      * @param value
      * @return
@@ -38,6 +39,10 @@ public class ConfigController {
             SimDebugConfig.TCP_LOCAL_PORT = Integer.parseInt(value);
             return AjaxResult.success(SimDebugConfig.TCP_LOCAL_PORT);
         }
+        if (StringUtils.equalsIgnoreCase(SimDebugConfig.KEY_CHECK_MIN_OR_MAX, key)) {
+            SimDebugConfig.CHECK_ID_MIN_OR_MAX = Boolean.parseBoolean(value);
+            return AjaxResult.success(SimDebugConfig.CHECK_ID_MIN_OR_MAX);
+        }
         return AjaxResult.error("no match key.");
     }
 
@@ -45,6 +50,8 @@ public class ConfigController {
      * http://192.168.1.110:8080/sim/config/get?key=CHECK_REPLACE_EMPTY
      * http://192.168.1.60:8080/sim/config/get?key=SCHEDULED_CONNECT
      *
+     * http://192.168.1.60:8080/sim/config/get?key=CHECK_ID_MIN_OR_MAX
+     *
      * @param key
      * @return
      */
@@ -60,6 +67,9 @@ public class ConfigController {
         if (StringUtils.equalsIgnoreCase(SimDebugConfig.KEY_TCP_LOCAL_PORT, key)) {
             return AjaxResult.success(SimDebugConfig.TCP_LOCAL_PORT);
         }
+        if (StringUtils.equalsIgnoreCase(SimDebugConfig.KEY_CHECK_MIN_OR_MAX, key)) {
+            return AjaxResult.success(SimDebugConfig.CHECK_ID_MIN_OR_MAX);
+        }
         return AjaxResult.error("no match key.");
     }
 }

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.config.SimDebugConfig;
 import com.ruoyi.sim.constant.ArBuilder;
 import com.ruoyi.sim.constant.CommConst;
 import com.ruoyi.sim.constant.FaultConst;
@@ -230,7 +231,8 @@ public class CommReceiveService {
             }
         }
         // 可换件id 最小值 最大值 判断
-        {
+        l.info("SimDebugConfig.CHECK_ID_MIN_OR_MAX = {}", SimDebugConfig.CHECK_ID_MIN_OR_MAX);
+        if (SimDebugConfig.CHECK_ID_MIN_OR_MAX) {
             if (FaultConst.CHECK_PASS_SET.contains(faultId) ||
                     FaultConst.GAN_ZAO_GUAN_SET.contains(faultId)
             ) {
@@ -239,10 +241,14 @@ public class CommReceiveService {
                 String id = CommParseUtils.receiveSubContentData68(sm);
                 int idDec = Integer.parseInt(id, 16);
                 if (idDec < CommConst.ID_MIN) {
-                    return ArBuilder.error(T20011, M20011, vo);
+                    l.info("check id idDec = {}", idDec);
+                    final String msg = "[" + replaceName + "] 可换件ID = " + idDec + "<br/>" + M20011;
+                    return ArBuilder.error(T20011, msg, vo);
                 }
                 if (idDec > CommConst.ID_MAX) {
-                    return ArBuilder.error(T20012, M20012, vo);
+                    l.info("check id idDec = {}", idDec);
+                    final String msg = "[" + replaceName + "] 可换件ID = " + idDec + "<br/>" + M20012;
+                    return ArBuilder.error(T20012, msg, vo);
                 }
             }
         }