From ae084b7ab31c38588928afb770cec1320c8c27f0 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 07 十二月 2023 12:26:24 +0800
Subject: [PATCH] 提交粮情协协议-控制柜-3
---
src/main/java/com/fzzy/protocol/fzzy/server/FzzyServerEngine.java | 2 +-
src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java | 25 ++++++++++++++++++++++++-
src/main/java/com/fzzy/api/data/ApiCommonDevice.java | 4 ++++
src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml | 18 +++++++++++++++---
src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisSystem.java | 1 +
5 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/fzzy/api/data/ApiCommonDevice.java b/src/main/java/com/fzzy/api/data/ApiCommonDevice.java
index 4f0906b..52240c4 100644
--- a/src/main/java/com/fzzy/api/data/ApiCommonDevice.java
+++ b/src/main/java/com/fzzy/api/data/ApiCommonDevice.java
@@ -3,6 +3,8 @@
import com.fzzy.api.Constant;
import lombok.Data;
+import java.util.Date;
+
/**
* 铏氭嫙閫氱敤璁惧锛屼富瑕佺敤浜庨�氳杩囩▼涓殑璁惧淇℃伅锛屼笉鎸佷箙鍖栧埌鏁版嵁搴擄紝鍦ㄥ唴瀛樹腑淇濆瓨鍜屾洿鏂扮姸鎬�
*/
@@ -27,4 +29,6 @@
private String result;//缁撴灉淇℃伅锛屼互瀛楃涓蹭唬鏇�
+ private Date onlineTime = new Date();
+
}
diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
index 2210aed..bda41b6 100644
--- a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
+++ b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
@@ -3,6 +3,8 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.ApiCommonDevice;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.async.fzzy40.Fzzy40CommonService;
import com.fzzy.gateway.GatewayUtils;
@@ -17,6 +19,7 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
@Slf4j
@@ -34,7 +37,27 @@
@DataProvider
public List<GatewayDevice> listAll() {
Sort sort = new Sort(Sort.Direction.ASC, "deviceId");
- return gatewayDeviceRep.findAll(sort);
+
+
+ List<GatewayDevice> list = gatewayDeviceRep.findAll(sort);
+
+ if (null == list || list.isEmpty()) return list;
+
+ List<GatewayDevice> result = new ArrayList<>();
+
+ ApiCommonDevice apiCommonDevice;
+ for (GatewayDevice device : list) {
+
+ apiCommonDevice = Constant.getCommonDeviceCache(device.getDeviceSn());
+ if (null != apiCommonDevice) {
+ device.setIp(apiCommonDevice.getIp());
+ device.setPort(apiCommonDevice.getPort());
+ device.setStatus(apiCommonDevice.getStatus());
+ device.setOnlineTime(apiCommonDevice.getOnlineTime());
+ }
+ result.add(device);
+ }
+ return result;
}
// /**
diff --git a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
index 3e7e883..6d1e9a8 100644
--- a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
+++ b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
@@ -113,8 +113,16 @@
<Property name="label">绛掍粨灞傝鍒�</Property>
</PropertyDef>
<PropertyDef name="position">
- <Property/>
+ <Property></Property>
<Property name="label">浣嶇疆</Property>
+ </PropertyDef>
+ <PropertyDef name="status">
+ <Property/>
+ <Property name="label">鍦ㄧ嚎鐘舵��</Property>
+ </PropertyDef>
+ <PropertyDef name="onlineTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鏈�鍚庝笂绾挎椂闂�</Property>
</PropertyDef>
</DataType>
<DataType name="dtParam" parent="Map">
@@ -275,8 +283,12 @@
<Property name="property">syncProtocol</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="pushProtocol">
- <Property name="property">pushProtocol</Property>
+ <DataColumn name="status">
+ <Property name="property">status</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="onlineTime">
+ <Property name="property">onlineTime</Property>
<Property name="align">center</Property>
</DataColumn>
</DataGrid>
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 3a5a27f..f0f6e00 100644
--- a/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisSystem.java
+++ b/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisSystem.java
@@ -38,6 +38,7 @@
device.setPort(reMessage.getPort());
device.setSn(reMessage.getSn());
device.setId(reMessage.getIedId());
+ device.setOnlineTime(new Date());
Constant.updateCache(device);
diff --git a/src/main/java/com/fzzy/protocol/fzzy/server/FzzyServerEngine.java b/src/main/java/com/fzzy/protocol/fzzy/server/FzzyServerEngine.java
index a51ac92..c4088fd 100644
--- a/src/main/java/com/fzzy/protocol/fzzy/server/FzzyServerEngine.java
+++ b/src/main/java/com/fzzy/protocol/fzzy/server/FzzyServerEngine.java
@@ -12,7 +12,7 @@
@Slf4j
public class FzzyServerEngine {
- public static final int default_port = 9300;
+ public static final int default_port = 19300;
public static NettyServer ioServer = null;
--
Gitblit v1.9.3