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/gateway/service/GatewayDeviceService.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
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;
}
// /**
--
Gitblit v1.9.3