From 5bb3ad3944ff229baff1d8bb92caf55d816ee68b Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 02 十二月 2023 18:34:45 +0800
Subject: [PATCH] 提交粮情协议1
---
src/main/java/com/fzzy/gateway/GatewayUtils.java | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/GatewayUtils.java b/src/main/java/com/fzzy/gateway/GatewayUtils.java
index 0de33a5..b87a207 100644
--- a/src/main/java/com/fzzy/gateway/GatewayUtils.java
+++ b/src/main/java/com/fzzy/gateway/GatewayUtils.java
@@ -1,7 +1,10 @@
package com.fzzy.gateway;
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.ApiCommonDevice;
import com.fzzy.api.data.GatewayDeviceType;
import com.fzzy.gateway.entity.GatewayDevice;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import java.util.*;
@@ -11,13 +14,6 @@
*/
@Component
public class GatewayUtils {
-
-
- /**
- * 璁惧鍦ㄧ嚎鏍囪锛岄拡瀵筗EBSocket璇锋眰锛屾帶鍒惰澶囨槸鍚﹀湪绾匡紝key = deviceId锛孷alue=Y/N
- */
- public static Map<String, String> contextOnlineMap = new HashMap<>();
-
/**
* 璁惧缂撳瓨
@@ -74,22 +70,21 @@
cacheMapDeviceSn.remove(data.getDeviceSn());
}
- public static void updateOnline(String deviceId) {
- contextOnlineMap.put(deviceId, "Y");
+ public static String getStatus(String sn) {
+ ApiCommonDevice device = Constant.getCommonDeviceCache(sn);
+ if (null == device) return Constant.YN_N;
+ return device.getStatus();
}
- public static void updateOffOnline(String deviceId) {
- contextOnlineMap.put(deviceId, "N");
- }
public static boolean isOnline(String deviceId) {
- String value = contextOnlineMap.get(deviceId);
- if (null == value || "N".equals(value)) return false;
+ GatewayDevice device = getCacheByDeviceId(deviceId);
+ if (null == device.getStatus() || Constant.YN_N.equals(device.getStatus())) return false;
return true;
}
- public static Collection<GatewayDevice> listDeviceWeight(){
+ public static Collection<GatewayDevice> listDeviceWeight() {
return cacheMapDeviceWeight.values();
}
}
--
Gitblit v1.9.3