推流接口

dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/MegaphoneController.java

@@ -267,14 +267,11 @@ public class MegaphoneController {
         //发送mqtt
         String s = remoteConfigService.selectStreamIp();
         DisobeyDTO param = Convert.convert(DisobeyDTO.class, objectMap);
-
         if (param.getOpen() == 1){
+            deviceStreamMapper.delete(new QueryWrapper<DeviceStreamEntity>().eq("rtmp_url", param.getRtmpUrl()));
             if (StringUtils.isNotEmpty(param.getModel())){
                 String[] split = param.getModel().split(",");
                 for (String type : split){
-                    List<DeviceStreamEntity> deviceStreamEntities = deviceStreamMapper.selectList(new QueryWrapper<DeviceStreamEntity>().eq("rtmp_url", param.getRtmpUrl())
-                        .eq("stream_type", type));
-                    if (CollectionUtils.isEmpty(deviceStreamEntities)){
                     DeviceStreamEntity deviceStreamEntity = new DeviceStreamEntity();
                     deviceStreamEntity.setStreamType(type);
                     deviceStreamEntity.setCreateTime(new Date());
@@ -290,21 +287,18 @@ public class MegaphoneController {
                     disobeyDTO.setRtmpUrl(param.getRtmpUrl());
                     gatewayPublish.publish(top,new CommonTopicRequest<>()
                         .setData(Objects.requireNonNull(disobeyDTO)),1);
-                    }
+
                 }
             }
         }
         if (param.getOpen() == 2){
-            if (StringUtils.isNotEmpty(param.getModel())){
-                String[] split = param.getModel().split(",");
-                for (String type : split){
-                    List<DeviceStreamEntity> deviceStreamEntities = deviceStreamMapper.selectList(new QueryWrapper<DeviceStreamEntity>().eq("rtmp_url", param.getRtmpUrl())
-                        .eq("stream_type", type));
+            List<DeviceStreamEntity> deviceStreamEntities = deviceStreamMapper.selectList(new QueryWrapper<DeviceStreamEntity>().eq("rtmp_url", param.getRtmpUrl()));
             if (CollectionUtils.isNotEmpty(deviceStreamEntities)){
-                        deviceStreamMapper.delete(new QueryWrapper<DeviceStreamEntity>().eq("rtmp_url", param.getRtmpUrl())
-                            .eq("stream_type", type));
+                for (DeviceStreamEntity deviceStreamEntity: deviceStreamEntities){
+                    deviceStreamMapper.delete(new QueryWrapper<DeviceStreamEntity>().eq("rtmp_url", deviceStreamEntity.getRtmpUrl())
+                        .eq("stream_type", deviceStreamEntity.getStreamType()));
                     List<String> list = new ArrayList<>();
-                        list.add(type);
+                    list.add(deviceStreamEntity.getStreamType());
                     DisobeyDTO disobeyDTO = new DisobeyDTO();
                     disobeyDTO.setUrl(s);
                     disobeyDTO.setOpen(param.getOpen());
@@ -313,9 +307,7 @@ public class MegaphoneController {
                     gatewayPublish.publish(top,new CommonTopicRequest<>()
                         .setData(Objects.requireNonNull(disobeyDTO)),1);
                 }
-                }
-            }else {
-                deviceStreamMapper.delete(new QueryWrapper<DeviceStreamEntity>().eq("rtmp_url", param.getRtmpUrl()));
+
             }
         }
         return HttpResultResponse.success();