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().eq("rtmp_url", param.getRtmpUrl())); if (StringUtils.isNotEmpty(param.getModel())){ String[] split = param.getModel().split(","); for (String type : split){ - List deviceStreamEntities = deviceStreamMapper.selectList(new QueryWrapper().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 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 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 deviceStreamEntities = deviceStreamMapper.selectList(new QueryWrapper().eq("rtmp_url", param.getRtmpUrl()) - .eq("stream_type", type)); - if (CollectionUtils.isNotEmpty(deviceStreamEntities)){ - deviceStreamMapper.delete(new QueryWrapper().eq("rtmp_url", param.getRtmpUrl()) - .eq("stream_type", type)); - List 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 deviceStreamEntities = deviceStreamMapper.selectList(new QueryWrapper().eq("rtmp_url", param.getRtmpUrl())); + if (CollectionUtils.isNotEmpty(deviceStreamEntities)){ + for (DeviceStreamEntity deviceStreamEntity: deviceStreamEntities){ + deviceStreamMapper.delete(new QueryWrapper().eq("rtmp_url", deviceStreamEntity.getRtmpUrl()) + .eq("stream_type", deviceStreamEntity.getStreamType())); + List 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().eq("rtmp_url", param.getRtmpUrl())); + } } return HttpResultResponse.success();