优化

liujun001
1 parent e8fc19d8
Showing 9 changed files with 98 additions and 55 deletions
src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
src/main/java/com/genersoft/iot/vmp/conf/StreamProxyTask.java
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.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/TuohuaConfigBean.java
web_src/config/index.js
@@ -60,4 +60,8 @@ public class VManageBootstrap extends SpringBootServletInitializer {
 		sessionCookieConfig.setHttpOnly(true);
 	}
+
+	public static  <T> T getBean(Class<T> tClass){
+		return context.getBean(tClass);
+	}
 }
 package com.genersoft.iot.vmp.conf;
+import com.genersoft.iot.vmp.VManageBootstrap;
+import com.genersoft.iot.vmp.service.IMediaServerService;
+import com.genersoft.iot.vmp.service.IStreamProxyService;
 import com.genersoft.iot.vmp.service.StremProxyService1078;
+import com.genersoft.iot.vmp.service.impl.StreamProxyServiceImpl;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -17,63 +21,20 @@ import java.util.concurrent.TimeUnit;
 @Component
 public class StreamProxyTask {
-    @Autowired
-    private RedisTemplate redisTemplate;
-    @Autowired
-    private StremProxyService1078 stremProxyService1078;
-    private Logger logger = LoggerFactory.getLogger(StreamProxyTask.class);
     public static final Long TIME_OUT = 180L;
+    @Autowired
+    private IStreamProxyService streamProxyService;
     @Scheduled(cron = "0 15 * * * ? ")
     public void work() {
-        Set<String> keys = redisTemplate.keys("tag:history:port:*");
-        if (CollectionUtils.isEmpty(keys)) {
-            return;
-        }
-        Long nowDate = new Date().getTime();
-        for (String key : keys) {
-            String stream = StringUtils.substringAfter(key, "tag:history:port:");
-            if (StringUtils.isEmpty(stream)) {
-                continue;
-            }
-
-            Object value = redisTemplate.opsForValue().get("tag:history:httpPort:time:"+stream);
-            if(Objects.isNull(value)){
-                sendIORequestStop(stream);
-                continue;
-            }
-            try {
-                Long val = (Long) value;
-                if(val == 0L){
-                    sendIORequestStop(stream);
-                    continue;
-                }
-
-                Long val1 = (nowDate-val)/1000;
-                if(val1 > TIME_OUT){
-                    sendIORequestStop(stream);
-                }
-
-            }catch (Exception e){
-                logger.error("[{}]停流失败",stream,e);
-            }
-        }
+        streamProxyService.choose1078Lister();
         // task execution logic
     }
-    private void sendIORequestStop(String stream){
-        try {
-            String sim = StringUtils.substringBeforeLast(stream,"-");
-            String channel =  StringUtils.substringAfterLast(stream,"-");
-            Object port = redisTemplate.opsForValue().get("tag:history:port:" + stream);
-            Object portHtt = redisTemplate.opsForValue().get("tag:history:httpPort:" + stream);
-            stremProxyService1078.sendIORequestStop(sim,channel,stream, (Integer) port, (Integer) portHtt);
+    private void sendIORequestStop(String stream) {
-        }catch (Exception e){
-            logger.error("[{}]停流失败",stream,e);
-        }
     }
 }
@@ -132,6 +132,9 @@ public class ZLMHttpHookListener {
     @Autowired
     private Jt1078OfCarController jt1078OfCarController;
+    @Autowired
+    private StremProxyService1078 stremProxyService1078;
+
     /**
      * 服务器定时上报时间，上报间隔可配置，默认10s上报一次
@@ -558,6 +561,7 @@ public class ZLMHttpHookListener {
                 param.getApp(), param.getStream());
         JSONObject ret = new JSONObject();
         ret.put("code", 0);
+        stremProxyService1078.sendIORequestStop(param.getStream());
         // 国标类型的流
         if ("rtp".equals(param.getApp())) {
             ret.put("close", userSetting.getStreamOnDemand());
@@ -669,6 +673,8 @@ public class ZLMHttpHookListener {
                 }
                 return ret;
             }
+
+
             // TODO 推流具有主动性，暂时不做处理
 //			StreamPushItem streamPushItem = streamPushService.getPush(app, streamId);
 //			if (streamPushItem != null) {
@@ -45,6 +45,8 @@ public interface IStreamProxyService {
      */
     void del(String app, String stream);
+     void choose1078Lister();
+
     /**
      * 启用视频代理
      * @param app
@@ -3,9 +3,11 @@ package com.genersoft.iot.vmp.service.impl;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.genersoft.iot.vmp.VManageBootstrap;
 import com.genersoft.iot.vmp.common.GeneralCallback;
 import com.genersoft.iot.vmp.common.StreamInfo;
 import com.genersoft.iot.vmp.conf.DynamicTask;
+import com.genersoft.iot.vmp.conf.StreamProxyTask;
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.conf.exception.ControllerException;
 import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
@@ -419,8 +421,8 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
                 result = true;
                 streamProxy.setEnable(true);
                 updateStreamProxy(streamProxy);
-            }else if(jsonObject.getInteger("code") == -1){
-                redisTemplate.opsForValue().set("stream:status:"+stream,"1",30, TimeUnit.SECONDS);
+            } else if (jsonObject.getInteger("code") == -1) {
+                redisTemplate.opsForValue().set("stream:status:" + stream, "1", 30, TimeUnit.SECONDS);
             } else {
                 logger.info("启用代理失败： {}/{}->{}({})", app, stream, jsonObject.getString("msg"),
                         streamProxy.getSrcUrl() == null ? streamProxy.getUrl() : streamProxy.getSrcUrl());
@@ -471,6 +473,8 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
     @Override
     public void zlmServerOnline(String mediaServerId) {
         // 移除开启了无人观看自动移除的流
+
+        choose1078Lister();
         List<StreamProxyItem> streamProxyItemList = streamProxyMapper.selectAutoRemoveItemByMediaServerId(mediaServerId);
         if (streamProxyItemList.size() > 0) {
             gbStreamMapper.batchDel(streamProxyItemList);
@@ -623,4 +627,59 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
             updateStreamProxy(streamProxyItem);
         }
     }
+
+
+    public void choose1078Lister() {
+        Set<String> keys = redisTemplate.keys("tag:history:port:*");
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(keys)) {
+            return;
+        }
+        Long nowDate = new Date().getTime();
+        for (String key : keys) {
+            String stream = StringUtils.substringAfter(key, "tag:history:port:");
+            if (StringUtils.isEmpty(stream)) {
+                continue;
+            }
+
+            Object value = redisTemplate.opsForValue().get("tag:history:httpPort:time:" + stream);
+            if (Objects.isNull(value)) {
+                sendIORequestStop(stream);
+                continue;
+            }
+            try {
+                Long val = (Long) value;
+                if (val == 0L) {
+                    sendIORequestStop(stream);
+                    continue;
+                }
+
+                Long val1 = (nowDate - val) / 1000;
+                if (val1 > StreamProxyTask.TIME_OUT) {
+                    sendIORequestStop(stream);
+                }
+
+            } catch (Exception e) {
+                logger.error("[{}]停流失败", stream, e);
+            }
+        }
+
+        // task execution logic
+    }
+
+    private void sendIORequestStop(String stream) {
+        try {
+            String sim = StringUtils.substringBeforeLast(stream, "-");
+            String channel = StringUtils.substringAfterLast(stream, "-");
+            Object port = redisTemplate.opsForValue().get("tag:history:port:" + stream);
+            Object portHtt = redisTemplate.opsForValue().get("tag:history:httpPort:" + stream);
+            stremProxyService1078.sendIORequestStop(sim, channel, stream, (Integer) port, (Integer) portHtt);
+
+            del("schedule", stream);
+            // VManageBootstrap.getBean(StreamProxyServiceImpl.class).del("schedule", stream);
+
+        } catch (Exception e) {
+            logger.error("[{}]停流失败", stream, e);
+        }
+
+    }
 }
@@ -32,6 +32,7 @@ public class StremProxyService1078Impl implements StremProxyService1078 {
     @Autowired
     private RedisTemplate<Object, Object> redisTemplate;
+
     private static final Logger log = LoggerFactory.getLogger(StremProxyService1078Impl.class);
@@ -71,7 +72,7 @@ public class StremProxyService1078Impl implements StremProxyService1078 {
                 log.info(entity.getResultStr());
             }
-
+//            streamProxyService.del("schedule", stream);
             resultMap.put("code", "1");
             resultMap.put("message", "OK");
@@ -455,7 +455,6 @@ public class Jt1078OfCarController {
         }
     }
-    public Map<>
     @PostMapping({"/test"})
     public String test(@RequestBody TestEntity test) {
@@ -3,6 +3,7 @@ package com.genersoft.iot.vmp.vmanager.jt1078.platform.config;
 import com.alibaba.fastjson2.JSON;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.ben.HttpClientPostEntity;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.handler.HttpClientUtil;
+import com.xiaoleilu.hutool.convert.Convert;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -94,7 +95,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 CAR_URL = "/car/company/{companyId}?timestamp={timestamp}&nonce={nonce}&password={password}&sign={sign}";
-    private final String GPS_URL = "//gps/all?timestamp={timestamp}&nonce={nonce}&password={password}&sign={sign}";
+    private final String GPS_URL = "/gps/all?timestamp={timestamp}&nonce={nonce}&password={password}&sign={sign}";
     public String requestLine(HttpClientUtil httpClientUtil, String companyId) throws Exception {
         String nonce = random(5);
@@ -247,15 +248,25 @@ public class TuohuaConfigBean {
         String sim = convertStr(ch.get("sim"));
         String name = code;
+        Integer abnormalStatus = 1;
+        long now = new Date().getTime();
+
         Optional<HashMap> optional = gpsList.stream().filter(g -> Objects.nonNull(g) && Objects.nonNull(g.get("deviceId")) &&
                 Objects.nonNull(ch.get("equipmentCode")) && Objects.equals(g.get("deviceId").toString(), ch.get("equipmentCode").toString())).findFirst();
-        if (StringUtils.isEmpty(sim) || !optional.isPresent() || Objects.isNull(optional.get().get("abnormalStatus")) || StringUtils.equalsIgnoreCase("offline", optional.get().get("abnormalStatus").toString())) {
-            name = "<del>" + name + "</del>";
+        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){
+            name = "<view style='color:#ccc'>" + name + "</view>";
+            abnormalStatus =20;
+        }else{
+            name = "<view style='color:blue'>" + name + "</view>";
         }
         HashMap<String, Object> hashMap = combationTree(code, "bus1", code, false, name, 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", formatSim(convertStr(ch.get("sim"))));
+        hashMap.put("abnormalStatus",abnormalStatus);
         if (StringUtils.equals(profileActive, "local")) {
 //            hashMap.put("sim","123456789011");
@@ -18,7 +18,7 @@ module.exports = {
         },
       },
       "/static/snap": {
-        target: "http://10.10.2.22:18089",
+        target: "http://118.113.164.50:18989",
         changeOrigin: true,
         // pathRewrite: {
         //   '^/static/snap': '/static/snap'