From 8402edf2ff71ad01bdab26874ff4e4072821ce19 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Mon, 30 Jan 2023 07:34:13 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java | 3 ++- acs/nladmin-system/src/main/resources/config/application.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java index e8325c852..09dbb54f9 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java +++ b/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(); diff --git a/acs/nladmin-system/src/main/resources/config/application.yml b/acs/nladmin-system/src/main/resources/config/application.yml index f943602c7..cfc52fe40 100644 --- a/acs/nladmin-system/src/main/resources/config/application.yml +++ b/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: From 005a156ce5ecd3be35fc600202f020af0ff755a9 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Mon, 30 Jan 2023 09:19:06 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SiemensConveyorLabelingDeviceDriver.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java index 70965b493..b5d8f2069 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java +++ b/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+"异常"); From 4df42ce4e72927ae79f68627bab11cc52917ffac Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Mon, 30 Jan 2023 09:52:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hongxiang_device/HongXiangConveyorDeviceDriver.java | 4 +--- .../siemens_conveyor/SiemensConveyorDeviceDriver.java | 4 +++- .../StandardCoveyorControlWithScannerDeviceDriver.java | 3 +++ .../org/nl/modules/security/service/OnlineUserService.java | 2 ++ acs/nladmin-system/src/main/resources/logback-spring.xml | 1 - 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java index d138d799d..010b952ca 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java +++ b/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) { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java index 1ec382c96..ae64411bb 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java +++ b/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()); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java index 469332373..34a3910a2 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java +++ b/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); diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/security/service/OnlineUserService.java b/acs/nladmin-system/src/main/java/org/nl/modules/security/service/OnlineUserService.java index e4b8b5e1a..2ae96ec44 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/security/service/OnlineUserService.java +++ b/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); } diff --git a/acs/nladmin-system/src/main/resources/logback-spring.xml b/acs/nladmin-system/src/main/resources/logback-spring.xml index 60d28f677..b661855b1 100644 --- a/acs/nladmin-system/src/main/resources/logback-spring.xml +++ b/acs/nladmin-system/src/main/resources/logback-spring.xml @@ -149,7 +149,6 @@ https://juejin.cn/post/6844903775631572999 - From 5257e18a27c3352435bdded69487318e791df75d Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Mon, 30 Jan 2023 10:07:32 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OvenGantryManipulatorDeviceDriver.java | 53 +++++++++++++------ 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java index 22b41ed55..d705ac911 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java +++ b/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) { - this.writing("to_command", "2"); - this.setNow_steps_type(3); + 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 { - this.writing("to_command", "2"); - this.setNow_steps_type(3); + 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"); } - this.writing("to_command", "3"); - this.setNow_steps_type(4); + 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) { - this.writing("to_command", "4"); - this.setNow_steps_type(5); + 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 { - this.writing("to_command", "4"); - this.setNow_steps_type(5); + 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)); } } - this.writing("to_command", "5"); - this.setNow_steps_type(6); - this.setNow_steps_type(0); - feedMessage = ""; + 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"); From 3a73d8f76a01b5f083937b8aa4228b19014f0aef Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 30 Jan 2023 10:24:27 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=B8=85=E7=90=86?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/nl/modules/logging/aspect/LogAspect.java | 3 ++- .../src/main/java/org/nl/wms/autotask/CleanLog.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java index 8adf7e7fc..18b788df7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java +++ b/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) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/autotask/CleanLog.java b/lms/nladmin-system/src/main/java/org/nl/wms/autotask/CleanLog.java index 6ca865225..e0363162e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/autotask/CleanLog.java +++ b/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("自动清理日志执行成功...!"); }