From 124d7ac453a09ec78ac3537c8e361590b4d35392 Mon Sep 17 00:00:00 2001
From: like <1025687351@qq.com>
Date: Thu, 15 May 2025 11:21:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E6=B5=81=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MegaphoneController.java       | 72 +++++++++----------
 1 file changed, 32 insertions(+), 40 deletions(-)

diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/MegaphoneController.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/MegaphoneController.java
index 0585aa0..12f5f39 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/MegaphoneController.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/MegaphoneController.java
@@ -267,55 +267,47 @@ 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());
-                        deviceStreamEntity.setUpdateTime(new Date());
-                        deviceStreamEntity.setRtmpUrl(param.getRtmpUrl());
-                        deviceStreamMapper.insert(deviceStreamEntity);
-                        List<String> list = new ArrayList<>();
-                        list.add(type);
-                        DisobeyDTO disobeyDTO = new DisobeyDTO();
-                        disobeyDTO.setUrl(s);
-                        disobeyDTO.setOpen(param.getOpen());
-                        disobeyDTO.setType(list);
-                        disobeyDTO.setRtmpUrl(param.getRtmpUrl());
-                        gatewayPublish.publish(top,new CommonTopicRequest<>()
-                            .setData(Objects.requireNonNull(disobeyDTO)),1);
-                    }
+                    DeviceStreamEntity deviceStreamEntity = new DeviceStreamEntity();
+                    deviceStreamEntity.setStreamType(type);
+                    deviceStreamEntity.setCreateTime(new Date());
+                    deviceStreamEntity.setUpdateTime(new Date());
+                    deviceStreamEntity.setRtmpUrl(param.getRtmpUrl());
+                    deviceStreamMapper.insert(deviceStreamEntity);
+                    List<String> list = new ArrayList<>();
+                    list.add(type);
+                    DisobeyDTO disobeyDTO = new DisobeyDTO();
+                    disobeyDTO.setUrl(s);
+                    disobeyDTO.setOpen(param.getOpen());
+                    disobeyDTO.setType(list);
+                    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));
-                    if (CollectionUtils.isNotEmpty(deviceStreamEntities)){
-                        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(param.getOpen());
-                        disobeyDTO.setType(list);
-                        disobeyDTO.setRtmpUrl(param.getRtmpUrl());
-                        gatewayPublish.publish(top,new CommonTopicRequest<>()
-                            .setData(Objects.requireNonNull(disobeyDTO)),1);
-                    }
+            List<DeviceStreamEntity> deviceStreamEntities = deviceStreamMapper.selectList(new QueryWrapper<DeviceStreamEntity>().eq("rtmp_url", param.getRtmpUrl()));
+            if (CollectionUtils.isNotEmpty(deviceStreamEntities)){
+                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(deviceStreamEntity.getStreamType());
+                    DisobeyDTO disobeyDTO = new DisobeyDTO();
+                    disobeyDTO.setUrl(s);
+                    disobeyDTO.setOpen(param.getOpen());
+                    disobeyDTO.setType(list);
+                    disobeyDTO.setRtmpUrl(param.getRtmpUrl());
+                    gatewayPublish.publish(top,new CommonTopicRequest<>()
+                        .setData(Objects.requireNonNull(disobeyDTO)),1);
                 }
-            }else {
-                deviceStreamMapper.delete(new QueryWrapper<DeviceStreamEntity>().eq("rtmp_url", param.getRtmpUrl()));
+
             }
         }
         return HttpResultResponse.success();