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/protocol/fzzy/analysis/AnalysisSystem.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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 91db1bd..83b0fae 100644
--- a/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisSystem.java
+++ b/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisSystem.java
@@ -4,6 +4,7 @@
 import com.fzzy.api.data.ApiCommonDevice;
 import com.fzzy.gateway.GatewayUtils;
 import com.fzzy.gateway.entity.GatewayDevice;
+import com.fzzy.gateway.service.GatewayDeviceService;
 import com.fzzy.protocol.fzzy.builder.ObjectCommandBuilder;
 import com.fzzy.protocol.fzzy.builder.SimpleCommandBuilder;
 import com.fzzy.protocol.fzzy.cmd.BaseRemoteImpl;
@@ -15,6 +16,7 @@
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.Date;
 
 /**
@@ -25,6 +27,10 @@
 public class AnalysisSystem extends BaseRemoteImpl {
 
     public static final String BEAN_ID = "fzzy.analysisSystem";
+
+
+    @Resource
+    private GatewayDeviceService gatewayDeviceService;
 
 
     public void analysis1001(ReMessage reMessage) {
@@ -38,7 +44,12 @@
         device.setPort(reMessage.getPort());
         device.setSn(reMessage.getSn());
         device.setId(reMessage.getIedId());
+        device.setOnlineTime(new Date());
+        device.setCode("SUCCESS");
         Constant.updateCache(device);
+
+        //鏇存柊璁惧鍦ㄧ嚎
+        gatewayDeviceService.onlineByCommonDevice(device);
 
 
         //杩斿洖褰撳墠绯荤粺鏃堕棿
@@ -49,7 +60,7 @@
         SendMessage message = commandBuilder.buildMessage(reMessage, ServerUtils.FUNCTION_1001, response);
         send(message);
 
-        log.info("鎺у埗鏌�----->>>骞冲彴锛氭帶鍒舵煖涓婄嚎鐧婚檰鎴愬姛-IP={},PORT={}", reMessage.getIp(), reMessage.getPort());
+        log.info("鎺у埗鏌�----->>>骞冲彴锛屾帶鍒舵煖鐧婚檰瑙f瀽瀹屾垚-鎶ユ枃-{}", reMessage);
     }
 
     public void analysis1003(ReMessage reMessage, ApiCommonDevice ser) {

--
Gitblit v1.9.3