From 03e26beab1d9c382b685c26059e6dec274a0d7d4 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 25 十月 2023 16:44:29 +0800
Subject: [PATCH] 四川省网关接口相关5
---
src/main/java/com/fzzy/gateway/hx2023/service/ApiInitService.java | 2
src/main/java/com/fzzy/gateway/api/GatewaySyncLedService.java | 34 ++
src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketDevice.java | 20 +
src/main/java/com/fzzy/gateway/hx2023/ScConstant.java | 35 ++
src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml | 46 ++-
src/main/java/com/fzzy/gateway/api/GatewaySyncIdCardService.java | 28 ++
src/main/java/com/fzzy/gateway/api/GatewaySyncWeightService.java | 26 ++
src/main/java/com/fzzy/gateway/api/GatewayRemoteManager.java | 83 +++++
src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketMqtt.java | 2
src/main/java/com/fzzy/api/data/GatewayProtocol.java | 39 +++
src/main/java/com/fzzy/gateway/hx2023/data/WeightInfo.java | 4
src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncLedImpl1.java | 27 ++
src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncIdCardImpl1.java | 31 ++
src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketDeviceLed.java | 17 +
src/main/java/com/fzzy/gateway/hx2023/package-info.java | 5
src/main/java/com/fzzy/gateway/hx2023/data/LprData.java | 2
src/main/java/com/fzzy/api/service/ApiTriggerService.java | 41 +++
src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncGrainImpl.java | 28 ++
src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java | 2
src/main/java/com/fzzy/gateway/hx2023/data/SyncReqData.java | 5
src/main/java/com/fzzy/gateway/hx2023/service/HxGatewayRemoteServiceImpl.java | 9
src/main/java/com/fzzy/gateway/api/GatewaySyncGranService.java | 28 ++
src/main/java/com/fzzy/gateway/hx2023/data/WebSocketPacketHeader.java | 2
/dev/null | 5
src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncLprImpl1.java | 29 ++
src/main/java/com/fzzy/gateway/data/GatewayResult.java | 7
src/main/java/com/fzzy/gateway/hx2023/data/WebSocketPacket.java | 2
src/main/java/com/fzzy/gateway/api/GatewaySyncLprService.java | 26 ++
src/main/java/com/fzzy/gateway/hx2023/data/IdCardData.java | 2
src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncWeightImpl1.java | 34 ++
src/main/java/com/fzzy/gateway/view/GatewayConf.view.xml | 81 +++++
src/main/java/com/fzzy/gateway/entity/GatewayConf.java | 30 ++
src/main/java/com/fzzy/api/data/GatewayDeviceProtocol.java | 41 +++
src/main/java/com/fzzy/gateway/GatewayRunner.java | 3
34 files changed, 712 insertions(+), 64 deletions(-)
diff --git a/src/main/java/com/fzzy/api/data/GatewayDeviceProtocol.java b/src/main/java/com/fzzy/api/data/GatewayDeviceProtocol.java
new file mode 100644
index 0000000..a5f26f3
--- /dev/null
+++ b/src/main/java/com/fzzy/api/data/GatewayDeviceProtocol.java
@@ -0,0 +1,41 @@
+package com.fzzy.api.data;
+
+
+/**
+ * 缃戝叧涓庤澶囩洿鎺ョ殑閫氳鍗忚
+ */
+public enum GatewayDeviceProtocol {
+
+ GRAIN_FZZY_ZH_2023("GRAIN_FZZY_ZH_2023", "绮儏-椋庢鑷磋繙鎺у埗鏌滃崗璁�2023"),
+ DEVICE_WEIGHT_HTTP("DEVICE_WEIGHT_HTTP", "鍦扮-HTTP鍗忚"),
+ DEVICE_IDCARD_HTTP("DEVICE_IDCARD_HTTP", "韬唤璇�-HTTP鍗忚"),
+ DEVICE_LED_HTTP("DEVICE_LED_HTTP", "LED-HTTP鍗忚"),
+ DEVICE_LPR_HTTP("DEVICE_LPR_HTTP", "杞︾墝璇嗗埆-HTTP鍗忚"),
+ DEVICE_TEST("DEVICE_TEST", "娴嬭瘯鍗忚");
+
+
+ private String code;
+ private String name;
+
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ GatewayDeviceProtocol(String code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+}
diff --git a/src/main/java/com/fzzy/api/data/GatewayProtocol.java b/src/main/java/com/fzzy/api/data/GatewayProtocol.java
new file mode 100644
index 0000000..4948379
--- /dev/null
+++ b/src/main/java/com/fzzy/api/data/GatewayProtocol.java
@@ -0,0 +1,39 @@
+package com.fzzy.api.data;
+
+
+/**
+ * 绯荤粺涓庣綉鍏充箣闂寸殑閫氳鍗忚
+ */
+public enum GatewayProtocol {
+
+ GATE_WEBSOCKET("GATE_WEBSOCKET", "webSocket"),
+ GATE_MQTT("GATE_MQTT", "MQTT"),
+ GATE_HTTP("GATE_HTTP", "HTTP"),
+ GATE_TEST("GATE_TEST", "娴嬭瘯");
+
+
+ private String code;
+ private String name;
+
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ GatewayProtocol(String code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+}
diff --git a/src/main/java/com/fzzy/api/service/ApiTriggerService.java b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
index 5e0b5c3..819b278 100644
--- a/src/main/java/com/fzzy/api/service/ApiTriggerService.java
+++ b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
@@ -4,6 +4,8 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
+import com.fzzy.api.data.GatewayDeviceProtocol;
+import com.fzzy.api.data.GatewayProtocol;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.entity.ApiTrigger;
@@ -190,6 +192,8 @@
list.add(new ApiTrigger(PushProtocol.HB_FZZY_JG_2022.getCode(), PushProtocol.HB_FZZY_JG_2022.getName()));
list.add(new ApiTrigger(PushProtocol.SB_SHJdJW_2023.getCode(), PushProtocol.SB_SHJdJW_2023.getName()));
list.add(new ApiTrigger(PushProtocol.SB_SH_2023.getCode(), PushProtocol.SB_SH_2023.getName()));
+
+ list.add(new ApiTrigger(PushProtocol.GATEWAY_SC_2023.getCode(), PushProtocol.GATEWAY_SC_2023.getName()));
return list;
}
@@ -211,4 +215,41 @@
return list;
}
+ /**
+ * ${dorado.getDataProvider("apiTriggerService#triggerGatewayProtocol").getResult()}
+ * 绯荤粺涓庣綉鍏崇洿鎺ョ殑閫氳鍗忚
+ *
+ * @return
+ */
+ @DataProvider
+ public List<ApiTrigger> triggerGatewayProtocol() {
+ List<ApiTrigger> list = new ArrayList<>();
+ list.add(new ApiTrigger(GatewayProtocol.GATE_HTTP.getCode(), GatewayProtocol.GATE_HTTP.getName()));
+ list.add(new ApiTrigger(GatewayProtocol.GATE_MQTT.getCode(), GatewayProtocol.GATE_MQTT.getName()));
+ list.add(new ApiTrigger(GatewayProtocol.GATE_WEBSOCKET.getCode(), GatewayProtocol.GATE_WEBSOCKET.getName()));
+ list.add(new ApiTrigger(GatewayProtocol.GATE_TEST.getName(), GatewayProtocol.GATE_TEST.getName()));
+ return list;
+ }
+
+ /**
+ * ${dorado.getDataProvider("apiTriggerService#triggerGatewayDeviceProtocol").getResult()}
+ * 绯荤粺涓庣綉鍏崇洿鎺ョ殑閫氳鍗忚
+ *
+ * @return
+ */
+ @DataProvider
+ public List<ApiTrigger> triggerGatewayDeviceProtocol() {
+ List<ApiTrigger> list = new ArrayList<>();
+ list.add(new ApiTrigger(GatewayDeviceProtocol.GRAIN_FZZY_ZH_2023.getCode(), GatewayDeviceProtocol.GRAIN_FZZY_ZH_2023.getName()));
+
+ list.add(new ApiTrigger(GatewayDeviceProtocol.DEVICE_WEIGHT_HTTP.getCode(), GatewayDeviceProtocol.DEVICE_WEIGHT_HTTP.getName()));
+ list.add(new ApiTrigger(GatewayDeviceProtocol.DEVICE_IDCARD_HTTP.getCode(), GatewayDeviceProtocol.DEVICE_IDCARD_HTTP.getName()));
+ list.add(new ApiTrigger(GatewayDeviceProtocol.DEVICE_LED_HTTP.getCode(), GatewayDeviceProtocol.DEVICE_LED_HTTP.getName()));
+ list.add(new ApiTrigger(GatewayDeviceProtocol.DEVICE_LPR_HTTP.getCode(), GatewayDeviceProtocol.DEVICE_LPR_HTTP.getName()));
+ list.add(new ApiTrigger(GatewayDeviceProtocol.DEVICE_TEST.getCode(), GatewayDeviceProtocol.DEVICE_TEST.getName()));
+
+ return list;
+ }
+
+
}
diff --git a/src/main/java/com/fzzy/gateway/GatewayRunner.java b/src/main/java/com/fzzy/gateway/GatewayRunner.java
index 738714d..9dfc519 100644
--- a/src/main/java/com/fzzy/gateway/GatewayRunner.java
+++ b/src/main/java/com/fzzy/gateway/GatewayRunner.java
@@ -1,6 +1,6 @@
package com.fzzy.gateway;
-import com.fzzy.gateway.sc2023.service.ApiInitService;
+import com.fzzy.gateway.hx2023.service.ApiInitService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
@@ -27,7 +27,6 @@
//鍥涘窛缃戝叧鎺ュ彛锛屽惎鍔ㄩ粯璁よ幏鍙栭壌鏉冧俊鎭紝闀挎湡鏈夋晥
apiInitService.init();
-
}
diff --git a/src/main/java/com/fzzy/gateway/api/GatewayRemoteManager.java b/src/main/java/com/fzzy/gateway/api/GatewayRemoteManager.java
index 9e475a6..6df640e 100644
--- a/src/main/java/com/fzzy/gateway/api/GatewayRemoteManager.java
+++ b/src/main/java/com/fzzy/gateway/api/GatewayRemoteManager.java
@@ -9,29 +9,56 @@
import java.util.Map;
+/**
+ * 鎺ュ彛灏佽
+ */
@Component
public class GatewayRemoteManager implements ApplicationContextAware {
public static Map<String, GatewayRemoteService> remoteMap = new HashMap<>();
- public static Map<String, GatewaySyncService> syncMap = new HashMap<>();
+ public static Map<String, GatewaySyncGranService> syncGrain = new HashMap<>();
+
+ public static Map<String, GatewaySyncIdCardService> syncIdCard = new HashMap<>();
+
+ public static Map<String, GatewaySyncLedService> syncLed = new HashMap<>();
+
+ public static Map<String, GatewaySyncLprService> syncLpr = new HashMap<>();
+
+ public static Map<String, GatewaySyncWeightService> syncWeight = new HashMap<>();
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
Map<String, GatewayRemoteService> serviceMap1 = applicationContext.getBeansOfType(GatewayRemoteService.class);
-
for (String key : serviceMap1.keySet()) {
remoteMap.put(serviceMap1.get(key).getProtocol(), serviceMap1.get(key));
}
-
- Map<String, GatewaySyncService> serviceMap2 = applicationContext.getBeansOfType(GatewaySyncService.class);
-
+ Map<String, GatewaySyncGranService> serviceMap2 = applicationContext.getBeansOfType(GatewaySyncGranService.class);
for (String key : serviceMap2.keySet()) {
- syncMap.put(serviceMap2.get(key).getProtocol(), serviceMap2.get(key));
+ syncGrain.put(serviceMap2.get(key).getGrainProtocol(), serviceMap2.get(key));
+ }
+
+ Map<String, GatewaySyncIdCardService> serviceMap3 = applicationContext.getBeansOfType(GatewaySyncIdCardService.class);
+ for (String key : serviceMap3.keySet()) {
+ syncIdCard.put(serviceMap3.get(key).getIdCardProtocol(), serviceMap3.get(key));
}
+ Map<String, GatewaySyncLedService> serviceMap4 = applicationContext.getBeansOfType(GatewaySyncLedService.class);
+ for (String key : serviceMap4.keySet()) {
+ syncLed.put(serviceMap4.get(key).getLedProtocol(), serviceMap4.get(key));
+ }
+
+ Map<String, GatewaySyncLprService> serviceMap5 = applicationContext.getBeansOfType(GatewaySyncLprService.class);
+ for (String key : serviceMap5.keySet()) {
+ syncLpr.put(serviceMap5.get(key).getLprProtocol(), serviceMap5.get(key));
+ }
+
+ Map<String, GatewaySyncWeightService> serviceMap6 = applicationContext.getBeansOfType(GatewaySyncWeightService.class);
+ for (String key : serviceMap6.keySet()) {
+ syncWeight.put(serviceMap6.get(key).getWeightProtocol(), serviceMap6.get(key));
+ }
}
@@ -52,8 +79,48 @@
* @param protocol
* @return
*/
- public GatewaySyncService getSyncService(String protocol) {
- return syncMap.get(protocol);
+ public GatewaySyncGranService getSyncGrainService(String protocol) {
+ return syncGrain.get(protocol);
+ }
+
+ /**
+ * 鏍规嵁瀹炵幇鍗忚鑾峰彇褰撳墠瀹炵幇鏂规硶
+ *
+ * @param protocol
+ * @return
+ */
+ public GatewaySyncIdCardService getSyncIdCardService(String protocol) {
+ return syncIdCard.get(protocol);
+ }
+
+ /**
+ * 鏍规嵁瀹炵幇鍗忚鑾峰彇褰撳墠瀹炵幇鏂规硶
+ *
+ * @param protocol
+ * @return
+ */
+ public GatewaySyncLedService getSyncLedService(String protocol) {
+ return syncLed.get(protocol);
+ }
+
+ /**
+ * 鏍规嵁瀹炵幇鍗忚鑾峰彇褰撳墠瀹炵幇鏂规硶
+ *
+ * @param protocol
+ * @return
+ */
+ public GatewaySyncLprService getSyncLprService(String protocol) {
+ return syncLpr.get(protocol);
+ }
+
+ /**
+ * 鏍规嵁瀹炵幇鍗忚鑾峰彇褰撳墠瀹炵幇鏂规硶
+ *
+ * @param protocol
+ * @return
+ */
+ public GatewaySyncWeightService getSyncWeightService(String protocol) {
+ return syncWeight.get(protocol);
}
}
diff --git a/src/main/java/com/fzzy/gateway/api/GatewaySyncGranService.java b/src/main/java/com/fzzy/gateway/api/GatewaySyncGranService.java
new file mode 100644
index 0000000..cb8846c
--- /dev/null
+++ b/src/main/java/com/fzzy/gateway/api/GatewaySyncGranService.java
@@ -0,0 +1,28 @@
+package com.fzzy.gateway.api;
+
+
+import com.fzzy.gateway.hx2023.data.GrainData;
+import com.fzzy.gateway.hx2023.data.*;
+
+/**
+ * 缃戝叧璁惧鍚屾鎺ュ彛锛屾牴鎹笟鍔￠渶姹傚畾涔夋帴鍙�
+ */
+public interface GatewaySyncGranService {
+
+ /**
+ * 鍗忚瀹氫箟
+ *
+ * @return
+ */
+ String getGrainProtocol();
+
+ /**
+ * 鍚屾绮儏淇℃伅
+ *
+ * @param reqData
+ * @return
+ */
+ public GrainData syncGrain(SyncReqData reqData);
+
+
+}
diff --git a/src/main/java/com/fzzy/gateway/api/GatewaySyncIdCardService.java b/src/main/java/com/fzzy/gateway/api/GatewaySyncIdCardService.java
new file mode 100644
index 0000000..32014b7
--- /dev/null
+++ b/src/main/java/com/fzzy/gateway/api/GatewaySyncIdCardService.java
@@ -0,0 +1,28 @@
+package com.fzzy.gateway.api;
+
+
+import com.fzzy.gateway.hx2023.data.IdCardData;
+import com.fzzy.gateway.hx2023.data.*;
+
+/**
+ * 缃戝叧璁惧鍚屾鎺ュ彛锛屾牴鎹笟鍔￠渶姹傚畾涔夋帴鍙�
+ */
+public interface GatewaySyncIdCardService {
+
+ /**
+ * 鍗忚瀹氫箟
+ *
+ * @return
+ */
+ String getIdCardProtocol();
+
+ /**
+ * 韬唤璇佽鍗″櫒
+ *
+ * @return
+ */
+ public IdCardData syncIdCard(SyncReqData reqData);
+
+
+
+}
diff --git a/src/main/java/com/fzzy/gateway/api/GatewaySyncLedService.java b/src/main/java/com/fzzy/gateway/api/GatewaySyncLedService.java
new file mode 100644
index 0000000..633e4dd
--- /dev/null
+++ b/src/main/java/com/fzzy/gateway/api/GatewaySyncLedService.java
@@ -0,0 +1,34 @@
+package com.fzzy.gateway.api;
+
+
+import com.fzzy.gateway.hx2023.data.*;
+
+/**
+ * 缃戝叧璁惧鍚屾鎺ュ彛锛屾牴鎹笟鍔￠渶姹傚畾涔夋帴鍙�
+ */
+public interface GatewaySyncLedService {
+
+ /**
+ * 鍗忚瀹氫箟
+ *
+ * @return
+ */
+ String getLedProtocol();
+
+
+
+
+
+ /**
+ * 鎺ㄩ�佹姤鏂囩粰LED
+ * <p>
+ * TODO>>>>>褰撳墠鎺ュ彛鏂囨。鐪嬩笉鎳�
+ *
+ * @return
+ */
+ public String push2Led(SyncReqData reqData);
+
+
+
+
+}
diff --git a/src/main/java/com/fzzy/gateway/api/GatewaySyncLprService.java b/src/main/java/com/fzzy/gateway/api/GatewaySyncLprService.java
new file mode 100644
index 0000000..3d1f47a
--- /dev/null
+++ b/src/main/java/com/fzzy/gateway/api/GatewaySyncLprService.java
@@ -0,0 +1,26 @@
+package com.fzzy.gateway.api;
+
+
+import com.fzzy.gateway.hx2023.data.*;
+
+/**
+ * 缃戝叧璁惧鍚屾鎺ュ彛锛屾牴鎹笟鍔￠渶姹傚畾涔夋帴鍙�
+ */
+public interface GatewaySyncLprService {
+
+ /**
+ * 鍗忚瀹氫箟
+ *
+ * @return
+ */
+ String getLprProtocol();
+
+
+ /**
+ * 杞︾墝璇嗗埆鑾峰彇
+ *
+ * @return
+ */
+ public LprData syncLpr(SyncReqData reqData);
+
+}
diff --git a/src/main/java/com/fzzy/gateway/api/GatewaySyncService.java b/src/main/java/com/fzzy/gateway/api/GatewaySyncService.java
deleted file mode 100644
index 9ed3646..0000000
--- a/src/main/java/com/fzzy/gateway/api/GatewaySyncService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.fzzy.gateway.api;
-
-
-import com.fzzy.gateway.sc2023.data.*;
-
-/**
- * 缃戝叧璁惧鍚屾鎺ュ彛锛屾牴鎹笟鍔￠渶姹傚畾涔夋帴鍙�
- */
-public interface GatewaySyncService {
-
- /**
- * 鍗忚瀹氫箟
- *
- * @return
- */
- String getProtocol();
-
-
- /**
- * 鍚屾鍦扮淇℃伅
- *
- * @return
- */
- public WeightInfo syncWeightInfo(SyncReqData reqData);
-
-
- /**
- * 杞︾墝璇嗗埆鑾峰彇
- *
- * @return
- */
- public LprData syncLpr(SyncReqData reqData);
-
-
- /**
- * 韬唤璇佽鍗″櫒
- *
- * @return
- */
- public IdCardData syncIdCard(SyncReqData reqData);
-
-
- /**
- * 鎺ㄩ�佹姤鏂囩粰LED
- * <p>
- * TODO>>>>>褰撳墠鎺ュ彛鏂囨。鐪嬩笉鎳�
- *
- * @return
- */
- public String push2Led(SyncReqData reqData);
-
-
- /**
- * 鍚屾绮儏淇℃伅
- *
- * @param reqData
- * @return
- */
- public GrainData syncGrain(SyncReqData reqData);
-
-
-}
diff --git a/src/main/java/com/fzzy/gateway/api/GatewaySyncWeightService.java b/src/main/java/com/fzzy/gateway/api/GatewaySyncWeightService.java
new file mode 100644
index 0000000..2a59985
--- /dev/null
+++ b/src/main/java/com/fzzy/gateway/api/GatewaySyncWeightService.java
@@ -0,0 +1,26 @@
+package com.fzzy.gateway.api;
+
+
+import com.fzzy.gateway.hx2023.data.*;
+
+/**
+ * 缃戝叧璁惧鍚屾鎺ュ彛锛屾牴鎹笟鍔￠渶姹傚畾涔夋帴鍙�
+ */
+public interface GatewaySyncWeightService {
+
+ /**
+ * 鍗忚瀹氫箟
+ *
+ * @return
+ */
+ String getWeightProtocol();
+
+
+ /**
+ * 鍚屾鍦扮淇℃伅
+ *
+ * @return
+ */
+ public WeightInfo syncWeightInfo(SyncReqData reqData);
+
+}
diff --git a/src/main/java/com/fzzy/gateway/data/GatewayResult.java b/src/main/java/com/fzzy/gateway/data/GatewayResult.java
index 2e56d29..9d0e164 100644
--- a/src/main/java/com/fzzy/gateway/data/GatewayResult.java
+++ b/src/main/java/com/fzzy/gateway/data/GatewayResult.java
@@ -8,5 +8,10 @@
@Data
public class GatewayResult implements Serializable {
- public String token;
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ public String token;
}
diff --git a/src/main/java/com/fzzy/gateway/entity/GatewayConf.java b/src/main/java/com/fzzy/gateway/entity/GatewayConf.java
index cec0d22..71cae3c 100644
--- a/src/main/java/com/fzzy/gateway/entity/GatewayConf.java
+++ b/src/main/java/com/fzzy/gateway/entity/GatewayConf.java
@@ -28,6 +28,30 @@
@Column(name = "kqmc", length = 100)
private String kqmc;
+ @PropertyDef(label = "缃戝叧ID")
+ @Column(name = "gatewayId", length = 50)
+ private String gatewayId;
+
+ @PropertyDef(label = "缃戝叧IP")
+ @Column(name = "gatewayIp", length = 20)
+ private String gatewayIp;
+
+ @PropertyDef(label = "缃戝叧Mac")
+ @Column(name = "gatewayMac", length = 20)
+ private String gatewayMac;
+
+ @PropertyDef(label = "缃戝叧CPU")
+ @Column(name = "gatewayCPU", length = 50)
+ private String gatewayCPU;
+
+ @PropertyDef(label = "缃戝叧鍐呭瓨")
+ @Column(name = "gatewayMem", length = 50)
+ private String gatewayMem;
+
+ @PropertyDef(label = "缃戝叧纭洏")
+ @Column(name = "gatewayHardDisk", length = 50)
+ private String gatewayHardDisk;
+
@PropertyDef(label = "鐢ㄦ埛鍚�")
@Column(name = "username", length = 50)
private String userName;
@@ -44,6 +68,10 @@
@Column(name = "apiUrl", length = 200)
private String apiUrl;
+ @PropertyDef(label = "appId")
+ @Column(name = "appId", length = 50)
+ private String appId;
+
@PropertyDef(label = "鎺ㄩ�佸崗璁�")
@Column(name = "pushProtocol", length = 20)
private String pushProtocol;
@@ -54,6 +82,6 @@
@PropertyDef(label = "鏄惁涓婄嚎")
@Column(name = "exe_tag", length = 2)
- private String exeTag ="Y";
+ private String exeTag = "Y";
}
diff --git a/src/main/java/com/fzzy/gateway/hx2023/ScConstant.java b/src/main/java/com/fzzy/gateway/hx2023/ScConstant.java
new file mode 100644
index 0000000..1623d17
--- /dev/null
+++ b/src/main/java/com/fzzy/gateway/hx2023/ScConstant.java
@@ -0,0 +1,35 @@
+package com.fzzy.gateway.hx2023;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 甯搁噺
+ */
+public class ScConstant {
+
+ public static String API_URL_AUTH = "${auth}/authorize/login";
+
+
+ /**
+ * 璁惧鍦ㄧ嚎鏍囪锛岄拡瀵筗EBSocket璇锋眰锛屾帶鍒惰澶囨槸鍚﹀湪绾匡紝key = deviceId锛孷alue=Y/N
+ */
+ public static Map<String, String> contextOnlineMap = new HashMap<>();
+
+
+ public static void updateOnline(String deviceId) {
+ contextOnlineMap.put(deviceId, "Y");
+ }
+
+ public static void updateOffOnline(String deviceId) {
+ contextOnlineMap.put(deviceId, "N");
+ }
+
+ public static boolean isOnline(String deviceId) {
+ String value = contextOnlineMap.get(deviceId);
+ if (null == value || "N".equals(value)) return false;
+ return true;
+ }
+
+
+}
diff --git a/src/main/java/com/fzzy/gateway/sc2023/data/GrainData.java b/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java
similarity index 92%
rename from src/main/java/com/fzzy/gateway/sc2023/data/GrainData.java
rename to src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java
index 7c76db4..3593f17 100644
--- a/src/main/java/com/fzzy/gateway/sc2023/data/GrainData.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java
@@ -1,4 +1,4 @@
-package com.fzzy.gateway.sc2023.data;
+package com.fzzy.gateway.hx2023.data;
import lombok.Data;
diff --git a/src/main/java/com/fzzy/gateway/sc2023/data/IdCardData.java b/src/main/java/com/fzzy/gateway/hx2023/data/IdCardData.java
similarity index 86%
rename from src/main/java/com/fzzy/gateway/sc2023/data/IdCardData.java
rename to src/main/java/com/fzzy/gateway/hx2023/data/IdCardData.java
index 0b91c22..f0049ff 100644
--- a/src/main/java/com/fzzy/gateway/sc2023/data/IdCardData.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/IdCardData.java
@@ -1,4 +1,4 @@
-package com.fzzy.gateway.sc2023.data;
+package com.fzzy.gateway.hx2023.data;
import lombok.Data;
diff --git a/src/main/java/com/fzzy/gateway/sc2023/data/LprData.java b/src/main/java/com/fzzy/gateway/hx2023/data/LprData.java
similarity index 82%
rename from src/main/java/com/fzzy/gateway/sc2023/data/LprData.java
rename to src/main/java/com/fzzy/gateway/hx2023/data/LprData.java
index 2ac12ef..9e8b654 100644
--- a/src/main/java/com/fzzy/gateway/sc2023/data/LprData.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/LprData.java
@@ -1,4 +1,4 @@
-package com.fzzy.gateway.sc2023.data;
+package com.fzzy.gateway.hx2023.data;
import lombok.Data;
diff --git a/src/main/java/com/fzzy/gateway/sc2023/data/SyncReqData.java b/src/main/java/com/fzzy/gateway/hx2023/data/SyncReqData.java
similarity index 76%
rename from src/main/java/com/fzzy/gateway/sc2023/data/SyncReqData.java
rename to src/main/java/com/fzzy/gateway/hx2023/data/SyncReqData.java
index b1cc1e1..31a2512 100644
--- a/src/main/java/com/fzzy/gateway/sc2023/data/SyncReqData.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/SyncReqData.java
@@ -1,5 +1,8 @@
-package com.fzzy.gateway.sc2023.data;
+package com.fzzy.gateway.hx2023.data;
+import lombok.Data;
+
+@Data
public class SyncReqData {
private String productId;
diff --git a/src/main/java/com/fzzy/gateway/sc2023/data/WebSocketPacket.java b/src/main/java/com/fzzy/gateway/hx2023/data/WebSocketPacket.java
similarity index 89%
rename from src/main/java/com/fzzy/gateway/sc2023/data/WebSocketPacket.java
rename to src/main/java/com/fzzy/gateway/hx2023/data/WebSocketPacket.java
index 1b0d7c0..2a04034 100644
--- a/src/main/java/com/fzzy/gateway/sc2023/data/WebSocketPacket.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/WebSocketPacket.java
@@ -1,4 +1,4 @@
-package com.fzzy.gateway.sc2023.data;
+package com.fzzy.gateway.hx2023.data;
import com.alibaba.fastjson2.JSONObject;
import lombok.Data;
diff --git a/src/main/java/com/fzzy/gateway/sc2023/data/WebSocketPacketHeader.java b/src/main/java/com/fzzy/gateway/hx2023/data/WebSocketPacketHeader.java
similarity index 86%
rename from src/main/java/com/fzzy/gateway/sc2023/data/WebSocketPacketHeader.java
rename to src/main/java/com/fzzy/gateway/hx2023/data/WebSocketPacketHeader.java
index 57ee7d4..58eddd0 100644
--- a/src/main/java/com/fzzy/gateway/sc2023/data/WebSocketPacketHeader.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/WebSocketPacketHeader.java
@@ -1,4 +1,4 @@
-package com.fzzy.gateway.sc2023.data;
+package com.fzzy.gateway.hx2023.data;
import lombok.Data;
diff --git a/src/main/java/com/fzzy/gateway/sc2023/data/WeightInfo.java b/src/main/java/com/fzzy/gateway/hx2023/data/WeightInfo.java
similarity index 86%
rename from src/main/java/com/fzzy/gateway/sc2023/data/WeightInfo.java
rename to src/main/java/com/fzzy/gateway/hx2023/data/WeightInfo.java
index 5544c23..331fd2e 100644
--- a/src/main/java/com/fzzy/gateway/sc2023/data/WeightInfo.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/WeightInfo.java
@@ -1,4 +1,4 @@
-package com.fzzy.gateway.sc2023.data;
+package com.fzzy.gateway.hx2023.data;
import lombok.Data;
@@ -10,7 +10,7 @@
private String deviceId;
-
+
private boolean exceed;
private Double grossWeight;
diff --git a/src/main/java/com/fzzy/gateway/hx2023/package-info.java b/src/main/java/com/fzzy/gateway/hx2023/package-info.java
new file mode 100644
index 0000000..d488eaa
--- /dev/null
+++ b/src/main/java/com/fzzy/gateway/hx2023/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * 鍗庝俊-2023骞存帴鍙�
+ */
+package com.fzzy.gateway.hx2023;
+
diff --git a/src/main/java/com/fzzy/gateway/sc2023/service/ApiInitService.java b/src/main/java/com/fzzy/gateway/hx2023/service/ApiInitService.java
similarity index 95%
rename from src/main/java/com/fzzy/gateway/sc2023/service/ApiInitService.java
rename to src/main/java/com/fzzy/gateway/hx2023/service/ApiInitService.java
index 02d8aed..05ebc0e 100644
--- a/src/main/java/com/fzzy/gateway/sc2023/service/ApiInitService.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/ApiInitService.java
@@ -1,4 +1,4 @@
-package com.fzzy.gateway.sc2023.service;
+package com.fzzy.gateway.hx2023.service;
import com.fzzy.gateway.api.GatewayRemoteManager;
import com.fzzy.gateway.api.GatewayRemoteService;
diff --git a/src/main/java/com/fzzy/gateway/sc2023/service/ScGatewayRemoteServiceImpl.java b/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewayRemoteServiceImpl.java
similarity index 93%
rename from src/main/java/com/fzzy/gateway/sc2023/service/ScGatewayRemoteServiceImpl.java
rename to src/main/java/com/fzzy/gateway/hx2023/service/HxGatewayRemoteServiceImpl.java
index 5b8f8f5..d95db6b 100644
--- a/src/main/java/com/fzzy/gateway/sc2023/service/ScGatewayRemoteServiceImpl.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewayRemoteServiceImpl.java
@@ -1,4 +1,4 @@
-package com.fzzy.gateway.sc2023.service;
+package com.fzzy.gateway.hx2023.service;
import com.fzzy.api.data.AuthToken;
import com.fzzy.api.data.PushProtocol;
@@ -10,10 +10,11 @@
import com.fzzy.gateway.api.GatewayRemoteService;
import com.fzzy.gateway.data.GatewayResponse;
import com.fzzy.gateway.entity.GatewayConf;
-import com.fzzy.gateway.sc2023.ScConstant;
+import com.fzzy.gateway.hx2023.ScConstant;
import com.fzzy.push.gb2022.HttpClientUtil;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -23,8 +24,8 @@
@Slf4j
@Data
-@Service
-public class ScGatewayRemoteServiceImpl implements GatewayRemoteService {
+@Component
+public class HxGatewayRemoteServiceImpl implements GatewayRemoteService {
@Resource
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncGrainImpl.java b/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncGrainImpl.java
new file mode 100644
index 0000000..2e0b694
--- /dev/null
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncGrainImpl.java
@@ -0,0 +1,28 @@
+package com.fzzy.gateway.hx2023.service;
+
+import com.fzzy.gateway.api.GatewaySyncGranService;
+import com.fzzy.gateway.hx2023.data.GrainData;
+import com.fzzy.gateway.hx2023.data.SyncReqData;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 缃戝叧涓庣伯鎯呭垎鏈洪�氳鍜岃В鏋�
+ */
+@Slf4j
+@Data
+@Component
+public class HxGatewaySyncGrainImpl implements GatewaySyncGranService {
+
+
+ @Override
+ public String getGrainProtocol() {
+ return null;
+ }
+
+ @Override
+ public GrainData syncGrain(SyncReqData reqData) {
+ return null;
+ }
+}
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncIdCardImpl1.java b/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncIdCardImpl1.java
new file mode 100644
index 0000000..5e8b953
--- /dev/null
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncIdCardImpl1.java
@@ -0,0 +1,31 @@
+package com.fzzy.gateway.hx2023.service;
+
+import com.fzzy.gateway.api.GatewaySyncIdCardService;
+import com.fzzy.gateway.api.GatewaySyncLedService;
+import com.fzzy.gateway.api.GatewaySyncLprService;
+import com.fzzy.gateway.api.GatewaySyncWeightService;
+import com.fzzy.gateway.hx2023.data.IdCardData;
+import com.fzzy.gateway.hx2023.data.*;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 缃戝叧涓庤澶囦箣闂寸殑閫氳
+ */
+@Slf4j
+@Data
+@Component
+public class HxGatewaySyncIdCardImpl1 implements GatewaySyncIdCardService {
+
+
+ @Override
+ public String getIdCardProtocol() {
+ return null;
+ }
+
+ @Override
+ public IdCardData syncIdCard(SyncReqData reqData) {
+ return null;
+ }
+}
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncLedImpl1.java b/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncLedImpl1.java
new file mode 100644
index 0000000..5e09af8
--- /dev/null
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncLedImpl1.java
@@ -0,0 +1,27 @@
+package com.fzzy.gateway.hx2023.service;
+
+import com.fzzy.gateway.api.GatewaySyncLedService;
+import com.fzzy.gateway.hx2023.data.SyncReqData;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 缃戝叧涓庤澶囦箣闂寸殑閫氳
+ */
+@Slf4j
+@Data
+@Component
+public class HxGatewaySyncLedImpl1 implements GatewaySyncLedService {
+
+
+ @Override
+ public String getLedProtocol() {
+ return null;
+ }
+
+ @Override
+ public String push2Led(SyncReqData reqData) {
+ return null;
+ }
+}
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncLprImpl1.java b/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncLprImpl1.java
new file mode 100644
index 0000000..9b1e910
--- /dev/null
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncLprImpl1.java
@@ -0,0 +1,29 @@
+package com.fzzy.gateway.hx2023.service;
+
+import com.fzzy.gateway.api.GatewaySyncLedService;
+import com.fzzy.gateway.api.GatewaySyncLprService;
+import com.fzzy.gateway.hx2023.data.LprData;
+import com.fzzy.gateway.hx2023.data.SyncReqData;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 缃戝叧涓庤澶囦箣闂寸殑閫氳
+ */
+@Slf4j
+@Data
+@Component
+public class HxGatewaySyncLprImpl1 implements GatewaySyncLprService {
+
+
+ @Override
+ public String getLprProtocol() {
+ return null;
+ }
+
+ @Override
+ public LprData syncLpr(SyncReqData reqData) {
+ return null;
+ }
+}
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncWeightImpl1.java b/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncWeightImpl1.java
new file mode 100644
index 0000000..d228042
--- /dev/null
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncWeightImpl1.java
@@ -0,0 +1,34 @@
+package com.fzzy.gateway.hx2023.service;
+
+import com.fzzy.api.data.GatewayDeviceProtocol;
+import com.fzzy.gateway.api.GatewaySyncLprService;
+import com.fzzy.gateway.api.GatewaySyncWeightService;
+import com.fzzy.gateway.hx2023.data.LprData;
+import com.fzzy.gateway.hx2023.data.SyncReqData;
+import com.fzzy.gateway.hx2023.data.WeightInfo;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 缃戝叧涓庤澶囦箣闂寸殑閫氳
+ */
+@Slf4j
+@Data
+@Component
+public class HxGatewaySyncWeightImpl1 implements GatewaySyncWeightService {
+
+
+ @Override
+ public String getWeightProtocol() {
+ return GatewayDeviceProtocol.DEVICE_WEIGHT_HTTP.getCode();
+ }
+
+ @Override
+ public WeightInfo syncWeightInfo(SyncReqData reqData) {
+
+
+
+ return null;
+ }
+}
diff --git a/src/main/java/com/fzzy/gateway/sc2023/websocket/WebSocketDevice.java b/src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketDevice.java
similarity index 83%
rename from src/main/java/com/fzzy/gateway/sc2023/websocket/WebSocketDevice.java
rename to src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketDevice.java
index 79f37a2..dce5180 100644
--- a/src/main/java/com/fzzy/gateway/sc2023/websocket/WebSocketDevice.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketDevice.java
@@ -1,7 +1,8 @@
-package com.fzzy.gateway.sc2023.websocket;
+package com.fzzy.gateway.hx2023.websocket;
import com.alibaba.fastjson.JSONObject;
-import com.fzzy.gateway.sc2023.data.WebSocketPacket;
+import com.fzzy.gateway.hx2023.ScConstant;
+import com.fzzy.gateway.hx2023.data.WebSocketPacket;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Component;
@@ -17,7 +18,7 @@
*/
@Slf4j
@Component
-@ServerEndpoint(value = "/device/${productId}/${deviceId}/message/property/report")
+@ServerEndpoint(value = "/device/{productId}/{deviceId}/message/property/report")
public class WebSocketDevice {
private static Map<String, Session> sessionPool = new ConcurrentHashMap<>();
@@ -41,6 +42,8 @@
sessionPool.put(key, session);
sessionIds.put(session.getId(), key);
+ ScConstant.updateOnline(deviceId);
+
log.info("new webSocket,clientId={}", key);
}
@@ -49,11 +52,14 @@
String key = sessionIds.get(session.getId());
+ String deviceId = key.substring(0, key.indexOf("-"));
+
+ ScConstant.updateOffOnline(deviceId);
+
sessionPool.remove(key);
sessionIds.remove(session.getId());
log.info("WebSocket杩炴帴鍏抽棴={}", key);
-
}
@@ -75,6 +81,10 @@
String key = sessionIds.get(session.getId());
+ String deviceId = key.substring(0, key.indexOf("-"));
+
+ ScConstant.updateOffOnline(deviceId);
+
sessionPool.remove(key);
sessionIds.remove(session.getId());
error.printStackTrace();
@@ -82,6 +92,8 @@
/**
+ * 鎺ㄩ�佷俊鎭埌鍓嶇
+ *
* @param packet
*/
public static void sendByPacket(WebSocketPacket packet) {
diff --git a/src/main/java/com/fzzy/gateway/sc2023/websocket/WebSocketDeviceLed.java b/src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketDeviceLed.java
similarity index 84%
rename from src/main/java/com/fzzy/gateway/sc2023/websocket/WebSocketDeviceLed.java
rename to src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketDeviceLed.java
index e0eac23..7662a8a 100644
--- a/src/main/java/com/fzzy/gateway/sc2023/websocket/WebSocketDeviceLed.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketDeviceLed.java
@@ -1,7 +1,8 @@
-package com.fzzy.gateway.sc2023.websocket;
+package com.fzzy.gateway.hx2023.websocket;
import com.alibaba.fastjson.JSONObject;
-import com.fzzy.gateway.sc2023.data.WebSocketPacket;
+import com.fzzy.gateway.hx2023.ScConstant;
+import com.fzzy.gateway.hx2023.data.WebSocketPacket;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Component;
@@ -17,7 +18,7 @@
*/
@Slf4j
@Component
-@ServerEndpoint(value = "/device-message-sender/${productId}/${deviceId}")
+@ServerEndpoint(value = "/device-message-sender/{productId}/{deviceId}")
public class WebSocketDeviceLed {
private static Map<String, Session> sessionPool = new ConcurrentHashMap<>();
@@ -41,6 +42,8 @@
sessionPool.put(key, session);
sessionIds.put(session.getId(), key);
+ ScConstant.updateOnline(deviceId);
+
log.info("new webSocket,clientId={}", key);
}
@@ -51,6 +54,10 @@
sessionPool.remove(key);
sessionIds.remove(session.getId());
+
+ String deviceId = key.substring(0, key.indexOf("-"));
+
+ ScConstant.updateOffOnline(deviceId);
log.info("WebSocket杩炴帴鍏抽棴={}", key);
@@ -75,6 +82,10 @@
String key = sessionIds.get(session.getId());
+ String deviceId = key.substring(0, key.indexOf("-"));
+
+ ScConstant.updateOffOnline(deviceId);
+
sessionPool.remove(key);
sessionIds.remove(session.getId());
error.printStackTrace();
diff --git a/src/main/java/com/fzzy/gateway/sc2023/websocket/WebSocketMqtt.java b/src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketMqtt.java
similarity index 97%
rename from src/main/java/com/fzzy/gateway/sc2023/websocket/WebSocketMqtt.java
rename to src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketMqtt.java
index 7969203..affbda3 100644
--- a/src/main/java/com/fzzy/gateway/sc2023/websocket/WebSocketMqtt.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketMqtt.java
@@ -1,4 +1,4 @@
-package com.fzzy.gateway.sc2023.websocket;
+package com.fzzy.gateway.hx2023.websocket;
import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/com/fzzy/gateway/sc2023/ScConstant.java b/src/main/java/com/fzzy/gateway/sc2023/ScConstant.java
deleted file mode 100644
index 97a1b94..0000000
--- a/src/main/java/com/fzzy/gateway/sc2023/ScConstant.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.fzzy.gateway.sc2023;
-
-/**
- * 甯搁噺
- */
-public class ScConstant {
-
- public static String API_URL_AUTH ="${auth}/authorize/login";
-
-
-}
diff --git a/src/main/java/com/fzzy/gateway/sc2023/package-info.java b/src/main/java/com/fzzy/gateway/sc2023/package-info.java
deleted file mode 100644
index d6d6127..0000000
--- a/src/main/java/com/fzzy/gateway/sc2023/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * 鍥涘窛鐪�-2023骞存帴鍙�
- */
-package com.fzzy.gateway.sc2023;
-
diff --git a/src/main/java/com/fzzy/gateway/view/GatewayConf.view.xml b/src/main/java/com/fzzy/gateway/view/GatewayConf.view.xml
index ac6066d..9c6076c 100644
--- a/src/main/java/com/fzzy/gateway/view/GatewayConf.view.xml
+++ b/src/main/java/com/fzzy/gateway/view/GatewayConf.view.xml
@@ -6,38 +6,66 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.gateway.entity.GatewayConf</Property>
<PropertyDef name="kqmc">
- <Property/>
+ <Property></Property>
<Property name="label">搴撳尯鍚嶇О</Property>
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="kqdm">
- <Property/>
+ <Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
<Property name="required">true</Property>
</PropertyDef>
- <PropertyDef name="userName">
+ <PropertyDef name="appId">
<Property/>
+ <Property name="label">appId</Property>
+ </PropertyDef>
+ <PropertyDef name="gatewayId">
+ <Property/>
+ <Property name="label">缃戝叧ID</Property>
+ </PropertyDef>
+ <PropertyDef name="gatewayIp">
+ <Property/>
+ <Property name="label">缃戝叧IP</Property>
+ </PropertyDef>
+ <PropertyDef name="gatewayMac">
+ <Property/>
+ <Property name="label">缃戝叧Mac</Property>
+ </PropertyDef>
+ <PropertyDef name="gatewayCPU">
+ <Property/>
+ <Property name="label">缃戝叧CPU</Property>
+ </PropertyDef>
+ <PropertyDef name="gatewayMem">
+ <Property/>
+ <Property name="label">缃戝叧鍐呭瓨</Property>
+ </PropertyDef>
+ <PropertyDef name="gatewayHardDisk">
+ <Property/>
+ <Property name="label">缃戝叧纭洏</Property>
+ </PropertyDef>
+ <PropertyDef name="userName">
+ <Property></Property>
<Property name="label">鐪佸钩鍙板笎鍙�</Property>
</PropertyDef>
<PropertyDef name="password">
- <Property/>
+ <Property></Property>
<Property name="label">鐪佸钩鍙板瘑鐮�</Property>
</PropertyDef>
<PropertyDef name="publicKey">
- <Property/>
+ <Property></Property>
<Property name="label">鐪佸钩鍙板叕閽�</Property>
</PropertyDef>
<PropertyDef name="apiUrl">
- <Property/>
+ <Property></Property>
<Property name="label">鐪佸钩鍙版帴鍙ｅ湴鍧�</Property>
</PropertyDef>
<PropertyDef name="exeTag">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁鍚敤</Property>
</PropertyDef>
<PropertyDef name="pushProtocol">
<Property></Property>
- <Property name="label">涓婅鍗忚</Property>
+ <Property name="label">鐪佸钩鍙板崗璁�</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("apiTriggerService#triggerPushProtocol").getResult()}</Property>
<Property name="keyProperty">code</Property>
@@ -46,7 +74,7 @@
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="deptId">
- <Property/>
+ <Property></Property>
<Property name="label">绮簱绯荤粺涓簱鍖虹紪鐮�</Property>
</PropertyDef>
</DataType>
@@ -183,6 +211,41 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">gatewayId</Property>
+ <Property name="property">gatewayId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">gatewayIp</Property>
+ <Property name="property">gatewayIp</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">gatewayMac</Property>
+ <Property name="property">gatewayMac</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">gatewayCPU</Property>
+ <Property name="property">gatewayCPU</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">gatewayMem</Property>
+ <Property name="property">gatewayMem</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">gatewayHardDisk</Property>
+ <Property name="property">gatewayHardDisk</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">appId</Property>
+ <Property name="property">appId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">userName</Property>
<Property name="property">userName</Property>
<Editor/>
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 e4edcc9..617451d 100644
--- a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
+++ b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
@@ -6,31 +6,33 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.gateway.entity.GatewayDevice</Property>
<PropertyDef name="id">
- <Property/>
+ <Property></Property>
<Property name="label">绯荤粺ID</Property>
</PropertyDef>
<PropertyDef name="deviceId">
- <Property/>
+ <Property></Property>
<Property name="label">璁惧ID</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="deviceName">
- <Property/>
+ <Property></Property>
<Property name="label">鍚嶇О</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="type">
- <Property/>
+ <Property></Property>
<Property name="label">璁惧绫诲瀷</Property>
</PropertyDef>
<PropertyDef name="depotId">
- <Property/>
+ <Property></Property>
<Property name="label">鎵�灞炰粨搴�</Property>
</PropertyDef>
<PropertyDef name="depotName">
- <Property/>
+ <Property></Property>
<Property name="label">鎵�灞炰粨搴�</Property>
</PropertyDef>
<PropertyDef name="ip">
- <Property/>
+ <Property></Property>
<Property name="label">閫氳IP</Property>
</PropertyDef>
<PropertyDef name="port">
@@ -38,35 +40,45 @@
<Property name="label">閫氳绔彛</Property>
</PropertyDef>
<PropertyDef name="rtsp">
- <Property/>
+ <Property></Property>
<Property name="label">瑙嗛RTSP</Property>
- </PropertyDef>
- <PropertyDef name="syncProtocol">
- <Property/>
- <Property name="label">璁惧鍗忚</Property>
</PropertyDef>
<PropertyDef name="pushProtocol">
<Property></Property>
- <Property name="label">缃戝叧閫氳</Property>
+ <Property name="label">绯荤粺缃戝叧閫氳鍗忚</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#triggerPushProtocol").getResult()}</Property>
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#triggerGatewayProtocol").getResult()}</Property>
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
<Property name="required">true</Property>
</PropertyDef>
+ <PropertyDef name="syncProtocol">
+ <Property></Property>
+ <Property name="label">缃戝叧涓庤澶囬�氳鍗忚</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#triggerGatewayDeviceProtocol").getResult()}</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
<PropertyDef name="orgId">
- <Property/>
+ <Property></Property>
<Property name="label">缁勭粐缂栫爜</Property>
</PropertyDef>
<PropertyDef name="remark">
- <Property/>
+ <Property></Property>
<Property name="label">澶囨敞</Property>
</PropertyDef>
<PropertyDef name="httpUrl">
- <Property/>
+ <Property></Property>
<Property name="label">HTTP鍦板潃</Property>
</PropertyDef>
+ <PropertyDef name="deviceSn">
+ <Property/>
+ <Property name="label">璁惧搴忓垪鍙�</Property>
+ </PropertyDef>
</DataType>
</Model>
<View layout="regionPadding:10">
--
Gitblit v1.9.3