更新

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java

@@ -293,11 +293,9 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple
         if (this.getMode() == 0) {
             mode = "未联机";
         } else if (this.getMode() == 1) {
-            mode = "单机";
+            mode = "联机";
         } else if (this.getMode() == 2) {
             mode = "联机";
-        } else if (this.getMode() == 3) {
-            mode = "运行中";
         }
         String requireSucess = "0";
         if (this.requireSucess) {

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java

@@ -145,7 +145,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
             task = this.itemProtocol.getTask();
             if (mode != last_mode) {
                 if( mode == 2){
-                    message = null;
                     requireSucess = false;
                     requireApplyLabelingSuccess = false;
                     requireApplyLaStrangulationSuccess =false;
@@ -158,6 +157,8 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
             }
             if (move != last_move) {
                 if(move == 0 && mode == 2 ){
+                    message = null;
+                    inst_message = null;
                     this.clearWrite();
                 }
                 logServer.deviceItemValue(this.device_code, "move", String.valueOf(move));
@@ -442,6 +443,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
         jo.put("move", move);
         jo.put("carrier_direction", carrier_direction);
         jo.put("task", task);
+        jo.put("inst_message", this.inst_message);
         jo.put("isOnline", this.getIsonline());
         jo.put("error", this.getError());
         jo.put("isError", this.getIserror());

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java

@@ -195,6 +195,8 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
             }
             if (move != last_move) {
                 if (move == 0 && mode == 2) {
+                    message = null;
+                    inst_message = null;
                     thingToNothing();
                 }
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_move + "->" + move);
@@ -753,6 +755,7 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
         jo.put("error", this.getError());
         jo.put("isError", this.getIserror());
         jo.put("message", this.getMessage());
+        jo.put("inst_message", this.inst_message);
         jo.put("task", this.getTask());
         jo.put("barcode", plcbarcode);
         jo.put("barcode_length", plcbarcode_length);

acs/nladmin-system/src/main/java/org/nl/modules/security/service/OnlineUserService.java

@@ -16,6 +16,7 @@
 package org.nl.modules.security.service;
 
 import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.modules.common.utils.*;
@@ -118,6 +119,7 @@ public class OnlineUserService {
      * @param token /
      */
     public void logout(String token) {
+        if (ObjectUtil.isNotEmpty(token))
         redisUtils.del(token);
     }
 

acs/nladmin-system/src/main/resources/logback-spring.xml

@@ -149,7 +149,6 @@ https://juejin.cn/post/6844903775631572999
     <!--生产环境:打印控制台和输出到文件-->
     <springProfile name="prod">
         <root level="info">
-            <appender-ref ref="CONSOLE"/>
             <appender-ref ref="lokiAppender" />
             <appender-ref ref="asyncFileAppender"/>
         </root>