From f01dc4edbe2c8689483787ea8e8d5ee2c54195df Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 25 十月 2023 20:31:34 +0800
Subject: [PATCH] 四川省网关接口相关6
---
src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java | 37 ++++++++++++++++++
src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncWeightImpl1.java | 5 +-
src/main/java/com/fzzy/gateway/entity/GatewayConf.java | 12 +++++-
src/main/java/com/fzzy/api/data/GatewayDeviceProtocol.java | 3 +
src/main/java/com/fzzy/api/utils/RedisConst.java | 6 +++
src/main/java/com/fzzy/api/data/GatewayDeviceType.java | 42 +++++++++++++++++++++
src/main/java/com/fzzy/gateway/entity/GatewayDevice.java | 11 +++--
7 files changed, 106 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/fzzy/api/data/GatewayDeviceProtocol.java b/src/main/java/com/fzzy/api/data/GatewayDeviceProtocol.java
index a5f26f3..93dec3a 100644
--- a/src/main/java/com/fzzy/api/data/GatewayDeviceProtocol.java
+++ b/src/main/java/com/fzzy/api/data/GatewayDeviceProtocol.java
@@ -8,9 +8,10 @@
GRAIN_FZZY_ZH_2023("GRAIN_FZZY_ZH_2023", "绮儏-椋庢鑷磋繙鎺у埗鏌滃崗璁�2023"),
DEVICE_WEIGHT_HTTP("DEVICE_WEIGHT_HTTP", "鍦扮-HTTP鍗忚"),
+ DEVICE_WEIGHT_TCP_YH("DEVICE_WEIGHT_TCP_YH", "鍦扮-鑰�鍗嶵CP鍗忚"),
DEVICE_IDCARD_HTTP("DEVICE_IDCARD_HTTP", "韬唤璇�-HTTP鍗忚"),
DEVICE_LED_HTTP("DEVICE_LED_HTTP", "LED-HTTP鍗忚"),
- DEVICE_LPR_HTTP("DEVICE_LPR_HTTP", "杞︾墝璇嗗埆-HTTP鍗忚"),
+ DEVICE_LPR_SDK_HK("DEVICE_LPR_SDK_HK", "杞︾墝璇嗗埆-SDK娴峰悍"),
DEVICE_TEST("DEVICE_TEST", "娴嬭瘯鍗忚");
diff --git a/src/main/java/com/fzzy/api/data/GatewayDeviceType.java b/src/main/java/com/fzzy/api/data/GatewayDeviceType.java
new file mode 100644
index 0000000..c4d65f4
--- /dev/null
+++ b/src/main/java/com/fzzy/api/data/GatewayDeviceType.java
@@ -0,0 +1,42 @@
+package com.fzzy.api.data;
+
+
+/**
+ * 缃戝叧璁惧绫诲瀷
+ */
+public enum GatewayDeviceType {
+
+ GRAIN_FZZY_ZH_2023("GRAIN_FZZY_ZH_2023", "绮儏-椋庢鑷磋繙鎺у埗鏌滃崗璁�2023"),
+ DEVICE_WEIGHT_HTTP("DEVICE_WEIGHT_HTTP", "鍦扮-HTTP鍗忚"),
+ DEVICE_WEIGHT_TCP_YH("DEVICE_WEIGHT_TCP_YH", "鍦扮-鑰�鍗嶵CP鍗忚"),
+ DEVICE_IDCARD_HTTP("DEVICE_IDCARD_HTTP", "韬唤璇�-HTTP鍗忚"),
+ DEVICE_LED_HTTP("DEVICE_LED_HTTP", "LED-HTTP鍗忚"),
+ DEVICE_LPR_SDK_HK("DEVICE_LPR_SDK_HK", "杞︾墝璇嗗埆-SDK娴峰悍"),
+ 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;
+ }
+
+ GatewayDeviceType(String code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+}
diff --git a/src/main/java/com/fzzy/api/utils/RedisConst.java b/src/main/java/com/fzzy/api/utils/RedisConst.java
index 5c55c4f..af4aaf7 100644
--- a/src/main/java/com/fzzy/api/utils/RedisConst.java
+++ b/src/main/java/com/fzzy/api/utils/RedisConst.java
@@ -15,6 +15,12 @@
/**
+ * 璁惧缂撳瓨
+ */
+ public static String KYE_GATE_DEVICE = "G_DEVICE";
+
+
+ /**
* 鎺ュ彛閰嶇疆-鍗曚釜鏁版嵁鍗曚釜KEY
*/
public static String KYE_CONF = "CONF";
diff --git a/src/main/java/com/fzzy/gateway/entity/GatewayConf.java b/src/main/java/com/fzzy/gateway/entity/GatewayConf.java
index 71cae3c..622cc8d 100644
--- a/src/main/java/com/fzzy/gateway/entity/GatewayConf.java
+++ b/src/main/java/com/fzzy/gateway/entity/GatewayConf.java
@@ -52,11 +52,19 @@
@Column(name = "gatewayHardDisk", length = 50)
private String gatewayHardDisk;
- @PropertyDef(label = "鐢ㄦ埛鍚�")
+ @PropertyDef(label = "缃戝叧鐢ㄦ埛鍚�")
+ @Column(name = "gatewayUsername", length = 50)
+ private String gatewayUsername;
+
+ @PropertyDef(label = "缃戝叧瀵嗙爜")
+ @Column(name = "gatewayPassword", length = 50)
+ private String gatewayPassword;
+
+ @PropertyDef(label = "鐪佸钩鍙扮敤鎴峰悕")
@Column(name = "username", length = 50)
private String userName;
- @PropertyDef(label = "瀵嗙爜")
+ @PropertyDef(label = "鐪佸钩鍙板瘑鐮�")
@Column(name = "password", length = 50)
private String password;
diff --git a/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java b/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
index 9497a15..f10ec07 100644
--- a/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
+++ b/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
@@ -23,7 +23,6 @@
@PropertyDef(label = "绯荤粺ID")
private String id;
-
@Column(name = "DEVICE_SN_", length = 50)
@PropertyDef(label = "璁惧搴忓垪鍙�")
private String deviceSn;
@@ -55,7 +54,7 @@
@Column(name = "PORT_")
@PropertyDef(label = "閫氳绔彛")
private Integer port;
-
+
@Column(name = "RTSP_", length = 100)
@PropertyDef(label = "瑙嗛RTSP", description = "鐢ㄤ簬灞�鍩熺綉鍐呮姄鎷嶉厤缃�")
private String rtsp;
@@ -65,13 +64,17 @@
private String httpUrl;
@PropertyDef(label = "涓婅鍗忚")
- @Column(name = "pushProtocol", length = 20)
+ @Column(name = "PUSH_PROTOCOL_", length = 20)
private String pushProtocol;
@PropertyDef(label = "鍚屾鍗忚")
- @Column(name = "syncProtocol", length = 20)
+ @Column(name = "SYNC_PROTOCOL_", length = 20)
private String syncProtocol;
+ @PropertyDef(label = "TCP鏈嶅姟绔彛", description = "閽堝缃戝叧浣滀负TCP鏈嶅姟鏃跺�欑鍙�")
+ @Column(name = "SER_PORT_")
+ private int serPort;
+
@Column(name = "ORG_ID_", length = 40)
@PropertyDef(label = "缁勭粐缂栫爜")
private String orgId;
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncWeightImpl1.java b/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncWeightImpl1.java
index d228042..970be79 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncWeightImpl1.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncWeightImpl1.java
@@ -21,14 +21,13 @@
@Override
public String getWeightProtocol() {
- return GatewayDeviceProtocol.DEVICE_WEIGHT_HTTP.getCode();
+ return GatewayDeviceProtocol.DEVICE_WEIGHT_TCP_YH.getCode();
}
@Override
public WeightInfo syncWeightInfo(SyncReqData reqData) {
-
-
return null;
}
+
}
diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
index e7a1784..5a738b1 100644
--- a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
+++ b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
@@ -4,6 +4,8 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.utils.RedisConst;
+import com.fzzy.api.utils.RedisUtil;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.service.repository.GatewayDeviceRep;
import org.springframework.beans.BeanUtils;
@@ -17,6 +19,8 @@
@Resource
private GatewayDeviceRep gatewayDeviceRep;
+ @Resource
+ private RedisUtil redisUtil;
/**
@@ -45,7 +49,10 @@
if (null == data.getId()) {
data.setId(ContextUtil.getUUID());
}
+
gatewayDeviceRep.save(data);
+
+ flushCache();
}
/**
@@ -58,6 +65,36 @@
GatewayDevice data2 = new GatewayDevice();
BeanUtils.copyProperties(data, data2);
gatewayDeviceRep.delete(data2);
+
+ flushCache();
return null;
}
+
+
+ /**
+ * gatewayDeviceService#flushCache
+ */
+ @Expose
+ public void flushCache() {
+ List<GatewayDevice> list = listAll();
+ if (null == list || list.isEmpty()) return;
+ String key;
+ for (GatewayDevice device : list) {
+ key = RedisConst.buildKey(RedisConst.KYE_GATE_DEVICE, device.getDeviceId());
+ redisUtil.set(key, device);
+ }
+ }
+
+ /**
+ * 缂撳瓨鑾峰彇璁惧淇℃伅
+ *
+ * @param deviceId
+ * @return
+ */
+ public GatewayDevice getCacheDevice(String deviceId) {
+ String key = RedisConst.buildKey(RedisConst.KYE_GATE_DEVICE, deviceId);
+ return (GatewayDevice) redisUtil.get(key);
+ }
+
+
}
--
Gitblit v1.9.3