From 0c64a1d994e992dc8a35aa97323364cf4b4a2010 Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Mon, 15 Aug 2022 18:19:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- acs/hd/nladmin-system/pom.xml | 26 ++ .../acs/agv/server/impl/AgvServiceImpl.java | 9 +- .../LnshLaminatingMachineDeviceDriver.java | 37 +- .../LnshFoldDiscSiteDeviceDriver.java | 45 +- .../LnshKilnLaneDeviceDriver.java | 100 ++--- .../LnshKilnTrussDeviceDriver.java | 39 +- .../LnshLabelingMachineDeviceDriver.java | 45 +- .../LnshMixingMillDeviceDriver.java | 50 +-- .../lnsh_one_rgv/LnshOneRGVDeviceDriver.java | 54 ++- .../LnshOutKilnTrussDeviceDriver.java | 47 +- .../LnshPackageLineDeviceDriver.java | 40 +- ...hPackagePalletManipulatorDeviceDriver.java | 307 +++++++------ .../LnshPackageSiteDeviceDriver.java | 40 +- .../LnshPalletStorageDeviceDriver.java | 49 +- ...nshPalletizingManipulatorDeviceDriver.java | 56 +-- ...alletizingManipulatorSiteDeviceDriver.java | 71 ++- .../lnsh_press/LnshPressDeviceDriver.java | 63 ++- .../lnsh/lnsh_rgv/LnshRGVDeviceDriver.java | 92 ++-- .../LnshSplitManipulatorDeviceDriver.java | 307 +++++++------ .../lnsh/lnsh_station/ItemProtocol.java | 2 - .../lnsh_station/LnshStationDeviceDriver.java | 56 +-- ...agePalletSplitManipulatorDeviceDriver.java | 308 ++++++------- .../StandardInspectSiteDeviceDriver.java | 20 +- .../wms/service/impl/AcsToWmsServiceImpl.java | 47 +- .../org/nl/acs/log/rest/LogsController.java | 43 -- .../main/java/org/nl/acs/log/service/1.txt | 0 .../log/service/DeviceExecuteLogService.java | 27 ++ .../org/nl/acs/log/service/LogServer.java | 56 --- .../nl/acs/log/service/dto/DeviceLogDto.java | 24 - .../org/nl/acs/log/service/dto/LogDto.java | 56 --- .../impl/DeviceExecuteLogServiceImpl.java | 40 ++ .../acs/log/service/impl/LogServerImpl.java | 151 ------- .../java/org/nl/annotation/RateLimiter.java | 39 ++ .../java/org/nl/aspect/RateLimiterAspect.java | 55 +++ .../log/service/impl/RootLogServiceImpl.java | 3 - .../nl/modules/loki/rest/LokiController.java | 46 ++ .../nl/modules/loki/service/LokiService.java | 30 ++ .../loki/service/impl/LokiServiceImpl.java | 78 ++++ .../src/main/java/org/nl/start/Init.java | 10 + .../main/resources/config/application-dev.yml | 12 +- .../main/resources/log/AgvLeaveServlet.xml | 28 +- .../src/main/resources/log/AutoCreateInst.xml | 30 +- .../log/NDCSocketConnectionAutoRun.xml | 28 +- .../main/resources/log/QueryAgvTaskStatus.xml | 28 +- .../resources/log/QueryXZAgvTaskStatus.xml | 31 +- .../src/main/resources/log/WmsToAcs.xml | 33 +- .../src/main/resources/logback-spring.xml | 74 ++-- acs/qd/package.json | 1 + acs/qd/src/api/monitor/loki.js | 26 ++ acs/qd/src/views/monitor/logback/index.vue | 418 ++++++++++++++++++ 50 files changed, 1842 insertions(+), 1435 deletions(-) delete mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/acs/log/rest/LogsController.java create mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/1.txt create mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/DeviceExecuteLogService.java delete mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/LogServer.java delete mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/dto/DeviceLogDto.java delete mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/dto/LogDto.java create mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/impl/DeviceExecuteLogServiceImpl.java delete mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/impl/LogServerImpl.java create mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/annotation/RateLimiter.java create mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/aspect/RateLimiterAspect.java create mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/modules/loki/rest/LokiController.java create mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/modules/loki/service/LokiService.java create mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/modules/loki/service/impl/LokiServiceImpl.java create mode 100644 acs/qd/src/api/monitor/loki.js create mode 100644 acs/qd/src/views/monitor/logback/index.vue diff --git a/acs/hd/nladmin-system/pom.xml b/acs/hd/nladmin-system/pom.xml index 672f487..74a92bb 100644 --- a/acs/hd/nladmin-system/pom.xml +++ b/acs/hd/nladmin-system/pom.xml @@ -221,6 +221,32 @@ ${mysql.version} + + + + com.github.loki4j + loki-logback-appender-jdk8 + 1.3.2 + + + org.apache.httpcomponents + httpclient + 4.5.13 + + + + + org.springframework.boot + spring-boot-starter-aop + + + + + com.google.guava + guava + 29.0-jre + + diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java index 626c348..6334880 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java @@ -15,7 +15,6 @@ import org.nl.acs.config.server.AcsConfigService; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device.service.impl.DeviceServiceImpl; import org.nl.acs.device_driver.lnsh.lnsh_package_site.LnshPackageSiteDeviceDriver; -import org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator.LnshPalletizingManipulatorDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_station.LnshStationDeviceDriver; import org.nl.acs.device_driver.machines_site.MachinesSiteDeviceDriver; import org.nl.acs.device_driver.special_ordinary_site.SpecialOrdinarySiteDeviceDriver; @@ -29,7 +28,7 @@ import org.nl.acs.ext.erp.service.AcsToErpService; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.opc.DeviceAppServiceImpl; @@ -63,7 +62,7 @@ public class AgvServiceImpl implements AgvService { @Autowired AcsToWmsService acsToWmsService; - private final LogServer logServer; + private final DeviceExecuteLogService logServer; Map AGVDeviceStatus = new HashMap(); @@ -1775,7 +1774,7 @@ public class AgvServiceImpl implements AgvService { } else { type = "error"; } - logServer.log("", "pause", type, "", result.body(), String.valueOf(result.getStatus()), agvurl, ""); +// logServer.log("", "pause", type, "", result.body(), String.valueOf(result.getStatus()), agvurl, ""); return result; } else { return null; @@ -1822,7 +1821,7 @@ public class AgvServiceImpl implements AgvService { } else { type = "error"; } - logServer.log("", "resume", type, "", result.body(), String.valueOf(result.getStatus()), agvurl, ""); +// logServer.log("", "resume", type, "", result.body(), String.valueOf(result.getStatus()), agvurl, ""); return result; } else { return null; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java index 757690f..fc916c1 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java @@ -1,7 +1,5 @@ package org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import lombok.Data; @@ -16,18 +14,11 @@ import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.opc.WcsConfig; import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; import org.openscada.opc.lib.da.Server; import org.springframework.beans.factory.annotation.Autowired; @@ -54,7 +45,7 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i @Autowired TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); @Autowired - LogServer logServer = SpringContextHolder.getBean("logServerImpl"); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); @Autowired AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl"); @@ -129,28 +120,28 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i if (mode != last_mode) { this.setRequireSucess(false); - logServer.deviceLog(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceLogToacs(this.device_code,"","","信号mode：" + last_mode + "->" + mode); + logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); + logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } if (move != last_move) { - logServer.deviceLog(this.device_code,"move" ,String.valueOf(move)); - logServer.deviceLogToacs(this.device_code,"","","信号move：" + last_move + "->" + move); + logServer.deviceItemValue(this.device_code,"move" ,String.valueOf(move)); + logServer.deviceExecuteLog(this.device_code,"","","信号move：" + last_move + "->" + move); } if (error != last_error) { - logServer.deviceLog(this.device_code,"error" ,String.valueOf(error)); - logServer.deviceLogToacs(this.device_code,"","","信号error：" + last_error + "->" + error); + logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error)); + logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + "->" + error); } if (task != last_task) { - logServer.deviceLog(this.device_code,"task",String.valueOf(task)); - logServer.deviceLogToacs(this.device_code,"","","信号task：" + last_task + "->" + task); + logServer.deviceItemValue(this.device_code,"task",String.valueOf(task)); + logServer.deviceExecuteLog(this.device_code,"","","信号task：" + last_task + "->" + task); } if (!StrUtil.equals(barcode,last_barcode)) { - logServer.deviceLog(this.device_code,"barcode",barcode); - logServer.deviceLogToacs(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode); + logServer.deviceItemValue(this.device_code,"barcode",barcode); + logServer.deviceExecuteLog(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode); } if (container_type != last_container_type) { - logServer.deviceLog(this.device_code,"container_type",String.valueOf(container_type)); - logServer.deviceLogToacs(this.device_code,"","","信号container_type：" + last_container_type + "->" + container_type); + logServer.deviceItemValue(this.device_code,"container_type",String.valueOf(container_type)); + logServer.deviceExecuteLog(this.device_code,"","","信号container_type：" + last_container_type + "->" + container_type); } } catch (Exception var17) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDeviceDriver.java index 9f69992..1799246 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDeviceDriver.java @@ -1,9 +1,5 @@ package org.nl.acs.device_driver.lnsh.lnsh_fold_disc_site; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -15,16 +11,11 @@ import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; -import org.nl.acs.opc.WcsConfig; import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; import org.openscada.opc.lib.da.Server; import org.springframework.beans.factory.annotation.Autowired; @@ -47,7 +38,7 @@ public class LnshFoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implem @Autowired TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); @Autowired - LogServer logServer = SpringContextHolder.getBean("logServerImpl"); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); String device_code; int mode = 0; @@ -111,36 +102,36 @@ public class LnshFoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implem if (mode != last_mode) { this.setRequireSucess(false); - logServer.deviceLog(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceLogToacs(this.device_code,"","","信号mode：" + last_mode + "->" + mode); + logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); + logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } if (status != last_status) { - logServer.deviceLog(this.device_code,"status" ,String.valueOf(status)); - logServer.deviceLogToacs(this.device_code,"","","信号status：" + last_status + "->" + status); + logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); + logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); } if (open_time != last_open_time) { - logServer.deviceLog(this.device_code,"open_time" ,String.valueOf(open_time)); - logServer.deviceLogToacs(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); + logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); } if (close_time != last_close_time) { - logServer.deviceLog(this.device_code,"close_time" ,String.valueOf(close_time)); - logServer.deviceLogToacs(this.device_code,"","","信号close_time：" + last_close_time + "->" + close_time); + logServer.deviceItemValue(this.device_code,"close_time" ,String.valueOf(close_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号close_time：" + last_close_time + "->" + close_time); } if (standby_time != last_standby_time) { - logServer.deviceLog(this.device_code,"standby_time" ,String.valueOf(standby_time)); - logServer.deviceLogToacs(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); + logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); } if (production_time != last_production_time) { - logServer.deviceLog(this.device_code,"production_time" ,String.valueOf(production_time)); - logServer.deviceLogToacs(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); + logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); } if (error_time != last_error_time) { - logServer.deviceLog(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceLogToacs(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); + logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); } if (container_qty != last_container_qty) { - logServer.deviceLog(this.device_code,"container_qty" ,String.valueOf(container_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号container_qty：" + last_container_qty + "->" + container_qty); + logServer.deviceItemValue(this.device_code,"container_qty" ,String.valueOf(container_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号container_qty：" + last_container_qty + "->" + container_qty); } } catch (Exception var17) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/LnshKilnLaneDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/LnshKilnLaneDeviceDriver.java index 43cdfa6..0a8fd1b 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/LnshKilnLaneDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/LnshKilnLaneDeviceDriver.java @@ -1,9 +1,6 @@ package org.nl.acs.device_driver.lnsh.lnsh_kiln_lane; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -15,16 +12,11 @@ import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; -import org.nl.acs.opc.WcsConfig; import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; import org.openscada.opc.lib.da.Server; import org.springframework.beans.factory.annotation.Autowired; @@ -47,7 +39,7 @@ public class LnshKilnLaneDeviceDriver extends AbstractOpcDeviceDriver implements @Autowired TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); @Autowired - LogServer logServer = SpringContextHolder.getBean("logServerImpl"); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); String device_code; int mode = 0; @@ -168,92 +160,92 @@ public class LnshKilnLaneDeviceDriver extends AbstractOpcDeviceDriver implements if (mode != last_mode) { this.setRequireSucess(false); - logServer.deviceLog(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceLogToacs(this.device_code,"","","信号mode：" + last_mode + "->" + mode); + logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); + logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } if (status != last_status) { - logServer.deviceLog(this.device_code,"status" ,String.valueOf(status)); - logServer.deviceLogToacs(this.device_code,"","","信号status：" + last_status + "->" + status); + logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); + logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); } if (open_time != last_open_time) { - logServer.deviceLog(this.device_code,"open_time" ,String.valueOf(open_time)); - logServer.deviceLogToacs(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); + logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); } if (standby_time != last_standby_time) { - logServer.deviceLog(this.device_code,"standby_time" ,String.valueOf(standby_time)); - logServer.deviceLogToacs(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); + logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); } if (production_time != last_production_time) { - logServer.deviceLog(this.device_code,"production_time" ,String.valueOf(production_time)); - logServer.deviceLogToacs(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); + logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); } if (error_time != last_error_time) { - logServer.deviceLog(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceLogToacs(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); + logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); } if (car_sum != last_car_sum) { - logServer.deviceLog(this.device_code,"car_sum" ,String.valueOf(car_sum)); - logServer.deviceLogToacs(this.device_code,"","","信号car_sum：" + last_car_sum + "->" + car_sum); + logServer.deviceItemValue(this.device_code,"car_sum" ,String.valueOf(car_sum)); + logServer.deviceExecuteLog(this.device_code,"","","信号car_sum：" + last_car_sum + "->" + car_sum); } if (nullCar_qty != last_nullCar_qty) { - logServer.deviceLog(this.device_code,"nullCar_qty" ,String.valueOf(nullCar_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号nullCar_qty：" + last_nullCar_qty + "->" + nullCar_qty); + logServer.deviceItemValue(this.device_code,"nullCar_qty" ,String.valueOf(nullCar_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号nullCar_qty：" + last_nullCar_qty + "->" + nullCar_qty); } if (burning_car_qty != last_burning_car_qty) { - logServer.deviceLog(this.device_code,"burning_car_qty" ,String.valueOf(burning_car_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号burning_car_qty：" + last_burning_car_qty + "->" + burning_car_qty); + logServer.deviceItemValue(this.device_code,"burning_car_qty" ,String.valueOf(burning_car_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号burning_car_qty：" + last_burning_car_qty + "->" + burning_car_qty); } if (container_sum != last_container_sum) { - logServer.deviceLog(this.device_code,"container_sum" ,String.valueOf(container_sum)); - logServer.deviceLogToacs(this.device_code,"","","信号container_sum：" + last_container_sum + "->" + container_sum); + logServer.deviceItemValue(this.device_code,"container_sum" ,String.valueOf(container_sum)); + logServer.deviceExecuteLog(this.device_code,"","","信号container_sum：" + last_container_sum + "->" + container_sum); } if (batch != last_batch) { - logServer.deviceLog(this.device_code,"batch" ,String.valueOf(batch)); - logServer.deviceLogToacs(this.device_code,"","","信号batch：" + last_batch + "->" + batch); + logServer.deviceItemValue(this.device_code,"batch" ,String.valueOf(batch)); + logServer.deviceExecuteLog(this.device_code,"","","信号batch：" + last_batch + "->" + batch); } if (!StrUtil.equals(specifications,last_specifications)) { - logServer.deviceLog(this.device_code,"specifications" ,specifications); - logServer.deviceLogToacs(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications); + logServer.deviceItemValue(this.device_code,"specifications" ,specifications); + logServer.deviceExecuteLog(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications); } if (!StrUtil.equals(material,last_material)) { - logServer.deviceLog(this.device_code,"material" ,material); - logServer.deviceLogToacs(this.device_code,"","","信号material：" + last_material + "->" + material); + logServer.deviceItemValue(this.device_code,"material" ,material); + logServer.deviceExecuteLog(this.device_code,"","","信号material：" + last_material + "->" + material); } if (!StrUtil.equals(inSpecifications,last_inSpecifications)) { - logServer.deviceLog(this.device_code,"inSpecifications" ,inSpecifications); - logServer.deviceLogToacs(this.device_code,"","","信号inSpecifications：" + last_inSpecifications + "->" + inSpecifications); + logServer.deviceItemValue(this.device_code,"inSpecifications" ,inSpecifications); + logServer.deviceExecuteLog(this.device_code,"","","信号inSpecifications：" + last_inSpecifications + "->" + inSpecifications); } if (!StrUtil.equals(inDay_material,last_inDay_material)) { - logServer.deviceLog(this.device_code,"inDay_material" ,inDay_material); - logServer.deviceLogToacs(this.device_code,"","","信号inDay_material：" + last_inDay_material + "->" + inDay_material); + logServer.deviceItemValue(this.device_code,"inDay_material" ,inDay_material); + logServer.deviceExecuteLog(this.device_code,"","","信号inDay_material：" + last_inDay_material + "->" + inDay_material); } if (inDay_batch != last_inDay_batch) { - logServer.deviceLog(this.device_code,"inDay_batch" ,String.valueOf(inDay_batch)); - logServer.deviceLogToacs(this.device_code,"","","信号inDay_batch：" + last_inDay_batch + "->" + inDay_batch); + logServer.deviceItemValue(this.device_code,"inDay_batch" ,String.valueOf(inDay_batch)); + logServer.deviceExecuteLog(this.device_code,"","","信号inDay_batch：" + last_inDay_batch + "->" + inDay_batch); } if (inDay_qty != last_inDay_qty) { - logServer.deviceLog(this.device_code,"inDay_qty" ,String.valueOf(inDay_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号inDay_qty：" + last_inDay_qty + "->" + inDay_qty); + logServer.deviceItemValue(this.device_code,"inDay_qty" ,String.valueOf(inDay_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号inDay_qty：" + last_inDay_qty + "->" + inDay_qty); } if (!StrUtil.equals(outSpecifications,last_outSpecifications)) { - logServer.deviceLog(this.device_code,"outSpecifications" ,outSpecifications); - logServer.deviceLogToacs(this.device_code,"","","信号outSpecifications：" + last_outSpecifications + "->" + outSpecifications); + logServer.deviceItemValue(this.device_code,"outSpecifications" ,outSpecifications); + logServer.deviceExecuteLog(this.device_code,"","","信号outSpecifications：" + last_outSpecifications + "->" + outSpecifications); } if (!StrUtil.equals(outDay_material,last_outDay_material)) { - logServer.deviceLog(this.device_code,"outDay_material" ,outDay_material); - logServer.deviceLogToacs(this.device_code,"","","信号outDay_material：" + last_outDay_material + "->" + outDay_material); + logServer.deviceItemValue(this.device_code,"outDay_material" ,outDay_material); + logServer.deviceExecuteLog(this.device_code,"","","信号outDay_material：" + last_outDay_material + "->" + outDay_material); } if (outDay_batch != last_outDay_batch) { - logServer.deviceLog(this.device_code,"outDay_batch" ,String.valueOf(outDay_batch)); - logServer.deviceLogToacs(this.device_code,"","","信号outDay_batch：" + last_outDay_batch + "->" + outDay_batch); + logServer.deviceItemValue(this.device_code,"outDay_batch" ,String.valueOf(outDay_batch)); + logServer.deviceExecuteLog(this.device_code,"","","信号outDay_batch：" + last_outDay_batch + "->" + outDay_batch); } if (outDay_qty != last_outDay_qty) { - logServer.deviceLog(this.device_code,"outDay_qty" ,String.valueOf(outDay_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号outDay_qty：" + last_outDay_qty + "->" + outDay_qty); + logServer.deviceItemValue(this.device_code,"outDay_qty" ,String.valueOf(outDay_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号outDay_qty：" + last_outDay_qty + "->" + outDay_qty); } if (!StrUtil.equals(barcode,last_barcode)) { - logServer.deviceLog(this.device_code,"barcode" ,barcode); - logServer.deviceLogToacs(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode); + logServer.deviceItemValue(this.device_code,"barcode" ,barcode); + logServer.deviceExecuteLog(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode); } } catch (Exception var17) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/LnshKilnTrussDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/LnshKilnTrussDeviceDriver.java index 72b1775..fa99d7f 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/LnshKilnTrussDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/LnshKilnTrussDeviceDriver.java @@ -1,13 +1,8 @@ package org.nl.acs.device_driver.lnsh.lnsh_kiln_truss; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.RouteableDeviceDriver; @@ -15,17 +10,11 @@ import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; -import org.nl.acs.opc.WcsConfig; import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; -import org.openscada.opc.lib.da.Server; import org.springframework.beans.factory.annotation.Autowired; import java.util.*; @@ -47,7 +36,7 @@ public class LnshKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implement @Autowired TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); @Autowired - LogServer logServer = SpringContextHolder.getBean("logServerImpl"); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); String device_code; int mode = 0; @@ -103,28 +92,28 @@ public class LnshKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implement if (mode != last_mode) { this.setRequireSucess(false); - logServer.deviceLog(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceLogToacs(this.device_code,"","","信号mode：" + last_mode + "->" + mode); + logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); + logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } if (status != last_status) { - logServer.deviceLog(this.device_code,"status" ,String.valueOf(status)); - logServer.deviceLogToacs(this.device_code,"","","信号status：" + last_status + "->" + status); + logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); + logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); } if (open_time != last_open_time) { - logServer.deviceLog(this.device_code,"open_time" ,String.valueOf(open_time)); - logServer.deviceLogToacs(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); + logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); } if (standby_time != last_standby_time) { - logServer.deviceLog(this.device_code,"standby_time" ,String.valueOf(standby_time)); - logServer.deviceLogToacs(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); + logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); } if (production_time != last_production_time) { - logServer.deviceLog(this.device_code,"production_time" ,String.valueOf(production_time)); - logServer.deviceLogToacs(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); + logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); } if (error_time != last_error_time) { - logServer.deviceLog(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceLogToacs(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); + logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); } } catch (Exception var17) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_labeling_machine/LnshLabelingMachineDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_labeling_machine/LnshLabelingMachineDeviceDriver.java index 38a5e71..78ece4b 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_labeling_machine/LnshLabelingMachineDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_labeling_machine/LnshLabelingMachineDeviceDriver.java @@ -1,9 +1,5 @@ package org.nl.acs.device_driver.lnsh.lnsh_labeling_machine; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -16,16 +12,11 @@ import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; -import org.nl.acs.opc.WcsConfig; import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; import org.openscada.opc.lib.da.Server; import org.springframework.beans.factory.annotation.Autowired; @@ -48,7 +39,7 @@ public class LnshLabelingMachineDeviceDriver extends AbstractOpcDeviceDriver imp @Autowired TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); @Autowired - LogServer logServer = SpringContextHolder.getBean("logServerImpl"); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); @Autowired AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl"); @@ -109,36 +100,36 @@ public class LnshLabelingMachineDeviceDriver extends AbstractOpcDeviceDriver imp if (mode != last_mode) { this.setRequireSucess(false); - logServer.deviceLog(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceLogToacs(this.device_code,"","","信号mode：" + last_mode + "->" + mode); + logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); + logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } if (status != last_status) { - logServer.deviceLog(this.device_code,"status" ,String.valueOf(status)); - logServer.deviceLogToacs(this.device_code,"","","信号status：" + last_status + "->" + status); + logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); + logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); } if (open_time != last_open_time) { - logServer.deviceLog(this.device_code,"open_time" ,String.valueOf(open_time)); - logServer.deviceLogToacs(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); + logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); } if (close_time != last_close_time) { - logServer.deviceLog(this.device_code,"close_time" ,String.valueOf(close_time)); - logServer.deviceLogToacs(this.device_code,"","","信号close_time：" + last_close_time + "->" + close_time); + logServer.deviceItemValue(this.device_code,"close_time" ,String.valueOf(close_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号close_time：" + last_close_time + "->" + close_time); } if (standby_time != last_standby_time) { - logServer.deviceLog(this.device_code,"standby_time" ,String.valueOf(standby_time)); - logServer.deviceLogToacs(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); + logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); } if (production_time != last_production_time) { - logServer.deviceLog(this.device_code,"production_time" ,String.valueOf(production_time)); - logServer.deviceLogToacs(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); + logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); } if (error_time != last_error_time) { - logServer.deviceLog(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceLogToacs(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); + logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); } if (labeling_qty != last_labeling_qty) { - logServer.deviceLog(this.device_code,"labeling_qty" ,String.valueOf(labeling_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号labeling_qty：" + last_labeling_qty + "->" + labeling_qty); + logServer.deviceItemValue(this.device_code,"labeling_qty" ,String.valueOf(labeling_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号labeling_qty：" + last_labeling_qty + "->" + labeling_qty); } } catch (Exception var17) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java index 974d976..0a12e84 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java @@ -19,10 +19,8 @@ import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; import org.nl.acs.opc.WcsConfig; import org.nl.acs.order.service.ProduceshiftorderService; import org.nl.acs.order.service.dto.ProduceshiftorderDto; @@ -59,7 +57,7 @@ public class LnshMixingMillDeviceDriver extends AbstractOpcDeviceDriver implemen @Autowired TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); @Autowired - LogServer logServer = SpringContextHolder.getBean("logServerImpl"); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); @Autowired AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl"); @Autowired @@ -138,48 +136,48 @@ public class LnshMixingMillDeviceDriver extends AbstractOpcDeviceDriver implemen if (mode != last_mode) { this.setRequireSucess(false); - logServer.deviceLog(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceLogToacs(this.device_code,"","","信号mode：" + last_mode + "->" + mode); + logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); + logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } if (error != last_error) { - logServer.deviceLog(this.device_code,"error" ,String.valueOf(error)); - logServer.deviceLogToacs(this.device_code,"","","信号error：" + last_error + "->" + error); + logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error)); + logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + "->" + error); } if (status != last_status) { - logServer.deviceLog(this.device_code,"status" ,String.valueOf(status)); - logServer.deviceLogToacs(this.device_code,"","","信号status：" + last_status + "->" + status); + logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); + logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); } if (open_time != last_open_time) { - logServer.deviceLog(this.device_code,"open_time" ,String.valueOf(open_time)); - logServer.deviceLogToacs(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); + logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); } if (standby_time != last_standby_time) { - logServer.deviceLog(this.device_code,"standby_time" ,String.valueOf(standby_time)); - logServer.deviceLogToacs(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); + logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); } if (production_time != last_production_time) { - logServer.deviceLog(this.device_code,"production_time" ,String.valueOf(production_time)); - logServer.deviceLogToacs(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); + logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); } if (error_time != last_error_time) { - logServer.deviceLog(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceLogToacs(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); + logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); } if (weight != last_weight) { - logServer.deviceLog(this.device_code,"weight" ,String.valueOf(weight)); - logServer.deviceLogToacs(this.device_code,"","","信号weight：" + last_weight + "->" + weight); + logServer.deviceItemValue(this.device_code,"weight" ,String.valueOf(weight)); + logServer.deviceExecuteLog(this.device_code,"","","信号weight：" + last_weight + "->" + weight); } if (!StrUtil.equals(material,last_material)) { - logServer.deviceLog(this.device_code,"material" ,String.valueOf(material)); - logServer.deviceLogToacs(this.device_code,"","","信号material：" + last_material + "->" + material); + logServer.deviceItemValue(this.device_code,"material" ,String.valueOf(material)); + logServer.deviceExecuteLog(this.device_code,"","","信号material：" + last_material + "->" + material); } if (!StrUtil.equals(order_No,last_order_No)) { - logServer.deviceLog(this.device_code,"order_No" ,order_No); - logServer.deviceLogToacs(this.device_code,"","","信号order_No：" + last_order_No + "->" + order_No); + logServer.deviceItemValue(this.device_code,"order_No" ,order_No); + logServer.deviceExecuteLog(this.device_code,"","","信号order_No：" + last_order_No + "->" + order_No); } if (mix_num != last_mix_num) { - logServer.deviceLog(this.device_code,"mix_num" ,String.valueOf(mix_num)); - logServer.deviceLogToacs(this.device_code,"","","信号mix_num：" + last_mix_num + "->" + mix_num); + logServer.deviceItemValue(this.device_code,"mix_num" ,String.valueOf(mix_num)); + logServer.deviceExecuteLog(this.device_code,"","","信号mix_num：" + last_mix_num + "->" + mix_num); } } catch (Exception var17) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_one_rgv/LnshOneRGVDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_one_rgv/LnshOneRGVDeviceDriver.java index 7b5a3bf..20b7f54 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_one_rgv/LnshOneRGVDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_one_rgv/LnshOneRGVDeviceDriver.java @@ -7,7 +7,6 @@ import cn.hutool.core.util.StrUtil; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.DeviceDriver; @@ -16,12 +15,11 @@ import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.opc.DeviceAppServiceImpl; import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; import org.nl.utils.SpringContextHolder; @@ -48,7 +46,7 @@ public class LnshOneRGVDeviceDriver extends AbstractOpcDeviceDriver implements D @Autowired TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); @Autowired - LogServer logServer = SpringContextHolder.getBean("logServerImpl"); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); @Autowired DeviceAppService deviceAppservice = SpringContextHolder.getBean(DeviceAppServiceImpl.class); @@ -130,52 +128,52 @@ public class LnshOneRGVDeviceDriver extends AbstractOpcDeviceDriver implements D if (mode != last_mode) { this.setRequireSucess(false); - logServer.deviceLog(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceLogToacs(this.device_code,"","","信号mode：" + last_mode + "->" + mode); + logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); + logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } if (error != last_error) { - logServer.deviceLog(this.device_code,"error" ,String.valueOf(error)); - logServer.deviceLogToacs(this.device_code,"","","信号error：" + last_error + "->" + error); + logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error)); + logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + "->" + error); } if (status != last_status) { - logServer.deviceLog(this.device_code,"status" ,String.valueOf(status)); - logServer.deviceLogToacs(this.device_code,"","","信号status：" + last_status + "->" + status); + logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); + logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); } if (move_1 != last_move_1) { - logServer.deviceLog(this.device_code,"move_1" ,String.valueOf(move_1)); - logServer.deviceLogToacs(this.device_code,"","","信号move_1：" + last_move_1 + "->" + move_1); + logServer.deviceItemValue(this.device_code,"move_1" ,String.valueOf(move_1)); + logServer.deviceExecuteLog(this.device_code,"","","信号move_1：" + last_move_1 + "->" + move_1); } if (action_1 != last_action_1) { - logServer.deviceLog(this.device_code,"action_1" ,String.valueOf(action_1)); - logServer.deviceLogToacs(this.device_code,"","","信号action_1：" + last_action_1 + "->" + action_1); + logServer.deviceItemValue(this.device_code,"action_1" ,String.valueOf(action_1)); + logServer.deviceExecuteLog(this.device_code,"","","信号action_1：" + last_action_1 + "->" + action_1); } if (walk_y != last_walk_y) { - logServer.deviceLog(this.device_code,"walk_y" ,String.valueOf(walk_y)); - logServer.deviceLogToacs(this.device_code,"","","信号walk_y：" + last_walk_y + "->" + walk_y); + logServer.deviceItemValue(this.device_code,"walk_y" ,String.valueOf(walk_y)); + logServer.deviceExecuteLog(this.device_code,"","","信号walk_y：" + last_walk_y + "->" + walk_y); } if (task1 != last_task1) { - logServer.deviceLog(this.device_code,"task1" ,String.valueOf(task1)); - logServer.deviceLogToacs(this.device_code,"","","信号task1：" + last_task1 + "->" + task1); + logServer.deviceItemValue(this.device_code,"task1" ,String.valueOf(task1)); + logServer.deviceExecuteLog(this.device_code,"","","信号task1：" + last_task1 + "->" + task1); } if (task_qty != last_task_qty) { - logServer.deviceLog(this.device_code,"task_qty" ,String.valueOf(task_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号task_qty：" + last_task_qty + "->" + task_qty); + logServer.deviceItemValue(this.device_code,"task_qty" ,String.valueOf(task_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号task_qty：" + last_task_qty + "->" + task_qty); } if (finishTask_qty != last_finishTask_qty) { - logServer.deviceLog(this.device_code,"finishTask_qty" ,String.valueOf(finishTask_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号finishTask_qty：" + last_finishTask_qty + "->" + finishTask_qty); + logServer.deviceItemValue(this.device_code,"finishTask_qty" ,String.valueOf(finishTask_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号finishTask_qty：" + last_finishTask_qty + "->" + finishTask_qty); } if (batch != last_batch) { - logServer.deviceLog(this.device_code,"batch" ,String.valueOf(batch)); - logServer.deviceLogToacs(this.device_code,"","","信号batch：" + last_batch + "->" + batch); + logServer.deviceItemValue(this.device_code,"batch" ,String.valueOf(batch)); + logServer.deviceExecuteLog(this.device_code,"","","信号batch：" + last_batch + "->" + batch); } if (qty != last_qty) { - logServer.deviceLog(this.device_code,"qty" ,String.valueOf(qty)); - logServer.deviceLogToacs(this.device_code,"","","信号qty：" + last_qty + "->" + qty); + logServer.deviceItemValue(this.device_code,"qty" ,String.valueOf(qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号qty：" + last_qty + "->" + qty); } if (!StrUtil.equals(specifications,last_specifications)) { - logServer.deviceLog(this.device_code,"specifications" ,specifications); - logServer.deviceLogToacs(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications); + logServer.deviceItemValue(this.device_code,"specifications" ,specifications); + logServer.deviceExecuteLog(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications); } if ( action_1 == 1 && move_1 != 0 && task1 > 0) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDeviceDriver.java index d88c9a8..e48af42 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDeviceDriver.java @@ -1,7 +1,5 @@ package org.nl.acs.device_driver.lnsh.lnsh_out_kiln_truss; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpResponse; @@ -18,16 +16,11 @@ import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; -import org.nl.acs.opc.WcsConfig; import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; import org.openscada.opc.lib.da.Server; import org.springframework.beans.factory.annotation.Autowired; @@ -50,7 +43,7 @@ public class LnshOutKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implem @Autowired TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); @Autowired - LogServer logServer = SpringContextHolder.getBean("logServerImpl"); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); @Autowired AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl"); @@ -127,40 +120,40 @@ public class LnshOutKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implem if (mode != last_mode) { this.setRequireSucess(false); - logServer.deviceLog(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceLogToacs(this.device_code,"","","信号mode：" + last_mode + "->" + mode); + logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); + logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } if (status != last_status) { - logServer.deviceLog(this.device_code,"status" ,String.valueOf(status)); - logServer.deviceLogToacs(this.device_code,"","","信号status：" + last_status + "->" + status); + logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); + logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); } if (open_time != last_open_time) { - logServer.deviceLog(this.device_code,"open_time" ,String.valueOf(open_time)); - logServer.deviceLogToacs(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); + logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); } if (standby_time != last_standby_time) { - logServer.deviceLog(this.device_code,"standby_time" ,String.valueOf(standby_time)); - logServer.deviceLogToacs(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); + logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); } if (production_time != last_production_time) { - logServer.deviceLog(this.device_code,"production_time" ,String.valueOf(production_time)); - logServer.deviceLogToacs(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); + logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); } if (error_time != last_error_time) { - logServer.deviceLog(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceLogToacs(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); + logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); } if (outKiln_move != last_outKiln_move) { - logServer.deviceLog(this.device_code,"outKiln_move" ,String.valueOf(outKiln_move)); - logServer.deviceLogToacs(this.device_code,"","","信号outKiln_move：" + last_outKiln_move + "->" + outKiln_move); + logServer.deviceItemValue(this.device_code,"outKiln_move" ,String.valueOf(outKiln_move)); + logServer.deviceExecuteLog(this.device_code,"","","信号outKiln_move：" + last_outKiln_move + "->" + outKiln_move); } if (!StrUtil.equals(outKiln_barcode,last_outKiln_barcode)) { - logServer.deviceLog(this.device_code,"outKiln_barcode" ,outKiln_barcode); - logServer.deviceLogToacs(this.device_code,"","","信号outKiln_barcode：" + last_outKiln_barcode + "->" + outKiln_barcode); + logServer.deviceItemValue(this.device_code,"outKiln_barcode" ,outKiln_barcode); + logServer.deviceExecuteLog(this.device_code,"","","信号outKiln_barcode：" + last_outKiln_barcode + "->" + outKiln_barcode); } if (outKiln_device != last_outKiln_device) { - logServer.deviceLog(this.device_code,"outKiln_device" ,String.valueOf(outKiln_device)); - logServer.deviceLogToacs(this.device_code,"","","信号outKiln_device：" + last_outKiln_device + "->" + outKiln_device); + logServer.deviceItemValue(this.device_code,"outKiln_device" ,String.valueOf(outKiln_device)); + logServer.deviceExecuteLog(this.device_code,"","","信号outKiln_device：" + last_outKiln_device + "->" + outKiln_device); } } catch (Exception var17) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/LnshPackageLineDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/LnshPackageLineDeviceDriver.java index 175b053..a7a30cc 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/LnshPackageLineDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/LnshPackageLineDeviceDriver.java @@ -1,9 +1,6 @@ package org.nl.acs.device_driver.lnsh.lnsh_package_line; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -15,16 +12,11 @@ import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; -import org.nl.acs.opc.WcsConfig; import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; import org.openscada.opc.lib.da.Server; import org.springframework.beans.factory.annotation.Autowired; @@ -47,7 +39,7 @@ public class LnshPackageLineDeviceDriver extends AbstractOpcDeviceDriver impleme @Autowired TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); @Autowired - LogServer logServer = SpringContextHolder.getBean("logServerImpl"); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); String device_code; int mode = 0; @@ -104,32 +96,32 @@ public class LnshPackageLineDeviceDriver extends AbstractOpcDeviceDriver impleme if (mode != last_mode) { this.setRequireSucess(false); - logServer.deviceLog(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceLogToacs(this.device_code,"","","信号mode：" + last_mode + "->" + mode); + logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); + logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } if (status != last_status) { - logServer.deviceLog(this.device_code,"status" ,String.valueOf(status)); - logServer.deviceLogToacs(this.device_code,"","","信号status：" + last_status + "->" + status); + logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); + logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); } if (open_time != last_open_time) { - logServer.deviceLog(this.device_code,"open_time" ,String.valueOf(open_time)); - logServer.deviceLogToacs(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); + logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); } if (standby_time != last_standby_time) { - logServer.deviceLog(this.device_code,"standby_time" ,String.valueOf(standby_time)); - logServer.deviceLogToacs(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); + logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); } if (production_time != last_production_time) { - logServer.deviceLog(this.device_code,"production_time" ,String.valueOf(production_time)); - logServer.deviceLogToacs(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); + logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); } if (error_time != last_error_time) { - logServer.deviceLog(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceLogToacs(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); + logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); } if (!StrUtil.equals(barcode,last_barcode)) { - logServer.deviceLog(this.device_code,"barcode", barcode); - logServer.deviceLogToacs(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode); + logServer.deviceItemValue(this.device_code,"barcode", barcode); + logServer.deviceExecuteLog(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode); } } catch (Exception var17) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java index d962f81..814c9dd 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java @@ -1,7 +1,5 @@ package org.nl.acs.device_driver.lnsh.lnsh_package_pallet_manipulator; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpResponse; @@ -18,18 +16,13 @@ import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; -import org.nl.acs.opc.WcsConfig; import org.nl.acs.order.service.ProduceshiftorderService; import org.nl.acs.order.service.dto.ProduceshiftorderDto; import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; import org.openscada.opc.lib.da.Server; import org.springframework.beans.factory.annotation.Autowired; @@ -53,7 +46,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD @Autowired TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); @Autowired - LogServer logServer = SpringContextHolder.getBean("logServerImpl"); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); @Autowired AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl"); @Autowired @@ -331,300 +324,300 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD if (mode != last_mode) { this.setRequireSucess(false); - logServer.deviceLog(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceLogToacs(this.device_code,"","","信号mode：" + last_mode + "->" + mode); + logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); + logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } if (status != last_status) { - logServer.deviceLog(this.device_code,"status" ,String.valueOf(status)); - logServer.deviceLogToacs(this.device_code,"","","信号status：" + last_status + "->" + status); + logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); + logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); } if (put_station != last_put_station) { - logServer.deviceLog(this.device_code,"put_station" ,String.valueOf(put_station)); - logServer.deviceLogToacs(this.device_code,"","","信号put_station：" + last_put_station + "->" + put_station); + logServer.deviceItemValue(this.device_code,"put_station" ,String.valueOf(put_station)); + logServer.deviceExecuteLog(this.device_code,"","","信号put_station：" + last_put_station + "->" + put_station); } if (error != last_error) { - logServer.deviceLog(this.device_code,"error" ,String.valueOf(error)); - logServer.deviceLogToacs(this.device_code,"","","信号error：" + last_error + "->" + error); + logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error)); + logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + "->" + error); } if (open_time != last_open_time) { - logServer.deviceLog(this.device_code,"open_time" ,String.valueOf(open_time)); - logServer.deviceLogToacs(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); + logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); } if (standby_time != last_standby_time) { - logServer.deviceLog(this.device_code,"standby_time" ,String.valueOf(standby_time)); - logServer.deviceLogToacs(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); + logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); } if (production_time != last_production_time) { - logServer.deviceLog(this.device_code,"production_time" ,String.valueOf(production_time)); - logServer.deviceLogToacs(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); + logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); } if (error_time != last_error_time) { - logServer.deviceLog(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceLogToacs(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); + logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); } if (!StrUtil.equals(barcode,last_barcode)) { - logServer.deviceLog(this.device_code,"barcode", barcode); - logServer.deviceLogToacs(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode); + logServer.deviceItemValue(this.device_code,"barcode", barcode); + logServer.deviceExecuteLog(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode); } if (!StrUtil.equals(material,last_material)) { - logServer.deviceLog(this.device_code,"material", material); - logServer.deviceLogToacs(this.device_code,"","","信号material：" + last_material + "->" + material); + logServer.deviceItemValue(this.device_code,"material", material); + logServer.deviceExecuteLog(this.device_code,"","","信号material：" + last_material + "->" + material); } if (qty != last_qty) { - logServer.deviceLog(this.device_code,"qty" ,String.valueOf(qty)); - logServer.deviceLogToacs(this.device_code,"","","信号qty：" + last_qty + "->" + qty); + logServer.deviceItemValue(this.device_code,"qty" ,String.valueOf(qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号qty：" + last_qty + "->" + qty); } if (onoff_status != last_onoff_status) { - logServer.deviceLog(this.device_code,"onoff_status" ,String.valueOf(onoff_status)); - logServer.deviceLogToacs(this.device_code,"","","信号onoff_status：" + last_onoff_status + "->" + onoff_status); + logServer.deviceItemValue(this.device_code,"onoff_status" ,String.valueOf(onoff_status)); + logServer.deviceExecuteLog(this.device_code,"","","信号onoff_status：" + last_onoff_status + "->" + onoff_status); } if (batch != last_batch) { - logServer.deviceLog(this.device_code,"batch" ,String.valueOf(batch)); - logServer.deviceLogToacs(this.device_code,"","","信号batch：" + last_batch + "->" + batch); + logServer.deviceItemValue(this.device_code,"batch" ,String.valueOf(batch)); + logServer.deviceExecuteLog(this.device_code,"","","信号batch：" + last_batch + "->" + batch); } if (!StrUtil.equals(specifications,last_specifications)) { - logServer.deviceLog(this.device_code,"specifications", specifications); - logServer.deviceLogToacs(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications); + logServer.deviceItemValue(this.device_code,"specifications", specifications); + logServer.deviceExecuteLog(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications); } if (!StrUtil.equals(order_No,last_order_No)) { - logServer.deviceLog(this.device_code,"order_No" ,order_No); - logServer.deviceLogToacs(this.device_code,"","","信号order_No：" + last_order_No + "->" + order_No); + logServer.deviceItemValue(this.device_code,"order_No" ,order_No); + logServer.deviceExecuteLog(this.device_code,"","","信号order_No：" + last_order_No + "->" + order_No); } if (order_qty != last_order_qty) { - logServer.deviceLog(this.device_code,"order_qty" ,String.valueOf(order_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号order_qty：" + last_order_qty + "->" + order_qty); + logServer.deviceItemValue(this.device_code,"order_qty" ,String.valueOf(order_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号order_qty：" + last_order_qty + "->" + order_qty); } if (product_code != last_product_code) { - logServer.deviceLog(this.device_code,"product_code" ,String.valueOf(product_code)); - logServer.deviceLogToacs(this.device_code,"","","信号product_code：" + last_product_code + "->" + product_code); + logServer.deviceItemValue(this.device_code,"product_code" ,String.valueOf(product_code)); + logServer.deviceExecuteLog(this.device_code,"","","信号product_code：" + last_product_code + "->" + product_code); } if (AlongSide != last_AlongSide) { - logServer.deviceLog(this.device_code,"AlongSide" ,String.valueOf(AlongSide)); - logServer.deviceLogToacs(this.device_code,"","","信号AlongSide：" + last_AlongSide + "->" + AlongSide); + logServer.deviceItemValue(this.device_code,"AlongSide" ,String.valueOf(AlongSide)); + logServer.deviceExecuteLog(this.device_code,"","","信号AlongSide：" + last_AlongSide + "->" + AlongSide); } if (BshortSide != last_BshortSide) { - logServer.deviceLog(this.device_code,"BshortSide" ,String.valueOf(BshortSide)); - logServer.deviceLogToacs(this.device_code,"","","信号BshortSide：" + last_BshortSide + "->" + BshortSide); + logServer.deviceItemValue(this.device_code,"BshortSide" ,String.valueOf(BshortSide)); + logServer.deviceExecuteLog(this.device_code,"","","信号BshortSide：" + last_BshortSide + "->" + BshortSide); } if (Htrapezoidal != last_Htrapezoidal) { - logServer.deviceLog(this.device_code,"Htrapezoidal" ,String.valueOf(Htrapezoidal)); - logServer.deviceLogToacs(this.device_code,"","","信号Htrapezoidal：" + last_Htrapezoidal + "->" + Htrapezoidal); + logServer.deviceItemValue(this.device_code,"Htrapezoidal" ,String.valueOf(Htrapezoidal)); + logServer.deviceExecuteLog(this.device_code,"","","信号Htrapezoidal：" + last_Htrapezoidal + "->" + Htrapezoidal); } if (Wthickness != last_Wthickness) { - logServer.deviceLog(this.device_code,"Wthickness" ,String.valueOf(Wthickness)); - logServer.deviceLogToacs(this.device_code,"","","信号Wthickness：" + last_Wthickness + "->" + Wthickness); + logServer.deviceItemValue(this.device_code,"Wthickness" ,String.valueOf(Wthickness)); + logServer.deviceExecuteLog(this.device_code,"","","信号Wthickness：" + last_Wthickness + "->" + Wthickness); } if (tray_qty != last_tray_qty) { - logServer.deviceLog(this.device_code,"tray_qty" ,String.valueOf(tray_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号tray_qty：" + last_tray_qty + "->" + tray_qty); + logServer.deviceItemValue(this.device_code,"tray_qty" ,String.valueOf(tray_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号tray_qty：" + last_tray_qty + "->" + tray_qty); } if (tray_high != last_tray_high) { - logServer.deviceLog(this.device_code,"tray_high" ,String.valueOf(tray_high)); - logServer.deviceLogToacs(this.device_code,"","","信号tray_high：" + last_tray_high + "->" + tray_high); + logServer.deviceItemValue(this.device_code,"tray_high" ,String.valueOf(tray_high)); + logServer.deviceExecuteLog(this.device_code,"","","信号tray_high：" + last_tray_high + "->" + tray_high); } if (crib_category != last_crib_category) { - logServer.deviceLog(this.device_code,"crib_category" ,String.valueOf(crib_category)); - logServer.deviceLogToacs(this.device_code,"","","信号crib_category：" + last_crib_category + "->" + crib_category); + logServer.deviceItemValue(this.device_code,"crib_category" ,String.valueOf(crib_category)); + logServer.deviceExecuteLog(this.device_code,"","","信号crib_category：" + last_crib_category + "->" + crib_category); } if (palletX1_line != last_palletX1_line) { - logServer.deviceLog(this.device_code,"palletX1_line" ,String.valueOf(palletX1_line)); - logServer.deviceLogToacs(this.device_code,"","","信号palletX1_line：" + last_palletX1_line + "->" + palletX1_line); + logServer.deviceItemValue(this.device_code,"palletX1_line" ,String.valueOf(palletX1_line)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletX1_line：" + last_palletX1_line + "->" + palletX1_line); } if (palletY1_row != last_palletY1_row) { - logServer.deviceLog(this.device_code,"palletY1_row" ,String.valueOf(palletY1_row)); - logServer.deviceLogToacs(this.device_code,"","","信号palletY1_row：" + last_palletY1_row + "->" + palletY1_row); + logServer.deviceItemValue(this.device_code,"palletY1_row" ,String.valueOf(palletY1_row)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletY1_row：" + last_palletY1_row + "->" + palletY1_row); } if (palletA1_angle != last_palletA1_angle) { - logServer.deviceLog(this.device_code,"palletA1_angle" ,String.valueOf(palletA1_angle)); - logServer.deviceLogToacs(this.device_code,"","","信号palletA1_angle：" + last_palletA1_angle + "->" + palletA1_angle); + logServer.deviceItemValue(this.device_code,"palletA1_angle" ,String.valueOf(palletA1_angle)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletA1_angle：" + last_palletA1_angle + "->" + palletA1_angle); } if (palletX2_line != last_palletX2_line) { - logServer.deviceLog(this.device_code,"palletX2_line" ,String.valueOf(palletX2_line)); - logServer.deviceLogToacs(this.device_code,"","","信号palletX2_line：" + last_palletX2_line + "->" + palletX2_line); + logServer.deviceItemValue(this.device_code,"palletX2_line" ,String.valueOf(palletX2_line)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletX2_line：" + last_palletX2_line + "->" + palletX2_line); } if (palletY2_row != last_palletY2_row) { - logServer.deviceLog(this.device_code,"palletY2_row" ,String.valueOf(palletY2_row)); - logServer.deviceLogToacs(this.device_code,"","","信号palletY2_row：" + last_palletY2_row + "->" + palletY2_row); + logServer.deviceItemValue(this.device_code,"palletY2_row" ,String.valueOf(palletY2_row)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletY2_row：" + last_palletY2_row + "->" + palletY2_row); } if (palletA2_angle != last_palletA2_angle) { - logServer.deviceLog(this.device_code,"palletA2_angle" ,String.valueOf(palletA2_angle)); - logServer.deviceLogToacs(this.device_code,"","","信号palletA2_angle：" + last_palletA2_angle + "->" + palletA2_angle); + logServer.deviceItemValue(this.device_code,"palletA2_angle" ,String.valueOf(palletA2_angle)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletA2_angle：" + last_palletA2_angle + "->" + palletA2_angle); } if (palletX3_line != last_palletX3_line) { - logServer.deviceLog(this.device_code,"palletX3_line" ,String.valueOf(palletX3_line)); - logServer.deviceLogToacs(this.device_code,"","","信号palletX3_line：" + last_palletX3_line + "->" + palletX3_line); + logServer.deviceItemValue(this.device_code,"palletX3_line" ,String.valueOf(palletX3_line)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletX3_line：" + last_palletX3_line + "->" + palletX3_line); } if (palletY3_row != last_palletY3_row) { - logServer.deviceLog(this.device_code,"palletY3_row" ,String.valueOf(palletY3_row)); - logServer.deviceLogToacs(this.device_code,"","","信号palletY3_row：" + last_palletY3_row + "->" + palletY3_row); + logServer.deviceItemValue(this.device_code,"palletY3_row" ,String.valueOf(palletY3_row)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletY3_row：" + last_palletY3_row + "->" + palletY3_row); } if (palletA3_angle != last_palletA3_angle) { - logServer.deviceLog(this.device_code,"palletA3_angle" ,String.valueOf(palletA3_angle)); - logServer.deviceLogToacs(this.device_code,"","","信号palletA3_angle：" + last_palletA3_angle + "->" + palletA3_angle); + logServer.deviceItemValue(this.device_code,"palletA3_angle" ,String.valueOf(palletA3_angle)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletA3_angle：" + last_palletA3_angle + "->" + palletA3_angle); } if (pressCribX1_line != last_pressCribX1_line) { - logServer.deviceLog(this.device_code,"pressCribX1_line" ,String.valueOf(pressCribX1_line)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribX1_line：" + last_pressCribX1_line + "->" + pressCribX1_line); + logServer.deviceItemValue(this.device_code,"pressCribX1_line" ,String.valueOf(pressCribX1_line)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribX1_line：" + last_pressCribX1_line + "->" + pressCribX1_line); } if (pressCribY1_row != last_pressCribY1_row) { - logServer.deviceLog(this.device_code,"pressCribY1_row" ,String.valueOf(pressCribY1_row)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribY1_row：" + last_pressCribY1_row + "->" + pressCribY1_row); + logServer.deviceItemValue(this.device_code,"pressCribY1_row" ,String.valueOf(pressCribY1_row)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribY1_row：" + last_pressCribY1_row + "->" + pressCribY1_row); } if (pressCribA1_angle != last_pressCribA1_angle) { - logServer.deviceLog(this.device_code,"pressCribA1_angle" ,String.valueOf(pressCribA1_angle)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribA1_angle：" + last_pressCribA1_angle + "->" + pressCribA1_angle); + logServer.deviceItemValue(this.device_code,"pressCribA1_angle" ,String.valueOf(pressCribA1_angle)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribA1_angle：" + last_pressCribA1_angle + "->" + pressCribA1_angle); } if (pressCribX2_line != last_pressCribX2_line) { - logServer.deviceLog(this.device_code,"pressCribX2_line" ,String.valueOf(pressCribX2_line)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribX2_line：" + last_pressCribX2_line + "->" + pressCribX2_line); + logServer.deviceItemValue(this.device_code,"pressCribX2_line" ,String.valueOf(pressCribX2_line)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribX2_line：" + last_pressCribX2_line + "->" + pressCribX2_line); } if (pressCribY2_row != last_pressCribY2_row) { - logServer.deviceLog(this.device_code,"pressCribY2_row" ,String.valueOf(pressCribY2_row)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribY2_row：" + last_pressCribY2_row + "->" + pressCribY2_row); + logServer.deviceItemValue(this.device_code,"pressCribY2_row" ,String.valueOf(pressCribY2_row)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribY2_row：" + last_pressCribY2_row + "->" + pressCribY2_row); } if (pressCribA2_angle != last_pressCribA2_angle) { - logServer.deviceLog(this.device_code,"pressCribA2_angle" ,String.valueOf(pressCribA2_angle)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribA2_angle：" + last_pressCribA2_angle + "->" + pressCribA2_angle); + logServer.deviceItemValue(this.device_code,"pressCribA2_angle" ,String.valueOf(pressCribA2_angle)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribA2_angle：" + last_pressCribA2_angle + "->" + pressCribA2_angle); } if (pressCribX3_line != last_pressCribX3_line) { - logServer.deviceLog(this.device_code,"pressCribX3_line" ,String.valueOf(pressCribX3_line)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribX3_line：" + last_pressCribX3_line + "->" + pressCribX3_line); + logServer.deviceItemValue(this.device_code,"pressCribX3_line" ,String.valueOf(pressCribX3_line)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribX3_line：" + last_pressCribX3_line + "->" + pressCribX3_line); } if (pressCribY3_row != last_pressCribY3_row) { - logServer.deviceLog(this.device_code,"pressCribY3_row" ,String.valueOf(pressCribY3_row)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribY3_row：" + last_pressCribY3_row + "->" + pressCribY3_row); + logServer.deviceItemValue(this.device_code,"pressCribY3_row" ,String.valueOf(pressCribY3_row)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribY3_row：" + last_pressCribY3_row + "->" + pressCribY3_row); } if (pressCribA3_angle != last_pressCribA3_angle) { - logServer.deviceLog(this.device_code,"pressCribA3_angle" ,String.valueOf(pressCribA3_angle)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribA3_angle：" + last_pressCribA3_angle + "->" + pressCribA3_angle); + logServer.deviceItemValue(this.device_code,"pressCribA3_angle" ,String.valueOf(pressCribA3_angle)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribA3_angle：" + last_pressCribA3_angle + "->" + pressCribA3_angle); } if (Zoffset != last_Zoffset) { - logServer.deviceLog(this.device_code,"Zoffset" ,String.valueOf(Zoffset)); - logServer.deviceLogToacs(this.device_code,"","","信号Zoffset：" + last_Zoffset + "->" + Zoffset); + logServer.deviceItemValue(this.device_code,"Zoffset" ,String.valueOf(Zoffset)); + logServer.deviceExecuteLog(this.device_code,"","","信号Zoffset：" + last_Zoffset + "->" + Zoffset); } if (pallet_layerQty != last_pallet_layerQty) { - logServer.deviceLog(this.device_code,"pallet_layerQty" ,String.valueOf(pallet_layerQty)); - logServer.deviceLogToacs(this.device_code,"","","信号pallet_layerQty：" + last_pallet_layerQty + "->" + pallet_layerQty); + logServer.deviceItemValue(this.device_code,"pallet_layerQty" ,String.valueOf(pallet_layerQty)); + logServer.deviceExecuteLog(this.device_code,"","","信号pallet_layerQty：" + last_pallet_layerQty + "->" + pallet_layerQty); } if (pressCrib_layerQty != last_pressCrib_layerQty) { - logServer.deviceLog(this.device_code,"pressCrib_layerQty" ,String.valueOf(pressCrib_layerQty)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCrib_layerQty：" + last_pressCrib_layerQty + "->" + pressCrib_layerQty); + logServer.deviceItemValue(this.device_code,"pressCrib_layerQty" ,String.valueOf(pressCrib_layerQty)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCrib_layerQty：" + last_pressCrib_layerQty + "->" + pressCrib_layerQty); } if (codeLayerX1_interval != last_codeLayerX1_interval) { - logServer.deviceLog(this.device_code,"codeLayerX1_interval" ,String.valueOf(codeLayerX1_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerX1_interval：" + last_codeLayerX1_interval + "->" + codeLayerX1_interval); + logServer.deviceItemValue(this.device_code,"codeLayerX1_interval" ,String.valueOf(codeLayerX1_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerX1_interval：" + last_codeLayerX1_interval + "->" + codeLayerX1_interval); } if (codeLayerY1_interval != last_codeLayerY1_interval) { - logServer.deviceLog(this.device_code,"codeLayerY1_interval" ,String.valueOf(codeLayerY1_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerY1_interval：" + last_codeLayerY1_interval + "->" + codeLayerY1_interval); + logServer.deviceItemValue(this.device_code,"codeLayerY1_interval" ,String.valueOf(codeLayerY1_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerY1_interval：" + last_codeLayerY1_interval + "->" + codeLayerY1_interval); } if (codeLayerX2_interval != last_codeLayerX2_interval) { - logServer.deviceLog(this.device_code,"codeLayerX2_interval" ,String.valueOf(codeLayerX2_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerX2_interval：" + last_codeLayerX2_interval + "->" + codeLayerX2_interval); + logServer.deviceItemValue(this.device_code,"codeLayerX2_interval" ,String.valueOf(codeLayerX2_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerX2_interval：" + last_codeLayerX2_interval + "->" + codeLayerX2_interval); } if (codeLayerY2_interval != last_codeLayerY2_interval) { - logServer.deviceLog(this.device_code,"codeLayerY2_interval" ,String.valueOf(codeLayerY2_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerY2_interval：" + last_codeLayerY2_interval + "->" + codeLayerY2_interval); + logServer.deviceItemValue(this.device_code,"codeLayerY2_interval" ,String.valueOf(codeLayerY2_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerY2_interval：" + last_codeLayerY2_interval + "->" + codeLayerY2_interval); } if (codeLayerX3_interval != last_codeLayerX3_interval) { - logServer.deviceLog(this.device_code,"codeLayerX3_interval" ,String.valueOf(codeLayerX3_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerX3_interval：" + last_codeLayerX3_interval + "->" + codeLayerX3_interval); + logServer.deviceItemValue(this.device_code,"codeLayerX3_interval" ,String.valueOf(codeLayerX3_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerX3_interval：" + last_codeLayerX3_interval + "->" + codeLayerX3_interval); } if (codeLayerY3_interval != last_codeLayerY3_interval) { - logServer.deviceLog(this.device_code,"codeLayerY3_interval" ,String.valueOf(codeLayerY3_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerY3_interval：" + last_codeLayerY3_interval + "->" + codeLayerY3_interval); + logServer.deviceItemValue(this.device_code,"codeLayerY3_interval" ,String.valueOf(codeLayerY3_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerY3_interval：" + last_codeLayerY3_interval + "->" + codeLayerY3_interval); } if (codeLayerX1_offset != last_codeLayerX1_offset) { - logServer.deviceLog(this.device_code,"codeLayerX1_offset" ,String.valueOf(codeLayerX1_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerX1_offset：" + last_codeLayerX1_offset + "->" + codeLayerX1_offset); + logServer.deviceItemValue(this.device_code,"codeLayerX1_offset" ,String.valueOf(codeLayerX1_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerX1_offset：" + last_codeLayerX1_offset + "->" + codeLayerX1_offset); } if (codeLayerY1_offset != last_codeLayerY1_offset) { - logServer.deviceLog(this.device_code,"codeLayerY1_offset" ,String.valueOf(codeLayerY1_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerY1_offset：" + last_codeLayerY1_offset + "->" + codeLayerY1_offset); + logServer.deviceItemValue(this.device_code,"codeLayerY1_offset" ,String.valueOf(codeLayerY1_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerY1_offset：" + last_codeLayerY1_offset + "->" + codeLayerY1_offset); } if (codeLayerX2_offset != last_codeLayerX2_offset) { - logServer.deviceLog(this.device_code,"codeLayerX2_offset" ,String.valueOf(codeLayerX2_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerX2_offset：" + last_codeLayerX2_offset + "->" + codeLayerX2_offset); + logServer.deviceItemValue(this.device_code,"codeLayerX2_offset" ,String.valueOf(codeLayerX2_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerX2_offset：" + last_codeLayerX2_offset + "->" + codeLayerX2_offset); } if (codeLayerY2_offset != last_codeLayerY2_offset) { - logServer.deviceLog(this.device_code,"codeLayerY2_offset" ,String.valueOf(codeLayerY2_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerY2_offset：" + last_codeLayerY2_offset + "->" + codeLayerY2_offset); + logServer.deviceItemValue(this.device_code,"codeLayerY2_offset" ,String.valueOf(codeLayerY2_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerY2_offset：" + last_codeLayerY2_offset + "->" + codeLayerY2_offset); } if (codeLayerX3_offset != last_codeLayerX3_offset) { - logServer.deviceLog(this.device_code,"codeLayerX3_offset" ,String.valueOf(codeLayerX3_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerX3_offset：" + last_codeLayerX3_offset + "->" + codeLayerX3_offset); + logServer.deviceItemValue(this.device_code,"codeLayerX3_offset" ,String.valueOf(codeLayerX3_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerX3_offset：" + last_codeLayerX3_offset + "->" + codeLayerX3_offset); } if (codeLayerY3_offset != last_codeLayerY3_offset) { - logServer.deviceLog(this.device_code,"codeLayerY3_offset" ,String.valueOf(codeLayerY3_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerY3_offset：" + last_codeLayerY3_offset + "->" + codeLayerY3_offset); + logServer.deviceItemValue(this.device_code,"codeLayerY3_offset" ,String.valueOf(codeLayerY3_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerY3_offset：" + last_codeLayerY3_offset + "->" + codeLayerY3_offset); } if (pressLayerX1_interval != last_pressLayerX1_interval) { - logServer.deviceLog(this.device_code,"pressLayerX1_interval" ,String.valueOf(pressLayerX1_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerX1_interval：" + last_pressLayerX1_interval + "->" + pressLayerX1_interval); + logServer.deviceItemValue(this.device_code,"pressLayerX1_interval" ,String.valueOf(pressLayerX1_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerX1_interval：" + last_pressLayerX1_interval + "->" + pressLayerX1_interval); } if (pressLayerY1_interval != last_pressLayerY1_interval) { - logServer.deviceLog(this.device_code,"pressLayerY1_interval" ,String.valueOf(pressLayerY1_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerY1_interval：" + last_pressLayerY1_interval + "->" + pressLayerY1_interval); + logServer.deviceItemValue(this.device_code,"pressLayerY1_interval" ,String.valueOf(pressLayerY1_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerY1_interval：" + last_pressLayerY1_interval + "->" + pressLayerY1_interval); } if (pressLayerX2_interval != last_pressLayerX2_interval) { - logServer.deviceLog(this.device_code,"pressLayerX2_interval" ,String.valueOf(pressLayerX2_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerX2_interval：" + last_pressLayerX2_interval + "->" + pressLayerX2_interval); + logServer.deviceItemValue(this.device_code,"pressLayerX2_interval" ,String.valueOf(pressLayerX2_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerX2_interval：" + last_pressLayerX2_interval + "->" + pressLayerX2_interval); } if (pressLayerY2_interval != last_pressLayerY2_interval) { - logServer.deviceLog(this.device_code,"pressLayerY2_interval" ,String.valueOf(pressLayerY2_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerY2_interval：" + last_pressLayerY2_interval + "->" + pressLayerY2_interval); + logServer.deviceItemValue(this.device_code,"pressLayerY2_interval" ,String.valueOf(pressLayerY2_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerY2_interval：" + last_pressLayerY2_interval + "->" + pressLayerY2_interval); } if (pressLayerX3_interval != last_pressLayerX3_interval) { - logServer.deviceLog(this.device_code,"pressLayerX3_interval" ,String.valueOf(pressLayerX3_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerX3_interval：" + last_pressLayerX3_interval + "->" + pressLayerX3_interval); + logServer.deviceItemValue(this.device_code,"pressLayerX3_interval" ,String.valueOf(pressLayerX3_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerX3_interval：" + last_pressLayerX3_interval + "->" + pressLayerX3_interval); } if (pressLayerY3_interval != last_pressLayerY3_interval) { - logServer.deviceLog(this.device_code,"pressLayerY3_interval" ,String.valueOf(pressLayerY3_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerY3_interval：" + last_pressLayerY3_interval + "->" + pressLayerY3_interval); + logServer.deviceItemValue(this.device_code,"pressLayerY3_interval" ,String.valueOf(pressLayerY3_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerY3_interval：" + last_pressLayerY3_interval + "->" + pressLayerY3_interval); } if (pressLayerX1_offset != last_pressLayerX1_offset) { - logServer.deviceLog(this.device_code,"pressLayerX1_offset" ,String.valueOf(pressLayerX1_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerX1_offset：" + last_pressLayerX1_offset + "->" + pressLayerX1_offset); + logServer.deviceItemValue(this.device_code,"pressLayerX1_offset" ,String.valueOf(pressLayerX1_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerX1_offset：" + last_pressLayerX1_offset + "->" + pressLayerX1_offset); } if (pressLayerY1_offset != last_pressLayerY1_offset) { - logServer.deviceLog(this.device_code,"pressLayerY1_offset" ,String.valueOf(pressLayerY1_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerY1_offset：" + last_pressLayerY1_offset + "->" + pressLayerY1_offset); + logServer.deviceItemValue(this.device_code,"pressLayerY1_offset" ,String.valueOf(pressLayerY1_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerY1_offset：" + last_pressLayerY1_offset + "->" + pressLayerY1_offset); } if (pressLayerX2_offset != last_pressLayerX2_offset) { - logServer.deviceLog(this.device_code,"pressLayerX2_offset" ,String.valueOf(pressLayerX2_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerX2_offset：" + last_pressLayerX2_offset + "->" + pressLayerX2_offset); + logServer.deviceItemValue(this.device_code,"pressLayerX2_offset" ,String.valueOf(pressLayerX2_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerX2_offset：" + last_pressLayerX2_offset + "->" + pressLayerX2_offset); } if (pressLayerY2_offset != last_pressLayerY2_offset) { - logServer.deviceLog(this.device_code,"pressLayerY2_offset" ,String.valueOf(pressLayerY2_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerY2_offset：" + last_pressLayerY2_offset + "->" + pressLayerY2_offset); + logServer.deviceItemValue(this.device_code,"pressLayerY2_offset" ,String.valueOf(pressLayerY2_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerY2_offset：" + last_pressLayerY2_offset + "->" + pressLayerY2_offset); } if (pressLayerX3_offset != last_pressLayerX3_offset) { - logServer.deviceLog(this.device_code,"pressLayerX3_offset" ,String.valueOf(pressLayerX3_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerX3_offset：" + last_pressLayerX3_offset + "->" + pressLayerX3_offset); + logServer.deviceItemValue(this.device_code,"pressLayerX3_offset" ,String.valueOf(pressLayerX3_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerX3_offset：" + last_pressLayerX3_offset + "->" + pressLayerX3_offset); } if (pressLayerY3_offset != last_pressLayerY3_offset) { - logServer.deviceLog(this.device_code,"pressLayerY3_offset" ,String.valueOf(pressLayerY3_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerY3_offset：" + last_pressLayerY3_offset + "->" + pressLayerY3_offset); + logServer.deviceItemValue(this.device_code,"pressLayerY3_offset" ,String.valueOf(pressLayerY3_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerY3_offset：" + last_pressLayerY3_offset + "->" + pressLayerY3_offset); } if (one_cribTotal != last_one_cribTotal) { - logServer.deviceLog(this.device_code,"one_cribTotal" ,String.valueOf(one_cribTotal)); - logServer.deviceLogToacs(this.device_code,"","","信号one_cribTotal：" + last_one_cribTotal + "->" + one_cribTotal); + logServer.deviceItemValue(this.device_code,"one_cribTotal" ,String.valueOf(one_cribTotal)); + logServer.deviceExecuteLog(this.device_code,"","","信号one_cribTotal：" + last_one_cribTotal + "->" + one_cribTotal); } if (two_cribTotal != last_two_cribTotal) { - logServer.deviceLog(this.device_code,"two_cribTotal" ,String.valueOf(two_cribTotal)); - logServer.deviceLogToacs(this.device_code,"","","信号two_cribTotal：" + last_two_cribTotal + "->" + two_cribTotal); + logServer.deviceItemValue(this.device_code,"two_cribTotal" ,String.valueOf(two_cribTotal)); + logServer.deviceExecuteLog(this.device_code,"","","信号two_cribTotal：" + last_two_cribTotal + "->" + two_cribTotal); } if (one_qty != last_one_qty) { - logServer.deviceLog(this.device_code,"one_qty" ,String.valueOf(one_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号one_qty：" + last_one_qty + "->" + one_qty); + logServer.deviceItemValue(this.device_code,"one_qty" ,String.valueOf(one_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号one_qty：" + last_one_qty + "->" + one_qty); } if (two_qty != last_two_qty) { - logServer.deviceLog(this.device_code,"two_qty" ,String.valueOf(two_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号two_qty：" + last_two_qty + "->" + two_qty); + logServer.deviceItemValue(this.device_code,"two_qty" ,String.valueOf(two_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号two_qty：" + last_two_qty + "->" + two_qty); } if (tool_coordinate != last_tool_coordinate) { - logServer.deviceLog(this.device_code,"tool_coordinate" ,String.valueOf(tool_coordinate)); - logServer.deviceLogToacs(this.device_code,"","","信号tool_coordinate：" + last_tool_coordinate + "->" + tool_coordinate); + logServer.deviceItemValue(this.device_code,"tool_coordinate" ,String.valueOf(tool_coordinate)); + logServer.deviceExecuteLog(this.device_code,"","","信号tool_coordinate：" + last_tool_coordinate + "->" + tool_coordinate); } } catch (Exception var17) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDeviceDriver.java index b211d38..af942d2 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDeviceDriver.java @@ -18,7 +18,7 @@ import org.nl.acs.device_driver.standard_emptypallet_site.StandardEmptyPalletSit import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.opc.DeviceAppServiceImpl; @@ -52,7 +52,7 @@ public class LnshPackageSiteDeviceDriver extends AbstractOpcDeviceDriver impleme @Autowired TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); @Autowired - LogServer logServer = SpringContextHolder.getBean("logServerImpl"); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); //放货准备锁 String putReadyLock = null; @@ -137,40 +137,40 @@ public class LnshPackageSiteDeviceDriver extends AbstractOpcDeviceDriver impleme if (mode != last_mode) { this.setRequireSucess(false); - logServer.deviceLog(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceLogToacs(this.device_code,"","","信号mode：" + last_mode + "->" + mode); + logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); + logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } if (move != last_move) { - logServer.deviceLog(this.device_code,"move" ,String.valueOf(move)); - logServer.deviceLogToacs(this.device_code,"","","信号move：" + last_move + "->" + move); + logServer.deviceItemValue(this.device_code,"move" ,String.valueOf(move)); + logServer.deviceExecuteLog(this.device_code,"","","信号move：" + last_move + "->" + move); } if (error != last_error) { - logServer.deviceLog(this.device_code,"error" ,String.valueOf(error)); - logServer.deviceLogToacs(this.device_code,"","","信号error：" + last_error + "->" + error); + logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error)); + logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + "->" + error); } if (task != last_task) { - logServer.deviceLog(this.device_code,"task",String.valueOf(task)); - logServer.deviceLogToacs(this.device_code,"","","信号task：" + last_task + "->" + task); + logServer.deviceItemValue(this.device_code,"task",String.valueOf(task)); + logServer.deviceExecuteLog(this.device_code,"","","信号task：" + last_task + "->" + task); } if (action != last_action) { - logServer.deviceLog(this.device_code,"action",String.valueOf(action)); - logServer.deviceLogToacs(this.device_code,"","","信号action：" + last_action + "->" + action); + logServer.deviceItemValue(this.device_code,"action",String.valueOf(action)); + logServer.deviceExecuteLog(this.device_code,"","","信号action：" + last_action + "->" + action); } if (io_action != last_ioaction) { - logServer.deviceLog(this.device_code,"io_action",String.valueOf(io_action)); - logServer.deviceLogToacs(this.device_code,"","","信号io_action: " + last_ioaction + "->" + io_action); + logServer.deviceItemValue(this.device_code,"io_action",String.valueOf(io_action)); + logServer.deviceExecuteLog(this.device_code,"","","信号io_action: " + last_ioaction + "->" + io_action); } if (weight != last_weight) { - logServer.deviceLog(this.device_code,"weight",String.valueOf(weight)); - logServer.deviceLogToacs(this.device_code,"","","信号weight: " + last_weight + "->" + weight); + logServer.deviceItemValue(this.device_code,"weight",String.valueOf(weight)); + logServer.deviceExecuteLog(this.device_code,"","","信号weight: " + last_weight + "->" + weight); } if (!StrUtil.equals(material,last_material)) { - logServer.deviceLog(this.device_code,"material", material); - logServer.deviceLogToacs(this.device_code,"","","信号material：" + last_material + "->" + material); + logServer.deviceItemValue(this.device_code,"material", material); + logServer.deviceExecuteLog(this.device_code,"","","信号material：" + last_material + "->" + material); } if (!StrUtil.equals(barcode,last_barcode)) { - logServer.deviceLog(this.device_code,"barcode", barcode); - logServer.deviceLogToacs(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode); + logServer.deviceItemValue(this.device_code,"barcode", barcode); + logServer.deviceExecuteLog(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode); } } catch (Exception var17) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/LnshPalletStorageDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/LnshPalletStorageDeviceDriver.java index 2c9052a..fe464e5 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/LnshPalletStorageDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/LnshPalletStorageDeviceDriver.java @@ -1,9 +1,5 @@ package org.nl.acs.device_driver.lnsh.lnsh_pallet_storage; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -15,16 +11,11 @@ import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; -import org.nl.acs.opc.WcsConfig; import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; import org.openscada.opc.lib.da.Server; import org.springframework.beans.factory.annotation.Autowired; @@ -47,7 +38,7 @@ public class LnshPalletStorageDeviceDriver extends AbstractOpcDeviceDriver imple @Autowired TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); @Autowired - LogServer logServer = SpringContextHolder.getBean("logServerImpl"); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); String device_code; int mode = 0; @@ -117,40 +108,40 @@ public class LnshPalletStorageDeviceDriver extends AbstractOpcDeviceDriver imple if (mode != last_mode) { this.setRequireSucess(false); - logServer.deviceLog(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceLogToacs(this.device_code,"","","信号mode：" + last_mode + "->" + mode); + logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); + logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } if (status != last_status) { - logServer.deviceLog(this.device_code,"status" ,String.valueOf(status)); - logServer.deviceLogToacs(this.device_code,"","","信号status：" + last_status + "->" + status); + logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); + logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); } if (open_time != last_open_time) { - logServer.deviceLog(this.device_code,"open_time" ,String.valueOf(open_time)); - logServer.deviceLogToacs(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); + logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); } if (close_time != last_close_time) { - logServer.deviceLog(this.device_code,"close_time" ,String.valueOf(close_time)); - logServer.deviceLogToacs(this.device_code,"","","信号close_time：" + last_close_time + "->" + close_time); + logServer.deviceItemValue(this.device_code,"close_time" ,String.valueOf(close_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号close_time：" + last_close_time + "->" + close_time); } if (standby_time != last_standby_time) { - logServer.deviceLog(this.device_code,"standby_time" ,String.valueOf(standby_time)); - logServer.deviceLogToacs(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); + logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); } if (production_time != last_production_time) { - logServer.deviceLog(this.device_code,"production_time" ,String.valueOf(production_time)); - logServer.deviceLogToacs(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); + logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); } if (error_time != last_error_time) { - logServer.deviceLog(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceLogToacs(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); + logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); } if (tray_crib_qty != last_tray_crib_qty) { - logServer.deviceLog(this.device_code,"tray_crib_qty" ,String.valueOf(tray_crib_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号tray_crib_qty：" + last_tray_crib_qty + "->" + tray_crib_qty); + logServer.deviceItemValue(this.device_code,"tray_crib_qty" ,String.valueOf(tray_crib_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号tray_crib_qty：" + last_tray_crib_qty + "->" + tray_crib_qty); } if (total_container != last_total_container) { - logServer.deviceLog(this.device_code,"total_container" ,String.valueOf(total_container)); - logServer.deviceLogToacs(this.device_code,"","","信号total_container：" + last_total_container + "->" + total_container); + logServer.deviceItemValue(this.device_code,"total_container" ,String.valueOf(total_container)); + logServer.deviceExecuteLog(this.device_code,"","","信号total_container：" + last_total_container + "->" + total_container); } } catch (Exception var17) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java index 90a4567..a888494 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java @@ -1,7 +1,5 @@ package org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpResponse; @@ -15,24 +13,18 @@ import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.RouteableDeviceDriver; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.device_driver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.opc.WcsConfig; import org.nl.acs.order.service.ProduceshiftorderService; import org.nl.acs.order.service.dto.ProduceshiftorderDto; import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; import org.openscada.opc.lib.da.Server; import org.springframework.beans.factory.annotation.Autowired; @@ -55,7 +47,7 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri @Autowired TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); @Autowired - LogServer logServer = SpringContextHolder.getBean("logServerImpl"); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); @Autowired AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl"); @Autowired @@ -139,48 +131,48 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri if (mode != last_mode) { this.setRequireSucess(false); - logServer.deviceLog(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceLogToacs(this.device_code,"","","信号mode：" + last_mode + "->" + mode); + logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); + logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } if (status != last_status) { - logServer.deviceLog(this.device_code,"status" ,String.valueOf(status)); - logServer.deviceLogToacs(this.device_code,"","","信号status：" + last_status + "->" + status); + logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); + logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); } if (action != last_action) { - logServer.deviceLog(this.device_code,"action" ,String.valueOf(action)); - logServer.deviceLogToacs(this.device_code,"","","信号action：" + last_action + "->" + action); + logServer.deviceItemValue(this.device_code,"action" ,String.valueOf(action)); + logServer.deviceExecuteLog(this.device_code,"","","信号action：" + last_action + "->" + action); } if (error != last_error) { - logServer.deviceLog(this.device_code,"error" ,String.valueOf(error)); - logServer.deviceLogToacs(this.device_code,"","","信号error：" + last_error + "->" + error); + logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error)); + logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + "->" + error); } if (put_station != last_put_station) { - logServer.deviceLog(this.device_code,"put_station" ,String.valueOf(put_station)); - logServer.deviceLogToacs(this.device_code,"","","信号put_station：" + last_put_station + "->" + put_station); + logServer.deviceItemValue(this.device_code,"put_station" ,String.valueOf(put_station)); + logServer.deviceExecuteLog(this.device_code,"","","信号put_station：" + last_put_station + "->" + put_station); } if (encoder_qty != last_encoder_qty) { - logServer.deviceLog(this.device_code,"encoder_qty" ,String.valueOf(encoder_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号encoder_qty：" + last_encoder_qty + "->" + encoder_qty); + logServer.deviceItemValue(this.device_code,"encoder_qty" ,String.valueOf(encoder_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号encoder_qty：" + last_encoder_qty + "->" + encoder_qty); } if (batch != last_batch) { - logServer.deviceLog(this.device_code,"batch" ,String.valueOf(batch)); - logServer.deviceLogToacs(this.device_code,"","","信号batch：" + last_batch + "->" + batch); + logServer.deviceItemValue(this.device_code,"batch" ,String.valueOf(batch)); + logServer.deviceExecuteLog(this.device_code,"","","信号batch：" + last_batch + "->" + batch); } if (!StrUtil.equals(specifications,last_specifications)) { - logServer.deviceLog(this.device_code,"specifications", specifications); - logServer.deviceLogToacs(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications); + logServer.deviceItemValue(this.device_code,"specifications", specifications); + logServer.deviceExecuteLog(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications); } if (!StrUtil.equals(material,last_material)) { - logServer.deviceLog(this.device_code,"material", material); - logServer.deviceLogToacs(this.device_code,"","","信号material：" + last_material + "->" + material); + logServer.deviceItemValue(this.device_code,"material", material); + logServer.deviceExecuteLog(this.device_code,"","","信号material：" + last_material + "->" + material); } if (!StrUtil.equals(order_No,last_order_No)) { - logServer.deviceLog(this.device_code,"order_No", order_No); - logServer.deviceLogToacs(this.device_code,"","","信号order_No：" + last_order_No + "->" + order_No); + logServer.deviceItemValue(this.device_code,"order_No", order_No); + logServer.deviceExecuteLog(this.device_code,"","","信号order_No：" + last_order_No + "->" + order_No); } if (order_qty != last_order_qty) { - logServer.deviceLog(this.device_code,"order_qty" ,String.valueOf(order_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号order_qty：" + last_order_qty + "->" + order_qty); + logServer.deviceItemValue(this.device_code,"order_qty" ,String.valueOf(order_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号order_qty：" + last_order_qty + "->" + order_qty); } } catch (Exception var17) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java index 06c0ade..44e5981 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java @@ -1,7 +1,5 @@ package org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator_site; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpResponse; @@ -9,7 +7,6 @@ import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.checkerframework.checker.units.qual.A; import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.DeviceDriver; @@ -19,15 +16,11 @@ import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.exception.WDKException; import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; import org.openscada.opc.lib.da.Server; import org.springframework.beans.factory.annotation.Autowired; @@ -53,7 +46,7 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic @Autowired TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); @Autowired - LogServer logServer = SpringContextHolder.getBean("logServerImpl"); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); @Autowired AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl"); String device_code; @@ -153,64 +146,64 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic if (mode != last_mode) { this.setRequireSucess(false); - logServer.deviceLog(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceLogToacs(this.device_code,"","","信号mode：" + last_mode + "->" + mode); + logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); + logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } if (move != last_move) { - logServer.deviceLog(this.device_code,"move" ,String.valueOf(move)); - logServer.deviceLogToacs(this.device_code,"","","信号move：" + last_move + "->" + move); + logServer.deviceItemValue(this.device_code,"move" ,String.valueOf(move)); + logServer.deviceExecuteLog(this.device_code,"","","信号move：" + last_move + "->" + move); } if (error != last_error) { - logServer.deviceLog(this.device_code,"error" ,String.valueOf(error)); - logServer.deviceLogToacs(this.device_code,"","","信号error：" + last_error + "->" + error); + logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error)); + logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + "->" + error); } if (task != last_task) { - logServer.deviceLog(this.device_code,"task",String.valueOf(task)); - logServer.deviceLogToacs(this.device_code,"","","信号task：" + last_task + "->" + task); + logServer.deviceItemValue(this.device_code,"task",String.valueOf(task)); + logServer.deviceExecuteLog(this.device_code,"","","信号task：" + last_task + "->" + task); } if (action != last_action) { - logServer.deviceLog(this.device_code,"action",String.valueOf(action)); - logServer.deviceLogToacs(this.device_code,"","","信号action：" + last_action + "->" + action); + logServer.deviceItemValue(this.device_code,"action",String.valueOf(action)); + logServer.deviceExecuteLog(this.device_code,"","","信号action：" + last_action + "->" + action); } if (io_action != last_ioaction) { - logServer.deviceLog(this.device_code,"io_action",String.valueOf(io_action)); - logServer.deviceLogToacs(this.device_code,"","","信号io_action: " + last_ioaction + "->" + io_action); + logServer.deviceItemValue(this.device_code,"io_action",String.valueOf(io_action)); + logServer.deviceExecuteLog(this.device_code,"","","信号io_action: " + last_ioaction + "->" + io_action); } if (weight != last_weight) { - logServer.deviceLog(this.device_code,"weight",String.valueOf(weight)); - logServer.deviceLogToacs(this.device_code,"","","信号weight: " + last_weight + "->" + weight); + logServer.deviceItemValue(this.device_code,"weight",String.valueOf(weight)); + logServer.deviceExecuteLog(this.device_code,"","","信号weight: " + last_weight + "->" + weight); } if (batch != last_batch) { - logServer.deviceLog(this.device_code,"batch",String.valueOf(batch)); - logServer.deviceLogToacs(this.device_code,"","","信号batch: " + last_batch + "->" + batch); + logServer.deviceItemValue(this.device_code,"batch",String.valueOf(batch)); + logServer.deviceExecuteLog(this.device_code,"","","信号batch: " + last_batch + "->" + batch); } if (!StrUtil.equals(material,last_material)) { - logServer.deviceLog(this.device_code,"material", material); - logServer.deviceLogToacs(this.device_code,"","","信号material：" + last_material + "->" + material); + logServer.deviceItemValue(this.device_code,"material", material); + logServer.deviceExecuteLog(this.device_code,"","","信号material：" + last_material + "->" + material); } if (!StrUtil.equals(barcode,last_barcode)) { - logServer.deviceLog(this.device_code,"barcode", barcode); - logServer.deviceLogToacs(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode); + logServer.deviceItemValue(this.device_code,"barcode", barcode); + logServer.deviceExecuteLog(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode); } if (!StrUtil.equals(specifications,last_specifications)) { - logServer.deviceLog(this.device_code,"specifications", specifications); - logServer.deviceLogToacs(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications); + logServer.deviceItemValue(this.device_code,"specifications", specifications); + logServer.deviceExecuteLog(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications); } if (AlongSide != last_AlongSide) { - logServer.deviceLog(this.device_code,"AlongSide",String.valueOf(AlongSide)); - logServer.deviceLogToacs(this.device_code,"","","信号AlongSide: " + last_AlongSide + "->" + AlongSide); + logServer.deviceItemValue(this.device_code,"AlongSide",String.valueOf(AlongSide)); + logServer.deviceExecuteLog(this.device_code,"","","信号AlongSide: " + last_AlongSide + "->" + AlongSide); } if (BshortSide != last_BshortSide) { - logServer.deviceLog(this.device_code,"BshortSide",String.valueOf(BshortSide)); - logServer.deviceLogToacs(this.device_code,"","","信号BshortSide: " + last_BshortSide + "->" + BshortSide); + logServer.deviceItemValue(this.device_code,"BshortSide",String.valueOf(BshortSide)); + logServer.deviceExecuteLog(this.device_code,"","","信号BshortSide: " + last_BshortSide + "->" + BshortSide); } if (Htrapezoidal != last_Htrapezoidal) { - logServer.deviceLog(this.device_code,"Htrapezoidal",String.valueOf(Htrapezoidal)); - logServer.deviceLogToacs(this.device_code,"","","信号Htrapezoidal: " + last_Htrapezoidal + "->" + Htrapezoidal); + logServer.deviceItemValue(this.device_code,"Htrapezoidal",String.valueOf(Htrapezoidal)); + logServer.deviceExecuteLog(this.device_code,"","","信号Htrapezoidal: " + last_Htrapezoidal + "->" + Htrapezoidal); } if (Wthickness != last_Wthickness) { - logServer.deviceLog(this.device_code,"Wthickness",String.valueOf(Wthickness)); - logServer.deviceLogToacs(this.device_code,"","","信号Wthickness: " + last_Wthickness + "->" + Wthickness); + logServer.deviceItemValue(this.device_code,"Wthickness",String.valueOf(Wthickness)); + logServer.deviceExecuteLog(this.device_code,"","","信号Wthickness: " + last_Wthickness + "->" + Wthickness); } } catch (Exception var17) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java index ab7d647..ef76674 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java @@ -1,7 +1,5 @@ package org.nl.acs.device_driver.lnsh.lnsh_press; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONObject; @@ -17,18 +15,13 @@ import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; -import org.nl.acs.opc.WcsConfig; import org.nl.acs.order.service.ProduceshiftorderService; import org.nl.acs.order.service.dto.ProduceshiftorderDto; import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; import org.openscada.opc.lib.da.Server; import org.springframework.beans.factory.annotation.Autowired; @@ -55,7 +48,7 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De @Autowired TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); @Autowired - LogServer logServer = SpringContextHolder.getBean("logServerImpl"); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); @Autowired AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl"); @Autowired @@ -140,56 +133,56 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De if (mode != last_mode) { this.setRequireSucess(false); - logServer.deviceLog(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceLogToacs(this.device_code,"","","信号mode：" + last_mode + "->" + mode); + logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); + logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } if (error != last_error) { - logServer.deviceLog(this.device_code,"error" ,String.valueOf(error)); - logServer.deviceLogToacs(this.device_code,"","","信号error：" + last_error + "->" + error); + logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error)); + logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + "->" + error); } if (status != last_status) { - logServer.deviceLog(this.device_code,"status" ,String.valueOf(status)); - logServer.deviceLogToacs(this.device_code,"","","信号status：" + last_status + "->" + status); + logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); + logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); } if (open_time != last_open_time) { - logServer.deviceLog(this.device_code,"open_time" ,String.valueOf(open_time)); - logServer.deviceLogToacs(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); + logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); } if (standby_time != last_standby_time) { - logServer.deviceLog(this.device_code,"standby_time" ,String.valueOf(standby_time)); - logServer.deviceLogToacs(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); + logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); } if (production_time != last_production_time) { - logServer.deviceLog(this.device_code,"production_time" ,String.valueOf(production_time)); - logServer.deviceLogToacs(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); + logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); } if (error_time != last_error_time) { - logServer.deviceLog(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceLogToacs(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); + logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); } if (weight != last_weight) { - logServer.deviceLog(this.device_code,"weight" ,String.valueOf(weight)); - logServer.deviceLogToacs(this.device_code,"","","信号weight：" + last_weight + "->" + weight); + logServer.deviceItemValue(this.device_code,"weight" ,String.valueOf(weight)); + logServer.deviceExecuteLog(this.device_code,"","","信号weight：" + last_weight + "->" + weight); } if (!StrUtil.equals(material,last_material)) { - logServer.deviceLog(this.device_code,"material" ,material); - logServer.deviceLogToacs(this.device_code,"","","信号material：" + last_material + "->" + material); + logServer.deviceItemValue(this.device_code,"material" ,material); + logServer.deviceExecuteLog(this.device_code,"","","信号material：" + last_material + "->" + material); } if (qty != last_qty) { - logServer.deviceLog(this.device_code,"qty" ,String.valueOf(qty)); - logServer.deviceLogToacs(this.device_code,"","","信号qty：" + last_qty + "->" + qty); + logServer.deviceItemValue(this.device_code,"qty" ,String.valueOf(qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号qty：" + last_qty + "->" + qty); } if (qualified != last_qualified) { - logServer.deviceLog(this.device_code,"qualified" ,String.valueOf(qualified)); - logServer.deviceLogToacs(this.device_code,"","","信号qualified：" + last_qualified + "->" + qualified); + logServer.deviceItemValue(this.device_code,"qualified" ,String.valueOf(qualified)); + logServer.deviceExecuteLog(this.device_code,"","","信号qualified：" + last_qualified + "->" + qualified); } if (unqualified != last_unqualified) { - logServer.deviceLog(this.device_code,"unqualified" ,String.valueOf(unqualified)); - logServer.deviceLogToacs(this.device_code,"","","信号unqualified：" + last_unqualified + "->" + unqualified); + logServer.deviceItemValue(this.device_code,"unqualified" ,String.valueOf(unqualified)); + logServer.deviceExecuteLog(this.device_code,"","","信号unqualified：" + last_unqualified + "->" + unqualified); } if (!StrUtil.equals(order_No,last_order_No)) { - logServer.deviceLog(this.device_code,"order_No" ,order_No); - logServer.deviceLogToacs(this.device_code,"","","信号order_No：" + last_order_No + "->" + order_No); + logServer.deviceItemValue(this.device_code,"order_No" ,order_No); + logServer.deviceExecuteLog(this.device_code,"","","信号order_No：" + last_order_No + "->" + order_No); } } catch (Exception var17) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java index a981efb..2f4d7ce 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java @@ -4,7 +4,6 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -16,23 +15,22 @@ import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.opc.WcsConfig; import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; -import org.nl.modules.quartz.task.AutoCreateInst; -import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SpringContextHolder; import org.nl.wql.core.bean.WQLObject; import org.openscada.opc.lib.da.Server; import org.springframework.beans.factory.annotation.Autowired; import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 嘉耐双工位RGV @@ -50,8 +48,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); @Autowired TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - @Autowired - LogServer logServer = SpringContextHolder.getBean("logServerImpl"); + @Autowired DeviceAppService deviceAppservice = SpringContextHolder.getBean(DeviceAppServiceImpl.class); @@ -60,6 +57,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi //当前指令2 Instruction inst2 = null; + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); int mode = 0; int error = 0; @@ -160,86 +158,88 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi qty = this.itemProtocol.getQty(); if (mode != last_mode) { - logServer.deviceLog(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceLogToacs(this.device_code,"","","信号mode：" + last_mode + "->" + mode); + logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); + logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } if (error != last_error) { - logServer.deviceLog(this.device_code,"error" ,String.valueOf(error)); - logServer.deviceLogToacs(this.device_code,"","","信号error：" + last_error + "->" + error); + logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error)); + logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + "->" + error); } if (status != last_status) { - logServer.deviceLog(this.device_code,"status" ,String.valueOf(status)); - logServer.deviceLogToacs(this.device_code,"","","信号status：" + last_status + "->" + status); + logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); + logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); } if (move_1 != last_move_1) { if(move_1 == 0){ this.setRequireSucess1(false); } - logServer.deviceLog(this.device_code,"move_1" ,String.valueOf(move_1)); - logServer.deviceLogToacs(this.device_code,"","","信号move_1：" + last_move_1 + "->" + move_1); } if (move_2 != last_move_2) { if(move_2 == 0){ this.setRequireSucess2(false); } - logServer.deviceLog(this.device_code,"move_2" ,String.valueOf(move_2)); - logServer.deviceLogToacs(this.device_code,"","","信号move_2：" + last_move_2 + "->" + move_2); + logServer.deviceItemValue(this.device_code,"move_1" ,String.valueOf(move_1)); + logServer.deviceExecuteLog(this.device_code,"","","信号move_1：" + last_move_1 + "->" + move_1); + } + if (move_2 != last_move_2) { + logServer.deviceItemValue(this.device_code,"move_2" ,String.valueOf(move_2)); + logServer.deviceExecuteLog(this.device_code,"","","信号move_2：" + last_move_2 + "->" + move_2); } if (action_1 != last_action_1) { - logServer.deviceLog(this.device_code,"action_1" ,String.valueOf(action_1)); - logServer.deviceLogToacs(this.device_code,"","","信号action_1：" + last_action_1 + "->" + action_1); + logServer.deviceItemValue(this.device_code,"action_1" ,String.valueOf(action_1)); + logServer.deviceExecuteLog(this.device_code,"","","信号action_1：" + last_action_1 + "->" + action_1); } if (action_2 != last_action_2) { - logServer.deviceLog(this.device_code,"action_2" ,String.valueOf(action_2)); - logServer.deviceLogToacs(this.device_code,"","","信号action_2：" + last_action_2 + "->" + action_2); + logServer.deviceItemValue(this.device_code,"action_2" ,String.valueOf(action_2)); + logServer.deviceExecuteLog(this.device_code,"","","信号action_2：" + last_action_2 + "->" + action_2); } if (walk_y != last_walk_y) { - logServer.deviceLog(this.device_code,"walk_y" ,String.valueOf(walk_y)); - logServer.deviceLogToacs(this.device_code,"","","信号walk_y：" + last_walk_y + "->" + walk_y); + logServer.deviceItemValue(this.device_code,"walk_y" ,String.valueOf(walk_y)); + logServer.deviceExecuteLog(this.device_code,"","","信号walk_y：" + last_walk_y + "->" + walk_y); } if (task1 != last_task1) { - logServer.deviceLog(this.device_code,"task1" ,String.valueOf(task1)); - logServer.deviceLogToacs(this.device_code,"","","信号task1：" + last_task1 + "->" + task1); + logServer.deviceItemValue(this.device_code,"task1" ,String.valueOf(task1)); + logServer.deviceExecuteLog(this.device_code,"","","信号task1：" + last_task1 + "->" + task1); } if (task2 != last_task2) { - logServer.deviceLog(this.device_code,"task2" ,String.valueOf(task2)); - logServer.deviceLogToacs(this.device_code,"","","信号task2：" + last_task2 + "->" + task2); + logServer.deviceItemValue(this.device_code,"task2" ,String.valueOf(task2)); + logServer.deviceExecuteLog(this.device_code,"","","信号task2：" + last_task2 + "->" + task2); } if (open_time != last_open_time) { - logServer.deviceLog(this.device_code,"open_time" ,String.valueOf(open_time)); - logServer.deviceLogToacs(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); + logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); } if (standby_time != last_standby_time) { - logServer.deviceLog(this.device_code,"standby_time" ,String.valueOf(standby_time)); - logServer.deviceLogToacs(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); + logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); } if (production_time != last_production_time) { - logServer.deviceLog(this.device_code,"production_time" ,String.valueOf(production_time)); - logServer.deviceLogToacs(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); + logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); } if (error_time != last_error_time) { - logServer.deviceLog(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceLogToacs(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); + logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); } if (task_qty != last_task_qty) { - logServer.deviceLog(this.device_code,"task_qty" ,String.valueOf(task_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号task_qty：" + last_task_qty + "->" + task_qty); + logServer.deviceItemValue(this.device_code,"task_qty" ,String.valueOf(task_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号task_qty：" + last_task_qty + "->" + task_qty); } if (finishTask_qty != last_finishTask_qty) { - logServer.deviceLog(this.device_code,"finishTask_qty" ,String.valueOf(finishTask_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号finishTask_qty：" + last_finishTask_qty + "->" + finishTask_qty); + logServer.deviceItemValue(this.device_code,"finishTask_qty" ,String.valueOf(finishTask_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号finishTask_qty：" + last_finishTask_qty + "->" + finishTask_qty); } if (batch != last_batch) { - logServer.deviceLog(this.device_code,"batch" ,String.valueOf(batch)); - logServer.deviceLogToacs(this.device_code,"","","信号batch：" + last_batch + "->" + batch); + logServer.deviceItemValue(this.device_code,"batch" ,String.valueOf(batch)); + logServer.deviceExecuteLog(this.device_code,"","","信号batch：" + last_batch + "->" + batch); } if (qty != last_qty) { - logServer.deviceLog(this.device_code,"qty" ,String.valueOf(qty)); - logServer.deviceLogToacs(this.device_code,"","","信号qty：" + last_qty + "->" + qty); + logServer.deviceItemValue(this.device_code,"qty" ,String.valueOf(qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号qty：" + last_qty + "->" + qty); } if (!StrUtil.equals(specifications,last_specifications)) { - logServer.deviceLog(this.device_code,"specifications" ,specifications); - logServer.deviceLogToacs(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications); + logServer.deviceItemValue(this.device_code,"specifications" ,specifications); + logServer.deviceExecuteLog(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications); } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java index fba2cc6..4919aad 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java @@ -1,7 +1,5 @@ package org.nl.acs.device_driver.lnsh.lnsh_split_manipulator; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpResponse; @@ -18,18 +16,13 @@ import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; -import org.nl.acs.opc.WcsConfig; import org.nl.acs.order.service.ProduceshiftorderService; import org.nl.acs.order.service.dto.ProduceshiftorderDto; import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; import org.openscada.opc.lib.da.Server; import org.springframework.beans.factory.annotation.Autowired; @@ -52,7 +45,7 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im @Autowired TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); @Autowired - LogServer logServer = SpringContextHolder.getBean("logServerImpl"); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); @Autowired AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl"); @Autowired @@ -334,300 +327,300 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im if (mode != last_mode) { this.setRequireSucess(false); - logServer.deviceLog(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceLogToacs(this.device_code,"","","信号mode：" + last_mode + "->" + mode); + logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); + logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } if (getStation != last_getStation) { - logServer.deviceLog(this.device_code,"getStation" ,String.valueOf(getStation)); - logServer.deviceLogToacs(this.device_code,"","","信号getStation：" + last_getStation + "->" + getStation); + logServer.deviceItemValue(this.device_code,"getStation" ,String.valueOf(getStation)); + logServer.deviceExecuteLog(this.device_code,"","","信号getStation：" + last_getStation + "->" + getStation); } if (error != last_error) { - logServer.deviceLog(this.device_code,"error" ,String.valueOf(error)); - logServer.deviceLogToacs(this.device_code,"","","信号error：" + last_error + "->" + error); + logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error)); + logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + "->" + error); } if (onoff_status != last_onoff_status) { - logServer.deviceLog(this.device_code,"onoff_status" ,String.valueOf(onoff_status)); - logServer.deviceLogToacs(this.device_code,"","","信号onoff_status：" + last_onoff_status + "->" + onoff_status); + logServer.deviceItemValue(this.device_code,"onoff_status" ,String.valueOf(onoff_status)); + logServer.deviceExecuteLog(this.device_code,"","","信号onoff_status：" + last_onoff_status + "->" + onoff_status); } if (open_time != last_open_time) { - logServer.deviceLog(this.device_code,"open_time" ,String.valueOf(open_time)); - logServer.deviceLogToacs(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); + logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); } if (standby_time != last_standby_time) { - logServer.deviceLog(this.device_code,"standby_time" ,String.valueOf(standby_time)); - logServer.deviceLogToacs(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); + logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); } if (production_time != last_production_time) { - logServer.deviceLog(this.device_code,"production_time" ,String.valueOf(production_time)); - logServer.deviceLogToacs(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); + logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); } if (error_time != last_error_time) { - logServer.deviceLog(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceLogToacs(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); + logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); } if (!StrUtil.equals(barcode,last_barcode)) { - logServer.deviceLog(this.device_code,"barcode", barcode); - logServer.deviceLogToacs(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode); + logServer.deviceItemValue(this.device_code,"barcode", barcode); + logServer.deviceExecuteLog(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode); } if (!StrUtil.equals(material,last_material)) { - logServer.deviceLog(this.device_code,"material", material); - logServer.deviceLogToacs(this.device_code,"","","信号material：" + last_material + "->" + material); + logServer.deviceItemValue(this.device_code,"material", material); + logServer.deviceExecuteLog(this.device_code,"","","信号material：" + last_material + "->" + material); } if (total_split != last_total_split) { - logServer.deviceLog(this.device_code,"total_split" ,String.valueOf(total_split)); - logServer.deviceLogToacs(this.device_code,"","","信号total_split：" + last_total_split + "->" + total_split); + logServer.deviceItemValue(this.device_code,"total_split" ,String.valueOf(total_split)); + logServer.deviceExecuteLog(this.device_code,"","","信号total_split：" + last_total_split + "->" + total_split); } if (batch != last_batch) { - logServer.deviceLog(this.device_code,"batch" ,String.valueOf(batch)); - logServer.deviceLogToacs(this.device_code,"","","信号batch：" + last_batch + "->" + batch); + logServer.deviceItemValue(this.device_code,"batch" ,String.valueOf(batch)); + logServer.deviceExecuteLog(this.device_code,"","","信号batch：" + last_batch + "->" + batch); } if (!StrUtil.equals(specifications,last_specifications)) { - logServer.deviceLog(this.device_code,"specifications" ,specifications); - logServer.deviceLogToacs(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications); + logServer.deviceItemValue(this.device_code,"specifications" ,specifications); + logServer.deviceExecuteLog(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications); } if (qty != last_qty) { - logServer.deviceLog(this.device_code,"qty" ,String.valueOf(qty)); - logServer.deviceLogToacs(this.device_code,"","","信号qty：" + last_qty + "->" + qty); + logServer.deviceItemValue(this.device_code,"qty" ,String.valueOf(qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号qty：" + last_qty + "->" + qty); } if (order_qty != last_order_qty) { - logServer.deviceLog(this.device_code,"order_qty" ,String.valueOf(order_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号order_qty：" + last_order_qty + "->" + order_qty); + logServer.deviceItemValue(this.device_code,"order_qty" ,String.valueOf(order_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号order_qty：" + last_order_qty + "->" + order_qty); } if (!StrUtil.equals(order_No,last_order_No)) { - logServer.deviceLog(this.device_code,"order_No" ,order_No); - logServer.deviceLogToacs(this.device_code,"","","信号order_No：" + last_order_No + "->" + order_No); + logServer.deviceItemValue(this.device_code,"order_No" ,order_No); + logServer.deviceExecuteLog(this.device_code,"","","信号order_No：" + last_order_No + "->" + order_No); } if (product_code != last_product_code) { - logServer.deviceLog(this.device_code,"product_code" ,String.valueOf(product_code)); - logServer.deviceLogToacs(this.device_code,"","","信号product_code：" + last_product_code + "->" + product_code); + logServer.deviceItemValue(this.device_code,"product_code" ,String.valueOf(product_code)); + logServer.deviceExecuteLog(this.device_code,"","","信号product_code：" + last_product_code + "->" + product_code); } if (AlongSide != last_AlongSide) { - logServer.deviceLog(this.device_code,"AlongSide" ,String.valueOf(AlongSide)); - logServer.deviceLogToacs(this.device_code,"","","信号AlongSide：" + last_AlongSide + "->" + AlongSide); + logServer.deviceItemValue(this.device_code,"AlongSide" ,String.valueOf(AlongSide)); + logServer.deviceExecuteLog(this.device_code,"","","信号AlongSide：" + last_AlongSide + "->" + AlongSide); } if (BshortSide != last_BshortSide) { - logServer.deviceLog(this.device_code,"BshortSide" ,String.valueOf(BshortSide)); - logServer.deviceLogToacs(this.device_code,"","","信号BshortSide：" + last_BshortSide + "->" + BshortSide); + logServer.deviceItemValue(this.device_code,"BshortSide" ,String.valueOf(BshortSide)); + logServer.deviceExecuteLog(this.device_code,"","","信号BshortSide：" + last_BshortSide + "->" + BshortSide); } if (Htrapezoidal != last_Htrapezoidal) { - logServer.deviceLog(this.device_code,"Htrapezoidal" ,String.valueOf(Htrapezoidal)); - logServer.deviceLogToacs(this.device_code,"","","信号Htrapezoidal：" + last_Htrapezoidal + "->" + Htrapezoidal); + logServer.deviceItemValue(this.device_code,"Htrapezoidal" ,String.valueOf(Htrapezoidal)); + logServer.deviceExecuteLog(this.device_code,"","","信号Htrapezoidal：" + last_Htrapezoidal + "->" + Htrapezoidal); } if (Wthickness != last_Wthickness) { - logServer.deviceLog(this.device_code,"Wthickness" ,String.valueOf(Wthickness)); - logServer.deviceLogToacs(this.device_code,"","","信号Wthickness：" + last_Wthickness + "->" + Wthickness); + logServer.deviceItemValue(this.device_code,"Wthickness" ,String.valueOf(Wthickness)); + logServer.deviceExecuteLog(this.device_code,"","","信号Wthickness：" + last_Wthickness + "->" + Wthickness); } if (tray_qty != last_tray_qty) { - logServer.deviceLog(this.device_code,"tray_qty" ,String.valueOf(tray_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号tray_qty：" + last_tray_qty + "->" + tray_qty); + logServer.deviceItemValue(this.device_code,"tray_qty" ,String.valueOf(tray_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号tray_qty：" + last_tray_qty + "->" + tray_qty); } if (tray_high != last_tray_high) { - logServer.deviceLog(this.device_code,"tray_high" ,String.valueOf(tray_high)); - logServer.deviceLogToacs(this.device_code,"","","信号tray_high：" + last_tray_high + "->" + tray_high); + logServer.deviceItemValue(this.device_code,"tray_high" ,String.valueOf(tray_high)); + logServer.deviceExecuteLog(this.device_code,"","","信号tray_high：" + last_tray_high + "->" + tray_high); } if (crib_category != last_crib_category) { - logServer.deviceLog(this.device_code,"crib_category" ,String.valueOf(crib_category)); - logServer.deviceLogToacs(this.device_code,"","","信号crib_category：" + last_crib_category + "->" + crib_category); + logServer.deviceItemValue(this.device_code,"crib_category" ,String.valueOf(crib_category)); + logServer.deviceExecuteLog(this.device_code,"","","信号crib_category：" + last_crib_category + "->" + crib_category); } if (palletX1_line != last_palletX1_line) { - logServer.deviceLog(this.device_code,"palletX1_line" ,String.valueOf(palletX1_line)); - logServer.deviceLogToacs(this.device_code,"","","信号palletX1_line：" + last_palletX1_line + "->" + palletX1_line); + logServer.deviceItemValue(this.device_code,"palletX1_line" ,String.valueOf(palletX1_line)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletX1_line：" + last_palletX1_line + "->" + palletX1_line); } if (palletY1_row != last_palletY1_row) { - logServer.deviceLog(this.device_code,"palletY1_row" ,String.valueOf(palletY1_row)); - logServer.deviceLogToacs(this.device_code,"","","信号palletY1_row：" + last_palletY1_row + "->" + palletY1_row); + logServer.deviceItemValue(this.device_code,"palletY1_row" ,String.valueOf(palletY1_row)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletY1_row：" + last_palletY1_row + "->" + palletY1_row); } if (palletA1_angle != last_palletA1_angle) { - logServer.deviceLog(this.device_code,"palletA1_angle" ,String.valueOf(palletA1_angle)); - logServer.deviceLogToacs(this.device_code,"","","信号palletA1_angle：" + last_palletA1_angle + "->" + palletA1_angle); + logServer.deviceItemValue(this.device_code,"palletA1_angle" ,String.valueOf(palletA1_angle)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletA1_angle：" + last_palletA1_angle + "->" + palletA1_angle); } if (palletX2_line != last_palletX2_line) { - logServer.deviceLog(this.device_code,"palletX2_line" ,String.valueOf(palletX2_line)); - logServer.deviceLogToacs(this.device_code,"","","信号palletX2_line：" + last_palletX2_line + "->" + palletX2_line); + logServer.deviceItemValue(this.device_code,"palletX2_line" ,String.valueOf(palletX2_line)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletX2_line：" + last_palletX2_line + "->" + palletX2_line); } if (palletY2_row != last_palletY2_row) { - logServer.deviceLog(this.device_code,"palletY2_row" ,String.valueOf(palletY2_row)); - logServer.deviceLogToacs(this.device_code,"","","信号palletY2_row：" + last_palletY2_row + "->" + palletY2_row); + logServer.deviceItemValue(this.device_code,"palletY2_row" ,String.valueOf(palletY2_row)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletY2_row：" + last_palletY2_row + "->" + palletY2_row); } if (palletA2_angle != last_palletA2_angle) { - logServer.deviceLog(this.device_code,"palletA2_angle" ,String.valueOf(palletA2_angle)); - logServer.deviceLogToacs(this.device_code,"","","信号palletA2_angle：" + last_palletA2_angle + "->" + palletA2_angle); + logServer.deviceItemValue(this.device_code,"palletA2_angle" ,String.valueOf(palletA2_angle)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletA2_angle：" + last_palletA2_angle + "->" + palletA2_angle); } if (palletX3_line != last_palletX3_line) { - logServer.deviceLog(this.device_code,"palletX3_line" ,String.valueOf(palletX3_line)); - logServer.deviceLogToacs(this.device_code,"","","信号palletX3_line：" + last_palletX3_line + "->" + palletX3_line); + logServer.deviceItemValue(this.device_code,"palletX3_line" ,String.valueOf(palletX3_line)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletX3_line：" + last_palletX3_line + "->" + palletX3_line); } if (palletY3_row != last_palletY3_row) { - logServer.deviceLog(this.device_code,"palletY3_row" ,String.valueOf(palletY3_row)); - logServer.deviceLogToacs(this.device_code,"","","信号palletY3_row：" + last_palletY3_row + "->" + palletY3_row); + logServer.deviceItemValue(this.device_code,"palletY3_row" ,String.valueOf(palletY3_row)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletY3_row：" + last_palletY3_row + "->" + palletY3_row); } if (palletA3_angle != last_palletA3_angle) { - logServer.deviceLog(this.device_code,"palletA3_angle" ,String.valueOf(palletA3_angle)); - logServer.deviceLogToacs(this.device_code,"","","信号palletA3_angle：" + last_palletA3_angle + "->" + palletA3_angle); + logServer.deviceItemValue(this.device_code,"palletA3_angle" ,String.valueOf(palletA3_angle)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletA3_angle：" + last_palletA3_angle + "->" + palletA3_angle); } if (pressCribX1_line != last_pressCribX1_line) { - logServer.deviceLog(this.device_code,"pressCribX1_line" ,String.valueOf(pressCribX1_line)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribX1_line：" + last_pressCribX1_line + "->" + pressCribX1_line); + logServer.deviceItemValue(this.device_code,"pressCribX1_line" ,String.valueOf(pressCribX1_line)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribX1_line：" + last_pressCribX1_line + "->" + pressCribX1_line); } if (pressCribY1_row != last_pressCribY1_row) { - logServer.deviceLog(this.device_code,"pressCribY1_row" ,String.valueOf(pressCribY1_row)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribY1_row：" + last_pressCribY1_row + "->" + pressCribY1_row); + logServer.deviceItemValue(this.device_code,"pressCribY1_row" ,String.valueOf(pressCribY1_row)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribY1_row：" + last_pressCribY1_row + "->" + pressCribY1_row); } if (pressCribA1_angle != last_pressCribA1_angle) { - logServer.deviceLog(this.device_code,"pressCribA1_angle" ,String.valueOf(pressCribA1_angle)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribA1_angle：" + last_pressCribA1_angle + "->" + pressCribA1_angle); + logServer.deviceItemValue(this.device_code,"pressCribA1_angle" ,String.valueOf(pressCribA1_angle)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribA1_angle：" + last_pressCribA1_angle + "->" + pressCribA1_angle); } if (pressCribX2_line != last_pressCribX2_line) { - logServer.deviceLog(this.device_code,"pressCribX2_line" ,String.valueOf(pressCribX2_line)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribX2_line：" + last_pressCribX2_line + "->" + pressCribX2_line); + logServer.deviceItemValue(this.device_code,"pressCribX2_line" ,String.valueOf(pressCribX2_line)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribX2_line：" + last_pressCribX2_line + "->" + pressCribX2_line); } if (pressCribY2_row != last_pressCribY2_row) { - logServer.deviceLog(this.device_code,"pressCribY2_row" ,String.valueOf(pressCribY2_row)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribY2_row：" + last_pressCribY2_row + "->" + pressCribY2_row); + logServer.deviceItemValue(this.device_code,"pressCribY2_row" ,String.valueOf(pressCribY2_row)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribY2_row：" + last_pressCribY2_row + "->" + pressCribY2_row); } if (pressCribA2_angle != last_pressCribA2_angle) { - logServer.deviceLog(this.device_code,"pressCribA2_angle" ,String.valueOf(pressCribA2_angle)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribA2_angle：" + last_pressCribA2_angle + "->" + pressCribA2_angle); + logServer.deviceItemValue(this.device_code,"pressCribA2_angle" ,String.valueOf(pressCribA2_angle)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribA2_angle：" + last_pressCribA2_angle + "->" + pressCribA2_angle); } if (pressCribX3_line != last_pressCribX3_line) { - logServer.deviceLog(this.device_code,"pressCribX3_line" ,String.valueOf(pressCribX3_line)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribX3_line：" + last_pressCribX3_line + "->" + pressCribX3_line); + logServer.deviceItemValue(this.device_code,"pressCribX3_line" ,String.valueOf(pressCribX3_line)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribX3_line：" + last_pressCribX3_line + "->" + pressCribX3_line); } if (pressCribY3_row != last_pressCribY3_row) { - logServer.deviceLog(this.device_code,"pressCribY3_row" ,String.valueOf(pressCribY3_row)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribY3_row：" + last_pressCribY3_row + "->" + pressCribY3_row); + logServer.deviceItemValue(this.device_code,"pressCribY3_row" ,String.valueOf(pressCribY3_row)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribY3_row：" + last_pressCribY3_row + "->" + pressCribY3_row); } if (pressCribA3_angle != last_pressCribA3_angle) { - logServer.deviceLog(this.device_code,"pressCribA3_angle" ,String.valueOf(pressCribA3_angle)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribA3_angle：" + last_pressCribA3_angle + "->" + pressCribA3_angle); + logServer.deviceItemValue(this.device_code,"pressCribA3_angle" ,String.valueOf(pressCribA3_angle)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribA3_angle：" + last_pressCribA3_angle + "->" + pressCribA3_angle); } if (Zoffset != last_Zoffset) { - logServer.deviceLog(this.device_code,"Zoffset" ,String.valueOf(Zoffset)); - logServer.deviceLogToacs(this.device_code,"","","信号Zoffset：" + last_Zoffset + "->" + Zoffset); + logServer.deviceItemValue(this.device_code,"Zoffset" ,String.valueOf(Zoffset)); + logServer.deviceExecuteLog(this.device_code,"","","信号Zoffset：" + last_Zoffset + "->" + Zoffset); } if (pallet_layerQty != last_pallet_layerQty) { - logServer.deviceLog(this.device_code,"pallet_layerQty" ,String.valueOf(pallet_layerQty)); - logServer.deviceLogToacs(this.device_code,"","","信号pallet_layerQty：" + last_pallet_layerQty + "->" + pallet_layerQty); + logServer.deviceItemValue(this.device_code,"pallet_layerQty" ,String.valueOf(pallet_layerQty)); + logServer.deviceExecuteLog(this.device_code,"","","信号pallet_layerQty：" + last_pallet_layerQty + "->" + pallet_layerQty); } if (pressCrib_layerQty != last_pressCrib_layerQty) { - logServer.deviceLog(this.device_code,"pressCrib_layerQty" ,String.valueOf(pressCrib_layerQty)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCrib_layerQty：" + last_pressCrib_layerQty + "->" + pressCrib_layerQty); + logServer.deviceItemValue(this.device_code,"pressCrib_layerQty" ,String.valueOf(pressCrib_layerQty)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCrib_layerQty：" + last_pressCrib_layerQty + "->" + pressCrib_layerQty); } if (codeLayerX1_interval != last_codeLayerX1_interval) { - logServer.deviceLog(this.device_code,"codeLayerX1_interval" ,String.valueOf(codeLayerX1_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerX1_interval：" + last_codeLayerX1_interval + "->" + codeLayerX1_interval); + logServer.deviceItemValue(this.device_code,"codeLayerX1_interval" ,String.valueOf(codeLayerX1_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerX1_interval：" + last_codeLayerX1_interval + "->" + codeLayerX1_interval); } if (codeLayerY1_interval != last_codeLayerY1_interval) { - logServer.deviceLog(this.device_code,"codeLayerY1_interval" ,String.valueOf(codeLayerY1_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerY1_interval：" + last_codeLayerY1_interval + "->" + codeLayerY1_interval); + logServer.deviceItemValue(this.device_code,"codeLayerY1_interval" ,String.valueOf(codeLayerY1_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerY1_interval：" + last_codeLayerY1_interval + "->" + codeLayerY1_interval); } if (codeLayerX2_interval != last_codeLayerX2_interval) { - logServer.deviceLog(this.device_code,"codeLayerX2_interval" ,String.valueOf(codeLayerX2_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerX2_interval：" + last_codeLayerX2_interval + "->" + codeLayerX2_interval); + logServer.deviceItemValue(this.device_code,"codeLayerX2_interval" ,String.valueOf(codeLayerX2_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerX2_interval：" + last_codeLayerX2_interval + "->" + codeLayerX2_interval); } if (codeLayerY2_interval != last_codeLayerY2_interval) { - logServer.deviceLog(this.device_code,"codeLayerY2_interval" ,String.valueOf(codeLayerY2_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerY2_interval：" + last_codeLayerY2_interval + "->" + codeLayerY2_interval); + logServer.deviceItemValue(this.device_code,"codeLayerY2_interval" ,String.valueOf(codeLayerY2_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerY2_interval：" + last_codeLayerY2_interval + "->" + codeLayerY2_interval); } if (codeLayerX3_interval != last_codeLayerX3_interval) { - logServer.deviceLog(this.device_code,"codeLayerX3_interval" ,String.valueOf(codeLayerX3_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerX3_interval：" + last_codeLayerX3_interval + "->" + codeLayerX3_interval); + logServer.deviceItemValue(this.device_code,"codeLayerX3_interval" ,String.valueOf(codeLayerX3_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerX3_interval：" + last_codeLayerX3_interval + "->" + codeLayerX3_interval); } if (codeLayerY3_interval != last_codeLayerY3_interval) { - logServer.deviceLog(this.device_code,"codeLayerY3_interval" ,String.valueOf(codeLayerY3_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerY3_interval：" + last_codeLayerY3_interval + "->" + codeLayerY3_interval); + logServer.deviceItemValue(this.device_code,"codeLayerY3_interval" ,String.valueOf(codeLayerY3_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerY3_interval：" + last_codeLayerY3_interval + "->" + codeLayerY3_interval); } if (codeLayerX1_offset != last_codeLayerX1_offset) { - logServer.deviceLog(this.device_code,"codeLayerX1_offset" ,String.valueOf(codeLayerX1_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerX1_offset：" + last_codeLayerX1_offset + "->" + codeLayerX1_offset); + logServer.deviceItemValue(this.device_code,"codeLayerX1_offset" ,String.valueOf(codeLayerX1_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerX1_offset：" + last_codeLayerX1_offset + "->" + codeLayerX1_offset); } if (codeLayerY1_offset != last_codeLayerY1_offset) { - logServer.deviceLog(this.device_code,"codeLayerY1_offset" ,String.valueOf(codeLayerY1_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerY1_offset：" + last_codeLayerY1_offset + "->" + codeLayerY1_offset); + logServer.deviceItemValue(this.device_code,"codeLayerY1_offset" ,String.valueOf(codeLayerY1_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerY1_offset：" + last_codeLayerY1_offset + "->" + codeLayerY1_offset); } if (codeLayerX2_offset != last_codeLayerX2_offset) { - logServer.deviceLog(this.device_code,"codeLayerX2_offset" ,String.valueOf(codeLayerX2_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerX2_offset：" + last_codeLayerX2_offset + "->" + codeLayerX2_offset); + logServer.deviceItemValue(this.device_code,"codeLayerX2_offset" ,String.valueOf(codeLayerX2_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerX2_offset：" + last_codeLayerX2_offset + "->" + codeLayerX2_offset); } if (codeLayerY2_offset != last_codeLayerY2_offset) { - logServer.deviceLog(this.device_code,"codeLayerY2_offset" ,String.valueOf(codeLayerY2_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerY2_offset：" + last_codeLayerY2_offset + "->" + codeLayerY2_offset); + logServer.deviceItemValue(this.device_code,"codeLayerY2_offset" ,String.valueOf(codeLayerY2_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerY2_offset：" + last_codeLayerY2_offset + "->" + codeLayerY2_offset); } if (codeLayerX3_offset != last_codeLayerX3_offset) { - logServer.deviceLog(this.device_code,"codeLayerX3_offset" ,String.valueOf(codeLayerX3_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerX3_offset：" + last_codeLayerX3_offset + "->" + codeLayerX3_offset); + logServer.deviceItemValue(this.device_code,"codeLayerX3_offset" ,String.valueOf(codeLayerX3_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerX3_offset：" + last_codeLayerX3_offset + "->" + codeLayerX3_offset); } if (codeLayerY3_offset != last_codeLayerY3_offset) { - logServer.deviceLog(this.device_code,"codeLayerY3_offset" ,String.valueOf(codeLayerY3_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerY3_offset：" + last_codeLayerY3_offset + "->" + codeLayerY3_offset); + logServer.deviceItemValue(this.device_code,"codeLayerY3_offset" ,String.valueOf(codeLayerY3_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerY3_offset：" + last_codeLayerY3_offset + "->" + codeLayerY3_offset); } if (pressLayerX1_interval != last_pressLayerX1_interval) { - logServer.deviceLog(this.device_code,"pressLayerX1_interval" ,String.valueOf(pressLayerX1_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerX1_interval：" + last_pressLayerX1_interval + "->" + pressLayerX1_interval); + logServer.deviceItemValue(this.device_code,"pressLayerX1_interval" ,String.valueOf(pressLayerX1_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerX1_interval：" + last_pressLayerX1_interval + "->" + pressLayerX1_interval); } if (pressLayerY1_interval != last_pressLayerY1_interval) { - logServer.deviceLog(this.device_code,"pressLayerY1_interval" ,String.valueOf(pressLayerY1_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerY1_interval：" + last_pressLayerY1_interval + "->" + pressLayerY1_interval); + logServer.deviceItemValue(this.device_code,"pressLayerY1_interval" ,String.valueOf(pressLayerY1_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerY1_interval：" + last_pressLayerY1_interval + "->" + pressLayerY1_interval); } if (pressLayerX2_interval != last_pressLayerX2_interval) { - logServer.deviceLog(this.device_code,"pressLayerX2_interval" ,String.valueOf(pressLayerX2_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerX2_interval：" + last_pressLayerX2_interval + "->" + pressLayerX2_interval); + logServer.deviceItemValue(this.device_code,"pressLayerX2_interval" ,String.valueOf(pressLayerX2_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerX2_interval：" + last_pressLayerX2_interval + "->" + pressLayerX2_interval); } if (pressLayerY2_interval != last_pressLayerY2_interval) { - logServer.deviceLog(this.device_code,"pressLayerY2_interval" ,String.valueOf(pressLayerY2_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerY2_interval：" + last_pressLayerY2_interval + "->" + pressLayerY2_interval); + logServer.deviceItemValue(this.device_code,"pressLayerY2_interval" ,String.valueOf(pressLayerY2_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerY2_interval：" + last_pressLayerY2_interval + "->" + pressLayerY2_interval); } if (pressLayerX3_interval != last_pressLayerX3_interval) { - logServer.deviceLog(this.device_code,"pressLayerX3_interval" ,String.valueOf(pressLayerX3_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerX3_interval：" + last_pressLayerX3_interval + "->" + pressLayerX3_interval); + logServer.deviceItemValue(this.device_code,"pressLayerX3_interval" ,String.valueOf(pressLayerX3_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerX3_interval：" + last_pressLayerX3_interval + "->" + pressLayerX3_interval); } if (pressLayerY3_interval != last_pressLayerY3_interval) { - logServer.deviceLog(this.device_code,"pressLayerY3_interval" ,String.valueOf(pressLayerY3_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerY3_interval：" + last_pressLayerY3_interval + "->" + pressLayerY3_interval); + logServer.deviceItemValue(this.device_code,"pressLayerY3_interval" ,String.valueOf(pressLayerY3_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerY3_interval：" + last_pressLayerY3_interval + "->" + pressLayerY3_interval); } if (pressLayerX1_offset != last_pressLayerX1_offset) { - logServer.deviceLog(this.device_code,"pressLayerX1_offset" ,String.valueOf(pressLayerX1_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerX1_offset：" + last_pressLayerX1_offset + "->" + pressLayerX1_offset); + logServer.deviceItemValue(this.device_code,"pressLayerX1_offset" ,String.valueOf(pressLayerX1_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerX1_offset：" + last_pressLayerX1_offset + "->" + pressLayerX1_offset); } if (pressLayerY1_offset != last_pressLayerY1_offset) { - logServer.deviceLog(this.device_code,"pressLayerY1_offset" ,String.valueOf(pressLayerY1_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerY1_offset：" + last_pressLayerY1_offset + "->" + pressLayerY1_offset); + logServer.deviceItemValue(this.device_code,"pressLayerY1_offset" ,String.valueOf(pressLayerY1_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerY1_offset：" + last_pressLayerY1_offset + "->" + pressLayerY1_offset); } if (pressLayerX2_offset != last_pressLayerX2_offset) { - logServer.deviceLog(this.device_code,"pressLayerX2_offset" ,String.valueOf(pressLayerX2_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerX2_offset：" + last_pressLayerX2_offset + "->" + pressLayerX2_offset); + logServer.deviceItemValue(this.device_code,"pressLayerX2_offset" ,String.valueOf(pressLayerX2_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerX2_offset：" + last_pressLayerX2_offset + "->" + pressLayerX2_offset); } if (pressLayerY2_offset != last_pressLayerY2_offset) { - logServer.deviceLog(this.device_code,"pressLayerY2_offset" ,String.valueOf(pressLayerY2_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerY2_offset：" + last_pressLayerY2_offset + "->" + pressLayerY2_offset); + logServer.deviceItemValue(this.device_code,"pressLayerY2_offset" ,String.valueOf(pressLayerY2_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerY2_offset：" + last_pressLayerY2_offset + "->" + pressLayerY2_offset); } if (pressLayerX3_offset != last_pressLayerX3_offset) { - logServer.deviceLog(this.device_code,"pressLayerX3_offset" ,String.valueOf(pressLayerX3_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerX3_offset：" + last_pressLayerX3_offset + "->" + pressLayerX3_offset); + logServer.deviceItemValue(this.device_code,"pressLayerX3_offset" ,String.valueOf(pressLayerX3_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerX3_offset：" + last_pressLayerX3_offset + "->" + pressLayerX3_offset); } if (pressLayerY3_offset != last_pressLayerY3_offset) { - logServer.deviceLog(this.device_code,"pressLayerY3_offset" ,String.valueOf(pressLayerY3_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerY3_offset：" + last_pressLayerY3_offset + "->" + pressLayerY3_offset); + logServer.deviceItemValue(this.device_code,"pressLayerY3_offset" ,String.valueOf(pressLayerY3_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerY3_offset：" + last_pressLayerY3_offset + "->" + pressLayerY3_offset); } if (one_cribTotal != last_one_cribTotal) { - logServer.deviceLog(this.device_code,"one_cribTotal" ,String.valueOf(one_cribTotal)); - logServer.deviceLogToacs(this.device_code,"","","信号one_cribTotal：" + last_one_cribTotal + "->" + one_cribTotal); + logServer.deviceItemValue(this.device_code,"one_cribTotal" ,String.valueOf(one_cribTotal)); + logServer.deviceExecuteLog(this.device_code,"","","信号one_cribTotal：" + last_one_cribTotal + "->" + one_cribTotal); } if (two_cribTotal != last_two_cribTotal) { - logServer.deviceLog(this.device_code,"two_cribTotal" ,String.valueOf(two_cribTotal)); - logServer.deviceLogToacs(this.device_code,"","","信号two_cribTotal：" + last_two_cribTotal + "->" + two_cribTotal); + logServer.deviceItemValue(this.device_code,"two_cribTotal" ,String.valueOf(two_cribTotal)); + logServer.deviceExecuteLog(this.device_code,"","","信号two_cribTotal：" + last_two_cribTotal + "->" + two_cribTotal); } if (one_qty != last_one_qty) { - logServer.deviceLog(this.device_code,"one_qty" ,String.valueOf(one_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号one_qty：" + last_one_qty + "->" + one_qty); + logServer.deviceItemValue(this.device_code,"one_qty" ,String.valueOf(one_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号one_qty：" + last_one_qty + "->" + one_qty); } if (two_qty != last_two_qty) { - logServer.deviceLog(this.device_code,"two_qty" ,String.valueOf(two_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号two_qty：" + last_two_qty + "->" + two_qty); + logServer.deviceItemValue(this.device_code,"two_qty" ,String.valueOf(two_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号two_qty：" + last_two_qty + "->" + two_qty); } if (tool_coordinate != last_tool_coordinate) { - logServer.deviceLog(this.device_code,"tool_coordinate" ,String.valueOf(tool_coordinate)); - logServer.deviceLogToacs(this.device_code,"","","信号tool_coordinate：" + last_tool_coordinate + "->" + tool_coordinate); + logServer.deviceItemValue(this.device_code,"tool_coordinate" ,String.valueOf(tool_coordinate)); + logServer.deviceExecuteLog(this.device_code,"","","信号tool_coordinate：" + last_tool_coordinate + "->" + tool_coordinate); } } catch (Exception var17) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java index 617b0e6..2f9b719 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java @@ -4,8 +4,6 @@ import cn.hutool.core.util.StrUtil; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.log.service.LogServer; -import org.springframework.beans.factory.annotation.Autowired; import java.util.ArrayList; import java.util.List; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java index 05bdd99..fc7cbb3 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java @@ -5,7 +5,6 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpResponse; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; @@ -16,22 +15,15 @@ import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.RouteableDeviceDriver; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.device_driver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver; -import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.opc.WcsConfig; import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; import org.nl.exception.WDKException; -import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SpringContextHolder; import org.nl.wql.core.bean.WQLObject; import org.openscada.opc.lib.da.Server; @@ -56,7 +48,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements @Autowired TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); @Autowired - LogServer logServer = SpringContextHolder.getBean("logServerImpl"); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); @Autowired AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl"); @@ -146,48 +138,48 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements container_type = itemProtocol.getContainer_type(); if (mode != last_mode) { this.setRequireSucess(false); - logServer.deviceLog(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceLogToacs(this.device_code,"","","信号mode：" + last_mode + "->" + mode); + logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); + logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } if (move != last_move) { - logServer.deviceLog(this.device_code,"move" ,String.valueOf(move)); - logServer.deviceLogToacs(this.device_code,"","","信号move：" + last_move + "->" + move); + logServer.deviceItemValue(this.device_code,"move" ,String.valueOf(move)); + logServer.deviceExecuteLog(this.device_code,"","","信号move：" + last_move + "->" + move); } if (error != last_error) { - logServer.deviceLog(this.device_code,"error" ,String.valueOf(error)); - logServer.deviceLogToacs(this.device_code,"","","信号error：" + last_error + "->" + error); + logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error)); + logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + "->" + error); } if (task != last_task) { - logServer.deviceLog(this.device_code,"task",String.valueOf(task)); - logServer.deviceLogToacs(this.device_code,"","","信号task：" + last_task + "->" + task); + logServer.deviceItemValue(this.device_code,"task",String.valueOf(task)); + logServer.deviceExecuteLog(this.device_code,"","","信号task：" + last_task + "->" + task); } if (action != last_action) { - logServer.deviceLog(this.device_code,"action",String.valueOf(action)); - logServer.deviceLogToacs(this.device_code,"","","信号action：" + last_action + "->" + action); + logServer.deviceItemValue(this.device_code,"action",String.valueOf(action)); + logServer.deviceExecuteLog(this.device_code,"","","信号action：" + last_action + "->" + action); } if (io_action != last_ioaction) { - logServer.deviceLog(this.device_code,"io_action",String.valueOf(io_action)); - logServer.deviceLogToacs(this.device_code,"","","信号io_action: " + last_ioaction + "->" + io_action); + logServer.deviceItemValue(this.device_code,"io_action",String.valueOf(io_action)); + logServer.deviceExecuteLog(this.device_code,"","","信号io_action: " + last_ioaction + "->" + io_action); } if (weight != last_weight) { - logServer.deviceLog(this.device_code,"weight",String.valueOf(weight)); - logServer.deviceLogToacs(this.device_code,"","","信号weight: " + last_weight + "->" + weight); + logServer.deviceItemValue(this.device_code,"weight",String.valueOf(weight)); + logServer.deviceExecuteLog(this.device_code,"","","信号weight: " + last_weight + "->" + weight); } if (batch != last_batch) { - logServer.deviceLog(this.device_code,"batch",String.valueOf(batch)); - logServer.deviceLogToacs(this.device_code,"","","信号batch: " + last_batch + "->" + batch); + logServer.deviceItemValue(this.device_code,"batch",String.valueOf(batch)); + logServer.deviceExecuteLog(this.device_code,"","","信号batch: " + last_batch + "->" + batch); } if (!StrUtil.equals(material,last_material)) { - logServer.deviceLog(this.device_code,"material", material); - logServer.deviceLogToacs(this.device_code,"","","信号material：" + last_material + "->" + material); + logServer.deviceItemValue(this.device_code,"material", material); + logServer.deviceExecuteLog(this.device_code,"","","信号material：" + last_material + "->" + material); } if (!StrUtil.equals(barcode,last_barcode)) { - logServer.deviceLog(this.device_code,"barcode", barcode); - logServer.deviceLogToacs(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode); + logServer.deviceItemValue(this.device_code,"barcode", barcode); + logServer.deviceExecuteLog(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode); } if (!StrUtil.equals(specifications,last_specifications)) { - logServer.deviceLog(this.device_code,"specifications", specifications); - logServer.deviceLogToacs(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications); + logServer.deviceItemValue(this.device_code,"specifications", specifications); + logServer.deviceExecuteLog(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications); } } catch (Exception var17) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java index cfd0db9..4b0b8d5 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java @@ -16,7 +16,7 @@ import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; import org.nl.acs.order.service.ProduceshiftorderService; import org.nl.acs.order.service.dto.ProduceshiftorderDto; @@ -49,7 +49,7 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe @Autowired TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); @Autowired - LogServer logServer = SpringContextHolder.getBean("logServerImpl"); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); @Autowired AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl"); @Autowired @@ -336,308 +336,308 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe if (mode != last_mode) { this.setRequireSucess(false); - logServer.deviceLog(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceLogToacs(this.device_code,"","","信号mode：" + last_mode + "->" + mode); + logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); + logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } if (status != last_status) { - logServer.deviceLog(this.device_code,"status" ,String.valueOf(status)); - logServer.deviceLogToacs(this.device_code,"","","信号status：" + last_status + "->" + status); + logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); + logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); } if (onoff_status != last_onoff_status) { - logServer.deviceLog(this.device_code,"onoff_status" ,String.valueOf(onoff_status)); - logServer.deviceLogToacs(this.device_code,"","","信号onoff_status：" + last_onoff_status + "->" + onoff_status); + logServer.deviceItemValue(this.device_code,"onoff_status" ,String.valueOf(onoff_status)); + logServer.deviceExecuteLog(this.device_code,"","","信号onoff_status：" + last_onoff_status + "->" + onoff_status); } if (put_station != last_put_station) { - logServer.deviceLog(this.device_code,"put_station" ,String.valueOf(put_station)); - logServer.deviceLogToacs(this.device_code,"","","信号put_station：" + last_put_station + "->" + put_station); + logServer.deviceItemValue(this.device_code,"put_station" ,String.valueOf(put_station)); + logServer.deviceExecuteLog(this.device_code,"","","信号put_station：" + last_put_station + "->" + put_station); } if (getStation != last_getStation) { - logServer.deviceLog(this.device_code,"getStation" ,String.valueOf(getStation)); - logServer.deviceLogToacs(this.device_code,"","","信号getStation：" + last_getStation + "->" + getStation); + logServer.deviceItemValue(this.device_code,"getStation" ,String.valueOf(getStation)); + logServer.deviceExecuteLog(this.device_code,"","","信号getStation：" + last_getStation + "->" + getStation); } if (error != last_error) { - logServer.deviceLog(this.device_code,"error" ,String.valueOf(error)); - logServer.deviceLogToacs(this.device_code,"","","信号error：" + last_error + "->" + error); + logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error)); + logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + "->" + error); } if (open_time != last_open_time) { - logServer.deviceLog(this.device_code,"open_time" ,String.valueOf(open_time)); - logServer.deviceLogToacs(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); + logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); } if (standby_time != last_standby_time) { - logServer.deviceLog(this.device_code,"standby_time" ,String.valueOf(standby_time)); - logServer.deviceLogToacs(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); + logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); } if (production_time != last_production_time) { - logServer.deviceLog(this.device_code,"production_time" ,String.valueOf(production_time)); - logServer.deviceLogToacs(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); + logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); } if (error_time != last_error_time) { - logServer.deviceLog(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceLogToacs(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); + logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); + logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); } if (!StrUtil.equals(barcode,last_barcode)) { - logServer.deviceLog(this.device_code,"barcode", barcode); - logServer.deviceLogToacs(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode); + logServer.deviceItemValue(this.device_code,"barcode", barcode); + logServer.deviceExecuteLog(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode); } if (!StrUtil.equals(material,last_material)) { - logServer.deviceLog(this.device_code,"material", material); - logServer.deviceLogToacs(this.device_code,"","","信号material：" + last_material + "->" + material); + logServer.deviceItemValue(this.device_code,"material", material); + logServer.deviceExecuteLog(this.device_code,"","","信号material：" + last_material + "->" + material); } if (qty != last_qty) { - logServer.deviceLog(this.device_code,"qty" ,String.valueOf(qty)); - logServer.deviceLogToacs(this.device_code,"","","信号qty：" + last_qty + "->" + qty); + logServer.deviceItemValue(this.device_code,"qty" ,String.valueOf(qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号qty：" + last_qty + "->" + qty); } if (!StrUtil.equals(specifications,last_specifications)) { - logServer.deviceLog(this.device_code,"specifications" ,specifications); - logServer.deviceLogToacs(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications); + logServer.deviceItemValue(this.device_code,"specifications" ,specifications); + logServer.deviceExecuteLog(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications); } if (batch != last_batch) { - logServer.deviceLog(this.device_code,"batch" ,String.valueOf(batch)); - logServer.deviceLogToacs(this.device_code,"","","信号batch：" + last_batch + "->" + batch); + logServer.deviceItemValue(this.device_code,"batch" ,String.valueOf(batch)); + logServer.deviceExecuteLog(this.device_code,"","","信号batch：" + last_batch + "->" + batch); } if (order_qty != last_order_qty) { - logServer.deviceLog(this.device_code,"order_qty" ,String.valueOf(order_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号order_qty：" + last_order_qty + "->" + order_qty); + logServer.deviceItemValue(this.device_code,"order_qty" ,String.valueOf(order_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号order_qty：" + last_order_qty + "->" + order_qty); } if (!StrUtil.equals(order_No,last_order_No)) { - logServer.deviceLog(this.device_code,"order_No" ,order_No); - logServer.deviceLogToacs(this.device_code,"","","信号order_No：" + last_order_No + "->" + order_No); + logServer.deviceItemValue(this.device_code,"order_No" ,order_No); + logServer.deviceExecuteLog(this.device_code,"","","信号order_No：" + last_order_No + "->" + order_No); } if (total_split != last_total_split) { - logServer.deviceLog(this.device_code,"total_split" ,String.valueOf(total_split)); - logServer.deviceLogToacs(this.device_code,"","","信号total_split：" + last_total_split + "->" + total_split); + logServer.deviceItemValue(this.device_code,"total_split" ,String.valueOf(total_split)); + logServer.deviceExecuteLog(this.device_code,"","","信号total_split：" + last_total_split + "->" + total_split); } if (product_code != last_product_code) { - logServer.deviceLog(this.device_code,"product_code" ,String.valueOf(product_code)); - logServer.deviceLogToacs(this.device_code,"","","信号product_code：" + last_product_code + "->" + product_code); + logServer.deviceItemValue(this.device_code,"product_code" ,String.valueOf(product_code)); + logServer.deviceExecuteLog(this.device_code,"","","信号product_code：" + last_product_code + "->" + product_code); } if (AlongSide != last_AlongSide) { - logServer.deviceLog(this.device_code,"AlongSide" ,String.valueOf(AlongSide)); - logServer.deviceLogToacs(this.device_code,"","","信号AlongSide：" + last_AlongSide + "->" + AlongSide); + logServer.deviceItemValue(this.device_code,"AlongSide" ,String.valueOf(AlongSide)); + logServer.deviceExecuteLog(this.device_code,"","","信号AlongSide：" + last_AlongSide + "->" + AlongSide); } if (BshortSide != last_BshortSide) { - logServer.deviceLog(this.device_code,"BshortSide" ,String.valueOf(BshortSide)); - logServer.deviceLogToacs(this.device_code,"","","信号BshortSide：" + last_BshortSide + "->" + BshortSide); + logServer.deviceItemValue(this.device_code,"BshortSide" ,String.valueOf(BshortSide)); + logServer.deviceExecuteLog(this.device_code,"","","信号BshortSide：" + last_BshortSide + "->" + BshortSide); } if (Htrapezoidal != last_Htrapezoidal) { - logServer.deviceLog(this.device_code,"Htrapezoidal" ,String.valueOf(Htrapezoidal)); - logServer.deviceLogToacs(this.device_code,"","","信号Htrapezoidal：" + last_Htrapezoidal + "->" + Htrapezoidal); + logServer.deviceItemValue(this.device_code,"Htrapezoidal" ,String.valueOf(Htrapezoidal)); + logServer.deviceExecuteLog(this.device_code,"","","信号Htrapezoidal：" + last_Htrapezoidal + "->" + Htrapezoidal); } if (Wthickness != last_Wthickness) { - logServer.deviceLog(this.device_code,"Wthickness" ,String.valueOf(Wthickness)); - logServer.deviceLogToacs(this.device_code,"","","信号Wthickness：" + last_Wthickness + "->" + Wthickness); + logServer.deviceItemValue(this.device_code,"Wthickness" ,String.valueOf(Wthickness)); + logServer.deviceExecuteLog(this.device_code,"","","信号Wthickness：" + last_Wthickness + "->" + Wthickness); } if (tray_qty != last_tray_qty) { - logServer.deviceLog(this.device_code,"tray_qty" ,String.valueOf(tray_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号tray_qty：" + last_tray_qty + "->" + tray_qty); + logServer.deviceItemValue(this.device_code,"tray_qty" ,String.valueOf(tray_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号tray_qty：" + last_tray_qty + "->" + tray_qty); } if (tray_high != last_tray_high) { - logServer.deviceLog(this.device_code,"tray_high" ,String.valueOf(tray_high)); - logServer.deviceLogToacs(this.device_code,"","","信号tray_high：" + last_tray_high + "->" + tray_high); + logServer.deviceItemValue(this.device_code,"tray_high" ,String.valueOf(tray_high)); + logServer.deviceExecuteLog(this.device_code,"","","信号tray_high：" + last_tray_high + "->" + tray_high); } if (crib_category != last_crib_category) { - logServer.deviceLog(this.device_code,"crib_category" ,String.valueOf(crib_category)); - logServer.deviceLogToacs(this.device_code,"","","信号crib_category：" + last_crib_category + "->" + crib_category); + logServer.deviceItemValue(this.device_code,"crib_category" ,String.valueOf(crib_category)); + logServer.deviceExecuteLog(this.device_code,"","","信号crib_category：" + last_crib_category + "->" + crib_category); } if (palletX1_line != last_palletX1_line) { - logServer.deviceLog(this.device_code,"palletX1_line" ,String.valueOf(palletX1_line)); - logServer.deviceLogToacs(this.device_code,"","","信号palletX1_line：" + last_palletX1_line + "->" + palletX1_line); + logServer.deviceItemValue(this.device_code,"palletX1_line" ,String.valueOf(palletX1_line)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletX1_line：" + last_palletX1_line + "->" + palletX1_line); } if (palletY1_row != last_palletY1_row) { - logServer.deviceLog(this.device_code,"palletY1_row" ,String.valueOf(palletY1_row)); - logServer.deviceLogToacs(this.device_code,"","","信号palletY1_row：" + last_palletY1_row + "->" + palletY1_row); + logServer.deviceItemValue(this.device_code,"palletY1_row" ,String.valueOf(palletY1_row)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletY1_row：" + last_palletY1_row + "->" + palletY1_row); } if (palletA1_angle != last_palletA1_angle) { - logServer.deviceLog(this.device_code,"palletA1_angle" ,String.valueOf(palletA1_angle)); - logServer.deviceLogToacs(this.device_code,"","","信号palletA1_angle：" + last_palletA1_angle + "->" + palletA1_angle); + logServer.deviceItemValue(this.device_code,"palletA1_angle" ,String.valueOf(palletA1_angle)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletA1_angle：" + last_palletA1_angle + "->" + palletA1_angle); } if (palletX2_line != last_palletX2_line) { - logServer.deviceLog(this.device_code,"palletX2_line" ,String.valueOf(palletX2_line)); - logServer.deviceLogToacs(this.device_code,"","","信号palletX2_line：" + last_palletX2_line + "->" + palletX2_line); + logServer.deviceItemValue(this.device_code,"palletX2_line" ,String.valueOf(palletX2_line)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletX2_line：" + last_palletX2_line + "->" + palletX2_line); } if (palletY2_row != last_palletY2_row) { - logServer.deviceLog(this.device_code,"palletY2_row" ,String.valueOf(palletY2_row)); - logServer.deviceLogToacs(this.device_code,"","","信号palletY2_row：" + last_palletY2_row + "->" + palletY2_row); + logServer.deviceItemValue(this.device_code,"palletY2_row" ,String.valueOf(palletY2_row)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletY2_row：" + last_palletY2_row + "->" + palletY2_row); } if (palletA2_angle != last_palletA2_angle) { - logServer.deviceLog(this.device_code,"palletA2_angle" ,String.valueOf(palletA2_angle)); - logServer.deviceLogToacs(this.device_code,"","","信号palletA2_angle：" + last_palletA2_angle + "->" + palletA2_angle); + logServer.deviceItemValue(this.device_code,"palletA2_angle" ,String.valueOf(palletA2_angle)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletA2_angle：" + last_palletA2_angle + "->" + palletA2_angle); } if (palletX3_line != last_palletX3_line) { - logServer.deviceLog(this.device_code,"palletX3_line" ,String.valueOf(palletX3_line)); - logServer.deviceLogToacs(this.device_code,"","","信号palletX3_line：" + last_palletX3_line + "->" + palletX3_line); + logServer.deviceItemValue(this.device_code,"palletX3_line" ,String.valueOf(palletX3_line)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletX3_line：" + last_palletX3_line + "->" + palletX3_line); } if (palletY3_row != last_palletY3_row) { - logServer.deviceLog(this.device_code,"palletY3_row" ,String.valueOf(palletY3_row)); - logServer.deviceLogToacs(this.device_code,"","","信号palletY3_row：" + last_palletY3_row + "->" + palletY3_row); + logServer.deviceItemValue(this.device_code,"palletY3_row" ,String.valueOf(palletY3_row)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletY3_row：" + last_palletY3_row + "->" + palletY3_row); } if (palletA3_angle != last_palletA3_angle) { - logServer.deviceLog(this.device_code,"palletA3_angle" ,String.valueOf(palletA3_angle)); - logServer.deviceLogToacs(this.device_code,"","","信号palletA3_angle：" + last_palletA3_angle + "->" + palletA3_angle); + logServer.deviceItemValue(this.device_code,"palletA3_angle" ,String.valueOf(palletA3_angle)); + logServer.deviceExecuteLog(this.device_code,"","","信号palletA3_angle：" + last_palletA3_angle + "->" + palletA3_angle); } if (pressCribX1_line != last_pressCribX1_line) { - logServer.deviceLog(this.device_code,"pressCribX1_line" ,String.valueOf(pressCribX1_line)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribX1_line：" + last_pressCribX1_line + "->" + pressCribX1_line); + logServer.deviceItemValue(this.device_code,"pressCribX1_line" ,String.valueOf(pressCribX1_line)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribX1_line：" + last_pressCribX1_line + "->" + pressCribX1_line); } if (pressCribY1_row != last_pressCribY1_row) { - logServer.deviceLog(this.device_code,"pressCribY1_row" ,String.valueOf(pressCribY1_row)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribY1_row：" + last_pressCribY1_row + "->" + pressCribY1_row); + logServer.deviceItemValue(this.device_code,"pressCribY1_row" ,String.valueOf(pressCribY1_row)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribY1_row：" + last_pressCribY1_row + "->" + pressCribY1_row); } if (pressCribA1_angle != last_pressCribA1_angle) { - logServer.deviceLog(this.device_code,"pressCribA1_angle" ,String.valueOf(pressCribA1_angle)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribA1_angle：" + last_pressCribA1_angle + "->" + pressCribA1_angle); + logServer.deviceItemValue(this.device_code,"pressCribA1_angle" ,String.valueOf(pressCribA1_angle)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribA1_angle：" + last_pressCribA1_angle + "->" + pressCribA1_angle); } if (pressCribX2_line != last_pressCribX2_line) { - logServer.deviceLog(this.device_code,"pressCribX2_line" ,String.valueOf(pressCribX2_line)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribX2_line：" + last_pressCribX2_line + "->" + pressCribX2_line); + logServer.deviceItemValue(this.device_code,"pressCribX2_line" ,String.valueOf(pressCribX2_line)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribX2_line：" + last_pressCribX2_line + "->" + pressCribX2_line); } if (pressCribY2_row != last_pressCribY2_row) { - logServer.deviceLog(this.device_code,"pressCribY2_row" ,String.valueOf(pressCribY2_row)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribY2_row：" + last_pressCribY2_row + "->" + pressCribY2_row); + logServer.deviceItemValue(this.device_code,"pressCribY2_row" ,String.valueOf(pressCribY2_row)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribY2_row：" + last_pressCribY2_row + "->" + pressCribY2_row); } if (pressCribA2_angle != last_pressCribA2_angle) { - logServer.deviceLog(this.device_code,"pressCribA2_angle" ,String.valueOf(pressCribA2_angle)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribA2_angle：" + last_pressCribA2_angle + "->" + pressCribA2_angle); + logServer.deviceItemValue(this.device_code,"pressCribA2_angle" ,String.valueOf(pressCribA2_angle)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribA2_angle：" + last_pressCribA2_angle + "->" + pressCribA2_angle); } if (pressCribX3_line != last_pressCribX3_line) { - logServer.deviceLog(this.device_code,"pressCribX3_line" ,String.valueOf(pressCribX3_line)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribX3_line：" + last_pressCribX3_line + "->" + pressCribX3_line); + logServer.deviceItemValue(this.device_code,"pressCribX3_line" ,String.valueOf(pressCribX3_line)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribX3_line：" + last_pressCribX3_line + "->" + pressCribX3_line); } if (pressCribY3_row != last_pressCribY3_row) { - logServer.deviceLog(this.device_code,"pressCribY3_row" ,String.valueOf(pressCribY3_row)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribY3_row：" + last_pressCribY3_row + "->" + pressCribY3_row); + logServer.deviceItemValue(this.device_code,"pressCribY3_row" ,String.valueOf(pressCribY3_row)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribY3_row：" + last_pressCribY3_row + "->" + pressCribY3_row); } if (pressCribA3_angle != last_pressCribA3_angle) { - logServer.deviceLog(this.device_code,"pressCribA3_angle" ,String.valueOf(pressCribA3_angle)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCribA3_angle：" + last_pressCribA3_angle + "->" + pressCribA3_angle); + logServer.deviceItemValue(this.device_code,"pressCribA3_angle" ,String.valueOf(pressCribA3_angle)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCribA3_angle：" + last_pressCribA3_angle + "->" + pressCribA3_angle); } if (Zoffset != last_Zoffset) { - logServer.deviceLog(this.device_code,"Zoffset" ,String.valueOf(Zoffset)); - logServer.deviceLogToacs(this.device_code,"","","信号Zoffset：" + last_Zoffset + "->" + Zoffset); + logServer.deviceItemValue(this.device_code,"Zoffset" ,String.valueOf(Zoffset)); + logServer.deviceExecuteLog(this.device_code,"","","信号Zoffset：" + last_Zoffset + "->" + Zoffset); } if (pallet_layerQty != last_pallet_layerQty) { - logServer.deviceLog(this.device_code,"pallet_layerQty" ,String.valueOf(pallet_layerQty)); - logServer.deviceLogToacs(this.device_code,"","","信号pallet_layerQty：" + last_pallet_layerQty + "->" + pallet_layerQty); + logServer.deviceItemValue(this.device_code,"pallet_layerQty" ,String.valueOf(pallet_layerQty)); + logServer.deviceExecuteLog(this.device_code,"","","信号pallet_layerQty：" + last_pallet_layerQty + "->" + pallet_layerQty); } if (pressCrib_layerQty != last_pressCrib_layerQty) { - logServer.deviceLog(this.device_code,"pressCrib_layerQty" ,String.valueOf(pressCrib_layerQty)); - logServer.deviceLogToacs(this.device_code,"","","信号pressCrib_layerQty：" + last_pressCrib_layerQty + "->" + pressCrib_layerQty); + logServer.deviceItemValue(this.device_code,"pressCrib_layerQty" ,String.valueOf(pressCrib_layerQty)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressCrib_layerQty：" + last_pressCrib_layerQty + "->" + pressCrib_layerQty); } if (codeLayerX1_interval != last_codeLayerX1_interval) { - logServer.deviceLog(this.device_code,"codeLayerX1_interval" ,String.valueOf(codeLayerX1_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerX1_interval：" + last_codeLayerX1_interval + "->" + codeLayerX1_interval); + logServer.deviceItemValue(this.device_code,"codeLayerX1_interval" ,String.valueOf(codeLayerX1_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerX1_interval：" + last_codeLayerX1_interval + "->" + codeLayerX1_interval); } if (codeLayerY1_interval != last_codeLayerY1_interval) { - logServer.deviceLog(this.device_code,"codeLayerY1_interval" ,String.valueOf(codeLayerY1_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerY1_interval：" + last_codeLayerY1_interval + "->" + codeLayerY1_interval); + logServer.deviceItemValue(this.device_code,"codeLayerY1_interval" ,String.valueOf(codeLayerY1_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerY1_interval：" + last_codeLayerY1_interval + "->" + codeLayerY1_interval); } if (codeLayerX2_interval != last_codeLayerX2_interval) { - logServer.deviceLog(this.device_code,"codeLayerX2_interval" ,String.valueOf(codeLayerX2_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerX2_interval：" + last_codeLayerX2_interval + "->" + codeLayerX2_interval); + logServer.deviceItemValue(this.device_code,"codeLayerX2_interval" ,String.valueOf(codeLayerX2_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerX2_interval：" + last_codeLayerX2_interval + "->" + codeLayerX2_interval); } if (codeLayerY2_interval != last_codeLayerY2_interval) { - logServer.deviceLog(this.device_code,"codeLayerY2_interval" ,String.valueOf(codeLayerY2_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerY2_interval：" + last_codeLayerY2_interval + "->" + codeLayerY2_interval); + logServer.deviceItemValue(this.device_code,"codeLayerY2_interval" ,String.valueOf(codeLayerY2_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerY2_interval：" + last_codeLayerY2_interval + "->" + codeLayerY2_interval); } if (codeLayerX3_interval != last_codeLayerX3_interval) { - logServer.deviceLog(this.device_code,"codeLayerX3_interval" ,String.valueOf(codeLayerX3_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerX3_interval：" + last_codeLayerX3_interval + "->" + codeLayerX3_interval); + logServer.deviceItemValue(this.device_code,"codeLayerX3_interval" ,String.valueOf(codeLayerX3_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerX3_interval：" + last_codeLayerX3_interval + "->" + codeLayerX3_interval); } if (codeLayerY3_interval != last_codeLayerY3_interval) { - logServer.deviceLog(this.device_code,"codeLayerY3_interval" ,String.valueOf(codeLayerY3_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerY3_interval：" + last_codeLayerY3_interval + "->" + codeLayerY3_interval); + logServer.deviceItemValue(this.device_code,"codeLayerY3_interval" ,String.valueOf(codeLayerY3_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerY3_interval：" + last_codeLayerY3_interval + "->" + codeLayerY3_interval); } if (codeLayerX1_offset != last_codeLayerX1_offset) { - logServer.deviceLog(this.device_code,"codeLayerX1_offset" ,String.valueOf(codeLayerX1_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerX1_offset：" + last_codeLayerX1_offset + "->" + codeLayerX1_offset); + logServer.deviceItemValue(this.device_code,"codeLayerX1_offset" ,String.valueOf(codeLayerX1_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerX1_offset：" + last_codeLayerX1_offset + "->" + codeLayerX1_offset); } if (codeLayerY1_offset != last_codeLayerY1_offset) { - logServer.deviceLog(this.device_code,"codeLayerY1_offset" ,String.valueOf(codeLayerY1_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerY1_offset：" + last_codeLayerY1_offset + "->" + codeLayerY1_offset); + logServer.deviceItemValue(this.device_code,"codeLayerY1_offset" ,String.valueOf(codeLayerY1_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerY1_offset：" + last_codeLayerY1_offset + "->" + codeLayerY1_offset); } if (codeLayerX2_offset != last_codeLayerX2_offset) { - logServer.deviceLog(this.device_code,"codeLayerX2_offset" ,String.valueOf(codeLayerX2_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerX2_offset：" + last_codeLayerX2_offset + "->" + codeLayerX2_offset); + logServer.deviceItemValue(this.device_code,"codeLayerX2_offset" ,String.valueOf(codeLayerX2_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerX2_offset：" + last_codeLayerX2_offset + "->" + codeLayerX2_offset); } if (codeLayerY2_offset != last_codeLayerY2_offset) { - logServer.deviceLog(this.device_code,"codeLayerY2_offset" ,String.valueOf(codeLayerY2_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerY2_offset：" + last_codeLayerY2_offset + "->" + codeLayerY2_offset); + logServer.deviceItemValue(this.device_code,"codeLayerY2_offset" ,String.valueOf(codeLayerY2_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerY2_offset：" + last_codeLayerY2_offset + "->" + codeLayerY2_offset); } if (codeLayerX3_offset != last_codeLayerX3_offset) { - logServer.deviceLog(this.device_code,"codeLayerX3_offset" ,String.valueOf(codeLayerX3_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerX3_offset：" + last_codeLayerX3_offset + "->" + codeLayerX3_offset); + logServer.deviceItemValue(this.device_code,"codeLayerX3_offset" ,String.valueOf(codeLayerX3_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerX3_offset：" + last_codeLayerX3_offset + "->" + codeLayerX3_offset); } if (codeLayerY3_offset != last_codeLayerY3_offset) { - logServer.deviceLog(this.device_code,"codeLayerY3_offset" ,String.valueOf(codeLayerY3_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号codeLayerY3_offset：" + last_codeLayerY3_offset + "->" + codeLayerY3_offset); + logServer.deviceItemValue(this.device_code,"codeLayerY3_offset" ,String.valueOf(codeLayerY3_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号codeLayerY3_offset：" + last_codeLayerY3_offset + "->" + codeLayerY3_offset); } if (pressLayerX1_interval != last_pressLayerX1_interval) { - logServer.deviceLog(this.device_code,"pressLayerX1_interval" ,String.valueOf(pressLayerX1_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerX1_interval：" + last_pressLayerX1_interval + "->" + pressLayerX1_interval); + logServer.deviceItemValue(this.device_code,"pressLayerX1_interval" ,String.valueOf(pressLayerX1_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerX1_interval：" + last_pressLayerX1_interval + "->" + pressLayerX1_interval); } if (pressLayerY1_interval != last_pressLayerY1_interval) { - logServer.deviceLog(this.device_code,"pressLayerY1_interval" ,String.valueOf(pressLayerY1_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerY1_interval：" + last_pressLayerY1_interval + "->" + pressLayerY1_interval); + logServer.deviceItemValue(this.device_code,"pressLayerY1_interval" ,String.valueOf(pressLayerY1_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerY1_interval：" + last_pressLayerY1_interval + "->" + pressLayerY1_interval); } if (pressLayerX2_interval != last_pressLayerX2_interval) { - logServer.deviceLog(this.device_code,"pressLayerX2_interval" ,String.valueOf(pressLayerX2_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerX2_interval：" + last_pressLayerX2_interval + "->" + pressLayerX2_interval); + logServer.deviceItemValue(this.device_code,"pressLayerX2_interval" ,String.valueOf(pressLayerX2_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerX2_interval：" + last_pressLayerX2_interval + "->" + pressLayerX2_interval); } if (pressLayerY2_interval != last_pressLayerY2_interval) { - logServer.deviceLog(this.device_code,"pressLayerY2_interval" ,String.valueOf(pressLayerY2_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerY2_interval：" + last_pressLayerY2_interval + "->" + pressLayerY2_interval); + logServer.deviceItemValue(this.device_code,"pressLayerY2_interval" ,String.valueOf(pressLayerY2_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerY2_interval：" + last_pressLayerY2_interval + "->" + pressLayerY2_interval); } if (pressLayerX3_interval != last_pressLayerX3_interval) { - logServer.deviceLog(this.device_code,"pressLayerX3_interval" ,String.valueOf(pressLayerX3_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerX3_interval：" + last_pressLayerX3_interval + "->" + pressLayerX3_interval); + logServer.deviceItemValue(this.device_code,"pressLayerX3_interval" ,String.valueOf(pressLayerX3_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerX3_interval：" + last_pressLayerX3_interval + "->" + pressLayerX3_interval); } if (pressLayerY3_interval != last_pressLayerY3_interval) { - logServer.deviceLog(this.device_code,"pressLayerY3_interval" ,String.valueOf(pressLayerY3_interval)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerY3_interval：" + last_pressLayerY3_interval + "->" + pressLayerY3_interval); + logServer.deviceItemValue(this.device_code,"pressLayerY3_interval" ,String.valueOf(pressLayerY3_interval)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerY3_interval：" + last_pressLayerY3_interval + "->" + pressLayerY3_interval); } if (pressLayerX1_offset != last_pressLayerX1_offset) { - logServer.deviceLog(this.device_code,"pressLayerX1_offset" ,String.valueOf(pressLayerX1_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerX1_offset：" + last_pressLayerX1_offset + "->" + pressLayerX1_offset); + logServer.deviceItemValue(this.device_code,"pressLayerX1_offset" ,String.valueOf(pressLayerX1_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerX1_offset：" + last_pressLayerX1_offset + "->" + pressLayerX1_offset); } if (pressLayerY1_offset != last_pressLayerY1_offset) { - logServer.deviceLog(this.device_code,"pressLayerY1_offset" ,String.valueOf(pressLayerY1_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerY1_offset：" + last_pressLayerY1_offset + "->" + pressLayerY1_offset); + logServer.deviceItemValue(this.device_code,"pressLayerY1_offset" ,String.valueOf(pressLayerY1_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerY1_offset：" + last_pressLayerY1_offset + "->" + pressLayerY1_offset); } if (pressLayerX2_offset != last_pressLayerX2_offset) { - logServer.deviceLog(this.device_code,"pressLayerX2_offset" ,String.valueOf(pressLayerX2_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerX2_offset：" + last_pressLayerX2_offset + "->" + pressLayerX2_offset); + logServer.deviceItemValue(this.device_code,"pressLayerX2_offset" ,String.valueOf(pressLayerX2_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerX2_offset：" + last_pressLayerX2_offset + "->" + pressLayerX2_offset); } if (pressLayerY2_offset != last_pressLayerY2_offset) { - logServer.deviceLog(this.device_code,"pressLayerY2_offset" ,String.valueOf(pressLayerY2_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerY2_offset：" + last_pressLayerY2_offset + "->" + pressLayerY2_offset); + logServer.deviceItemValue(this.device_code,"pressLayerY2_offset" ,String.valueOf(pressLayerY2_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerY2_offset：" + last_pressLayerY2_offset + "->" + pressLayerY2_offset); } if (pressLayerX3_offset != last_pressLayerX3_offset) { - logServer.deviceLog(this.device_code,"pressLayerX3_offset" ,String.valueOf(pressLayerX3_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerX3_offset：" + last_pressLayerX3_offset + "->" + pressLayerX3_offset); + logServer.deviceItemValue(this.device_code,"pressLayerX3_offset" ,String.valueOf(pressLayerX3_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerX3_offset：" + last_pressLayerX3_offset + "->" + pressLayerX3_offset); } if (pressLayerY3_offset != last_pressLayerY3_offset) { - logServer.deviceLog(this.device_code,"pressLayerY3_offset" ,String.valueOf(pressLayerY3_offset)); - logServer.deviceLogToacs(this.device_code,"","","信号pressLayerY3_offset：" + last_pressLayerY3_offset + "->" + pressLayerY3_offset); + logServer.deviceItemValue(this.device_code,"pressLayerY3_offset" ,String.valueOf(pressLayerY3_offset)); + logServer.deviceExecuteLog(this.device_code,"","","信号pressLayerY3_offset：" + last_pressLayerY3_offset + "->" + pressLayerY3_offset); } if (one_cribTotal != last_one_cribTotal) { - logServer.deviceLog(this.device_code,"one_cribTotal" ,String.valueOf(one_cribTotal)); - logServer.deviceLogToacs(this.device_code,"","","信号one_cribTotal：" + last_one_cribTotal + "->" + one_cribTotal); + logServer.deviceItemValue(this.device_code,"one_cribTotal" ,String.valueOf(one_cribTotal)); + logServer.deviceExecuteLog(this.device_code,"","","信号one_cribTotal：" + last_one_cribTotal + "->" + one_cribTotal); } if (two_cribTotal != last_two_cribTotal) { - logServer.deviceLog(this.device_code,"two_cribTotal" ,String.valueOf(two_cribTotal)); - logServer.deviceLogToacs(this.device_code,"","","信号two_cribTotal：" + last_two_cribTotal + "->" + two_cribTotal); + logServer.deviceItemValue(this.device_code,"two_cribTotal" ,String.valueOf(two_cribTotal)); + logServer.deviceExecuteLog(this.device_code,"","","信号two_cribTotal：" + last_two_cribTotal + "->" + two_cribTotal); } if (one_qty != last_one_qty) { - logServer.deviceLog(this.device_code,"one_qty" ,String.valueOf(one_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号one_qty：" + last_one_qty + "->" + one_qty); + logServer.deviceItemValue(this.device_code,"one_qty" ,String.valueOf(one_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号one_qty：" + last_one_qty + "->" + one_qty); } if (two_qty != last_two_qty) { - logServer.deviceLog(this.device_code,"two_qty" ,String.valueOf(two_qty)); - logServer.deviceLogToacs(this.device_code,"","","信号two_qty：" + last_two_qty + "->" + two_qty); + logServer.deviceItemValue(this.device_code,"two_qty" ,String.valueOf(two_qty)); + logServer.deviceExecuteLog(this.device_code,"","","信号two_qty：" + last_two_qty + "->" + two_qty); } if (tool_coordinate != last_tool_coordinate) { - logServer.deviceLog(this.device_code,"tool_coordinate" ,String.valueOf(tool_coordinate)); - logServer.deviceLogToacs(this.device_code,"","","信号tool_coordinate：" + last_tool_coordinate + "->" + tool_coordinate); + logServer.deviceItemValue(this.device_code,"tool_coordinate" ,String.valueOf(tool_coordinate)); + logServer.deviceExecuteLog(this.device_code,"","","信号tool_coordinate：" + last_tool_coordinate + "->" + tool_coordinate); } } catch (Exception var17) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDeviceDriver.java index 685d630..b789295 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDeviceDriver.java @@ -15,7 +15,7 @@ import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.opc.DeviceAppServiceImpl; @@ -52,7 +52,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp @Autowired TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); @Autowired - LogServer logServer = SpringContextHolder.getBean("logServerImpl"); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); String container; String container_type_desc; @@ -141,20 +141,20 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp if (mode != last_mode) { this.setRequireSucess(false); - logServer.deviceLog(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceLogToacs(this.device_code,"","","信号mode：" + last_mode + "->" + mode); + logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); + logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } if (move != last_move) { - logServer.deviceLog(this.device_code,"move" ,String.valueOf(move)); - logServer.deviceLogToacs(this.device_code,"","","信号move：" + last_move + "->" + move); + logServer.deviceItemValue(this.device_code,"move" ,String.valueOf(move)); + logServer.deviceExecuteLog(this.device_code,"","","信号move：" + last_move + "->" + move); } if (error != last_error) { - logServer.deviceLog(this.device_code,"error" ,String.valueOf(error)); - logServer.deviceLogToacs(this.device_code,"","","信号error：" + last_error + "->" + error); + logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error)); + logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + "->" + error); } if (task != last_task) { - logServer.deviceLog(this.device_code,"task",String.valueOf(task)); - logServer.deviceLogToacs(this.device_code,"","","信号task：" + last_task + "->" + task); + logServer.deviceItemValue(this.device_code,"task",String.valueOf(task)); + logServer.deviceExecuteLog(this.device_code,"","","信号task：" + last_task + "->" + task); } if (this.getApply_handling()) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index 56bd073..dfa8ae1 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -13,12 +13,13 @@ import org.nl.acs.device.address.service.AddressService; import org.nl.acs.device.address.service.dto.AddressDto; import org.nl.acs.device.service.DeviceService; import org.nl.acs.ext.wms.service.AcsToWmsService; -import org.nl.acs.log.service.LogServer; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; import org.nl.acs.util.DateUtil; import org.nl.exception.BadRequestException; import org.nl.wql.core.bean.WQLObject; +import org.slf4j.MDC; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; @@ -44,11 +45,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { TaskService taskService; @Autowired - LogServer logServer; + DeviceExecuteLogService logServer; @Value("${acsTowms.token}") public String token; + private String log_file_type="log_file_type"; + private String log_type="ACS请求WMS"; + @Override public String applyTaskToWms(String device_code, String container_code, int height, int weight) { @@ -88,7 +92,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } else { type = "error"; } - logServer.log("", "applyTaskToWms", type, jo.toString(), result2.body(), String.valueOf(result2.getStatus()), url, container_code); +// logServer.log("", "applyTaskToWms", type, jo.toString(), result2.body(), String.valueOf(result2.getStatus()), url, container_code); log.info("applyTaskToWms-----输出参数{}", result2.body()); return result2.body(); } @@ -405,7 +409,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { type = "error"; } - logServer.log(task_code, "feedbackTaskStatusToWms", type, data.toString(), result2.body(), String.valueOf(result2.getStatus()), wmsurl + methods_url, vehicle_code); +// logServer.log(task_code, "feedbackTaskStatusToWms", type, data.toString(), result2.body(), String.valueOf(result2.getStatus()), wmsurl + methods_url, vehicle_code); JSONObject jo = JSONObject.parseObject(result2.body()); log.info("feedbackTaskStatusToWms-----输出参数{}", jo.toString()); return result2; @@ -447,21 +451,26 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override public JSONArray getDeviceStatusToWms() { - String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); - AddressDto addressDto = addressService.findByCode("getDeviceStatusToWms"); - String methods_url = addressDto.getMethods_url(); - String url = wmsurl + methods_url; - String result = ""; - try { - result = HttpRequest.get(url) - .execute().body(); - System.out.println(result); - log.info("getTaskStatusToWms----返回参数{}", result); - } catch (Exception e) { - System.out.println(e.getMessage()); - } - JSONArray jsonArray = JSONArray.parseArray(result); - return jsonArray; + try { + MDC.put(log_file_type,log_type); + String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + AddressDto addressDto = addressService.findByCode("getDeviceStatusToWms"); + String methods_url = addressDto.getMethods_url(); + String url = wmsurl + methods_url; + String result = ""; + try { + result = HttpRequest.get(url) + .execute().body(); + System.out.println(result); + log.info("getTaskStatusToWms----返回参数{}", result); + } catch (Exception e) { + System.out.println(e.getMessage()); + } + JSONArray jsonArray = JSONArray.parseArray(result); + return jsonArray; + }finally { + MDC.remove(log_type); + } } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/rest/LogsController.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/rest/LogsController.java deleted file mode 100644 index 96de472..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/rest/LogsController.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.nl.acs.log.rest; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.log.service.LogServer; -import org.nl.acs.log.service.dto.LogDto; -import org.nl.annotation.Log; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.text.ParseException; -import java.util.Map; - -/** - * @author loujf - * @date 2022-02-25 - **/ -@RestController -@RequiredArgsConstructor -@Api(tags = "日志管理") -@RequestMapping("/api/log") -@Slf4j -public class LogsController { - - private final LogServer logService; - - @GetMapping - @Log("查询日志") - @ApiOperation("查询日志") - //@PreAuthorize("@el.check('log:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) throws ParseException { - return new ResponseEntity<>(logService.queryAll(whereJson, page), HttpStatus.OK); - } -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/1.txt b/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/1.txt new file mode 100644 index 0000000..e69de29 diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/DeviceExecuteLogService.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/DeviceExecuteLogService.java new file mode 100644 index 0000000..b121480 --- /dev/null +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/DeviceExecuteLogService.java @@ -0,0 +1,27 @@ + +package org.nl.acs.log.service; + +/** + * @author loujf + * @description 设备执行日志 + * @date 2022-02-25 + **/ +public interface DeviceExecuteLogService { + /** + * 设备光电变化实时光电信号 + * @param device_code 设备编号 + * @param key plc信号 + * @param value plc信号值 + */ + void deviceItemValue(String device_code, String key, String value); + + /** + * 设备执行日志,会保留历史记录 + * @param device_code 设备编号 + * @param vehicle_code 载具号 + * @param inst_code 指令号 + * @param message 日志信息 + */ + void deviceExecuteLog(String device_code, String vehicle_code, String inst_code, String message); + +} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/LogServer.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/LogServer.java deleted file mode 100644 index 292654f..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/LogServer.java +++ /dev/null @@ -1,56 +0,0 @@ - -package org.nl.acs.log.service; - -import com.alibaba.fastjson.JSONObject; -import org.nl.acs.log.service.dto.LogDto; -import org.springframework.data.domain.Pageable; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.text.ParseException; -import java.util.List; -import java.util.Map; - -/** - * @author loujf - * @description 服务接口 - * @date 2022-02-25 - **/ -public interface LogServer { - - /** - * 查询数据分页 - * - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Object queryAll(Map whereJson, Pageable page) throws ParseException; - - /** - * @param task_code 任务编码 - * @param method 接口方法名 - * @param type 日志类别：error / info - * @param requestParam 请求参数 - * @param responseParam 返回参数 - * @param status_code 接口状态码 - * @param requestUrl 请求地址 - * @param vehicle_code 载具号 - */ - void log(String task_code, String method, String type, String requestParam, String responseParam, String status_code, String requestUrl, String vehicle_code); - - /** - * @param device_code 设备编号 - * @param key plc信号 - * @param value plc信号值 - */ - void deviceLog(String device_code, String key, String value); - - /** - * @param device_code 设备编号 - * @param vehicle_code 载具号 - * @param inst_code 指令号 - */ - void deviceLogToacs(String device_code, String vehicle_code, String inst_code, String message); - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/dto/DeviceLogDto.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/dto/DeviceLogDto.java deleted file mode 100644 index ee811ae..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/dto/DeviceLogDto.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.nl.acs.log.service.dto; - - -import lombok.Data; - -@Data -public class DeviceLogDto { - - /* 日志标识 */ - private String log_uuid; - - /* 设备编码 */ - private String device_code; - - /* plc信号标识 */ - private String key; - - /* plc信号值 */ - private String value; - - /* 修改时间 YYYY-MM-DD hh:mm:ss */ - private String update_time; - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/dto/LogDto.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/dto/LogDto.java deleted file mode 100644 index e493d30..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/dto/LogDto.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.nl.acs.log.service.dto; - -import lombok.Data; - -@Data -public class LogDto { - - /* 日志标识 */ - private String log_uuid; - - /* 任务编码 */ - private String task_code; - - /* 任务标识 */ - private String task_id; - - /* 载具号 */ - private String vehicle_code; - - /* 备注 */ - private String remark; - - /* 日志类型 */ - private String log_type; - - /* 方法 */ - private String method; - - /* 请求参数 */ - private String requestparam; - - /* 响应参数 */ - private String responseparam; - - /* 请求地址 */ - private String requesturl; - - /* 状态码 */ - private String status_code; - - /* 是否删除 1:是；0：否 */ - private String is_delete; - - /* 创建者 */ - private String create_by; - - /* 创建时间 YYYY-MM-DD hh:mm:ss */ - private String create_time; - - /* 修改者 */ - private String update_by; - - /* 修改时间 */ - private String update_time; - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/impl/DeviceExecuteLogServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/impl/DeviceExecuteLogServiceImpl.java new file mode 100644 index 0000000..9a663a8 --- /dev/null +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/impl/DeviceExecuteLogServiceImpl.java @@ -0,0 +1,40 @@ + +package org.nl.acs.log.service.impl; + + +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.acs.log.service.DeviceExecuteLogService; +import org.slf4j.MDC; +import org.springframework.stereotype.Service; + +/** + * @author loujf + * @description 服务实现 + * @date 2022-02-25 + **/ +@Service +@RequiredArgsConstructor +@Slf4j +public class DeviceExecuteLogServiceImpl implements DeviceExecuteLogService { + + + @Override + public void deviceItemValue(String device_code, String key, String value) { + String now = DateUtil.now(); + + + } + + @Override + public void deviceExecuteLog(String device_code, String vehicle_code, String inst_code, String message) { + try { + MDC.put("device_code_log",device_code); + log.info("{},{}",device_code,message); + }finally { + MDC.remove("device_code_log"); + } + } +} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/impl/LogServerImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/impl/LogServerImpl.java deleted file mode 100644 index ece1d61..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/log/service/impl/LogServerImpl.java +++ /dev/null @@ -1,151 +0,0 @@ - -package org.nl.acs.log.service.impl; - - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.mongodb.client.result.UpdateResult; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.log.service.LogServer; -import org.nl.acs.log.service.dto.DeviceLogDto; -import org.nl.acs.log.service.dto.LogDto; -import org.nl.exception.BadRequestException; -import org.nl.utils.FileUtil; -import org.nl.utils.SecurityUtils; -import org.nl.wql.WQL; -import org.nl.wql.core.bean.WQLObject; -import org.nl.wql.core.engine.object.WO; -import org.nl.wql.util.WqlUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Sort; -import org.springframework.data.mongodb.core.MongoTemplate; -import org.springframework.data.mongodb.core.query.Criteria; -import org.springframework.data.mongodb.core.query.Query; -import org.springframework.data.mongodb.core.query.Update; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.*; - -/** - * @author loujf - * @description 服务实现 - * @date 2022-02-25 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class LogServerImpl implements LogServer { - - @Autowired - private MongoTemplate mongoTemplate; - - @Override - public Object queryAll(Map whereJson, Pageable page) { - String blurry = (String) whereJson.get("blurry"); - String begin_time = (String) whereJson.get("begin_time"); - String end_time = (String) whereJson.get("end_time"); - - Query query = new Query().with(Sort.by("create_time")); - - if (StrUtil.isNotEmpty(blurry)) { - query.addCriteria(Criteria.where("method").is(blurry).regex("^.*" + blurry + ".*$")); - } - if (StrUtil.isNotEmpty(begin_time) && StrUtil.isNotEmpty(end_time)) { - query.addCriteria(Criteria.where("create_time") - .gte(begin_time) - .lte(end_time)); - } - - //根据条件得到的总条数 - long totalSize = mongoTemplate.count(query, LogDto.class,"interface_log"); - - //处理分页 - query.skip(page.getPageNumber()).limit(page.getPageSize()); - List list = mongoTemplate.find(query,LogDto.class, "interface_log"); - - //封装前端分页查询结果 - JSONObject result = new JSONObject(); - result.put("content", list); - result.put("totalElements", totalSize); - return result; - } - - @Override - public void log(String task_code, String method, String type, String requestParam, String responseParam, String status_code, String requesturl, String vehicle_code) { - String currentUsername = SecurityUtils.getCurrentUsername(); - String now = DateUtil.now(); - - LogDto logDto = new LogDto(); - logDto.setTask_code(task_code); - logDto.setMethod(method); - logDto.setLog_type(type); - logDto.setRequestparam(requestParam); - logDto.setResponseparam(responseParam); - logDto.setStatus_code(status_code); - logDto.setRequesturl(requesturl); - logDto.setVehicle_code(vehicle_code); - - logDto.setCreate_by(currentUsername); - logDto.setUpdate_by(currentUsername); - logDto.setUpdate_time(now); - logDto.setCreate_time(now); - - mongoTemplate.save(logDto,"interface_log"); - } - - @Override - public void deviceLog(String device_code,String key, String value) { - String now = DateUtil.now(); - - DeviceLogDto dto; - Query query = new Query(Criteria - .where("device_code").is(device_code) - .and("key").is(key) - ); - List deviceList = mongoTemplate.find(query, DeviceLogDto.class,"device_log"); - if (ObjectUtil.isEmpty(deviceList)) { - JSONObject json = new JSONObject(); - json.put("device_code",device_code); - json.put("key",key); - json.put("value",value); - json.put("update_time",now); - - mongoTemplate.save(json,"device_log"); - } else { - for (int i = 0; i < deviceList.size(); i++) { - dto = deviceList.get(i); - Update update = new Update(); - update.set("device_code",dto.getDevice_code()); - update.set("key",dto.getKey()); - update.set("value",value); - update.set("update_time",now); - - mongoTemplate.upsert(query, update, "device_log"); - } - } - } - - @Override - public void deviceLogToacs(String device_code, String vehicle_code, String inst_code, String message) { - String now = DateUtil.now(); - - JSONObject json = new JSONObject(); - json.put("device_code",device_code); - json.put("vehicle_code",vehicle_code); - json.put("inst_code",inst_code); - json.put("message",message); - json.put("create_time",now); - - mongoTemplate.save(json,device_code); - } -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/annotation/RateLimiter.java b/acs/hd/nladmin-system/src/main/java/org/nl/annotation/RateLimiter.java new file mode 100644 index 0000000..5553e1d --- /dev/null +++ b/acs/hd/nladmin-system/src/main/java/org/nl/annotation/RateLimiter.java @@ -0,0 +1,39 @@ +package org.nl.annotation; + +import org.springframework.core.annotation.AliasFor; +import org.springframework.core.annotation.AnnotationUtils; + +import java.lang.annotation.*; +import java.util.concurrent.TimeUnit; + +/** + * @Author: lyd + * @Description: 限流注解，添加了 {@link AliasFor} 必须通过 {@link AnnotationUtils} 获取，才会生效 + * @Date: 2022-08-15 + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface RateLimiter { + int NOT_LIMITED = 0; + + /** + * qps + */ + @AliasFor("qps") double value() default NOT_LIMITED; + + /** + * qps + */ + @AliasFor("value") double qps() default NOT_LIMITED; + + /** + * 超时时长 + */ + int timeout() default 0; + + /** + * 超时时间单位 + */ + TimeUnit timeUnit() default TimeUnit.MILLISECONDS; +} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/aspect/RateLimiterAspect.java b/acs/hd/nladmin-system/src/main/java/org/nl/aspect/RateLimiterAspect.java new file mode 100644 index 0000000..0fa3d06 --- /dev/null +++ b/acs/hd/nladmin-system/src/main/java/org/nl/aspect/RateLimiterAspect.java @@ -0,0 +1,55 @@ +package org.nl.aspect; + +import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Pointcut; +import org.aspectj.lang.reflect.MethodSignature; +import org.nl.annotation.RateLimiter; +import org.springframework.core.annotation.AnnotationUtils; +import org.springframework.stereotype.Component; + +import java.lang.reflect.Method; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + +/** + * @Author: lyd + * @Description: 限流切面 + * @Date: 2022-08-15 + */ +@Slf4j +@Aspect +@Component +public class RateLimiterAspect { + private static final ConcurrentMap RATE_LIMITER_CACHE = new ConcurrentHashMap<>(); + + @Pointcut("@annotation(org.nl.annotation.RateLimiter)") + public void rateLimit() { + + } + + @Around("rateLimit()") + public Object pointcut(ProceedingJoinPoint point) throws Throwable { + MethodSignature signature = (MethodSignature) point.getSignature(); + Method method = signature.getMethod(); + // 通过 AnnotationUtils.findAnnotation 获取 RateLimiter 注解 + RateLimiter rateLimiter = AnnotationUtils.findAnnotation(method, RateLimiter.class); + if (rateLimiter != null && rateLimiter.qps() > RateLimiter.NOT_LIMITED) { + double qps = rateLimiter.qps(); + if (RATE_LIMITER_CACHE.get(method.getName()) == null) { + // 初始化 QPS + RATE_LIMITER_CACHE.put(method.getName(), com.google.common.util.concurrent.RateLimiter.create(qps)); + } + + log.debug("【{}】的QPS设置为: {}", method.getName(), RATE_LIMITER_CACHE.get(method.getName()).getRate()); + // 尝试获取令牌 + if (RATE_LIMITER_CACHE.get(method.getName()) != null && !RATE_LIMITER_CACHE.get(method.getName()).tryAcquire(rateLimiter.timeout(), rateLimiter.timeUnit())) { +// throw new RuntimeException("手速太快了，慢点儿吧~"); + log.error("操作台频繁，慢点儿吧~"); + } + } + return point.proceed(); + } +} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/log/service/impl/RootLogServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/log/service/impl/RootLogServiceImpl.java index ff65b58..783284b 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/modules/log/service/impl/RootLogServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/modules/log/service/impl/RootLogServiceImpl.java @@ -5,9 +5,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.bson.Document; import org.nl.acs.device.service.DeviceService; -import org.nl.acs.log.service.LogServer; import org.nl.modules.log.service.RootLogService; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -16,7 +14,6 @@ import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Service; -import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/loki/rest/LokiController.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/loki/rest/LokiController.java new file mode 100644 index 0000000..b889c2c --- /dev/null +++ b/acs/hd/nladmin-system/src/main/java/org/nl/modules/loki/rest/LokiController.java @@ -0,0 +1,46 @@ +package org.nl.modules.loki.rest; + +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.annotation.RateLimiter; +import org.nl.modules.loki.service.LokiService; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +/** + * @Author: lyd + * @Description: 日志监控 + * @Date: 2022-08-15 + */ +@RestController +@RequiredArgsConstructor +@Api(tags = "日志监控") +@RequestMapping("/api/loki") +@Slf4j +public class LokiController { + + private final LokiService lokiService; + + @GetMapping("/labels") + @ApiOperation("获取标签") + public ResponseEntity labels() { + return new ResponseEntity<>(lokiService.getLabels(), HttpStatus.OK); + } + + @PostMapping("/values") + @ApiOperation("根据标签获取值") + public ResponseEntity getAllValues(@RequestBody String label) { + return new ResponseEntity<>(lokiService.getValuesByLabel(label), HttpStatus.OK); + } + + @PostMapping("/logs") + @ApiOperation("获取日志") + @RateLimiter(value = 1.0, timeout = 300) // 限流 + public ResponseEntity getLogData(@RequestBody JSONObject json) { + return new ResponseEntity<>(lokiService.getLogData(json), HttpStatus.OK); + } +} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/loki/service/LokiService.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/loki/service/LokiService.java new file mode 100644 index 0000000..dedd921 --- /dev/null +++ b/acs/hd/nladmin-system/src/main/java/org/nl/modules/loki/service/LokiService.java @@ -0,0 +1,30 @@ +package org.nl.modules.loki.service; + +import com.alibaba.fastjson.JSONObject; + +/** + * @Author: lyd + * @Description: 服务类 + * @Date: 2022-08-15 + */ +public interface LokiService { + /** + * 获取日志的所有标签 + * @return + */ + JSONObject getLabels(); + + /** + * 根据label获取值 + * @param label + * @return + */ + JSONObject getValuesByLabel(String label); + + /** + * 获取日志信息 + * @param json + * @return + */ + JSONObject getLogData(JSONObject json); +} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/loki/service/impl/LokiServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/loki/service/impl/LokiServiceImpl.java new file mode 100644 index 0000000..6940ab4 --- /dev/null +++ b/acs/hd/nladmin-system/src/main/java/org/nl/modules/loki/service/impl/LokiServiceImpl.java @@ -0,0 +1,78 @@ +package org.nl.modules.loki.service.impl; + +import cn.hutool.core.util.CharsetUtil; +import cn.hutool.http.HttpUtil; +import com.alibaba.fastjson.JSONObject; +import lombok.RequiredArgsConstructor; +import org.nl.modules.loki.service.LokiService; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +/** + * @Author: lyd + * @Description: 实现类 + * @Date: 2022-08-15 + */ +@Service +@RequiredArgsConstructor +public class LokiServiceImpl implements LokiService { + + @Value("${loki.url}") + private String lokiUrl; + + @Override + public JSONObject getLabels() { + String result = HttpUtil.get(lokiUrl + "/labels", CharsetUtil.CHARSET_UTF_8); + JSONObject parse = (JSONObject) JSONObject.parse(result); + return parse; + } + + @Override + public JSONObject getValuesByLabel(String label) { + String result = HttpUtil.get(lokiUrl + "/label/" + label + "/values", CharsetUtil.CHARSET_UTF_8); + JSONObject parse = (JSONObject) JSONObject.parse(result); + return parse; + } + + @Override + public JSONObject getLogData(JSONObject json) { + String logLabel = ""; + String logLabelValue = ""; + Long start = 0L; + Long end = 0L; + String text = ""; + String limit = "100"; + String direction = "backward"; + if (json.get("logLabel") != null) logLabel = json.getString("logLabel"); + if (json.get("logLabelValue") != null) logLabelValue = json.getString("logLabelValue"); + if (json.get("text") != null) text = json.getString("text"); + if (json.get("start") != null) start = json.getLong("start"); + if (json.get("end") != null) end = json.getLong("end"); + if (json.get("limits") != null) limit = json.getString("limits"); + if (json.get("direction") != null) direction = json.getString("direction"); + /** + * 组织参数 + * 纳秒数 + * 1660037391880000000 + * 1641453208415000000 + * http://localhost:3100/loki/api/v1/query_range?query={host="localhost"} |= ``&limit=1500&start=1641453208415000000&end=1660027623419419002 + */ + JSONObject parse = null; + String query = lokiUrl + "/query_range?query={" + logLabel + "=\"" + logLabelValue + "\"} |= `" + text + "`"; + String result = ""; + if (start.equals(0L)) { + result = HttpUtil.get(query + "&limit=" + limit + "&direction=" + direction, CharsetUtil.CHARSET_UTF_8); + } else { + result = HttpUtil.get(query + "&limit=" + limit + "&start=" + start + "&end=" + end + "&direction=" + direction, CharsetUtil.CHARSET_UTF_8); + } + try { + parse = (JSONObject) JSONObject.parse(result); + } catch (Exception e) { +// reslut的值可能为:too many outstanding requests,无法转化成Json + System.out.println("reslut:" + result); +// e.printStackTrace(); + } + return parse; + } + +} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/start/Init.java b/acs/hd/nladmin-system/src/main/java/org/nl/start/Init.java index 508bb9c..631c572 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/start/Init.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/start/Init.java @@ -2,12 +2,14 @@ package org.nl.start; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.modules.quartz.domain.QuartzJob; import org.nl.modules.quartz.repository.QuartzJobRepository; import org.nl.modules.quartz.utils.QuartzManage; import org.nl.start.auto.initial.ApplicationAutoInitialExecuter; import org.nl.start.auto.initial.WebAutoInitialExecuter; import org.nl.wql.WQLCore; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.stereotype.Component; @@ -29,6 +31,8 @@ public class Init implements ApplicationRunner { //判断系统是否启动 public static boolean isStart = false; + private final DeviceExecuteLogService deviceExecuteLogService; + private void init() throws Exception { //初始化WQL initWql(); @@ -39,6 +43,12 @@ public class Init implements ApplicationRunner { initQuartz(); isStart = true; System.out.println("系统启动成功!"); +// int i = 0; +// while (true) { +// deviceExecuteLogService.deviceExecuteLog(String.valueOf(i), String.valueOf(i), String.valueOf(i), String.valueOf(i)); +// i++; +// Thread.sleep(2000); +// } } private void initQuartz() { diff --git a/acs/hd/nladmin-system/src/main/resources/config/application-dev.yml b/acs/hd/nladmin-system/src/main/resources/config/application-dev.yml index b16b25b..2e974fb 100644 --- a/acs/hd/nladmin-system/src/main/resources/config/application-dev.yml +++ b/acs/hd/nladmin-system/src/main/resources/config/application-dev.yml @@ -8,12 +8,12 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy -# url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:llsh_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true - url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:rljn_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:llsh_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true +# url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:rljn_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} - #password: ${DB_PWD:P@ssw0rd} -# password: ${DB_PWD:Root.123456} - password: ${DB_PWD:123456} +# password: ${DB_PWD:P@ssw0rd} + password: ${DB_PWD:Root.123456} +# password: ${DB_PWD:123456} # 初始连接数 initial-size: 5 # 最小连接数 @@ -163,4 +163,6 @@ jetcache: maxTotal: 1000 uri: - redis://127.0.0.1:6379 +loki: + url: http://localhost:3100/loki/api/v1 diff --git a/acs/hd/nladmin-system/src/main/resources/log/AgvLeaveServlet.xml b/acs/hd/nladmin-system/src/main/resources/log/AgvLeaveServlet.xml index 3c9d096..702bdbf 100644 --- a/acs/hd/nladmin-system/src/main/resources/log/AgvLeaveServlet.xml +++ b/acs/hd/nladmin-system/src/main/resources/log/AgvLeaveServlet.xml @@ -1,18 +1,30 @@ - - acs_log - agv_leave_servlet - ${CONTEXT_NAME} - - info - + + + + + + 1000 + + ${LOKI_URL} + + + + + ${log.pattern} + + true + - + diff --git a/acs/hd/nladmin-system/src/main/resources/log/AutoCreateInst.xml b/acs/hd/nladmin-system/src/main/resources/log/AutoCreateInst.xml index 3117421..f862fe2 100644 --- a/acs/hd/nladmin-system/src/main/resources/log/AutoCreateInst.xml +++ b/acs/hd/nladmin-system/src/main/resources/log/AutoCreateInst.xml @@ -1,16 +1,28 @@ - - acs_log - auto_create_inst - ${CONTEXT_NAME} - - info - + + + + + + 1000 + + ${LOKI_URL} + + + + + ${log.pattern} + + true + - - + + diff --git a/acs/hd/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml b/acs/hd/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml index e908af7..625ba86 100644 --- a/acs/hd/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml +++ b/acs/hd/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml @@ -1,17 +1,29 @@ - - acs_log - ndc_socket_connection_autorun - ${CONTEXT_NAME} - - info - + + + + + + 1000 + + ${LOKI_URL} + + + + + ${log.pattern} + + true + - + diff --git a/acs/hd/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml b/acs/hd/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml index 565a189..c42a9d4 100644 --- a/acs/hd/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml +++ b/acs/hd/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml @@ -1,15 +1,27 @@ - - acs_log - agv_task_status - ${CONTEXT_NAME} - - info - + + + + + + 1000 + + ${LOKI_URL} + + + + + ${log.pattern} + + true + - + diff --git a/acs/hd/nladmin-system/src/main/resources/log/QueryXZAgvTaskStatus.xml b/acs/hd/nladmin-system/src/main/resources/log/QueryXZAgvTaskStatus.xml index 4dd0141..4b1daf3 100644 --- a/acs/hd/nladmin-system/src/main/resources/log/QueryXZAgvTaskStatus.xml +++ b/acs/hd/nladmin-system/src/main/resources/log/QueryXZAgvTaskStatus.xml @@ -1,15 +1,28 @@ - - acs_log - xz_agv_task_status - ${CONTEXT_NAME} - - info - + + + + + + + 1000 + + ${LOKI_URL} + + + + + ${log.pattern} + + true + - - + + diff --git a/acs/hd/nladmin-system/src/main/resources/log/WmsToAcs.xml b/acs/hd/nladmin-system/src/main/resources/log/WmsToAcs.xml index 51e95e9..1af106d 100644 --- a/acs/hd/nladmin-system/src/main/resources/log/WmsToAcs.xml +++ b/acs/hd/nladmin-system/src/main/resources/log/WmsToAcs.xml @@ -1,19 +1,30 @@ - - acs_log - wms_to_acs - ${CONTEXT_NAME} - - info - + + + + + + + 1000 + + ${LOKI_URL} + + + + + ${log.pattern} + + true + + - + - diff --git a/acs/hd/nladmin-system/src/main/resources/logback-spring.xml b/acs/hd/nladmin-system/src/main/resources/logback-spring.xml index 3f2c4ac..91329fa 100644 --- a/acs/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/acs/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -14,9 +14,11 @@ https://juejin.cn/post/6844903775631572999 + + + - @@ -26,53 +28,15 @@ https://juejin.cn/post/6844903775631572999 - + ${log.pattern} ${log.charset} - - - - - 192.168.81.251 - 27017 - - acs_log - default - ${CONTEXT_NAME} - - info - - - - - - @@ -98,15 +62,35 @@ https://juejin.cn/post/6844903775631572999 + + + 1000 + + ${LOKI_URL}/push + + + + + ${log.pattern} + + true + + - + - + + + + + @@ -116,9 +100,6 @@ https://juejin.cn/post/6844903775631572999 - - - @@ -137,6 +118,7 @@ https://juejin.cn/post/6844903775631572999 + @@ -144,7 +126,7 @@ https://juejin.cn/post/6844903775631572999 + - diff --git a/acs/qd/package.json b/acs/qd/package.json index 6d2b7c5..e509f00 100644 --- a/acs/qd/package.json +++ b/acs/qd/package.json @@ -35,6 +35,7 @@ "dependencies": { "@riophae/vue-treeselect": "0.4.0", "af-table-column": "^1.0.3", + "ansi_up": "^5.1.0", "axios": "0.18.1", "clipboard": "2.0.4", "codemirror": "^5.49.2", diff --git a/acs/qd/src/api/monitor/loki.js b/acs/qd/src/api/monitor/loki.js new file mode 100644 index 0000000..4adb6b5 --- /dev/null +++ b/acs/qd/src/api/monitor/loki.js @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +export function getAllLabels() { + return request({ + url: 'api/loki/labels', + method: 'get' + }) +} + +export function getAllValues(label) { + return request({ + url: 'api/loki/values', + method: 'post', + data: label + }) +} + +export function getLogData(param) { + return request({ + url: 'api/loki/logs', + method: 'post', + data: param + }) +} + +export default { getAllLabels, getAllValues, getLogData } diff --git a/acs/qd/src/views/monitor/logback/index.vue b/acs/qd/src/views/monitor/logback/index.vue new file mode 100644 index 0000000..e540bc2 --- /dev/null +++ b/acs/qd/src/views/monitor/logback/index.vue @@ -0,0 +1,418 @@ + + + + +