From 083eb4417a04201f1eb755faab8ee7121b3c7f16 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 17 十一月 2023 16:19:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/gateway/api/GatewayRemoteManager.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/api/GatewayRemoteManager.java b/src/main/java/com/fzzy/gateway/api/GatewayRemoteManager.java
index b90a996..49357f3 100644
--- a/src/main/java/com/fzzy/gateway/api/GatewayRemoteManager.java
+++ b/src/main/java/com/fzzy/gateway/api/GatewayRemoteManager.java
@@ -17,7 +17,7 @@
public static Map<String, GatewayRemoteService> remoteMap = new HashMap<>();
- public static Map<String, DeviceReportService> reportMap = new HashMap<>();
+ public static Map<String, GatewayDeviceReportService> reportMap = new HashMap<>();
public static Map<String, GatewaySyncGranService> syncGrain = new HashMap<>();
@@ -28,6 +28,8 @@
public static Map<String, GatewaySyncLprService> syncLpr = new HashMap<>();
public static Map<String, GatewaySyncWeightService> syncWeight = new HashMap<>();
+
+ public static Map<String, GatewayDeviceTestService> testMap = new HashMap<>();
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
@@ -62,9 +64,14 @@
syncWeight.put(serviceMap6.get(key).getWeightProtocol(), serviceMap6.get(key));
}
- Map<String, DeviceReportService> serviceMap7 = applicationContext.getBeansOfType(DeviceReportService.class);
+ Map<String, GatewayDeviceReportService> serviceMap7 = applicationContext.getBeansOfType(GatewayDeviceReportService.class);
for (String key : serviceMap7.keySet()) {
- reportMap.put(serviceMap7.get(key).getProvinceProtocol(), serviceMap7.get(key));
+ reportMap.put(serviceMap7.get(key).getProtocol(), serviceMap7.get(key));
+ }
+
+ Map<String, GatewayDeviceTestService> serviceMap8 = applicationContext.getBeansOfType(GatewayDeviceTestService.class);
+ for (String key : serviceMap8.keySet()) {
+ testMap.put(serviceMap8.get(key).getProtocol(), serviceMap8.get(key));
}
}
@@ -136,8 +143,17 @@
* @param protocol
* @return
*/
- public DeviceReportService getDeviceReportService(String protocol) {
+ public GatewayDeviceReportService getDeviceReportService(String protocol) {
return reportMap.get(protocol);
}
+
+ /**
+ * @param protocol
+ * @return
+ */
+ public GatewayDeviceTestService getGatewayTestService(String protocol) {
+ return testMap.get(protocol);
+ }
+
}
--
Gitblit v1.9.3