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 | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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..744920c 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;
/**
@@ -27,18 +29,28 @@
public static final String BEAN_ID = "fzzy.analysisSystem";
+ @Resource
+ private GatewayDeviceService gatewayDeviceService;
+
+
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);
+
+ //鏇存柊璁惧鍦ㄧ嚎
+ gatewayDeviceService.onlineByCommonDevice(device);
//杩斿洖褰撳墠绯荤粺鏃堕棿
@@ -49,7 +61,7 @@
SendMessage message = commandBuilder.buildMessage(reMessage, ServerUtils.FUNCTION_1001, response);
send(message);
- log.info("鎺у埗鏌�----->>>骞冲彴锛氭帶鍒舵煖涓婄嚎鐧婚檰鎴愬姛-IP={},PORT={}", reMessage.getIp(), reMessage.getPort());
+ log.info("鎺у埗鏌�----->>>骞冲彴锛屾帶鍒舵煖鐧婚檰瑙ｆ瀽瀹屾垚-鎶ユ枃-{}", reMessage);
}
public void analysis1003(ReMessage reMessage, ApiCommonDevice ser) {
--
Gitblit v1.9.3