From b1c572949997a5d82d9b609163ff280a1c49627d Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期五, 26 四月 2024 14:09:45 +0800
Subject: [PATCH] 粮情协议优化

---
 src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisSystem.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisSystem.java b/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisSystem.java
index 83b0fae..744920c 100644
--- a/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisSystem.java
+++ b/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisSystem.java
@@ -36,14 +36,15 @@
     public void analysis1001(ReMessage reMessage) {
 
         //鑾峰彇鍒扮櫥闄嗕俊鎭紝鎵ц璁惧淇℃伅鏁寸悊
-        ApiCommonDevice device = Constant.getCommonDeviceCache(reMessage.getSn());
-        if (null == device) {
-            device = new ApiCommonDevice();
+        GatewayDevice d = GatewayUtils.getCacheByDeviceSn(reMessage.getSn());
+        if (null == d) {
+            d = new GatewayDevice();
         }
+        ApiCommonDevice device = new ApiCommonDevice();
         device.setIp(reMessage.getIp());
         device.setPort(reMessage.getPort());
         device.setSn(reMessage.getSn());
-        device.setId(reMessage.getIedId());
+        device.setId(d.getId());
         device.setOnlineTime(new Date());
         device.setCode("SUCCESS");
         Constant.updateCache(device);

--
Gitblit v1.9.3