From 6abe6c232248fcde4a0dad9c693524f9cceaddc8 Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Tue, 5 Dec 2023 18:05:50 +0800 Subject: [PATCH] =?UTF-8?q?rev=20=E4=BF=AE=E6=94=B9=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E7=B1=BB=E4=B8=8E=E4=B8=80=E6=9C=9F=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/acs/opc/DeviceOpcProtocolRunable.java | 13 ++++++++++++- .../nl/acs/task/enums/AgvSystemTypeEnum.java | 5 +++-- .../nl/acs/task/enums/StorageTaskTypeEnum.java | 10 ++++++---- .../org/nl/acs/task/enums/TaskTypeEnum.java | 17 +++++++++++++---- .../src/main/resources/logback-spring.xml | 18 ++++++++++++++++++ 5 files changed, 52 insertions(+), 11 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java index 6592d91..748fe5e 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alicp.jetcache.anno.method.SpringCacheContext; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.bag.SynchronizedSortedBag; import org.nl.acs.opc.service.dto.OpcServerManageDto; import org.nl.acs.udw.UnifiedDataAccessor; import org.nl.acs.udw.UnifiedDataAccessorFactory; @@ -424,7 +425,17 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value, sb}); // this.businessLogger.setResource(itemDto.getDevice_code(), itemDto.getDevice_name()).log("信号{}变更从{}->{};信号快照：{}", new Object[]{itemId, his, value, sb}); } else { - log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value}); + if(his instanceof int[]){ + if(!Arrays.equals((long[]) his, (long[]) value)){ + log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value}); + } + } else if(his instanceof String){ + if(!StrUtil.equals((CharSequence) his, (CharSequence) value)){ + log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value}); + } + } else { + log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value}); + } // this.businessLogger.setResource(itemDto.getDevice_code(), itemDto.getDevice_name()).log("信号{}变更从{}->{}", new Object[]{itemId, his, value}); } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/AgvSystemTypeEnum.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/AgvSystemTypeEnum.java index 6489137..b1a8b07 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/AgvSystemTypeEnum.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/AgvSystemTypeEnum.java @@ -8,8 +8,9 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum AgvSystemTypeEnum { - NDC_System_Type("1", "NDC_System_Type", "NDC系统"), - XG_System_Type("2", "XG_System_Type", "仙工系统"); + One_NDC_System_Type("1", "1", "一期1楼叉车NDC系统"), + Two_NDC_System_Type("2", "2", "一期2楼NDC系统"), + XG_System_Type("3", "3", "仙工AGV系统"); //索引 private String index; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/StorageTaskTypeEnum.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/StorageTaskTypeEnum.java index ccbdb1d..9e6bce9 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/StorageTaskTypeEnum.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/StorageTaskTypeEnum.java @@ -11,10 +11,12 @@ import lombok.Getter; * 立库任务类型 */ public enum StorageTaskTypeEnum { - IN("1", "Conveyor_Task", "任务"), - OUT("2", "Stacker_Task", "堆垛机任务"), - MOVE("3", "Truss_Task", "行架任务"), - AGV_Task("4", "AGV_Task", "AGV任务"); + IN("1", "1", "入库任务"), + EMPTY_IN("2", "2", "空盘入库任务"), + OUT("3", "3", "出库任务"), + EMPTY_OUT("4", "4", "空盘出空任务"), + MOVE("5", "5", "转库任务"); + //索引 private String index; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskTypeEnum.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskTypeEnum.java index 6ff0938..051a87e 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskTypeEnum.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskTypeEnum.java @@ -8,10 +8,19 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum TaskTypeEnum { - Conveyor_Task("1", "Conveyor_Task", "输送线任务"), - Stacker_Task("2", "Stacker_Task", "堆垛机任务"), - Truss_Task("3", "Truss_Task", "行架任务"), - AGV_Task("4", "AGV_Task", "AGV任务"); + Raw_Foil_AGV_Task("1", "1", "生箔AGV任务"), + Cutting_AGV_Task("2", "2", "分切AGV任务"), + Standard_AGV_Task("3", "3", "普通AGV任务"), + Forklift_AGV_Task("4", "4", "叉车AGV任务"), + Conveyor_Task("5", "5", "输送线任务"), + Truss_Task("6", "6", "行架任务"), + AGV_Task("7", "7", "立库任务"), + + Oven_Truss_Task("8", "8", "烘箱行架任务"), + + Inner_Truss_Task("9", "9", "内包间行架任务"), + + Stacker_Task("11", "11", "堆垛机任务"); //索引 private String index; diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index 7f6c752..ac3aa5d 100644 --- a/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -105,6 +105,24 @@ https://juejin.cn/post/6844903775631572999 + + + + + + + + + + + + + + + + + +