【优化】 algorithm模块配置优化

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/config/AlgorithmYml.java

@@ -15,7 +15,7 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
 
-@ConfigurationProperties("sys.config")
+@ConfigurationProperties("forward.config")
 @RefreshScope
 @Validated
 public class AlgorithmYml {
@@ -23,17 +23,17 @@ public class AlgorithmYml {
     /**
      * 视频算法
      */
-    Map<Integer,VideoCheckValid> videoAidMap = Collections.emptyMap();
+    Map<Integer, VideoCheckValid> videoAidMap = Collections.emptyMap();
 
     /**
      * 算法集合
      */
-    Map<Integer,CheckValid> algorithmMap = Collections.emptyMap();
+    Map<Integer, CheckValid> algorithmMap = Collections.emptyMap();
 
     /**
      * 警报配置
      */
-    Map<Integer,AlarmConfig> alarmConfigMap = Collections.emptyMap();
+    Map<Integer, AlarmConfig> alarmConfigMap = Collections.emptyMap();
 
     /**
      * 中转服务图片提交地址
@@ -51,9 +51,9 @@ public class AlgorithmYml {
     String checkLogUrl;
 
     /**
-    * 跳过次数 -1 为不开启跳过 默认为3
+     * 跳过次数 -1 为不开启跳过 默认为3
      */
-    Integer jumpThreshold=2;
+    Integer jumpThreshold = 2;
 
 
     @NotBlank(message = "项目地址不能为空")
@@ -76,7 +76,7 @@ public class AlgorithmYml {
     /**
      * 喇叭开关
      */
-    boolean loudspeakerSwitch=false;
+    boolean loudspeakerSwitch = false;
 
     public boolean isLoudspeakerSwitch() {
         return loudspeakerSwitch;
@@ -158,11 +158,11 @@ public class AlgorithmYml {
         this.checkLogUrl = checkLogUrl;
     }
 
-    public static class VideoCheckValid{
-        @NotNull (message = "描述不能为空")
+    public static class VideoCheckValid {
+        @NotNull(message = "描述不能为空")
         String tips;
 
-        @NotBlank (message = "算法结构解析实现类不能为空")
+        @NotBlank(message = "算法结构解析实现类不能为空")
         private String name = "videoCheckResultValidImpl";
 
         private VideoCheckResultValid videoCheckResultValid;
@@ -192,7 +192,7 @@ public class AlgorithmYml {
         }
     }
 
-    public static class AlarmConfig{
+    public static class AlarmConfig {
         private String funNum;
         private String describe;
 
@@ -215,16 +215,16 @@ public class AlgorithmYml {
 
     public static class CheckValid {
         //算法ID
-        @NotNull (message = "算法ID不能为空")
+        @NotNull(message = "算法ID不能为空")
         private Integer algoId;
         //cid
-        @NotNull (message = "数据ID不能为空")
+        @NotNull(message = "数据ID不能为空")
         private String did;
 
         private String algorithmName;
 
         //默认使用图片post 推送结果解析类
-        @NotNull (message = "算法结构解析实现类不能为空")
+        @NotNull(message = "算法结构解析实现类不能为空")
         private Class<?> classPath = ImageCheckResultValidImpl.class;
         //检查结果检查实现类
         private CheckResultValid checkResultValid;
@@ -282,7 +282,7 @@ public class AlgorithmYml {
         return Collections.unmodifiableMap(algorithmMap);
     }
 
-    public void setAlgorithmMap(Map<Integer,CheckValid> algorithmMap) {
+    public void setAlgorithmMap(Map<Integer, CheckValid> algorithmMap) {
         this.algorithmMap = algorithmMap;
     }
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/conf/MediaConfig.java

@@ -10,64 +10,64 @@ import java.text.SimpleDateFormat;
 @Configuration("mediaConfig")
 public class MediaConfig{
 
-    @Value("${media.id:}")
+    @Value("${camera.media.id:}")
     private String id;
 
-    @Value("${media.ip}")
+    @Value("${camera.media.ip}")
     private String ip;
 
-    @Value("${media.hook-ip:${sip.ip}}")
+    @Value("${camera.media.hook-ip:${camera.sip.ip}}")
     private String hookIp;
 
-    @Value("${sip.ip}")
+    @Value("${camera.sip.ip}")
     private String sipIp;
 
-    @Value("${sip.domain}")
+    @Value("${camera.sip.domain}")
     private String sipDomain;
 
-    @Value("${media.sdp-ip:${media.ip}}")
+    @Value("${camera.media.sdp-ip:${camera.media.ip}}")
     private String sdpIp;
 
-    @Value("${media.stream-ip:${media.ip}}")
+    @Value("${camera.media.stream-ip:${camera.media.ip}}")
     private String streamIp;
 
-    @Value("${media.http-port}")
+    @Value("${camera.media.http-port}")
     private Integer httpPort;
 
-    @Value("${media.http-ssl-port:0}")
+    @Value("${camera.media.http-ssl-port:0}")
     private Integer httpSSlPort = 0;
 
-    @Value("${media.rtmp-port:0}")
+    @Value("${camera.media.rtmp-port:0}")
     private Integer rtmpPort = 0;
 
-    @Value("${media.rtmp-ssl-port:0}")
+    @Value("${camera.media.rtmp-ssl-port:0}")
     private Integer rtmpSSlPort = 0;
 
-    @Value("${media.rtp-proxy-port:0}")
+    @Value("${camera.media.rtp-proxy-port:0}")
     private Integer rtpProxyPort = 0;
 
-    @Value("${media.rtsp-port:0}")
+    @Value("${camera.media.rtsp-port:0}")
     private Integer rtspPort = 0;
 
-    @Value("${media.rtsp-ssl-port:0}")
+    @Value("${camera.media.rtsp-ssl-port:0}")
     private Integer rtspSSLPort = 0;
 
-    @Value("${media.auto-config:true}")
+    @Value("${camera.media.auto-config:true}")
     private boolean autoConfig = true;
 
-    @Value("${media.secret}")
+    @Value("${camera.media.secret}")
     private String secret;
 
-    @Value("${media.stream-none-reader-delay-ms:18000}")
+    @Value("${camera.media.stream-none-reader-delay-ms:18000}")
     private String streamNoneReaderDelayMS = "18000";
 
-    @Value("${media.rtp.enable}")
+    @Value("${camera.media.rtp.enable}")
     private boolean rtpEnable;
 
-    @Value("${media.rtp.port-range}")
+    @Value("${camera.media.rtp.port-range}")
     private String rtpPortRange;
 
-    @Value("${media.record-assist-port:0}")
+    @Value("${camera.media.record-assist-port:0}")
     private Integer recordAssistPort = 0;
 
     public String getId() {

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/conf/UserSetup.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 
 @Component
-@ConfigurationProperties(prefix = "user-settings", ignoreInvalidFields = true)
+@ConfigurationProperties(prefix = "camera.user-settings", ignoreInvalidFields = true)
 public class UserSetup {
 
     private Boolean savePositionHistory = Boolean.FALSE;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/speaker/domain/RemoteAddress.java

@@ -7,19 +7,19 @@ import org.springframework.stereotype.Component;
 @Component
 @RefreshScope
 public class RemoteAddress {
-    @Value("${remote.ip_addr}")
+    @Value("${speaker.remote.ip_addr}")
     private String remoteIp;
-    @Value("${remote.port}")
+    @Value("${speaker.remote.port}")
     private String remotePort;
-    @Value("${remote.operation.login_url}")
+    @Value("${speaker.remote.operation.login_url}")
     private String loginUrl;
-    @Value("${remote.protocol}")
+    @Value("${speaker.remote.protocol}")
     private String protocol;
-    @Value("${remote.operation.get_device}")
+    @Value("${speaker.remote.operation.get_device}")
     private String deviceUrl;
-    @Value("${remote.tts_ip}")
+    @Value("${speaker.remote.tts_ip}")
     private String ttsIp;
-    @Value("${remote.tts_port}")
+    @Value("${speaker.remote.tts_port}")
     private String ttsPort;
 
     public String getRemoteIp() {

zd-modules/zd-algorithm/src/main/resources/bootstrap.yml

@@ -5,10 +5,9 @@ server:
 spring:
   servlet:
     multipart:
-      enabled: true
       max-file-size: 20MB
       max-request-size: 50MB
-      
+
 # mybatis配置
 mybatis:
   # 搜索指定包别名
@@ -29,34 +28,6 @@ ok-http:
   read-timeout-ms: 500
   write-timeout-ms: 500
 
-#远程请求地址配置
-remote:
-  protocol: http
-  ip_addr: 192.168.1.88
-  port: 17808
-  operation:
-    login_url: /api/users/login #登录
-    get_device: /api/devices  #获取设备列表
-    set_device: /api/sendtodevice #设置设备
-  tts_ip: 192.168.1.88
-  tts_port: 10008
-
-#ip喇叭控制端口
-speaker:
-  port: 8888
-  isOnline: 0  #1表示公网部署，0表示局域网部署
-# 电话报警
-alarm:
-  host: http://${ALARM_HOST:192.168.1.100}
-  retry: 3
-face:
-  appId: A3XKg9AUQhgd7RjBk8JKDrVkkoQRd6W9kxm5R2MtAeu1
-  ## windows:HXf4r2UBofUkGPUPQPQKag58fQoTiw5LHBMHPeFbY1n8  linux:HXf4r2UBofUkGPUPQPQKag58XJEK8LYpNvi1qH4g1t4f
-  sdkKey: HXf4r2UBofUkGPUPQPQKag58XJEK8LYpNvi1qH4g1t4f
-  linuxKey: HXf4r2UBofUkGPUPQPQKag58XJEK8LYpNvi1qH4g1t4f
-  winKey: HXf4r2UBofUkGPUPQPQKag58fQoTiw5LHBMHPeFbY1n8
-  activation: true
-  init: true
 sys:
   mqtt:
     topics: lab/news  # 订阅主题， 多个用,隔开
@@ -64,115 +35,11 @@ sys:
     inbound: true
     ## 默认为true 不需要发送则关闭
     outbound: true
-  config:
-    loginUri: http://${INNER_HOST:192.168.1.88}:${INNER_PORT:9800}/
-    #跳过阈值 跳过检查项触发阈值
-    jumpThreshold: 2
-    ## 日志检查提交地址
-    checkLogUrl: laboratory/checklog
-    ## 图片提交地址
-    # 原地址 http://180.76.134.43:31005/api/analysis/image
-    imgPostUrl: http://${ARITHMETIC_HOST:192.168.1.248}:${ARITHMETIC_PORT:80}/api/open/data/postAnalysis
-    #loginUri: 默认为云上地址 http://lab.sxitdlc.com/labSystem/
-    #转发目标地址
-    targetUrl: https://${NET_HOST:lab.sxitdlc.com}/appTest/
-    #1号喇叭IP
-    loudspeakerIp1: 192.168.1.103
-    # 2号喇叭IP
-    loudspeakerIp2:
-    # 语音播报开关
-    loudspeakerSwitch: true
-    #临时媒体文件存放地址
-    imgTemp: /home/upload
-    algorithmMap:
-      ## 护目镜
-      1:
-        algoId: 9787
-        did: 1557192675937570818
-        algorithmName: "护目镜识别图片算法"
-      ## 实验服
-      2:
-        algoId: 10285
-        did: 1557192675937570818
-        algorithmName: "实验服识别图片算法"
-    videoAidMap:
-      9688:
-        tips: 非法闯入人员
-        name: peopleCheckResultValidImpl
-      10258:
-        tips: 未穿戴实验服人员
-      9787:
-        tips: 未佩戴护目镜人员
-    alarmConfigMap:
-      9610:
-        funNum: "huoyan"
-        describe: "火焰识别"
-      9611:
-        funNum: "huoyan"
-        describe: "火焰识别"
-      9684:
-        funNum: "yanwu"
-        describe: "烟雾识别"
-      9688:
-        funNum: "juzhong"
-        describe: "聚众识别"
-      9690:
-        funNum: "ligang"
-        describe: "离岗识别"
-
+    
 file:
   path: /home/AIPIC
-fire:
-  algo_id: 9611
-  did: 1557192675937570818
-  algorithm_name: "火焰算法"
-  hardware_num: "040C7E75CA85"
-  stream_url: "rtsp://admin:hk123456@192.168.1.64:554/Streaming/Channels/101?transportmode=unicast&profile=Profile_1"
-  wait_time: 5
-# 作为28181服务器的配置
-sip:
-  # [必须修改] 本机的IP
-  ip: 192.168.1.88
-  # [可???] 28181服务监听的端??
-  port: 5060
-  # 根据国标6.1.2中规定，domain宜采用ID统一编码的前十位编码。国标附录D中定义前8位为中心编码（由省级、市级???区级???基层编号组成，参照GB/T 2260-2007??
-  # 后两位为行业编码，定义参照附录D.3
-  # 3701020049标识山东济南历下?? 信息行业接入
-  # [可???]
-  domain: 4401020049
-  # [可???]
-  id: 44010200492000000001
-  # [可???] 默认设备认证密码，后续扩展使用设备单独密??, 移除密码将不进行校验
-  password: admin123
-
-#zlm 默认服务器配??
-media:
-  # [必须修改] zlm服务器的内网IP
-  ip: 192.168.1.88
-  # [必须修改] zlm服务器的http.port
-  http-port: 8230
-  # [可???] zlm服务器的hook.admin_params=secret
-  secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
-  # [可???] 是否自动配置ZLM, 如果希望手动配置ZLM, 可以设为false, 不建议新接触的用户修??
-  auto-config: false
-  # 启用多端口模??, 多端口模式使用端口区分每路流，兼容???更好??? 单端口使用流的ssrc区分?? 点播超时建议使用多端口测??
-  # [可???] zlm服务器的general.streamNoneReaderDelayMS
-  stream-none-reader-delay-ms:  -1  # 无人观看多久自动关闭??, -1表示永不自动关闭,?? 关闭按需拉流
-  rtp:
-    # [可???] 是否启用多端口模??, ??启后会在portRange范围内???择端口用于媒体流传??
-    enable: true
-    # [可???] 在此范围内???择端口用于媒体流传??,
-    port-range: 30000,30500 # 端口范围
-  # 录像辅助服务?? 部署此服务可以实现zlm录像的管理与下载?? 0 表示不使??
-  record-assist-port: 0
 
-
-# [根据业务??求配置]
-user-settings:
-  # 推流直播是否录制
-  record-push-live: true
-
-# 在线文档?? swagger-ui（生产环境建议关闭）
+# swagger-ui（生产环境建议关闭）
 swagger-ui:
   enabled: true
 
@@ -180,17 +47,4 @@ swagger-ui:
 version:
   version: "@project.version@"
   description: "@project.description@"
-  artifact-id: "@project.artifactId@"
-
-# [必须配置] 智能门锁配置信息
-smartlock:
-  # 访问地址
-  serviceurl: http://192.168.1.66/info
-  # 用户名
-  userlogin: admin
-  # 密码
-  password: admin123
-  # 授权时长（小时）
-  authslength: 1
-  # 允许开门次数
-  opencount: 1
+  artifact-id: "@project.artifactId@"