优化

liujun001
1 parent fd94cb80
Showing 13 changed files with 301 additions and 120 deletions
src/main/java/com/genersoft/iot/vmp/conf/StreamProxyTask.java
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
src/main/java/com/genersoft/iot/vmp/service/impl/StremProxyService1078Impl.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
web_src/config/index.js
web_src/src/components/DeviceList1078.vue
web_src/src/components/common/jessibuca.vue
web_src/static/js/config.js
@@ -26,7 +26,7 @@ public class StreamProxyTask {
     @Autowired
     private IStreamProxyService streamProxyService;
-    @Scheduled(cron = "0 15 * * * ? ")
+    @Scheduled(cron = "0 45 * * * ? ")
     public void work() {
         streamProxyService.choose1078Lister();
@@ -423,6 +423,9 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
                 updateStreamProxy(streamProxy);
             } else if (jsonObject.getInteger("code") == -1) {
                 redisTemplate.opsForValue().set("stream:status:" + stream, "1", 30, TimeUnit.SECONDS);
+                if(StringUtils.equals(jsonObject.getString("msg"),"This stream already exists" )){
+                    redisTemplate.opsForValue().set("stream:status:" + stream, "2", 30, TimeUnit.SECONDS);
+                }
             } else {
                 logger.info("启用代理失败： {}/{}->{}({})", app, stream, jsonObject.getString("msg"),
                         streamProxy.getSrcUrl() == null ? streamProxy.getUrl() : streamProxy.getSrcUrl());
@@ -58,14 +58,13 @@ public class StremProxyService1078Impl implements StremProxyService1078 {
         String url = null;
         try {
-            url = StringUtils.replace(this.jt1078ConfigBean.getJt1078Url(), "{0}", this.jt1078ConfigBean.getJt1078SendPort());
+            url = StringUtils.replace(this.jt1078ConfigBean.getJt1078Url(), "{0}", this.jt1078ConfigBean.getStopSendPort());
             HttpClientPostEntity entity = httpClientUtil.doPost(url, msg, null);
             url = jt1078ConfigBean.formatStopPushURL(stream, port, httpPort);
             httpClientUtil.doGet(url, null);
-
             if (Objects.isNull(entity)) {
                 log.info("HttpClientPostEntity is null");
             } else {
@@ -12,8 +12,10 @@ import com.alibaba.fastjson2.JSONObject;
 import com.genersoft.iot.vmp.conf.MediaConfig;
 import com.genersoft.iot.vmp.conf.StreamProxyTask;
 import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
+import com.genersoft.iot.vmp.service.IStreamProxyService;
 import com.genersoft.iot.vmp.service.IStreamPushService;
 import com.genersoft.iot.vmp.service.StremProxyService1078;
 import com.genersoft.iot.vmp.vmanager.bean.StreamContent;
@@ -91,6 +93,8 @@ public class Jt1078OfCarController {
     private StremProxyService1078 stremProxyService1078;
     private static final long TIME_COUNT = 300000L;
     private Date tokenDate;
+    @Autowired
+    private IStreamProxyService streamProxyService;
     @Value("${spring.profiles.active}")
     private String profilesActive;
@@ -198,30 +202,27 @@ public class Jt1078OfCarController {
                     this.redisTemplate.opsForValue().set("tag:history:httpPort:" + stream, entity.getHttpPort(), 2L, TimeUnit.DAYS);
                     this.redisTemplate.opsForValue().set("tag:history:httpPort:time:" + stream, (new Date()).getTime(), StreamProxyTask.TIME_OUT, TimeUnit.SECONDS);
                     msg = this.jt1078ConfigBean.formatMessageId(sim, channel, this.rtspConfigBean, entity.getPort());
-                    entity = this.httpClientUtil.doPost(url, msg, (String) null);
+                    HttpClientPostEntity entity1 = this.httpClientUtil.doPost(url, msg, (String) null);
                     Map<String, Object> resultMap1 = this.chooseEntity(entity, url, false);
                     if (Objects.nonNull(resultMap1)) {
                         return resultMap1;
                     }
-                    log.info(entity.getResultStr());
-                    Thread.sleep(2000L);
-                    this.createStreamProxy(sim + "-" + channel);
-                    Map<String, Object> resultMap2 = this.getStreamContent(stream);
+                    log.info(entity1.getResultStr());
+                    this.createStreamProxy(sim + "-" + channel, entity.getHttpPort());
+                    Map<String, Object> resultMap2 = this.getStreamContent(stream, entity.getHttpPort());
                     if (Objects.nonNull(resultMap2) && Objects.nonNull(resultMap2.get("code")) && !StringUtils.equals(resultMap2.get("code").toString(), "1")) {
                         return resultMap2;
                     }
                     streamContent = (StreamContent) resultMap2.get("streamContent");
-                }else{
-                    resultMap.put("port", redisTemplate.opsForValue().get("tag:history:port:"+stream));
-                    resultMap.put("httpPort", redisTemplate.opsForValue().get("tag:history:httpPort:"+stream));
+                } else {
+                    resultMap.put("port", redisTemplate.opsForValue().get("tag:history:port:" + stream));
+                    resultMap.put("httpPort", redisTemplate.opsForValue().get("tag:history:httpPort:" + stream));
                     resultMap.put("stream", stream);
                 }
-
-
                 resultMap.put("code", "1");
                 resultMap.put("message", "OK");
                 resultMap.put("data", streamContent);
@@ -253,7 +254,7 @@ public class Jt1078OfCarController {
                 return resultMap1;
             } else {
                 try {
-                    this.streamProxyController.del(stream, stream);
+                    this.streamProxyController.del("schedule", stream);
                     List<StreamPushItem> streamPushItems = this.streamPushService.getPushList(stream);
                     int count = CollectionUtils.size(streamPushItems);
@@ -261,6 +262,60 @@ public class Jt1078OfCarController {
                         StreamPushItem item = streamPushItems.get(i);
                         try {
+                            this.streamProxyController.del(item.getApp(), item.getStream());
+                            this.streamPushService.stop(item.getApp(), item.getStream());
+                        } catch (Exception var13) {
+                            Exception e = var13;
+                            log.error("推流停止失败,[{}]", item, e);
+                        }
+                    }
+
+                    resultMap.put("code", "1");
+                    resultMap.put("message", "OK");
+                    return resultMap;
+                } catch (Exception var14) {
+                    resultMap.put("code", "-20");
+                    resultMap.put("msg", "发送停止推流指令异常");
+                    return resultMap;
+                }
+            }
+        }
+    }
+
+    @GetMapping({"/send/stop/io/{sim}/{channel}"})
+    public Map<String, Object> sendIORequestStop(@PathVariable String sim, @PathVariable String channel) {
+        Map<String, Object> resultMap = new HashMap();
+        if (StringUtils.isBlank(sim)) {
+            resultMap.put("code", "-100");
+            resultMap.put("msg", "sim 不能为空");
+            return resultMap;
+        } else if (StringUtils.isBlank(channel)) {
+            resultMap.put("code", "-100");
+            resultMap.put("msg", "channel 不能为空");
+            return resultMap;
+        } else {
+            String stream = StringUtils.join(new String[]{sim, "-", channel});
+            Integer port = (Integer) redisTemplate.opsForValue().get("tag:history:port:" + stream);
+            Integer httpPort = (Integer) redisTemplate.opsForValue().get("tag:history:httpPort:" + stream);
+            if (Objects.isNull(port) || Objects.isNull(httpPort)) {
+                resultMap.put("code", "1");
+                resultMap.put("message", "OK");
+                return resultMap;
+            }
+            Map<String, Object> resultMap1 = this.stremProxyService1078.sendIORequestStop(sim, channel, stream, port, httpPort);
+            if (Objects.nonNull(resultMap1) && Objects.nonNull(resultMap1.get("code")) && !StringUtils.equals(resultMap1.get("code").toString(), "1")) {
+                return resultMap1;
+            } else {
+                try {
+                    this.streamProxyController.del("schedule", stream);
+                    List<StreamPushItem> streamPushItems = this.streamPushService.getPushList(stream);
+                    int count = CollectionUtils.size(streamPushItems);
+
+                    for (int i = 0; i < count; ++i) {
+                        StreamPushItem item = streamPushItems.get(i);
+
+                        try {
+                            this.streamProxyController.del(item.getApp(), item.getStream());
                             this.streamPushService.stop(item.getApp(), item.getStream());
                         } catch (Exception var13) {
                             Exception e = var13;
@@ -324,12 +379,12 @@ public class Jt1078OfCarController {
                                 for (Object o : jsonArray) {
                                     JSONObject jo = (JSONObject) o;
                                     String startTimeStr = jo.getString("startTime");
-                                    if(StringUtils.isEmpty(startTimeStr)){
+                                    if (StringUtils.isEmpty(startTimeStr)) {
                                         startTimeStr = StringUtils.join(String.valueOf(System.currentTimeMillis()), "-", String.valueOf(RandomUtils.nextInt(1, 1000)));
-                                    }else{
-                                        startTimeStr = StringUtils.replace(startTimeStr,"-","");
-                                        startTimeStr = StringUtils.replace(startTimeStr,":","");
-                                        startTimeStr = StringUtils.replace(startTimeStr," ","");
+                                    } else {
+                                        startTimeStr = StringUtils.replace(startTimeStr, "-", "");
+                                        startTimeStr = StringUtils.replace(startTimeStr, ":", "");
+                                        startTimeStr = StringUtils.replace(startTimeStr, " ", "");
                                     }
                                     String channelMapping = StringUtils.join(new String[]{sim, "-", startTimeStr, "-", channel});
                                     jo.put("channelMapping", channelMapping);
@@ -379,13 +434,13 @@ public class Jt1078OfCarController {
             return resultMap;
         } else {
             StreamContent streamContent = this.getStreamContentPlayURL(StringUtils.join(new String[]{channelMapping}));
-            if(Objects.nonNull(streamContent) && StringUtils.isNotEmpty(streamContent.getWs_flv())){
+            if (Objects.nonNull(streamContent) && StringUtils.isNotEmpty(streamContent.getWs_flv())) {
                 resultMap.put("code", "1");
                 log.info("StreamContent:[{}]", streamContent);
                 resultMap.put("data", streamContent);
-                resultMap.put("port", redisTemplate.opsForValue().get("tag:history:port:"+channelMapping));
-                resultMap.put("httpPort", redisTemplate.opsForValue().get("tag:history:httpPort:"+channelMapping));
+                resultMap.put("port", redisTemplate.opsForValue().get("tag:history:port:" + channelMapping));
+                resultMap.put("httpPort", redisTemplate.opsForValue().get("tag:history:httpPort:" + channelMapping));
                 resultMap.put("stream", channelMapping);
                 return resultMap;
             }
@@ -415,21 +470,20 @@ public class Jt1078OfCarController {
                     msg = this.jt1078ConfigBean.formatMessageHistoryPlayRTSP(sim, channel, startTime, endTime, this.rtspConfigBean, entity.getPort());
                     log.info("获取推流");
-                    this.createStreamProxy(sim + "-" + channel);
+                    this.createStreamProxy(sim + "-" + channel, entity.getHttpPort());
                     entity = this.httpClientUtil.doPost(url, msg, (String) null);
                     Map<String, Object> resultMap2 = this.chooseEntity(entity, url, true);
                     if (Objects.nonNull(resultMap2)) {
                         return resultMap2;
                     } else {
                         log.info(entity.getResultStr());
-                        this.createStreamProxy(channelMapping);
+                        this.createStreamProxy(channelMapping, entity.getHttpPort());
                         resultMap.put("code", "1");
-                        Thread.sleep(2000L);
-                        Map<String, Object> resultMap3 = this.getStreamContent(channelMapping);
+                        Map<String, Object> resultMap3 = this.getStreamContent(channelMapping, entity.getHttpPort());
                         if (Objects.nonNull(resultMap3) && Objects.nonNull(resultMap3.get("code")) && !StringUtils.equals(resultMap3.get("code").toString(), "1")) {
                             return resultMap3;
                         } else {
-                             streamContent = (StreamContent) resultMap3.get("streamContent");
+                            streamContent = (StreamContent) resultMap3.get("streamContent");
                             if (Objects.isNull(streamContent)) {
                                 resultMap.put("code", "-20");
                                 resultMap.put("msg", "新建链接错误，请稍后再试");
@@ -468,70 +522,85 @@ public class Jt1078OfCarController {
     }
     @Nullable
-    private Map<String, Object> getStreamContent(String stream) throws InterruptedException {
-        StreamContent streamContent = null;
+    private Map<String, Object> getStreamContent(String stream, int httpPort) throws InterruptedException {
+
         Map<String, Object> datas = new HashMap();
-        int index = 0;
+        StreamContent streamContent = requestStreamContent(1, stream, httpPort);
-        Integer countTimeOut = 0;
+        if (Objects.isNull(streamContent) || StringUtils.isEmpty(streamContent.getWs_flv())) {
+            streamContent = new StreamContent();
+            streamContent.setWs_flv(StringUtils.replace(this.jt1078ConfigBean.getWs(), "{stream}", stream));
+            streamContent.setWss_flv(StringUtils.replace(this.jt1078ConfigBean.getWss(), "{stream}", stream));
-        do {
-            ++index;
-            streamContent = this.getStreamContentPlayURL(stream);
-            if (Objects.nonNull(streamContent) && StringUtils.isNotEmpty(streamContent.getWs_flv())) {
-                break;
-            }
-            Object valObj = redisTemplate.opsForValue().get("stream:status:" + stream);
-            if (Objects.nonNull(valObj) && StringUtils.equals(valObj.toString(), "1")) {
-                StreamProxyItem streamProxyItem = streamProxyController.one("schedule",stream);
-                if(Objects.nonNull(streamProxyItem) && StringUtils.isNotEmpty(streamProxyItem.getApp())){
-                    try {
-                        streamProxyController.start("schedule", stream);
-                    } catch (Exception e) {
-                        log.error(e.getMessage());
-                    }
-                }else{
-                    createStreamProxy(stream);
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    requestStreamContent(100, stream, httpPort);
                 }
+            }).start();
+        }
+        log.info("StreamContent:[{}]", streamContent);
+        datas.put("code", "1");
+        datas.put("streamContent", streamContent);
+        return datas;
+    }
-            }else{
-                Object val = this.redisTemplate.opsForValue().get("timeout:" + stream);
-                if (Objects.nonNull(val) && StringUtils.equals(val.toString(), "1")) {
-
-                    countTimeOut++;
-                    try {
-                        streamProxyController.start("schedule", stream);
-                    } catch (Exception e) {
-                        log.error(e.getMessage());
-                    }
+    private StreamContent requestStreamContent(int count, String stream, int httpPort) {
+        int index = 0;
+        StreamContent streamContent = null;
+        try {
+            do {
+                ++index;
+                streamContent = this.getStreamContentPlayURL(stream);
+                if (Objects.nonNull(streamContent) && StringUtils.isNotEmpty(streamContent.getWs_flv())) {
+                    break;
                 }
-            }
+                Object valObj = redisTemplate.opsForValue().get("stream:status:" + stream);
+                if (Objects.nonNull(valObj) && StringUtils.equals(valObj.toString(), "1")) {
+                    StreamProxyItem streamProxyItem = streamProxyController.one("schedule", stream);
+                    if (Objects.nonNull(streamProxyItem) && StringUtils.isNotEmpty(streamProxyItem.getApp())) {
+                        try {
+                            streamProxyController.start("schedule", stream);
+                        } catch (Exception e) {
+                            log.error(e.getMessage());
+                        }
+                    } else {
+                        createStreamProxy(stream, httpPort);
+                    }
-            Thread.sleep(1000L);
-            log.info("===============>" + index);
-        } while (index < 20);
+                } else if (Objects.nonNull(valObj) && StringUtils.equals(valObj.toString(), "2")) {
+//                    streamProxyService.del("schedule", stream);
+//                    redisTemplate.delete("stream:status:" + stream);
+//                    createStreamProxy(stream,httpPort);
+                } else {
+                    Object val = this.redisTemplate.opsForValue().get("timeout:" + stream);
+                    if (Objects.nonNull(val) && StringUtils.equals(val.toString(), "1")) {
+                        try {
+                            streamProxyController.start("schedule", stream);
+                        } catch (Exception e) {
+                            log.error(e.getMessage());
+                        }
+                    }
+                }
+                if (index >= count) {
+                    break;
+                }
-        if (countTimeOut > 0) {
-            datas.put("code", "301");
-            datas.put("msg", "获取摄像头视频数据失败，请稍后再试");
-            return datas;
-        }
+                try {
+                    Thread.sleep(1000L);
+                } catch (InterruptedException e) {
+                    log.info(e.getMessage());
+                }
+            } while (index < count);
-        log.info("===============>" + index);
-        if (Objects.isNull(streamContent)) {
-            streamContent = new StreamContent();
-            streamContent.setWs_flv(StringUtils.replace(this.jt1078ConfigBean.getWs(), "{stream}", stream));
-            streamContent.setWss_flv(StringUtils.replace(this.jt1078ConfigBean.getWss(), "{stream}", stream));
+        } catch (Exception e) {
+            log.error(e.getMessage());
         }
-
-        log.info("StreamContent:[{}]", streamContent);
-        datas.put("code", "1");
-        datas.put("streamContent", streamContent);
-        return datas;
+        return streamContent;
     }
     private StreamContent getStreamContentPlayURL(String stream) {
@@ -632,8 +701,13 @@ public class Jt1078OfCarController {
     }
     private HttpClientPostEntity createServerLister(String channelMapping) throws URISyntaxException, IOException {
+
         Integer port = RandomUtils.nextInt(this.jt1078ConfigBean.getStart1078Port(), this.jt1078ConfigBean.getEnd1078Port());
-        Integer httPort = RandomUtils.nextInt(this.jt1078ConfigBean.getStart1078Port(), this.jt1078ConfigBean.getEnd1078Port());
+        while (port % 2 == 1 || port == jt1078ConfigBean.getStart1078Port()) {
+            port = RandomUtils.nextInt(this.jt1078ConfigBean.getStart1078Port(), this.jt1078ConfigBean.getEnd1078Port());
+        }
+        Integer httPort = 3333;
+
         String url;
         if (!Objects.equals(port, httPort) && Objects.nonNull(port)) {
             url = "jt1078:server:port:" + port;
@@ -710,23 +784,46 @@ public class Jt1078OfCarController {
         }
     }
-    private void createStreamProxy(String stream) {
-        String url = StringUtils.replace(this.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(this.mediaConfig.getId());
-        item.setUrl(url);
-        item.setFfmpegCmdKey("ffmpeg.cmd");
-        item.setEnable(true);
-        item.setEnableAudio(true);
-        item.setEnableMp4(false);
-        item.setEnableRemoveNoneReader(false);
-        item.setEnableDisableNoneReader(false);
-        item.setName(stream);
-        this.streamProxyController.save(item);
+    private void createStreamProxy(String stream, Integer port) throws URISyntaxException, IOException {
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                int index = 0;
+                while (index < 100) {
+                    index++;
+                    try {
+                        boolean flag = httpClientUtil.doGetNoResult(jt1078ConfigBean.formatVideoURL(stream));
+                        if (flag) {
+                            String url = StringUtils.replace(jt1078ConfigBean.getGetURL(), "{stream}", stream);
+                            url = StringUtils.replace(url, "{port}", port + "");
+                            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);
+                            item.setName(stream);
+                            streamProxyController.save(item);
+                            break;
+                        }
+                    } catch (URISyntaxException e) {
+                        log.info(e.getMessage());
+                    } catch (IOException e) {
+                        log.info(e.getMessage());
+                    }
+
+                }
+            }
+        }).start();
+
+
     }
 }
-package com.genersoft.iot.vmp.vmanager.jt1078.platform.config;

import com.genersoft.iot.vmp.vmanager.jt1078.platform.config.RtspConfigBean;
import java.util.Objects;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;

@Component
public class Jt1078ConfigBean {
    @Value("${tuohua.bsth.jt1078.url}")
    private String jt1078Url;

    @Value("${tuohua.bsth.jt1078.sendPort}")
    private String jt1078SendPort;

    @Value("${tuohua.bsth.jt1078.stopSendPort}")
    private String stopSendPort;

    @Value("${tuohua.bsth.jt1078.historyListPort}")
    private String historyListPort;

    @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;

    @Value("${tuohua.bsth.jt1078.get.url}")
    private String getURL;

    @Value("${tuohua.bsth.jt1078.addPortVal}")
    private Integer addPort;

    @Value("${tuohua.bsth.jt1078.ws}")
    private String ws;

    @Value("${tuohua.bsth.jt1078.wss}")
    private String wss;

    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, Integer port) {
        String msg = StringUtils.replace("{ \"messageId\": 37121, \"properties\": 0, \"clientId\": \"{clientId}\", \"serialNo\": \"1\", \"ip\": \"{ip}\", \"tcpPort\": \"{tcpPort}\", \"udpPort\": \"{udpPort}\", \"channelNo\": \"{channelNo}\", \"mediaType\": \"1\", \"streamType\": \"1\"}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{tcpPort}", (port.intValue() + getAddPort().intValue()) + "");
        msg = StringUtils.replace(msg, "{udpPort}", (port.intValue() + getAddPort().intValue()) + "");
        msg = StringUtils.replace(msg, "{channelNo}", channel);
        return StringUtils.replace(msg, "{ip}", configBean.getRtspIp());
    }

    public String formatMessageStop(String sim, String channel) {
        String msg = StringUtils.replace("{\"messageId\": 37122,\"properties\": 0,\"clientId\": \"{clientId}\",\"serialNo\": \"1\",\"channelNo\": \"{channelNo}\",\"command\": \"0\",\"closeType\": \"0\",\"streamType\": \"1\"}", "{clientId}", sim);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatMessageHistoryListRTSP(String sim, String channel, String startTime, String endTime) {
        String msg = StringUtils.replace("{\"msgid\":37381,\"clientId\":\"{clientId}\",\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"channelId\":{channelNo}}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{startTime}", startTime);
        msg = StringUtils.replace(msg, "{endTime}", endTime);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatMessageHistoryPlayRTSP(String sim, String channel, String startTime, String endTime, RtspConfigBean configBean, Integer port) {
        String msg = StringUtils.replace("{\"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}", "{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}", (port.intValue() + getAddPort().intValue()) + "");
        msg = StringUtils.replace(msg, "{udpPort}", (port.intValue() + getAddPort().intValue()) + "");
        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(this.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(this.stopPUshURL, "{pushKey}", pushKey);
        msg = StringUtils.replace(msg, "{port}", String.valueOf(port));
        return StringUtils.replace(msg, "{httpPort}", String.valueOf(httpPort));
    }

    public String getJt1078Url() {
        return this.jt1078Url;
    }

    public String getJt1078SendPort() {
        return this.jt1078SendPort;
    }

    public String getStopSendPort() {
        return this.stopSendPort;
    }

    public String getHistoryListPort() {
        return this.historyListPort;
    }

    public String getPlayHistoryPort() {
        return this.playHistoryPort;
    }

    public String getPushURL() {
        return this.pushURL;
    }

    public Integer getStart1078Port() {
        if (Objects.isNull(this.start1078Port))
            this.start1078Port = Integer.valueOf(Integer.parseInt(StringUtils.substringBefore(this.portsOf1078, ",")));
        return this.start1078Port;
    }

    public Integer getEnd1078Port() {
        if (Objects.isNull(this.end1078Port))
            this.end1078Port = Integer.valueOf(Integer.parseInt(StringUtils.substringAfter(this.portsOf1078, ",")));
        return this.end1078Port;
    }

    public String getStopPUshURL() {
        return this.stopPUshURL;
    }

    public String getGetURL() {
        return this.getURL;
    }

    public Integer getAddPort() {
        return this.addPort;
    }

    public String getWs() {
        return this.ws;
    }

    public String getWss() {
        return this.wss;
    }
}
 \ No newline at end of file
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.config;

import com.genersoft.iot.vmp.vmanager.jt1078.platform.config.RtspConfigBean;
import java.util.Objects;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;

@Component
public class Jt1078ConfigBean {
    @Value("${tuohua.bsth.jt1078.url}")
    private String jt1078Url;

    @Value("${tuohua.bsth.jt1078.sendPort}")
    private String jt1078SendPort;

    @Value("${tuohua.bsth.jt1078.stopSendPort}")
    private String stopSendPort;

    @Value("${tuohua.bsth.jt1078.historyListPort}")
    private String historyListPort;

    @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;

    @Value("${tuohua.bsth.jt1078.get.url}")
    private String getURL;

    @Value("${tuohua.bsth.jt1078.addPortVal}")
    private Integer addPort;

    @Value("${tuohua.bsth.jt1078.ws}")
    private String ws;

    @Value("${tuohua.bsth.jt1078.wss}")
    private String wss;

    @Value("${tuohua.bsth.jt1078.videoURL}")
    private String videoURL;

    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, Integer port) {
        String msg = StringUtils.replace("{ \"messageId\": 37121, \"properties\": 0, \"clientId\": \"{clientId}\", \"serialNo\": \"1\", \"ip\": \"{ip}\", \"tcpPort\": \"{tcpPort}\", \"udpPort\": \"{udpPort}\", \"channelNo\": \"{channelNo}\", \"mediaType\": \"1\", \"streamType\": \"1\"}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{tcpPort}", (port.intValue() +getAddPort()) + "");
        msg = StringUtils.replace(msg, "{udpPort}", (port.intValue() +getAddPort()) + "");
        msg = StringUtils.replace(msg, "{channelNo}", channel);
        return StringUtils.replace(msg, "{ip}", configBean.getRtspIp());
    }

    public String formatMessageStop(String sim, String channel) {
        String msg = StringUtils.replace("{\"messageId\": 37122,\"properties\": 0,\"clientId\": \"{clientId}\",\"serialNo\": \"1\",\"channelNo\": \"{channelNo}\",\"command\": \"0\",\"closeType\": \"0\",\"streamType\": \"1\"}", "{clientId}", sim);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatMessageHistoryListRTSP(String sim, String channel, String startTime, String endTime) {
        String msg = StringUtils.replace("{\"msgid\":37381,\"clientId\":\"{clientId}\",\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"channelId\":{channelNo}}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{startTime}", startTime);
        msg = StringUtils.replace(msg, "{endTime}", endTime);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatMessageHistoryPlayRTSP(String sim, String channel, String startTime, String endTime, RtspConfigBean configBean, Integer port) {
        String msg = StringUtils.replace("{\"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}", "{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}", (port.intValue() +getAddPort()) + "");
        msg = StringUtils.replace(msg, "{udpPort}", (port.intValue() +getAddPort()) + "");
        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(this.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(this.stopPUshURL, "{pushKey}", pushKey);
        msg = StringUtils.replace(msg, "{port}", String.valueOf(port));
        return StringUtils.replace(msg, "{httpPort}", String.valueOf(httpPort));
    }

    public String formatVideoURL(String stream){
        return StringUtils.replace(videoURL,"{stream}",stream);
    }

    public String getJt1078Url() {
        return this.jt1078Url;
    }

    public String getJt1078SendPort() {
        return this.jt1078SendPort;
    }

    public String getStopSendPort() {
        return this.stopSendPort;
    }

    public String getHistoryListPort() {
        return this.historyListPort;
    }

    public String getPlayHistoryPort() {
        return this.playHistoryPort;
    }

    public String getPushURL() {
        return this.pushURL;
    }

    public Integer getStart1078Port() {
        if (Objects.isNull(this.start1078Port))
            this.start1078Port = Integer.valueOf(Integer.parseInt(StringUtils.substringBefore(this.portsOf1078, ",")));
        return this.start1078Port;
    }

    public Integer getEnd1078Port() {
        if (Objects.isNull(this.end1078Port))
            this.end1078Port = Integer.valueOf(Integer.parseInt(StringUtils.substringAfter(this.portsOf1078, ",")));
        return this.end1078Port;
    }

    public String getStopPUshURL() {
        return this.stopPUshURL;
    }

    public String getGetURL() {
        return this.getURL;
    }

    public Integer getAddPort() {
        return this.addPort;
    }

    public String getWs() {
        return this.ws;
    }

    public String getWss() {
        return this.wss;
    }

    public String getPortsOf1078() {
        return portsOf1078;
    }
}
 \ No newline at end of file
@@ -256,7 +256,7 @@ public class TuohuaConfigBean {
         if (StringUtils.isEmpty(sim) || !optional.isPresent()) {
             name = "<view style='color:red'>" + name + "</view>";
             abnormalStatus = 10;
-        }else if(Objects.isNull(optional.get().get("timestamp")) || now- Convert.toLong(optional.get().get("timestamp"))<=120000){
+        }else if(Objects.isNull(optional.get().get("timestamp")) || now- Convert.toLong(optional.get().get("timestamp"))>120000){
             name = "<view style='color:#ccc'>" + name + "</view>";
             abnormalStatus =20;
         }else{
@@ -162,6 +162,37 @@ public class HttpClientUtil {
         return null;
     }
+    public boolean doGetNoResult(String url) throws URISyntaxException, IOException {
+        // 创建Httpclient对象
+        DefaultHttpClient httpclient = getHttpClient();
+        // 定义请求的参数
+//
+//        httpclient.setCookieStore(cookieStore1);
+
+        URIBuilder uriBuilder = new URIBuilder(url);
+        URI uri = uriBuilder.build();
+
+        // 创建http GET请求
+        HttpGet httpGet = new HttpGet(uri);
+
+        //response 对象
+        CloseableHttpResponse response = null;
+        try {
+            // 执行http get请求
+            response = httpclient.execute(httpGet);
+            // 判断返回状态是否为200
+            if (response.getStatusLine().getStatusCode() == 200) {
+                return true;
+            }
+        } finally {
+            if (response != null) {
+                response.close();
+            }
+            httpclient.close();
+        }
+        return false;
+    }
+
     @NotNull
     private static HttpClientPostEntity combationReturnObj(CloseableHttpResponse response, DefaultHttpClient httpclient,String url,String requestBody) throws IOException {
@@ -13,11 +13,11 @@ spring:
   # REDIS数据库配置
   redis:
     # [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1
-    host: 192.168.168.124
+    host: 192.168.169.124
     # [必须修改] 端口号
     port: 6379
     # [可选] 数据库 DB
-    database: 10
+    database: 8
     # [可选] 访问密码,若你的redis服务器没有设置密码，就不需要用密码去连接
     #    password: guzijian
     # [可选] 超时时间
@@ -152,7 +152,7 @@ tuohua:
         historyUdpPort: 9999
         ip : 61.169.120.202
     jt1078:
-       ports: 9100,9600
+       ports: 9000,9500
        addPortVal: 30000
        pushURL: http://192.169.1.92:3333/new/server/{pushKey}/{port}/{httpPort}
        stopPushURL: http://192.169.1.92:3333/stop/channel/{pushKey}/{port}/{httpPort}
@@ -164,6 +164,7 @@ tuohua:
        ws: ws://192.168.169.100:1091/schedule/{stream}.live.flv
        wss: wss://192.168.169.100:443/schedule/{stream}.live.flv
        get:
+         #url: http://192.169.1.92:{port}/video/{stream}.flv
          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}
 Binary files a/src/main/resources/application-localDev.yml and b/src/main/resources/application-localDev.yml differ
@@ -11,7 +11,7 @@ module.exports = {
     assetsPublicPath: "/",
     proxyTable: {
       "/debug": {
-        target: "http://118.113.164.50:18989",
+        target: "http://127.0.0.1:28080",
         changeOrigin: true,
         pathRewrite: {
           "^/debug": "/",
@@ -24,6 +24,8 @@
             <button style="margin-left: 15px;" @click="openViewDIalog()">历史数据</button>
             <button style="margin-left: 15px;" @click="OneClickPlayback()">一键播放车辆视频</button>
+            <button style="margin-left: 15px;" @click="closeSelectItem()">关闭选中画面流</button>
+            <button style="margin-left: 15px;" @click="closeSelectCarItem()">一键关闭选中车辆流</button>
           </el-header>
@@ -248,7 +250,6 @@ export default {
       console.log("通知设备推流1：" + deviceId + " : " + channelId);
       let idxTmp = this.playerIdx
       let that = this;
-      this.loading = true
       this.$axios({
         method: 'get',
@@ -402,9 +403,6 @@ export default {
           sim = "";
         }
-        console.log("abnormalStatus=====================>"+abnormalStatus);
-        
-
         if(abnormalStatus >= 10 && abnormalStatus < 20){
           name = "<view style='color:red'>" + name + "</view>";
         }else if(abnormalStatus >= 20 && abnormalStatus < 30){
@@ -446,8 +444,8 @@ export default {
              return;
            }
-       
-          this.showLoading();        
+           this.showLoading();
+          
           if(treeNo.type == 401 || treeNo.type == '401'){
              let device = new Object();
              if(this.isEmpty(treeNo.online)){
@@ -459,6 +457,8 @@ export default {
                 this.videoUrl=[]
              }
+             this.closeLoading();
+
              let pageObj = this;
             if(!this.isEmpty(this.sim) && !this.channel  && this.sim != treeNo.sim && this.channel != treeNo.id){
@@ -633,12 +633,31 @@ export default {
           return;
         }
-        
+        this.videoUrl=[''];
+        this.$axios({
+                method: 'get',
+                url:`/api/jt1078/query/send/stop/io/`+sim+"/"+channel+"/"+this.stream+"/"+this.port+"/"+this.httpPort,
+            }).then((res) => {
+              console.log(res);
+              if(fun){
+                fun();
+              }
+            });
+      },
+
+      sendIORequestStop1(sim,channel,fun){
+        if(this.isEmpty(sim) || this.isEmpty(channel)){
+          console.log("sim:"+sim+";channel:"+channel);
+          if(fun){
+            fun();
+          }
+          return;
+        }
         this.videoUrl=[''];
         this.$axios({
                 method: 'get',
-                url:`/api/jt1078/query/send/stop/io/`+sim+"/"+channel+"/"+this.stream+"/"+this.port+"/"+this.httpPort+"/",
+                url:`/api/jt1078/query/send/stop/io/`+sim+"/"+channel,
             }).then((res) => {
               console.log(res);
               if(fun){
@@ -646,6 +665,7 @@ export default {
               }
             });
       },
+
       isEmpty(val){
           return null == val || undefined == val || "" == val;
       },
@@ -771,7 +791,7 @@ export default {
         }
         let pageObj = this;
-        this.showLoading();
+      
         this.videoUrl =[];
@@ -780,7 +800,7 @@ export default {
             method: 'get',
             url: '/api/jt1078/query/send/request/io/history/' + pageObj.sim + '/' + pageObj.channel+"/"+e.target.getAttribute('startTime')+"/"+e.target.getAttribute('endTime')+"/"+e.target.getAttribute('channelMapping')
         }).then(function (res) {
-          console.log(res);
+         
             if (res.data && res.data.data && res.data.data.data) {
               let videoUrl1;
@@ -845,6 +865,17 @@ export default {
           this.$message.error('请选择车辆');
           return;
         }
+
+        if(this.isEmpty(this.carTreeNode.abnormalStatus)){
+          this.$message.error('请检查车辆状态');
+          return;
+        }
+
+      
+        if(this.carTreeNode.abnormalStatus!=1){
+          this.$message.error('车辆设备离线，请检查设备');
+          return;
+        }
         if(this.isEmpty(this.sim)){
           this.$message.error('无法获取SIM卡信息，请检查设备');
           return;
@@ -876,6 +907,23 @@ export default {
       }
       window.open(this.downloadURL,"_download");
+    },
+    closeSelectItem(){
+      console.log("============================>"+this.playerIdx);
+      this.setPlayUrl(null,this.playerIdx)
+      // this.videoUrl[this.playerIdx]=null;
+     // this.sendIORequestStop1(this.sim,this.playerIdx+1);
+      
+    },
+    closeSelectCarItem(){
+      for (let index = 0; index < 9; index++) {
+        this.setPlayUrl(null,index)
+      // this.videoUrl[this.playerIdx]=null;
+      this.sendIORequestStop1(this.sim,index+1);
+        
+      }
+    
+      
     }
   }
 };
@@ -105,6 +105,7 @@ export default {
       }
     },
     create() {
+      this.loaded = true;
       let options = {
         container: this.$refs.container,
         autoWasm: true,
@@ -114,9 +115,9 @@ export default {
         decoder: "static/js/jessibuca/decoder.js",
         forceNoOffscreen: false,
         hasAudio: typeof (this.hasAudio) == "undefined" ? true : this.hasAudio,
-        heartTimeout: 5,
+        heartTimeout: 1500000,
         heartTimeoutReplay: true,
-        heartTimeoutReplayTimes: 3,
+        heartTimeoutReplayTimes: -1,
         hiddenAutoPause: false,
         hotKey: true,
         isFlv: false,
@@ -125,9 +126,9 @@ export default {
         isResize: false,
         keepScreenOn: true,
         loadingText: "请稍等, 视频加载中......",
-        loadingTimeout: 10,
+        loadingTimeout: 100000,
         loadingTimeoutReplay: true,
-        loadingTimeoutReplayTimes: 3,
+        loadingTimeoutReplayTimes: -1,
         openWebglAlignment: false,
         operateBtns: {
           fullscreen: false,
@@ -140,7 +141,7 @@ export default {
         rotate: 0,
         showBandwidth: false,
         supportDblclickFullscreen: false,
-        timeout: 10,
+        timeout: 1000000,
         useMSE: true,
         useWCS: location.hostname === "localhost" || location.protocol === "https:",
         useWebFullScreen: true,
@@ -155,12 +156,13 @@ export default {
       let _this = this;
       jessibuca.on("pause", function () {
         _this.playing = false;
+        
       });
       jessibuca.on("play", function () {
         _this.playing = true;
       });
       jessibuca.on("fullscreen", function (msg) {
-        _this.fullscreen = msg
+        _this.fullscreen = msg;
       });
       jessibuca.on("mute", function (msg) {
         _this.isNotMute = !msg;
@@ -181,10 +183,10 @@ export default {
         console.log("Jessibuca -> videoInfo: ", msg);
       });
       jessibuca.on("audioInfo", function (msg) {
-        console.log("Jessibuca -> audioInfo: ", msg);
       });
       jessibuca.on("error", function (msg) {
         console.log("Jessibuca -> error: ", msg);
+        _this.play(_this.videoUrl);
       });
       jessibuca.on("timeout", function (msg) {
         console.log("Jessibuca -> timeout: ", msg);
-window.baseUrl = "http://118.113.164.50:18989";
+window.baseUrl = "http://127.0.0.1:28080";
 // map组件全局参数, 注释此内容可以关闭地图功能
 window.mapParam = {