Merge remote-tracking branch 'origin/dev' into dev

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

@@ -338,6 +338,25 @@ public class MegaphoneController {
 
                     }
                 }
+            }else {
+                if (CollectionUtils.isNotEmpty(types)){
+                    //删数据
+                    for (String type : types){
+                        deviceStreamMapper.delete(new QueryWrapper<DeviceStreamEntity>().eq("rtmp_url", param.getRtmpUrl())
+                                .eq("stream_type", type));
+                        List<String> list = new ArrayList<>();
+                        list.add(type);
+                        DisobeyDTO disobeyDTO = new DisobeyDTO();
+                        disobeyDTO.setUrl(s);
+                        disobeyDTO.setOpen(2);
+                        disobeyDTO.setType(list);
+                        disobeyDTO.setRtmpUrl(param.getRtmpUrl());
+                        gatewayPublish.publish(top,new CommonTopicRequest<>()
+                            .setData(Objects.requireNonNull(disobeyDTO)),1);
+                        }
+                }else {
+
+                }
             }
         }
         if (param.getOpen() == 2){