添加配置用于调度系统

liujun001
1 parent 77e16880
Showing 12 changed files with 196 additions and 52 deletions
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/Jt1078OfCarController.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/ben/HttpClientPostEntity.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/config/Jt1078ConfigBean.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/config/TuohuaConfigBean.java
src/main/resources/application-local.yml
src/main/resources/application-localDev.yml
src/main/resources/application.yml
web_src/config/index.js
web_src/src/components/common/DeviceTreeForZtree.vue
web_src/src/layout/UiHeader.vue
web_src/src/router/index.js
web_src/static/js/config.js
@@ -191,22 +191,36 @@ public class Jt1078OfCarController {
             return resultMap;
         }
-        String msg = jt1078ConfigBean.formatMessageId(sim, channel, rtspConfigBean);
+        String msg = null;
+        String stream = StringUtils.join(sim, "-", channel);
         String url = StringUtils.replace(jt1078ConfigBean.getJt1078Url(), "{0}", jt1078ConfigBean.getJt1078SendPort());
         try {
-            //List<StreamPushItem> streamPushItems = streamPushService.getPushList(StringUtils.join(sim, "-", channel));
-            // int count = CollectionUtils.size(streamPushItems);
-            // if (count == 0) {
-            HttpClientPostEntity entity = httpClientUtil.doPost(url, msg, null);
-            log.info(entity.getResultStr());
-            //}
+            StreamContent streamContent = getStreamContentPlayURL(StringUtils.join(stream));
+            if (Objects.isNull(streamContent) || StringUtils.isBlank(streamContent.getWs_flv())) {
+                //List<StreamPushItem> streamPushItems = streamPushService.getPushList(StringUtils.join(sim, "-", channel));
+                // int count = CollectionUtils.size(streamPushItems);
+                // if (count == 0) {
+                HttpClientPostEntity entity = createServerLister(stream);
+                if (Objects.isNull(entity)) {
+                    resultMap.put("code", "-20");
+                    resultMap.put("message", "新建链接错误，请稍后再试");
+                    return resultMap;
+                }
-            resultMap.put("code", "1");
-            resultMap.put("message", "OK");
+                resultMap.put("port", entity.getPort());
+                resultMap.put("httpPort", entity.getHttpPort());
+                resultMap.put("stream", stream);
+                msg = jt1078ConfigBean.formatMessageId(sim, channel, rtspConfigBean, entity.getPort() + 30000);
-            StreamContent streamContent = getStreamContent(StringUtils.join(sim, "-", channel));
+                entity = httpClientUtil.doPost(url, msg, null);
+                log.info(entity.getResultStr());
+
+                streamContent = getStreamContent(stream);
+            }
+            resultMap.put("code", "1");
+            resultMap.put("message", "OK");
             resultMap.put("data", streamContent);
             return resultMap;
@@ -221,10 +235,8 @@ public class Jt1078OfCarController {
     }
-
-
-    @GetMapping("/send/stop/io/{sim}/{channel}")
-    public Map<String, Object> sendIORequestStop(@PathVariable String sim, @PathVariable String channel) {
+    @GetMapping("/send/stop/io/{sim}/{channel}/{stream}/{port}/{httpPort}")
+    public Map<String, Object> sendIORequestStop(@PathVariable String sim, @PathVariable String channel, @PathVariable String stream, @PathVariable Integer port, @PathVariable Integer httpPort) {
         Map<String, Object> resultMap = new HashMap<>();
         if (StringUtils.isBlank(sim)) {
             resultMap.put("code", "-100");
@@ -243,9 +255,12 @@ public class Jt1078OfCarController {
         String msg = jt1078ConfigBean.formatMessageStop(sim, channel);
-        String url = StringUtils.replace(jt1078ConfigBean.getJt1078Url(), "{0}", jt1078ConfigBean.getStopSendPort());
+        String url = jt1078ConfigBean.formatStopPushURL(stream, port, httpPort);
         try {
-            List<StreamPushItem> streamPushItems = streamPushService.getPushList(StringUtils.join(sim, "-", channel));
+            httpClientUtil.doGet(url, null);
+
+            url = StringUtils.replace(jt1078ConfigBean.getJt1078Url(), "{0}", jt1078ConfigBean.getStopSendPort());
+            List<StreamPushItem> streamPushItems = streamPushService.getPushList(stream);
             int count = CollectionUtils.size(streamPushItems);
             for (int i = 0; i < count; i++) {
                 StreamPushItem item = streamPushItems.get(i);
@@ -268,6 +283,7 @@ public class Jt1078OfCarController {
             resultMap.put("code", "1");
             resultMap.put("message", "OK");
+
             return resultMap;
         } catch (URISyntaxException | IOException e) {
             log.error("发送停止推流指令异常;[{}],[{}]", url, msg, e);
@@ -383,13 +399,25 @@ public class Jt1078OfCarController {
         String key = StringUtils.join(sim, "-", channel);
         redisTemplate.opsForValue().set(key, channelMapping, 1, TimeUnit.HOURS);
-        String msg = jt1078ConfigBean.formatMessageHistoryPlayRTSP(sim, channel, startTime, endTime, rtspConfigBean);
+        String msg = null;
         log.info("msg:{}", msg);
         String url = StringUtils.replace(jt1078ConfigBean.getJt1078Url(), "{0}", jt1078ConfigBean.getPlayHistoryPort());
+
         try {
+            HttpClientPostEntity entity = createServerLister(channelMapping);
+            if (Objects.isNull(entity)) {
+                resultMap.put("code", "-20");
+                resultMap.put("message", "新建链接错误，请稍后再试");
+                return resultMap;
+            }
+            resultMap.put("stream", channelMapping);
+            resultMap.put("port", entity.getPort());
+            resultMap.put("httpPort", entity.getHttpPort());
+
+            msg = jt1078ConfigBean.formatMessageHistoryPlayRTSP(sim, channel, startTime, endTime, rtspConfigBean, entity.getPort() + 30000);
             boolean flag = false;
-            HttpClientPostEntity entity = null;
+
             key = key + "-lock";
             int index = 0;
             do {
@@ -419,11 +447,12 @@ public class Jt1078OfCarController {
             Thread.sleep(10000);
-            StreamContent streamContent = getStreamContent("\"" + channelMapping + "\"");
+            StreamContent streamContent = getStreamContent(channelMapping);
             log.info("StreamContent:[{}]", streamContent);
             resultMap.put("data", streamContent);
+
             return resultMap;
         } catch (URISyntaxException | IOException e) {
             log.error("发送推流指令异常;[{}],[{}]", url, msg, e);
@@ -456,11 +485,8 @@ public class Jt1078OfCarController {
         int index = 0;
         do {
             index++;
-            try {
-                streamContent = streamPushController.getPlayUrl("schedule", stream, mediaConfig.getId());
-            } catch (com.genersoft.iot.vmp.conf.exception.ControllerException e) {
-                log.info("获取播放地址失败:[{}],[{}]",stream,mediaConfig.getId());
-            }
+            streamContent = getStreamContentPlayURL(stream);
+
             if (Objects.nonNull(streamContent) && StringUtils.isNotEmpty(streamContent.getWs_flv())) {
                 break;
             }
@@ -471,6 +497,15 @@ public class Jt1078OfCarController {
         return streamContent;
     }
+    private StreamContent getStreamContentPlayURL(String stream) {
+        try {
+            return streamPushController.getPlayUrl("schedule", stream, mediaConfig.getId());
+        } catch (com.genersoft.iot.vmp.conf.exception.ControllerException e) {
+            log.info("获取播放地址失败:[{}],[{}]", stream, mediaConfig.getId());
+        }
+        return null;
+    }
+
     private void requestToken() throws URISyntaxException, IOException {
         HttpClientPostEntity entity = this.httpClientUtil.doGet(this.tuohuaConfigBean.getPageURL(), (String) null);
         if (!Objects.isNull(entity)) {
@@ -559,4 +594,45 @@ public class Jt1078OfCarController {
         time = StringUtils.replace(time, " ", "");
         return StringUtils.replace(time, ":", "");
     }
+
+    private HttpClientPostEntity createServerLister(String channelMapping) throws URISyntaxException, IOException {
+        Integer port = RandomUtils.nextInt(jt1078ConfigBean.getStart1078Port(), jt1078ConfigBean.getEnd1078Port());
+        Integer httPort = RandomUtils.nextInt(jt1078ConfigBean.getStart1078Port(), jt1078ConfigBean.getEnd1078Port());
+        if (!Objects.equals(port, httPort) && Objects.nonNull(port)) {
+//        Integer port = 1078;
+//        Integer httPort = 3333;
+
+            String key = "jt1078:server:port:" + port;
+            String httpKey = "jt1078:server:httpport:" + httPort;
+            int index = 0;
+            while (redisTemplate.hasKey(key) || redisTemplate.hasKey(httpKey)) {
+                port = RandomUtils.nextInt(jt1078ConfigBean.getStart1078Port(), jt1078ConfigBean.getEnd1078Port());
+                httPort = RandomUtils.nextInt(jt1078ConfigBean.getStart1078Port(), jt1078ConfigBean.getEnd1078Port());
+                key = "jt1078:server:port:" + port;
+                httpKey = "jt1078:server:httpport:" + httPort;
+
+                if (index > 1000) {
+                    break;
+                }
+            }
+
+            redisTemplate.opsForValue().set(key, 1, 2, TimeUnit.DAYS);
+            redisTemplate.opsForValue().set(httpKey, 1, 2, TimeUnit.DAYS);
+        } else {
+            port = 1078;
+            httPort = 3333;
+        }
+
+        String url = jt1078ConfigBean.formatPushURL(channelMapping, port, httPort);
+
+        HttpClientPostEntity httpClientPostEntity = httpClientUtil.doGet(url, null);
+        if (Objects.isNull(httpClientPostEntity)) {
+            return null;
+        }
+//        HttpClientPostEntity httpClientPostEntity = new HttpClientPostEntity();
+        httpClientPostEntity.setHttpPort(httPort);
+        httpClientPostEntity.setPort(port);
+
+        return httpClientPostEntity;
+    }
 }
@@ -15,6 +15,9 @@ public class HttpClientPostEntity {
     private Map<String, String> headers;
     private CookieStore cookieStore;
+    private Integer port;
+    private  Integer httpPort;
+
     public String getResultStr() {
         return resultStr;
     }
@@ -38,4 +41,20 @@ public class HttpClientPostEntity {
     public void setCookieStore(CookieStore cookieStore) {
         this.cookieStore = cookieStore;
     }
+
+    public Integer getPort() {
+        return port;
+    }
+
+    public void setPort(Integer port) {
+        this.port = port;
+    }
+
+    public Integer getHttpPort() {
+        return httpPort;
+    }
+
+    public void setHttpPort(Integer httpPort) {
+        this.httpPort = httpPort;
+    }
 }
@@ -4,6 +4,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import java.util.Objects;
+
 /**
  * @author liujun
  * @date 2024年10月23日 13:38
@@ -21,16 +23,27 @@ public class Jt1078ConfigBean {
     @Value("${tuohua.bsth.jt1078.playHistoryPort}")
     private String playHistoryPort;
+    @Value("${tuohua.bsth.jt1078.ports}")
+    private String portsOf1078;
+
+    @Value("${tuohua.bsth.jt1078.pushURL}")
+    private String pushURL;
+    @Value("${tuohua.bsth.jt1078.stopPushURL}")
+    private String stopPUshURL;
+
+    private Integer start1078Port;
+    private Integer end1078Port;
+
     private static final String SEND_IO_MESSAGE_RTSP = "{ \"messageId\": 37121, \"properties\": 0, \"clientId\": \"{clientId}\", \"serialNo\": \"1\", \"ip\": \"{ip}\", \"tcpPort\": \"{tcpPort}\", \"udpPort\": \"{udpPort}\", \"channelNo\": \"{channelNo}\", \"mediaType\": \"1\", \"streamType\": \"1\"}";
     private static final String SEND_IO_MESSAGE_RTSP_STOP = "{\"messageId\": 37122,\"properties\": 0,\"clientId\": \"{clientId}\",\"serialNo\": \"1\",\"channelNo\": \"{channelNo}\",\"command\": \"0\",\"closeType\": \"0\",\"streamType\": \"1\"}";
     private static final String SEND_IO_HISTORY_RTSP = "{\"msgid\":37381,\"clientId\":\"{clientId}\",\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"channelId\":{channelNo}}";
     private static final String SEND_IO_PLAY_RTSP = "{\"ip\":\"{ip}\",\"tcpPort\":{tcpPort},\"udpPort\":{udpPort},\"channelNo\":\"{channelNo}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"playbackType\":0,\"playbackSpeed\":1,\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"clientId\":\"{sim}\",\"messageId\":37377}";
-    public String formatMessageId(String sim, String channel, RtspConfigBean configBean) {
+    public String formatMessageId(String sim, String channel, RtspConfigBean configBean,Integer port) {
         String msg = StringUtils.replace(SEND_IO_MESSAGE_RTSP, "{clientId}", sim);
-        msg = StringUtils.replace(msg, "{tcpPort}", configBean.getRtspTcpPort());
-        msg = StringUtils.replace(msg, "{udpPort}", configBean.getRtspUdpPort());
+        msg = StringUtils.replace(msg, "{tcpPort}", port+"");
+        msg = StringUtils.replace(msg, "{udpPort}", port+"");
         msg = StringUtils.replace(msg, "{channelNo}", channel);
         return StringUtils.replace(msg, "{ip}", configBean.getRtspIp());
     }
@@ -47,17 +60,29 @@ public class Jt1078ConfigBean {
         return StringUtils.replace(msg, "{channelNo}", channel);
     }
-    public String formatMessageHistoryPlayRTSP(String sim, String channel, String startTime, String endTime, RtspConfigBean configBean) {
+    public String formatMessageHistoryPlayRTSP(String sim, String channel, String startTime, String endTime, RtspConfigBean configBean,Integer port) {
         String msg = StringUtils.replace(SEND_IO_PLAY_RTSP, "{clientId}", sim);
         msg = StringUtils.replace(msg, "{startTime}", startTime);
         msg = StringUtils.replace(msg, "{endTime}", endTime);
         msg = StringUtils.replace(msg, "{channelNo}", channel);
-        msg = StringUtils.replace(msg, "{tcpPort}", configBean.getHistoryTcpPort());
-        msg = StringUtils.replace(msg, "{udpPort}", configBean.getHistoryUdpPort());
+        msg = StringUtils.replace(msg, "{tcpPort}", port+"");
+        msg = StringUtils.replace(msg, "{udpPort}", port+"");
         msg = StringUtils.replace(msg, "{sim}", sim);
         return StringUtils.replace(msg, "{ip}", configBean.getRtspIp());
     }
+    public String formatPushURL(String pushKey, int port, int httpPort) {
+        String msg = StringUtils.replace(pushURL, "{pushKey}", pushKey);
+        msg = StringUtils.replace(msg, "{port}", String.valueOf(port));
+        return StringUtils.replace(msg, "{httpPort}", String.valueOf(httpPort));
+    }
+
+    public String formatStopPushURL(String pushKey, int port, int httpPort) {
+        String msg = StringUtils.replace(stopPUshURL, "{pushKey}", pushKey);
+        msg = StringUtils.replace(msg, "{port}", String.valueOf(port));
+        return StringUtils.replace(msg, "{httpPort}", String.valueOf(httpPort));
+    }
+
     public String getJt1078Url() {
         return jt1078Url;
     }
@@ -77,4 +102,26 @@ public class Jt1078ConfigBean {
     public String getPlayHistoryPort() {
         return playHistoryPort;
     }
+
+    public String getPushURL() {
+        return pushURL;
+    }
+
+    public Integer getStart1078Port() {
+        if (Objects.isNull(start1078Port)) {
+            start1078Port = Integer.parseInt(StringUtils.substringBefore(portsOf1078, ","));
+        }
+        return start1078Port;
+    }
+
+    public Integer getEnd1078Port() {
+        if (Objects.isNull(end1078Port)) {
+            end1078Port = Integer.parseInt(StringUtils.substringAfter(portsOf1078, ","));
+        }
+        return end1078Port;
+    }
+
+    public String getStopPUshURL() {
+        return stopPUshURL;
+    }
 }
 package com.genersoft.iot.vmp.vmanager.jt1078.platform.config;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import java.util.Objects;
+
 /**
  * @author liujun
  * @date 2024年10月23日 13:34
@@ -57,4 +60,6 @@ public class TuohuaConfigBean {
     public String getSimURL() {
         return simURL;
     }
+
+
 }
@@ -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: 0.0.0.0
   # [可选] 28181服务监听的端口
   port: 5060
@@ -148,9 +148,12 @@ tuohua:
         historyUdpPort: 9999
         ip : 61.169.120.202
     jt1078:
+       ports: 9000,9500
+       pushURL: http://192.169.1.92:3333/new/server/{pushKey}/{port}/{httpPort}
+       stopPushURL: http://192.169.1.92:3333/stop/channel/{pushKey}/{port}/{httpPort}
        url: http://192.168.168.241:8100/device/{0}
        historyListPort: 9205
-       historyPlayPort: 9201
+       playHistoryPort: 9201
        sendPort: 9101
        stopSendPort: 9102
        playURL: /play/wasm/ws%3A%2F%2F{ip}%3A{port}%2Fschedule%2F{sim}-{channel}.live.flv%3FcallId%{publickey}
@@ -81,15 +81,15 @@ sip:
 media:
   id: guzijian1
   # [必须修改] zlm服务器的内网IP
-  ip:  61.169.120.202
+  ip:  192.168.169.100
   # [必须修改] zlm服务器的http.port
   http-port: 1091
   # [可选] 返回流地址时的ip，置空使用 media.ip
-  stream-ip: 61.169.120.202
+  stream-ip: 192.168.169.100
   # [可选] wvp在国标信令中使用的ip，此ip为摄像机可以访问到的ip， 置空使用 media.ip
-  sdp-ip: 61.169.120.202
+  sdp-ip: 192.168.169.100
   # [可选] zlm服务器的hook所使用的IP, 默认使用sip.ip
-  hook-ip: 61.169.120.202
+  hook-ip: 192.168.169.100
   # [可选] zlm服务器的http.sslport, 置空使用zlm配置文件配置
   http-ssl-port: 443
   # [可选] zlm服务器的hook.admin_params=secret
@@ -147,6 +147,9 @@ tuohua:
         historyUdpPort: 9999
         ip : 61.169.120.202
     jt1078:
+      ports: 9000,9500
+      pushURL: http://192.169.1.92:3333/new/server/{pushKey}/{port}/{httpPort}
+      stopPushURL: http://192.169.1.92:3333/stop/channel/{pushKey}/{port}/{httpPort}
       url: http://192.168.168.241:8100/device/{0}
       historyListPort: 9205
       playHistoryPort: 9201
@@ -154,8 +157,4 @@ tuohua:
       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
-
@@ -2,6 +2,6 @@ spring:
   application:
     name: wvp
   profiles:
-    active: local
+    active: localDev
 server:
   port: 18080
 \ No newline at end of file
@@ -11,14 +11,14 @@ module.exports = {
     assetsPublicPath: "/",
     proxyTable: {
       "/debug": {
-        target: "http://192.169.1.89:18080",
+        target: "http://192.169.1.92:28080",
         changeOrigin: true,
         pathRewrite: {
           "^/debug": "/",
         },
       },
       "/static/snap": {
-        target: "http://192.169.1.89:18080",
+        target: "http://192.168.169.100:28080",
         changeOrigin: true,
         // pathRewrite: {
         //   '^/static/snap': '/static/snap'
@@ -30,6 +30,7 @@ export default {
         return {
           deviceService: new DeviceService(),
           device: null,
+          ztreeObj:null,
           nodes:[],
           setting: {
             callback: {
@@ -93,6 +94,7 @@ export default {
         // console.log(treeNodes)
       },
       handleCreated(ztreeObj) {
+        this.ztreeObj = ztreeObj;
         console.log(ztreeObj)
       }
     }
@@ -9,7 +9,6 @@
       <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="/deviceList1078">1078设备</el-menu-item>
       <el-menu-item index="/pushVideoList">推流列表</el-menu-item>
       <el-menu-item index="/streamProxyList">拉流代理</el-menu-item>
       <el-menu-item index="/cloudRecord">云端录像</el-menu-item>
@@ -20,7 +20,6 @@ import minhangChannel from &#39;../components/common/minhangChannel.vue&#39;
 import console from '../components/console.vue'
 import live from '../components/live.vue'
 import map from '../components/map.vue'
-import map1078 from '../components/map1078.vue'
 import media from '../components/setting/Media.vue'
 import sip from '../components/setting/Sip.vue'
 import web from '../components/setting/Web.vue'
@@ -100,11 +99,6 @@ export default new VueRouter({
           component: map,
         },
         {
-          path: '/map1078',
-          name: 'map1078',
-          component: map1078,
-        },
-        {
           path: '/cloudRecord',
           name: 'cloudRecord',
           component: cloudRecord,
-window.baseUrl = "http://192.169.1.89:18080";
+window.baseUrl = "http://192.168.169.100:28080";
 // map组件全局参数, 注释此内容可以关闭地图功能
 window.mapParam = {