From 46203ee88249d9a4046f3d453deb41edc562cf6c Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 12 十二月 2023 12:36:53 +0800
Subject: [PATCH] 提交网关心跳和设备状态
---
src/main/java/com/fzzy/gateway/GatewayUtils.java | 94 +++++++++++++++++++++++++++++++++++------------
1 files changed, 70 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/GatewayUtils.java b/src/main/java/com/fzzy/gateway/GatewayUtils.java
index 655af00..e7da33c 100644
--- a/src/main/java/com/fzzy/gateway/GatewayUtils.java
+++ b/src/main/java/com/fzzy/gateway/GatewayUtils.java
@@ -1,22 +1,19 @@
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.HashMap;
-import java.util.Map;
+import java.util.*;
/**
* 甯搁噺
*/
+@Component
public class GatewayUtils {
-
-
-
- /**
- * 璁惧鍦ㄧ嚎鏍囪锛岄拡瀵筗EBSocket璇锋眰锛屾帶鍒惰澶囨槸鍚﹀湪绾匡紝key = deviceId锛孷alue=Y/N
- */
- public static Map<String, String> contextOnlineMap = new HashMap<>();
-
/**
* 璁惧缂撳瓨
@@ -24,14 +21,21 @@
public static Map<String, GatewayDevice> cacheMapDeviceId = new HashMap<>();
/**
- * 璁惧缂撳瓨
+ * 璁惧缂撳瓨-鍙拡瀵�
*/
- public static Map<String, GatewayDevice> cacheMapDeviceSn = new HashMap<>();
+ public static Map<String, GatewayDevice> cacheMapDeviceWeight = new HashMap<>();
public static void add2Cache(GatewayDevice device) {
cacheMapDeviceId.put(device.getDeviceId(), device);
- cacheMapDeviceSn.put(device.getDeviceSn(), device);
+ //淇濆瓨鍦扮
+ if (GatewayDeviceType.TYPE_01.getCode().equals(device.getType())) {
+ cacheMapDeviceWeight.put(device.getDeviceId(), device);
+ }
+ }
+
+ public static Collection<GatewayDevice> allCacheDevice() {
+ return cacheMapDeviceId.values();
}
public static GatewayDevice getCacheByDeviceId(String deviceId) {
@@ -39,28 +43,70 @@
}
public static GatewayDevice getCacheByDeviceSn(String deviceSn) {
- return cacheMapDeviceSn.get(deviceSn);
+ Collection<GatewayDevice> list = allCacheDevice();
+ if (null == list || list.isEmpty()) return null;
+
+ for (GatewayDevice device : list) {
+ if (deviceSn.equals(device.getDeviceSn())) return device;
+ }
+
+ return null;
+ }
+
+ /**
+ * 閽堝涓�涓�氳鍒嗘満瀵瑰涓粨鎯呭喌
+ *
+ * @param deviceSn
+ * @return
+ */
+ public static List<GatewayDevice> getCacheByDeviceSn2(String deviceSn) {
+ Collection<GatewayDevice> list = allCacheDevice();
+ if (null == list || list.isEmpty()) return null;
+
+ List<GatewayDevice> result = new ArrayList<>();
+ for (GatewayDevice device : list) {
+ if (deviceSn.equals(device.getDeviceSn())) result.add(device);
+ }
+ return result;
+ }
+
+
+ public static List<GatewayDevice> getCacheByDeviceType(String deviceType) {
+ List<GatewayDevice> result = new ArrayList<>();
+ for (GatewayDevice device : cacheMapDeviceId.values()) {
+ if (deviceType.equals(device.getType())) result.add(device);
+ }
+ return result;
+ }
+
+ public static GatewayDevice getCacheByDeviceTypeOne(String deviceType) {
+ for (GatewayDevice device : cacheMapDeviceId.values()) {
+ if (deviceType.equals(device.getType())) return device;
+ }
+ return null;
}
public static void removeCache(GatewayDevice data) {
cacheMapDeviceId.remove(data.getDeviceId());
- cacheMapDeviceSn.remove(data.getDeviceSn());
+ //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() {
+ return cacheMapDeviceWeight.values();
+ }
}
--
Gitblit v1.9.3