From e2abf0dd0c49bc6e82f428ec747865cc806147a3 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 10 一月 2026 15:23:29 +0800
Subject: [PATCH] 优化网关配置
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/GatewaySerService.java | 18 +++++++--
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3020.java | 4 +
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/data/ApiV1Req.java | 2
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3030.java | 4 +
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/GatewaySer.java | 10 +++-
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3021.java | 4 +
fzzy-igdss-view/src/main/java/models/core.model.xml | 4 ++
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3010.java | 4 +
fzzy-igdss-view/src/main/java/com/fzzy/igds/GatewaySer.view.xml | 31 ++++++---------
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3031.java | 4 +
10 files changed, 54 insertions(+), 31 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/GatewaySer.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/GatewaySer.java
index fe0c363..28cee4a 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/GatewaySer.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/GatewaySer.java
@@ -62,18 +62,22 @@
@TableField("web_rtc_port")
private Integer webRtcPort;
- @Column(name = "snap_url", columnDefinition = "varchar(20) COMMENT '鎶撴媿璺緞'")
+ @Column(name = "snap_url", columnDefinition = "varchar(100) COMMENT '鎶撴媿璺緞'")
@TableField("snap_url")
private String snapUrl;
- @Column(name = "ptz_url", columnDefinition = "varchar(20) COMMENT '浜戝彴璺緞'")
+ @Column(name = "ptz_url", columnDefinition = "varchar(100) COMMENT '浜戝彴璺緞'")
@TableField("ptz_url")
private String ptzUrl;
- @Column(name = "play_url", columnDefinition = "varchar(20) COMMENT '鎾斁璺緞'")
+ @Column(name = "play_url", columnDefinition = "varchar(100) COMMENT '鎾斁璺緞'")
@TableField("play_url")
private String playUrl;
+ @Column(name = "plate_num_url", columnDefinition = "varchar(100) COMMENT '杞︾墝璺緞'")
+ @TableField("plate_num_url")
+ private String plateNumUrl;
+
@Column(name = "order_num", columnDefinition = "int(5) COMMENT '椤哄簭鍙�'")
@TableField("order_num")
private Integer orderNum = 1;
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/GatewaySerService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/GatewaySerService.java
index d39fea2..835baad 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/GatewaySerService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/GatewaySerService.java
@@ -100,14 +100,24 @@
if (StringUtils.isEmpty(ser.getCompanyId())) {
ser.setCompanyId(ContextUtil.getCompanyId());
}
- if (StringUtils.isEmpty(ser.getDeptId())) {
- ser.setDeptId(ContextUtil.subDeptId(null));
+
+ //鍒ゆ柇鎺ュ彛璺緞
+ if (StringUtils.isEmpty(ser.getPlateNumUrl())) {
+ ser.setPlateNumUrl("/open/api/get-plateNum");
+ }
+ if (StringUtils.isEmpty(ser.getPlayUrl())) {
+ ser.setPlayUrl("/open/api/get-media");
+ }
+ if (StringUtils.isEmpty(ser.getSnapUrl())) {
+ ser.setSnapUrl("/open/api/snap-img");
+ }
+ if (StringUtils.isEmpty(ser.getPtzUrl())) {
+ ser.setPtzUrl("/open/api/ptz-media");
}
ser.setUpdateBy(ContextUtil.getLoginUserName());
ser.setUpdateTime(new Date());
if (StringUtils.isBlank(ser.getCreateBy())) {
- ser.setHeartbeatTime(new Date());
ser.setCreateBy(ContextUtil.getLoginUserName());
ser.setCreateTime(new Date());
gatewaySerMapper.insert(ser);
@@ -166,7 +176,7 @@
if (StringUtils.isEmpty(companyId)) {
companyId = ContextUtil.getCompanyId();
}
- String patten = RedisConst.buildKey(companyId, RedisConst.KEY_DEVICE_SER_LIST) + "*";
+ String patten = RedisConst.buildKey(companyId, RedisConst.KEY_GATEWAY_SER_LIST) + "*";
Collection<String> keys = redisCache.keys(patten);
if (null == keys) {
return null;
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/data/ApiV1Req.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/data/ApiV1Req.java
index a22e8f1..e7509de 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/data/ApiV1Req.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/data/ApiV1Req.java
@@ -18,7 +18,7 @@
private String sign; //鏉冮檺绛惧悕
private String outId; //鑷畾涔夌紪鐮�
private String functionId; //鍔熻兘鐮�
- private Long timestamp; //鏃堕棿鎴�
+ private String timestamp; //鏃堕棿鎴�
/*-----娑堟伅浣�-----*/
private T data;
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3010.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3010.java
index b0728b8..7048f7c 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3010.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3010.java
@@ -8,6 +8,7 @@
import com.fzzy.igds.service.SnapConfService;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.utils.StringUtils;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.Date;
@@ -17,6 +18,7 @@
* @Author CZT
* @Date 2026/1/7 11:01
*/
+@Slf4j
@Component
public class ApiV1Service3010 {
@@ -52,7 +54,7 @@
if (StringUtils.isNotBlank(functionId)) {
req.setFunctionId(functionId);
}
-
+ log.info("璐ㄦ娂鐩戠鎺ュ彛V1锛�3010鎺ュ彛瑙ｆ瀽瀹屾垚={}", req);
return ApiV1Resp.success(null, req);
}
}
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3020.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3020.java
index 655a1a8..fd1048b 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3020.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3020.java
@@ -6,6 +6,7 @@
import com.fzzy.igds.domain.SnapConf;
import com.fzzy.igds.service.SnapConfService;
import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -16,6 +17,7 @@
* @Author CZT
* @Date 2026/1/7 11:03
*/
+@Slf4j
@Component
public class ApiV1Service3020 {
@@ -36,7 +38,7 @@
if(null == list || list.isEmpty()){
return ApiV1Resp.error("鏈幏鍙栧埌鎶撴媿閰嶇疆淇℃伅锛�", req);
}
-
+ log.info("璐ㄦ娂鐩戠鎺ュ彛V1锛�3020鎺ュ彛瑙ｆ瀽瀹屾垚={}", req);
return ApiV1Resp.success(list, req);
}
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3021.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3021.java
index 95eb356..4e4a9e0 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3021.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3021.java
@@ -6,6 +6,7 @@
import com.fzzy.igds.domain.GatewaySer;
import com.fzzy.igds.service.SecCameraService;
import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -16,6 +17,7 @@
* @Author CZT
* @Date 2026/1/7 11:05
*/
+@Slf4j
@Component
public class ApiV1Service3021 {
@@ -36,7 +38,7 @@
if(null == list || list.isEmpty()){
return ApiV1Resp.error("鏈幏鍙栧埌鐩戞帶淇℃伅锛�", req);
}
-
+ log.info("璐ㄦ娂鐩戠鎺ュ彛V1锛�3021鎺ュ彛瑙ｆ瀽瀹屾垚={}", req);
return ApiV1Resp.success(list, req);
}
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3030.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3030.java
index 428f874..f2c58ca 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3030.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3030.java
@@ -10,6 +10,7 @@
import com.fzzy.igds.service.SnapRecordService;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.config.FrameworkConfig;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
@@ -21,6 +22,7 @@
* @Author CZT
* @Date 2026/1/7 11:07
*/
+@Slf4j
@Component
public class ApiV1Service3030 {
@@ -45,7 +47,7 @@
}
step1(list, gatewaySer);
-
+ log.info("璐ㄦ娂鐩戠鎺ュ彛V1锛�3030鎺ュ彛瑙ｆ瀽瀹屾垚={}", req);
return ApiV1Resp.success(null, req);
}
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3031.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3031.java
index 5758f58..e591539 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3031.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3031.java
@@ -13,6 +13,7 @@
import com.fzzy.igds.service.FileService;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.config.FrameworkConfig;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
@@ -25,6 +26,7 @@
* @Author CZT
* @Date 2026/1/7 11:09
*/
+@Slf4j
@Component
public class ApiV1Service3031 {
@@ -49,7 +51,7 @@
}
step1(list, gatewaySer);
-
+ log.info("璐ㄦ娂鐩戠鎺ュ彛V1锛�3031鎺ュ彛瑙ｆ瀽瀹屾垚={}", req);
return ApiV1Resp.success(null, req);
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/GatewaySer.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/GatewaySer.view.xml
index b9e0892..8df17cf 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/GatewaySer.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/GatewaySer.view.xml
@@ -215,8 +215,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">playUrl</Property>
- <Property name="property">playUrl</Property>
+ <Property name="name">plateNumUrl</Property>
+ <Property name="property">plateNumUrl</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -225,8 +225,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">snapUrl</Property>
- <Property name="property">snapUrl</Property>
+ <Property name="name">playUrl</Property>
+ <Property name="property">playUrl</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -235,8 +235,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">ptzUrl</Property>
- <Property name="property">ptzUrl</Property>
+ <Property name="name">snapUrl</Property>
+ <Property name="property">snapUrl</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -245,18 +245,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">remark</Property>
- <Property name="property">remark</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">createBy</Property>
- <Property name="property">createBy</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">createTime</Property>
- <Property name="property">createTime</Property>
+ <Property name="name">ptzUrl</Property>
+ <Property name="property">ptzUrl</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -264,6 +254,11 @@
<Property name="property">updateBy</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
+ <Editor/>
+ </AutoFormElement>
<AutoFormElement>
<Property name="name">updateTime</Property>
<Property name="property">updateTime</Property>
diff --git a/fzzy-igdss-view/src/main/java/models/core.model.xml b/fzzy-igdss-view/src/main/java/models/core.model.xml
index 4fc57a5..e0ac1ed 100644
--- a/fzzy-igdss-view/src/main/java/models/core.model.xml
+++ b/fzzy-igdss-view/src/main/java/models/core.model.xml
@@ -1405,6 +1405,10 @@
<Property></Property>
<Property name="label">鎾斁璺緞</Property>
</PropertyDef>
+ <PropertyDef name="plateNumUrl">
+ <Property></Property>
+ <Property name="label">杞︾墝璇嗗埆璺緞</Property>
+ </PropertyDef>
<PropertyDef name="remark">
<Property></Property>
<Property name="label">澶囨敞</Property>
--
Gitblit v1.9.3