czt
2026-01-10 e2abf0dd0c49bc6e82f428ec747865cc806147a3
优化网关配置
已修改10个文件
85 ■■■■■ 文件已修改
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/GatewaySer.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/GatewaySerService.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/data/ApiV1Req.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3010.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3020.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3021.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3030.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3031.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-view/src/main/java/com/fzzy/igds/GatewaySer.view.xml 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-view/src/main/java/models/core.model.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
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;
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;
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);
    }
}
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);
    }
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);
    }
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);
    }
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);
    }
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>
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>