添加配置用于调度系统

liujun001
1 parent e1f3d030
Showing 8 changed files with 124 additions and 42 deletions
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/Jt1078OfCarController.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/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/handler/HttpClientUtil.java
src/main/resources/application-local.yml
src/main/resources/application-localDev.yml
src/main/resources/application.yml
@@ -49,10 +49,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.sip.InvalidArgumentException;
 import javax.sip.SipException;
 import java.text.ParseException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 /**
  * @description:针对 ZLMediaServer的hook事件监听
@@ -567,6 +564,8 @@ public class ZLMHttpHookListener {
             String stream = param.getStream();
             Object port = redisTemplate.opsForValue().get("tag:history:port:" + stream);
             Object httpPort = redisTemplate.opsForValue().get("tag:history:httpPort:" + stream);
+            Object time = redisTemplate.opsForValue().get("tag:history:httpPort:time:" + stream);
+
             if (ObjectUtils.isEmpty(port)) {
                 port = -1;
             }
@@ -575,11 +574,14 @@ public class ZLMHttpHookListener {
                 httpPort = -1;
             }
-            Map<String, Object> resl = jt1078OfCarController.sendIORequestStop(StringUtils.substringBefore(stream, "-"), StringUtils.substringAfter(stream, "-"), stream, (Integer) port, (Integer) httpPort);
-            if (!StringUtils.equals(String.valueOf(resl.get("code")), "1")) {
-                logger.info("停流失败，稍后再试:{},{},{}", stream, port, httpPort);
-                return ret;
+            if (Objects.isNull(time) || Objects.equals(0L, time)) {
+                Map<String, Object> resl = jt1078OfCarController.sendIORequestStop(StringUtils.substringBefore(stream, "-"), StringUtils.substringAfter(stream, "-"), stream, (Integer) port, (Integer) httpPort);
+                if (!StringUtils.equals(String.valueOf(resl.get("code")), "1")) {
+                    logger.info("停流失败，稍后再试:{},{},{}", stream, port, httpPort);
+                    return ret;
+                }
             }
+
             // 国标流， 点播/录像回放/录像下载
             InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(null, param.getStream());
             // 点播
@@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSONException;
 import com.genersoft.iot.vmp.conf.MediaConfig;
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.conf.security.SecurityUtils;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
 import com.genersoft.iot.vmp.service.IStreamPushService;
 import com.genersoft.iot.vmp.vmanager.bean.StreamContent;
@@ -15,6 +16,7 @@ import com.genersoft.iot.vmp.vmanager.jt1078.platform.config.RtspConfigBean;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.config.TuohuaConfigBean;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.handler.HttpClientUtil;
+import com.genersoft.iot.vmp.vmanager.streamProxy.StreamProxyController;
 import com.genersoft.iot.vmp.vmanager.streamPush.StreamPushController;
 import com.sun.jna.platform.win32.Rasapi32Util;
 import com.xiaoleilu.hutool.crypto.SecureUtil;
@@ -71,6 +73,8 @@ public class Jt1078OfCarController {
     private MediaConfig mediaConfig;
     @Autowired
     private StreamPushController streamPushController;
+    @Autowired
+    private StreamProxyController streamProxyController;
     @Autowired
     private IStreamPushService streamPushService;
@@ -189,17 +193,19 @@ public class Jt1078OfCarController {
                 resultMap.put("httpPort", entity.getHttpPort());
                 resultMap.put("stream", stream);
-                redisTemplate.opsForValue().set("tag:history:port:"+stream, entity.getPort(), 2, TimeUnit.DAYS);
-                redisTemplate.opsForValue().set("tag:history:httpPort:"+stream, entity.getHttpPort(), 2, TimeUnit.DAYS);
+                redisTemplate.opsForValue().set("tag:history:port:" + stream, entity.getPort(), 2, TimeUnit.DAYS);
+                redisTemplate.opsForValue().set("tag:history:httpPort:" + stream, entity.getHttpPort(), 2, TimeUnit.DAYS);
+                redisTemplate.opsForValue().set("tag:history:httpPort:time:" + stream, new Date().getTime(), 1800, TimeUnit.SECONDS);
-                msg = jt1078ConfigBean.formatMessageId(sim, channel, rtspConfigBean, entity.getPort() + 30000);
+                msg = jt1078ConfigBean.formatMessageId(sim, channel, rtspConfigBean, entity.getPort());
                 entity = httpClientUtil.doPost(url, msg, null);
-                Map<String, Object> resultMap1 = chooseEntity(entity);
-                if (Objects.nonNull(resultMap1)) {
-                    return resultMap1;
-                }
+//                Map<String, Object> resultMap1 = chooseEntity(entity);
+//                if (Objects.nonNull(resultMap1)) {
+//                    return resultMap1;
+//                }
                 log.info(entity.getResultStr());
+                createStreamProxy(sim + "-" + channel);
                 streamContent = getStreamContent(stream);
             }
@@ -241,6 +247,8 @@ public class Jt1078OfCarController {
         String url = jt1078ConfigBean.formatStopPushURL(stream, port, httpPort);
         try {
+            streamProxyController.del(stream,stream);
+
             httpClientUtil.doGet(url, null);
             url = StringUtils.replace(jt1078ConfigBean.getJt1078Url(), "{0}", jt1078ConfigBean.getStopSendPort());
@@ -267,7 +275,6 @@ public class Jt1078OfCarController {
             resultMap.put("code", "1");
             resultMap.put("message", "OK");
-
             return resultMap;
         } catch (URISyntaxException | IOException e) {
             log.error("发送停止推流指令异常;[{}],[{}]", url, msg, e);
@@ -325,7 +332,7 @@ public class Jt1078OfCarController {
                 return resultMap;
             }
-            Map<String, Object> resultMap1 = chooseEntity(entity);
+            Map<String, Object> resultMap1 = chooseEntity(entity,url);
             if (Objects.nonNull(resultMap1)) {
                 return resultMap1;
             }
@@ -402,7 +409,7 @@ public class Jt1078OfCarController {
                 return resultMap;
             }
-            Map<String, Object> resultMap1 = chooseEntity(entity);
+            Map<String, Object> resultMap1 = chooseEntity(entity,url);
             if (Objects.nonNull(resultMap1)) {
                 return resultMap1;
             }
@@ -411,10 +418,11 @@ public class Jt1078OfCarController {
             resultMap.put("port", entity.getPort());
             resultMap.put("httpPort", entity.getHttpPort());
-            redisTemplate.opsForValue().set("tag:history:port:"+channelMapping, entity.getPort(), 2, TimeUnit.DAYS);
-            redisTemplate.opsForValue().set("tag:history:httpPort:"+channelMapping, entity.getHttpPort(), 2, TimeUnit.DAYS);
+            redisTemplate.opsForValue().set("tag:history:port:" + channelMapping, entity.getPort(), 2, TimeUnit.DAYS);
+            redisTemplate.opsForValue().set("tag:history:httpPort:" + channelMapping, entity.getHttpPort(), 2, TimeUnit.DAYS);
+            redisTemplate.opsForValue().set("tag:history:httpPort:time:" + channelMapping, new Date().getTime(), 1800, TimeUnit.SECONDS);
-            msg = jt1078ConfigBean.formatMessageHistoryPlayRTSP(sim, channel, startTime, endTime, rtspConfigBean, entity.getPort() + 30000);
+            msg = jt1078ConfigBean.formatMessageHistoryPlayRTSP(sim, channel, startTime, endTime, rtspConfigBean, entity.getPort());
             boolean flag = false;
             key = key + "-lock";
@@ -439,7 +447,7 @@ public class Jt1078OfCarController {
                 return resultMap;
             }
             log.info(entity.getResultStr());
-
+            createStreamProxy(channelMapping);
             resultMap.put("code", "1");
             resultMap.put("message", "OK");
@@ -635,23 +643,56 @@ public class Jt1078OfCarController {
         return httpClientPostEntity;
     }
-    private Map<String, Object> chooseEntity(HttpClientPostEntity entity) {
+    private Map<String, Object> chooseEntity(HttpClientPostEntity entity,String url) {
         Map<String, Object> result = new HashMap<>();
         if (Objects.isNull(entity)) {
             result.put("code", "301");
             result.put("msg", "下发指令异常");
             return result;
         }
-        Map<String,String> rsultMap = JSON.parseObject(entity.getResultStr(),HashMap.class);
-        if(Objects.equals(rsultMap.get("code"),"4000") || Objects.equals(rsultMap.get("code"),4000)){
-            result.put("code", "304");
-            result.put("msg", "离线的客户端（请检查设备是否注册或者鉴权");
-            return result;
+        try {
+            Map<String, Object> rsultMap = JSON.parseObject(entity.getResultStr(), HashMap.class);
+            if (Objects.equals(rsultMap.get("code"), "4000") || Objects.equals(rsultMap.get("code"), 4000)) {
+                result.put("code", "304");
+                result.put("msg", "离线的客户端（请检查设备是否注册或者鉴权");
+                return result;
+            }
+
+            if (Objects.nonNull(rsultMap.get("success")) && StringUtils.equalsAnyIgnoreCase(String.valueOf(rsultMap.get("success")), "true")) {
+                return null;
+            } else if (StringUtils.isNoneBlank(rsultMap.get("msg") + "")) {
+                result.put("code", "304");
+                result.put("msg", rsultMap.get("msg"));
+                return result;
+            }
+        }catch (Exception e){
+            log.error("entity.getResultStr():{{}}",entity.getResultStr(),e);
         }
         return null;
     }
+    private void createStreamProxy(String stream) {
+        String url = StringUtils.replace(jt1078ConfigBean.getGetURL(), "{stream}", stream);
+        StreamProxyItem item = new StreamProxyItem();
+        item.setApp("schedule");
+        item.setEnable(true);
+        item.setEnableAudio(true);
+        item.setRtpType("default");
+        item.setStream(stream);
+        item.setMediaServerId(mediaConfig.getId());
+        item.setUrl(url);
+        item.setFfmpegCmdKey("ffmpeg.cmd");
+        item.setEnable(true);
+        item.setEnableAudio(true);
+        item.setEnableMp4(false);
+        item.setEnableRemoveNoneReader(false);
+        item.setEnableDisableNoneReader(false);
+
+        streamProxyController.save(item);
+
+    }
+
 }
@@ -33,6 +33,8 @@ public class Jt1078ConfigBean {
     private Integer start1078Port;
     private Integer end1078Port;
+    @Value("${tuohua.bsth.jt1078.get.url}")
+    private String getURL;
     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\"}";
@@ -124,4 +126,8 @@ public class Jt1078ConfigBean {
     public String getStopPUshURL() {
         return stopPUshURL;
     }
+
+    public String getGetURL() {
+        return getURL;
+    }
 }
@@ -84,7 +84,7 @@ public class TuohuaConfigBean {
     private final String LINE_URL = "/line/company/{companyId}?timestamp={timestamp}&nonce={nonce}&password={password}&sign={sign}";
-//private final String LINE_URL = "/line/all?timestamp={timestamp}&nonce={nonce}&password={password}&sign={sign}";
+    //private final String LINE_URL = "/line/all?timestamp={timestamp}&nonce={nonce}&password={password}&sign={sign}";
     private final String CAR_URL = "/car/company/{companyId}?timestamp={timestamp}&nonce={nonce}&password={password}&sign={sign}";
     public String requestLine(HttpClientUtil httpClientUtil, String companyId) throws Exception {
@@ -142,7 +142,7 @@ public class TuohuaConfigBean {
                 String code = convertStr(hashMap.get("lineCode"));
                 HashMap<String, Object> map = combationTree(code, convertStr(hashMap.get("line")), code, false, convertStr(hashMap.get("name")), code, false,
                         "<span><img src='/metronic_v4.5.4/layui/icon/line.png' class ='imageIcon' /></span><span>" + convertStr(hashMap.get("name")) + "</span>",
-                        "<span><img src='/metronic_v4.5.4/layui/icon/line.png' class ='imageIcon' /></span><span>" + convertStr(hashMap.get("name")) + "</span>",201);
+                        "<span><img src='/metronic_v4.5.4/layui/icon/line.png' class ='imageIcon' /></span><span>" + convertStr(hashMap.get("name")) + "</span>", 201);
                 if (carsSize > 0) {
                     List<HashMap> carList = carJsonListFinal.stream().filter(c -> Objects.nonNull(c.get("lineCode")) && StringUtils.equals(convertStr(c.get("lineCode")), code)).map(ch -> {
                         ch.put("used", "1");
@@ -196,7 +196,7 @@ public class TuohuaConfigBean {
     }
     public HashMap<String, Object> combationTree(String code, String icon, String id, boolean initChild, String name, String sourceId,
-                                                 boolean spread, String text, String title,Integer type) {
+                                                 boolean spread, String text, String title, Integer type) {
         HashMap<String, Object> result = new HashMap<>();
         result.put("code", code);
         result.put("icon", icon);
@@ -207,16 +207,16 @@ public class TuohuaConfigBean {
         result.put("spread", spread);
         result.put("text", text);
         result.put("title", title);
-        result.put("type",type);
+        result.put("type", type);
         return result;
     }
     private HashMap<String, Object> combatioinCarTree(HashMap ch) {
         String code = convertStr(ch.get("nbbm"));
         HashMap<String, Object> hashMap = combationTree(code, "bus1", code, false, code, code, false, "<span><img src='/metronic_v4.5.4/layui/icon/bus1.png' class ='imageIcon' /></span><span>" + code + "</span>",
-                "<span><img src='/metronic_v4.5.4/layui/icon/bus1.png' class ='imageIcon' /></span><span>" + code + "</span>",301);
-        hashMap.put("sim",convertStr(ch.get("sim")));
-//        hashMap.put("sim","122223333444");
+                "<span><img src='/metronic_v4.5.4/layui/icon/bus1.png' class ='imageIcon' /></span><span>" + code + "</span>", 301);
+        hashMap.put("sim", formatSim(convertStr(ch.get("sim"))));
+//        hashMap.put("sim","013800138999");
         return hashMap;
     }
@@ -243,5 +243,33 @@ public class TuohuaConfigBean {
         return Objects.isNull(object) ? "" : object.toString();
     }
+    private String formatSim(String sim) {
+        if (StringUtils.isBlank(sim)) {
+            return sim;
+        }
+
+        char[] chars = sim.toCharArray();
+        int length = chars.length;
+        StringBuilder builder = new StringBuilder();
+        boolean flag = true;
+        for (int i = 0; i < length; i++) {
+            char val =  chars[i];
+            if (flag && val == '0') {
+                continue;
+            }
+            flag = false;
+            builder.append(chars[i]);
+        }
+        return builder.toString();
+    }
+
+    public static void main(String[] args) {
+
+        TuohuaConfigBean bean = new TuohuaConfigBean();
+        String str = "0000156012345000";
+
+        System.out.println(bean.formatSim(str));
+    }
+
 }
 package com.genersoft.iot.vmp.vmanager.jt1078.platform.handler;
+import com.alibaba.fastjson2.JSON;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.ben.HttpClientPostEntity;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.http.HttpEntity;
@@ -61,7 +62,7 @@ public class HttpClientUtil {
             response = httpclient.execute(httpPost);
             // 判断返回状态是否为200
             if (response.getStatusLine().getStatusCode() == 200) {
-                return combationReturnObj(response, httpclient);
+                return combationReturnObj(response, httpclient,url, null);
             }
         } finally {
             if (response != null) {
@@ -96,7 +97,7 @@ public class HttpClientUtil {
             response = httpclient.execute(httpPost);
             // 判断返回状态是否为200
             if (response.getStatusLine().getStatusCode() == 200) {
-                return combationReturnObj(response, httpclient);
+                return combationReturnObj(response, httpclient,url,requestBody);
             }
         } catch (Exception e) {
             log.error("请求数据异常", e);
@@ -148,7 +149,7 @@ public class HttpClientUtil {
             response = httpclient.execute(httpGet);
             // 判断返回状态是否为200
             if (response.getStatusLine().getStatusCode() == 200) {
-                return combationReturnObj(response, httpclient);
+                return combationReturnObj(response, httpclient,url,null);
             }
         } finally {
             if (response != null) {
@@ -161,7 +162,7 @@ public class HttpClientUtil {
     @NotNull
-    private static HttpClientPostEntity combationReturnObj(CloseableHttpResponse response, DefaultHttpClient httpclient) throws IOException {
+    private static HttpClientPostEntity combationReturnObj(CloseableHttpResponse response, DefaultHttpClient httpclient,String url,String requestBody) throws IOException {
         HttpEntity httpEntity = response.getEntity();
         CookieStore cookieStore = httpclient.getCookieStore();
@@ -170,7 +171,7 @@ public class HttpClientUtil {
         HttpClientPostEntity postEntity = new HttpClientPostEntity();
         postEntity.setCookieStore(cookieStore);
         postEntity.setResultStr(result);
-        log.info("response data:{}",result);
+        log.info("url:{};requestBody:{};response data:{}",url,requestBody,result);
         return postEntity;
     }
 }
@@ -92,7 +92,7 @@ media:
   # [可选] zlm服务器的http.sslport, 置空使用zlm配置文件配置
   http-ssl-port: 443
   # [可选] zlm服务器的hook.admin_params=secret
-  secret: RPorcBlIw26uHGnEHYGesIYyFDXpgjkP
+  secret: RPorcBlIw26uHGnEHYGesIYyFDXpgjkP1
   # 启用多端口模式, 多端口模式使用端口区分每路流，兼容性更好。 单端口使用流的ssrc区分， 点播超时建议使用多端口测试
   rtp:
     # [可选] 是否启用多端口模式, 开启后会在portRange范围内选择端口用于媒体流传输
@@ -159,6 +159,8 @@ tuohua:
        playHistoryPort: 9201
        sendPort: 9101
        stopSendPort: 9102
+       get:
+         url: http://192.169.1.92:3333/video/{stream}.flv
        playURL: /play/wasm/ws%3A%2F%2F{ip}%3A{port}%2Fschedule%2F{sim}-{channel}.live.flv%3FcallId%{publickey}
@@ -157,6 +157,8 @@ tuohua:
       playHistoryPort: 9201
       sendPort: 9101
       stopSendPort: 9102
+      get:
+        url: http://192.169.1.92:3333/video/{stream}.flv
       playURL: /play/wasm/ws%3A%2F%2F{ip}%3A{port}%2Fschedule%2F{sim}-{channel}.live.flv%3FcallId%{publickey}
@@ -2,6 +2,6 @@ spring:
   application:
     name: wvp
   profiles:
-    active: localDev
+    active: local
 server:
   port: 18080
 \ No newline at end of file