添加配置用于调度系统

liujun001
1 parent caa848a7
Showing 8 changed files with 91 additions and 8 deletions
pom.xml
src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
src/main/java/com/genersoft/iot/vmp/jt1078/config/JT1078Controller.java
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
src/main/resources/application-local.yml
src/main/resources/application-localDev.yml
web_src/src/layout/UiHeader.vue
web_src/src/router/index.js
@@ -268,6 +268,12 @@
             <version>2.7</version>
         </dependency>
+        <dependency>
+            <groupId>com.xiaoleilu</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+
         <!-- https://mvnrepository.com/artifact/net.sf.kxml/kxml2 -->
         <!--		<dependency>-->
         <!--			<groupId>net.sf.kxml</groupId>-->
@@ -81,6 +81,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
             matchers.add("/record_proxy/*/**");
             matchers.add("/api/emit");
             matchers.add("/favicon.ico");
+            matchers.add("/api/jt1078/query/test1");
+            matchers.add("/api/jt1078/query/test");
             // 可以直接访问的静态数据
             web.ignoring().antMatchers(matchers.toArray(new String[0]));
         }
@@ -33,7 +33,7 @@ public class JT1078Controller {
     public WVPResult<?> startLive(@PathVariable String deviceId, @PathVariable String channelId) {
         J9101 j9101 = new J9101();
         j9101.setChannel(Integer.valueOf(channelId));
-        j9101.setIp("192.168.1.1");
+        j9101.setIp("192.168.169.100");
         j9101.setRate(1);
         j9101.setTcpPort(7618);
         j9101.setUdpPort(7618);
@@ -43,7 +43,7 @@ public class JT1078Controller {
         // TODO 设备响应成功后,封装拉流结果集
         WVPResult<String> wvpResult = new WVPResult<>();
         wvpResult.setCode(200);
-        wvpResult.setData(String.format("http://192.168.1.1/rtp/%s_%s.live.mp4", deviceId, channelId));
+        wvpResult.setData(String.format("http://192.168.169.100/rtp/%s_%s.live.mp4", deviceId, channelId));
         return wvpResult;
     }
 package com.genersoft.iot.vmp.media.zlm.dto;
+import com.alibaba.fastjson2.JSON;
 import com.genersoft.iot.vmp.gb28181.bean.GbStream;
 import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
 import com.genersoft.iot.vmp.utils.DateUtil;
@@ -385,5 +386,10 @@ public class StreamPushItem extends GbStream implements Comparable&lt;StreamPushIte
 //        super.setStatus(status);
 //    }
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
@@ -13,7 +13,7 @@ spring:
   # REDIS数据库配置
   redis:
     # [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1
-    host: 127.0.0.1
+    host: 192.168.169.100
     # [必须修改] 端口号
     port: 6379
     # [可选] 数据库 DB
@@ -60,7 +60,7 @@ sip:
   # 如果要监听多张网卡，可以使用逗号分隔多个IP， 例如： 192.168.1.4,10.0.0.4
   # 如果不明白，就使用0.0.0.0，大部分情况都是可以的
   # 请不要使用127.0.0.1，任何包括localhost在内的域名都是不可以的。
-  ip: 192.169.1.89
+  ip: 192.169.1.92
   # [可选] 28181服务监听的端口
   port: 5060
@@ -84,15 +84,15 @@ media:
   # [必须修改] zlm服务器的http.port
   http-port: 1091
   # [可选] 返回流地址时的ip，置空使用 media.ip
-  stream-ip:  192.168.169.100
+  stream-ip:  192.169.1.92
   # [可选] wvp在国标信令中使用的ip，此ip为摄像机可以访问到的ip， 置空使用 media.ip
-  sdp-ip:  192.168.169.100
+  sdp-ip:  192.169.1.92
   # [可选] zlm服务器的hook所使用的IP, 默认使用sip.ip
-  hook-ip:  192.168.169.100
+  hook-ip:  192.169.1.92
   # [可选] zlm服务器的http.sslport, 置空使用zlm配置文件配置
   http-ssl-port: 443
   # [可选] zlm服务器的hook.admin_params=secret
-  secret: RPorcBlIw26uHGnEHYGesIYyFDXpgjkP
+  secret: RPorcBlIw26uHGnEHYGesIYyFDXpgjkP1
   # 启用多端口模式, 多端口模式使用端口区分每路流，兼容性更好。 单端口使用流的ssrc区分， 点播超时建议使用多端口测试
   rtp:
     # [可选] 是否启用多端口模式, 开启后会在portRange范围内选择端口用于媒体流传输
@@ -122,7 +122,38 @@ user-settings:
 # [可选] 日志配置, 一般不需要改
 logging:
   config: classpath:logback-spring.xml
+jt1078:
+  enable: true
+  port: 9998
 #mybatis:
 #  configuration:
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+tuohua:
+  bsth:
+    login:
+      pageURL: http://192.169.1.92:9088/user/login/jCryptionKey
+      url: http://127.0.0.1:9088/user/login
+      userName: yuanxiaohu
+      password: Yxiaohu1.0
+    tree:
+      url:
+        company: http://127.0.0.1:9088/video/tree
+        car: http://127.0.0.1:9088/video/tree/carNo/{0}
+        sim: http://127.0.0.1:9088/video//tree/caNO/sim/{0}
+    wvp28181:
+
+      rtsp:
+        tcpPort: 1078
+        udpPort: 1078
+        historyTcpPort: 9999
+        historyUdpPort: 9999
+        ip : 61.169.120.202
+    jt1078:
+       url: http://192.168.168.241:8100/device/{0}
+       historyListPort: 9205
+       playHistoryPort: 9201
+       sendPort: 9101
+       stopSendPort: 9102
+       playURL: /play/wasm/ws%3A%2F%2F{ip}%3A{port}%2Fschedule%2F{sim}-{channel}.live.flv%3FcallId%{publickey}
+
@@ -126,4 +126,36 @@ logging:
 #mybatis:
 #  configuration:
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+tuohua:
+  bsth:
+    login:
+      pageURL: http://192.169.1.92:9088/user/login/jCryptionKey
+      url: http://192.169.1.92:9088/user/login
+      userName: yuanxiaohu
+      password: Yxiaohu1.0
+
+    tree:
+      url:
+        company: http://192.169.1.92:9088/video/tree
+        car: http://192.169.1.92:9088/video/tree/carNo/{0}
+        sim: http://192.169.1.92:9088/video//tree/caNO/sim/{0}
+    wvp28181:
+      rtsp:
+        tcpPort: 1078
+        udpPort: 1078
+        historyTcpPort: 9999
+        historyUdpPort: 9999
+        ip : 61.169.120.202
+    jt1078:
+      url: http://192.168.168.241:8100/device/{0}
+      historyListPort: 9205
+      playHistoryPort: 9201
+      sendPort: 9101
+      stopSendPort: 9102
+      playURL: /play/wasm/ws%3A%2F%2F{ip}%3A{port}%2Fschedule%2F{sim}-{channel}.live.flv%3FcallId%{publickey}
+
+jt1078:
+  enable: true
+  port: 9998
+
@@ -7,6 +7,7 @@
       <el-menu-item index="/console">控制台</el-menu-item>
       <el-menu-item index="/live">分屏监控</el-menu-item>
       <el-menu-item index="/deviceList">国标设备</el-menu-item>
+      <el-menu-item index="/deviceList1078">1078设备</el-menu-item>
       <el-menu-item index="/map">电子地图</el-menu-item>
       <el-menu-item index="/pushVideoList">推流列表</el-menu-item>
       <el-menu-item index="/streamProxyList">拉流代理</el-menu-item>
@@ -5,6 +5,7 @@ import Layout from &quot;../layout/index.vue&quot;
 import cloudRecord from '../components/CloudRecord.vue'
 import cloudRecordDetail from '../components/CloudRecordDetail.vue'
 import deviceList from '../components/DeviceList.vue'
+import deviceList1078 from '../components/DeviceList1078.vue'
 import gbRecordDetail from '../components/GBRecordDetail.vue'
 import login from '../components/Login.vue'
 import mediaServerManger from '../components/MediaServerManger.vue'
@@ -56,6 +57,10 @@ export default new VueRouter({
           component: deviceList,
         },
         {
+          path: '/deviceList1078',
+          component: deviceList1078,
+        },
+        {
           path: '/minhang/deviceList',
           name: 'minhang',
           component: minhang,