修复旧版本拉流代理的兼容接口

src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java

@@ -37,7 +37,9 @@ public class SipSubscribe {
     //    @Scheduled(fixedRate= 100 * 60 * 60 )
     @Scheduled(cron="0 0/5 * * * ?")   //每5分钟执行一次
     public void execute(){
+        if(log.isDebugEnabled()){
             log.info("[定时任务] 清理过期的SIP订阅信息");
+        }
 
         Instant instant = Instant.now().minusMillis(TimeUnit.MINUTES.toMillis(5));
 
@@ -53,11 +55,13 @@ public class SipSubscribe {
                 errorTimeSubscribes.remove(key);
             }
         }
+        if(log.isDebugEnabled()){
             log.debug("okTimeSubscribes.size:{}",okTimeSubscribes.size());
             log.debug("okSubscribes.size:{}",okSubscribes.size());
             log.debug("errorTimeSubscribes.size:{}",errorTimeSubscribes.size());
             log.debug("errorSubscribes.size:{}",errorSubscribes.size());
         }
+    }
 
     public interface Event { void response(EventResult eventResult);
     }

src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxyParam.java

@@ -16,6 +16,9 @@ public class StreamProxyParam {
     @Schema(description = "应用名")
     private String app;
 
+    @Schema(description = "名称")
+    private String name;
+
     @Schema(description = "流ID")
     private String stream;
 
@@ -64,7 +67,7 @@ public class StreamProxyParam {
         streamProxy.setEnableRemoveNoneReader(enableRemoveNoneReader);
         streamProxy.setEnableDisableNoneReader(enableDisableNoneReader);
         streamProxy.setFfmpegCmdKey(ffmpegCmdKey);
-
+        streamProxy.setGbName(name);
         return streamProxy;
 
     }

src/main/java/com/genersoft/iot/vmp/streamProxy/service/IStreamProxyService.java

@@ -87,7 +87,7 @@ public interface IStreamProxyService {
      */
     ResourceBaseInfo getOverview();
 
-    StreamInfo add(StreamProxy streamProxy);
+    void add(StreamProxy streamProxy);
 
     StreamProxy getStreamProxy(int id);
 

src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyServiceImpl.java

@@ -140,21 +140,35 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
     public StreamInfo save(StreamProxyParam param) {
         // 兼容旧接口
         StreamProxy streamProxyInDb = getStreamProxyByAppAndStream(param.getApp(), param.getStream());
-        if (streamProxyInDb  != null && streamProxyInDb.getPulling()) {
+        if (streamProxyInDb != null && streamProxyInDb.getPulling() != null && streamProxyInDb.getPulling()) {
             playService.stopProxy(streamProxyInDb);
         }
-        if (streamProxyInDb  == null){
+        if (param.getMediaServerId().equals("auto")) {
-            return add(param.buildStreamProxy());
+            param.setMediaServerId(null);
-        }else {
+        }
+        StreamProxy streamProxy = param.buildStreamProxy();
+
+        if (streamProxyInDb == null) {
+            add(streamProxy);
+        } else {
+            try {
                 playService.stopProxy(streamProxyInDb);
+            } catch (ControllerException ignored) {
+            }
             streamProxyMapper.delete(streamProxyInDb.getId());
-            return add(param.buildStreamProxy());
+            add(streamProxy);
+        }
+
+        if (param.isEnable()) {
+            return playService.startProxy(streamProxy);
+        } else {
+            return null;
         }
     }
 
     @Override
     @Transactional
-    public StreamInfo add(StreamProxy streamProxy) {
+    public void add(StreamProxy streamProxy) {
         StreamProxy streamProxyInDb = streamProxyMapper.selectOneByAppAndStream(streamProxy.getApp(), streamProxy.getStream());
         if (streamProxyInDb != null) {
             throw new ControllerException(ErrorCode.ERROR100.getCode(), "APP+STREAM已经存在");
@@ -166,7 +180,6 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
         streamProxy.setUpdateTime(DateUtil.getNow());
         streamProxyMapper.add(streamProxy);
         streamProxy.setStreamProxyId(streamProxy.getId());
-        return null;
     }
 
     @Override
@@ -183,7 +196,7 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
         if (streamProxy.getPulling() != null && streamProxy.getPulling()) {
             playService.stopProxy(streamProxy);
         }
-        if(streamProxy.getGbId() > 0) {
+        if (streamProxy.getGbId() > 0) {
             gbChannelService.delete(streamProxy.getGbId());
         }
         streamProxyMapper.delete(streamProxy.getId());
@@ -213,7 +226,7 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
         if (updateResult > 0 && !ObjectUtils.isEmpty(streamProxy.getGbDeviceId())) {
             if (streamProxy.getGbId() > 0) {
                 gbChannelService.update(streamProxy.buildCommonGBChannel());
-            }else {
+            } else {
                 gbChannelService.add(streamProxy.buildCommonGBChannel());
             }
         }
@@ -231,7 +244,7 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
     }
 
     @Override
-    public PageInfo<StreamProxy> getAll(Integer page, Integer count, String query, Boolean pulling,String mediaServerId) {
+    public PageInfo<StreamProxy> getAll(Integer page, Integer count, String query, Boolean pulling, String mediaServerId) {
         PageHelper.startPage(page, count);
         List<StreamProxy> all = streamProxyMapper.selectAll(query, pulling, mediaServerId);
         return new PageInfo<>(all);
@@ -258,7 +271,6 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
     }
 
 
-
     @Override
     public Map<String, String> getFFmpegCMDs(MediaServer mediaServer) {
         return mediaServerService.getFFmpegCMDs(mediaServer);
@@ -281,7 +293,7 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
         redisCatchStorage.removeStream(mediaServerId, "pull");
 
         List<StreamProxy> streamProxies = streamProxyMapper.selectForEnableInMediaServer(mediaServerId, true);
-        if (streamProxies.isEmpty()){
+        if (streamProxies.isEmpty()) {
             return;
         }
         Map<String, StreamProxy> streamProxyMapForDb = new HashMap<>();
@@ -300,7 +312,7 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
                 continue;
             }
             if (streamInfo.getOriginType() == OriginType.PULL.ordinal()
-                    || streamInfo.getOriginType() == OriginType.FFMPEG_PULL.ordinal() ) {
+                    || streamInfo.getOriginType() == OriginType.FFMPEG_PULL.ordinal()) {
                 if (streamProxyMapForDb.get(key) != null) {
                     redisCatchStorage.addStream(mediaServer, "pull", streamInfo.getApp(), streamInfo.getStream(), streamInfo.getMediaInfo());
                     if ("OFF".equalsIgnoreCase(streamProxy.getGbStatus()) && streamProxy.getGbId() > 0) {
@@ -353,7 +365,7 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
         // 清理redis相关的缓存
         redisCatchStorage.removeStream(mediaServerId, "pull");
 
-        if (streamProxies.isEmpty()){
+        if (streamProxies.isEmpty()) {
             return;
         }
         List<StreamProxy> streamProxiesForRemove = new ArrayList<>();
@@ -402,11 +414,11 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
         }
         streamProxy.setUpdateTime(DateUtil.getNow());
         streamProxyMapper.update(streamProxy);
-        streamProxy.setGbStatus(status?"ON":"OFF");
+        streamProxy.setGbStatus(status ? "ON" : "OFF");
         if (streamProxy.getGbId() > 0) {
             if (status) {
                 gbChannelService.online(streamProxy.buildCommonGBChannel());
-            }else {
+            } else {
                 gbChannelService.offline(streamProxy.buildCommonGBChannel());
             }
         }