From 6b1c7e3fa773aa75ea34b346d4104ba70064f52c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 31 八月 2023 14:35:53 +0800
Subject: [PATCH] 调整设备状态解析2
---
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ServerUtil.java | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ServerUtil.java b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ServerUtil.java
index 1a2813b..93a3fa4 100644
--- a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ServerUtil.java
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ServerUtil.java
@@ -32,36 +32,36 @@
* @param deviceCode 璁惧閫氶亾ID
* @param status 涓嶈�冭檻璁惧绫诲瀷锛屽彧鍦ㄩ�氶亾涓婃爣璁版槸OPEN鎴栬�匔LOSE鍗冲彲
*/
- public static void add2StatusMap(String companyId, String serId, String deviceCode, String status, String mainLink) {
-
- //鑻ヤ笉涓虹┖锛屽垯鏌ヨ涓昏澶囩姸鎬�
- if(StringUtils.isNotEmpty(mainLink)){
- String oldStatus = contextStatusMap.get(ContextUtil.buildDeviceStatusKey(companyId, serId, mainLink));
- //鑻ラ绐楁垨椋庡彛寮�
- if(DeviceStatus.OPEN.getCode().equals(oldStatus)){
- //鑻ラ鏈哄紑
- if(DeviceStatus.OPEN.getCode().equals(status)){
- status = DeviceStatus.F_OPEN.getCode();
- }
- //鑻ラ鏈哄叧
- if(DeviceStatus.CLOSE.getCode().equals(status)){
- status = DeviceStatus.W_OPEN.getCode();
- }
- }
- //鑻ラ绐楁垨椋庡彛寮�
- if(DeviceStatus.CLOSE.getCode().equals(oldStatus)){
- //鑻ラ鏈哄紑
- if(DeviceStatus.OPEN.getCode().equals(status)){
- status = DeviceStatus.ERROR.getCode();
- }
- //鑻ラ鏈哄叧
- if(DeviceStatus.CLOSE.getCode().equals(status)){
- status = DeviceStatus.W_CLOSE.getCode();
- }
- }
- contextStatusMap.put(ContextUtil.buildDeviceStatusKey(companyId, serId, mainLink), status);
- return;
- }
+ public static void add2StatusMap(String companyId, String serId, String deviceCode, String status) {
+// System.out.println(mainLink);
+// //鑻ヤ笉涓虹┖锛屽垯鏌ヨ涓昏澶囩姸鎬�
+// if(StringUtils.isNotEmpty(mainLink)){
+// String oldStatus = contextStatusMap.get(ContextUtil.buildDeviceStatusKey(companyId, serId, mainLink));
+// //鑻ラ绐楁垨椋庡彛寮�
+// if(DeviceStatus.OPEN.getCode().equals(oldStatus)){
+// //鑻ラ鏈哄紑
+// if(DeviceStatus.OPEN.getCode().equals(status)){
+// status = DeviceStatus.F_OPEN.getCode();
+// }
+// //鑻ラ鏈哄叧
+// if(DeviceStatus.CLOSE.getCode().equals(status)){
+// status = DeviceStatus.W_OPEN.getCode();
+// }
+// }
+// //鑻ラ绐楁垨椋庡彛寮�
+// if(DeviceStatus.CLOSE.getCode().equals(oldStatus)){
+// //鑻ラ鏈哄紑
+// if(DeviceStatus.OPEN.getCode().equals(status)){
+// status = DeviceStatus.ERROR.getCode();
+// }
+// //鑻ラ鏈哄叧
+// if(DeviceStatus.CLOSE.getCode().equals(status)){
+// status = DeviceStatus.W_CLOSE.getCode();
+// }
+// }
+// contextStatusMap.put(ContextUtil.buildDeviceStatusKey(companyId, serId, mainLink), status);
+// return;
+// }
contextStatusMap.put(ContextUtil.buildDeviceStatusKey(companyId, serId, deviceCode), status);
}
--
Gitblit v1.9.3