From cbe1226ae82f1818e13b7a4faa965b591d631633 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 11 十月 2023 12:24:18 +0800
Subject: [PATCH] 更新油罐页面
---
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ServerUtil.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 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 84352e8..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
@@ -1,7 +1,9 @@
package com.ld.igds.protocol.modbus;
import com.ld.igds.constant.Constant;
+import com.ld.igds.constant.DeviceStatus;
import com.ld.igds.util.ContextUtil;
+import org.apache.commons.lang3.StringUtils;
import java.util.HashMap;
import java.util.Map;
@@ -10,6 +12,10 @@
*
*/
public class ServerUtil {
+
+
+
+ public static final String RUN_TAG = "RUN_TAG";
@@ -27,6 +33,35 @@
* @param status 涓嶈�冭檻璁惧绫诲瀷锛屽彧鍦ㄩ�氶亾涓婃爣璁版槸OPEN鎴栬�匔LOSE鍗冲彲
*/
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