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/api/Constant.java | 45 +++++++++++++++++++--------------------------
1 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/fzzy/api/Constant.java b/src/main/java/com/fzzy/api/Constant.java
index b38f697..6c17aee 100644
--- a/src/main/java/com/fzzy/api/Constant.java
+++ b/src/main/java/com/fzzy/api/Constant.java
@@ -324,38 +324,31 @@
return contextDeviceMap.get(sn);
}
- public static void updateCacheOnline(String sn, String ip, Integer port, boolean isCreate) {
- ApiCommonDevice device = getCommonDeviceCache(sn);
- if (null == device && isCreate) {
- device = new ApiCommonDevice();
+ public static ApiCommonDevice getCommonDeviceCacheByIp(String ip) {
+ if (null == ip) return null;
+
+ if (contextDeviceMap.isEmpty()) return null;
+
+ for (ApiCommonDevice device : contextDeviceMap.values()) {
+ if (ip.equals(device)) return device;
}
- if (null != device) {
- device.setIp(ip);
- device.setPort(port);
- device.setStatus(Constant.YN_Y);
- device.setCode("SUCCESS");
- device.setMsg("璁惧鍦ㄧ嚎");
- device.setSn(ip);
- contextDeviceMap.put(device.getSn(), device);
- }
+ return null;
}
- public static void updateCacheOffline(String sn, String ip, Integer port, boolean isCreate) {
- ApiCommonDevice device = getCommonDeviceCache(sn);
+ public static ApiCommonDevice updateCacheOffline(String ip, Integer port) {
+ ApiCommonDevice device = getCommonDeviceCacheByIp(ip);
- if (null == device && isCreate) {
- device = new ApiCommonDevice();
+ if (null == device) {
+ return null;
}
+ device.setIp(ip);
+ device.setPort(port);
+ device.setStatus(Constant.YN_N);
+ device.setCode("ERROR");
+ device.setMsg("璁惧绂荤嚎");
+ contextDeviceMap.put(device.getSn(), device);
- if (null != device) {
- device.setIp(ip);
- device.setPort(port);
- device.setStatus(Constant.YN_N);
- device.setCode("ERROR");
- device.setMsg("璁惧绂荤嚎");
-
- contextDeviceMap.put(device.getSn(), device);
- }
+ return device;
}
public static void updateCache(ApiCommonDevice device) {
--
Gitblit v1.9.3