Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

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/oven_manipulator/OvenGantryManipulatorDeviceDriver.java

@@ -130,7 +130,6 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                     this.setRequireSucess(false);
                     message = null;
                     logServer.deviceExecuteLog(this.device_code, "", "", "信号复位后requireSuccess：" + requireSucess);
-
                 }
                 logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode));
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
@@ -195,8 +194,12 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                         int action = hongXiangConveyorDeviceDriver.getAction();
                         int error1 = hongXiangConveyorDeviceDriver.getError1();
                         if (mode == 1 && door == 1 && action == 1 && error1 == 0) {
+                            if (this.getNow_steps_type() == 2) {
                                 this.writing("to_command", "2");
                                 this.setNow_steps_type(3);
+                            } else {
+                                logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为下发电气信号（now_steps_type！=2）");
+                            }
                         } else {
                             if (this.getNow_steps_type() == 2) {
                                 feedMessage = "烘箱:" + hongXiangConveyorDeviceDriver.getDevice_code();
@@ -215,8 +218,12 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                             }
                         }
                     } else {
+                        if (this.getNow_steps_type() == 2) {
                             this.writing("to_command", "2");
                             this.setNow_steps_type(3);
+                        } else {
+                            logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为下发电气信号（now_steps_type！=2）\")");
+                        }
                     }
                 }
             } else {
@@ -248,8 +255,12 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                         hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) device.getDeviceDriver();
                         hongXiangConveyorDeviceDriver.writing("to_close_door", "1");
                     }
+                    if (this.getNow_steps_type() == 3) {
                         this.writing("to_command", "3");
                         this.setNow_steps_type(4);
+                    } else {
+                        logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为允许取货（now_steps_type！=3）");
+                    }
                 }
             } else {
                 if (this.getNow_steps_type() == 3) {
@@ -283,8 +294,12 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                     int action = hongXiangConveyorDeviceDriver.getAction();
                     int error1 = hongXiangConveyorDeviceDriver.getError1();
                     if (mode == 1 && door == 1 && action == 1 && error1 == 0) {
+                        if (this.getNow_steps_type() == 4) {
                             this.writing("to_command", "4");
                             this.setNow_steps_type(5);
+                        } else {
+                            logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为允许放货（now_steps_type！=4）");
+                        }
                     } else {
                         feedMessage = "烘箱:" + hongXiangConveyorDeviceDriver.getDevice_code();
                         if (mode != 1) {
@@ -301,8 +316,12 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                         }
                     }
                 } else {
+                    if (this.getNow_steps_type() == 4) {
                         this.writing("to_command", "4");
                         this.setNow_steps_type(5);
+                    } else {
+                        logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为允许放货（now_steps_type！=4）");
+                    }
                 }
             } else {
                 if (this.getNow_steps_type() == 4) {
@@ -355,10 +374,14 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                                 hongXiangConveyorDeviceDriver.writing("to_time_min", String.valueOf(minutes));
                             }
                         }
+                        if (this.getNow_steps_type() == 5) {
                             this.writing("to_command", "5");
                             this.setNow_steps_type(6);
                             this.setNow_steps_type(0);
                             feedMessage = "";
+                        } else {
+                            logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为放货完成（now_steps_type！=5）");
+                        }
 //                        this.writing("to_onset", "0");
 //                        this.writing("to_target", "0");
 //                        this.writing("to_task", "0");

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/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java

@@ -654,9 +654,6 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver
             }
             if(task >0 ){
                 Instruction instruction = instructionService.findByCodeFromCache(String.valueOf(task));
-                if (ObjectUtil.isEmpty(instruction)){
-                    instruction = instructionService.findByCode(String.valueOf(task));
-                }
                 vehicle_code = instruction.getVehicle_code();
             } else {
                 logServer.deviceExecuteLog(device_code, "", "", "申请贴标电气设备任务号:"+task+"异常");

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java

@@ -702,7 +702,8 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
                     //申请任务
                     if (mode == 2 && move1 == 0 && move2 == 0 && action1 == 0 && action2 == 0 && task1 == 0 && task2 == 0 && !requireSucess) {
                         //获取关联设备驱动信息 判断关联设备是否禁用
-                        Device device = deviceAppservice.findDeviceByCode(device_code);
+                        String link_device_code = String.valueOf(this.getDevice().getExtraValue().get("link_device_code"));
+                        Device device = deviceAppservice.findDeviceByCode(link_device_code);
                         SlitTwoManipulatorDeviceDriver slitTwoManipulatorDeviceDriver;
                         if (device.getDeviceDriver() instanceof SlitTwoManipulatorDeviceDriver) {
                             slitTwoManipulatorDeviceDriver = (SlitTwoManipulatorDeviceDriver) device.getDeviceDriver();

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/config/application.yml

@@ -2,7 +2,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: dev
+    active: prod
   jackson:
     time-zone: GMT+8
   data:

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>

lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java

@@ -15,6 +15,7 @@
  */
 package org.nl.modules.logging.aspect;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -128,7 +129,7 @@ public class LogAspect {
                 json.put("address", StringUtils.getCityInfo(requestIp));
                 json.put("browser", StringUtils.getBrowser(request));
                 json.put("exception_detail", IdUtil.getStringId());
-                json.put("create_time", IdUtil.getStringId());
+                json.put("create_time", DateUtil.now());
                 json.put("return_result", JSONObject.fromObject(result).getJSONObject("body"));
                 interfaceLog.insert(json);
             } catch (Exception e) {

lms/nladmin-system/src/main/java/org/nl/wms/autotask/CleanLog.java

@@ -6,6 +6,8 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.system.service.param.ISysParamService;
 import org.springframework.stereotype.Component;
 
+import java.util.Calendar;
+
 /**
  * 自动清除日志(操作日志、异常日志)数据
  */
@@ -18,8 +20,11 @@ public class CleanLog {
     public void run(){
         //delete from  sys_log where DATE(create_time) <= DATE(DATE_SUB(NOW(),INTERVAL 30 day)) limit 10;
         WQLObject logTab = WQLObject.getWQLObject("sys_log");
+        WQLObject sys_interface_log = WQLObject.getWQLObject("sys_interface_log");
         int days = Integer.parseInt(paramService.findByCode("log_day").getValue());
         logTab.delete("DATE(create_time) <= DATE(DATE_SUB(NOW(),INTERVAL " + days + " day))");
+        sys_interface_log.delete("DATE(create_time) <= DATE(DATE_SUB(NOW(),INTERVAL " + days + " day))");
+
         log.info("自动清理日志执行成功...!");
     }