提交

dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertController.java

@@ -101,9 +101,9 @@ public class BusinessAlertController extends BaseController {
     }
 
     /**
-     * 查询全部预警/待办/已完成/忽略
+     * ai实时流预警保存
      */
-    @Operation(summary ="ai实时流预警保存",description = "ai实时流预警保存")
+    @Operation(summary ="ai实时流预警保存-用于演示",description = "ai实时流预警保存-用于演示")
     @PostMapping("/saveAlert")
     public R  saveAlert(@RequestBody BusinessAlertVo vo) {
         vo.setBusinessType(2);
@@ -125,6 +125,7 @@ public class BusinessAlertController extends BaseController {
             businessAlert.setImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_DKCY, vo.getImages(), 3600).toString());
         }
         remoteNoticeBo.setDeviceSn(vo.getDeviceSn());
+        businessAlert.setDeviceSn(vo.getDeviceSn());
         remoteNoticeBo.setParam(JSON.toJSONString(businessAlert));
         remoteNoticeService.saveNotice(remoteNoticeBo);
         remoteSubmailConfigService.remoteCmdSend("smsMultixsend", JSON.toJSONString(vo));

dk-modules/business/src/main/java/org/dromara/business/domain/BusinessAlert.java

@@ -243,4 +243,7 @@ public class BusinessAlert {
      */
     @TableField(exist = false)
     private String buttonPermission;
+
+    @TableField(exist = false)
+    private String deviceSn;
 }

dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java

@@ -556,8 +556,14 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService {
             return result;
         }
         //不是空的话查看是对应各局的
-        businessAlertBo.setAiLabelEnList(List.of(businessAlertBo.getLabelEn()));
+        List<RemoteAiLabelPostVo> postVoList = remoteLablePostService.selectLabelByList(businessAlertBo.getPostCode(), null);
-        List<BusinessAlertVo> alertList = this.baseMapper.heatList(businessAlertBo,businessAlertBo.getStartTime(), businessAlertBo.getEndTime());
+
+
+        if (ObjectUtil.isEmpty(postVoList)){
+            return result;
+        }
+        businessAlertBo.setAiLabelEnList(postVoList.stream().map(RemoteAiLabelPostVo::getLabelEn).distinct().toList());
+        List<BusinessAlertVo> alertList = this.baseMapper.heatList(businessAlertBo, businessAlertBo.getStartTime(), businessAlertBo.getEndTime());
         Map<String, List<BusinessAlertVo>> listMap = alertList.stream().collect(Collectors.groupingBy(BusinessAlertVo::getLabelCn));
         result.putAll(listMap);
         return result;

dk-modules/sample/src/main/java/org/dromara/sample/rocketmq/RocketMqConsum.java

@@ -77,7 +77,7 @@ public class RocketMqConsum implements RocketMQListener<MessageExt> {
         HttpResultResponse httpResultResponse = liveStreamService.liveStart(liveTypeDTO);
         if (httpResultResponse.getCode() == 0 || httpResultResponse.getCode() ==  513012 ||  httpResultResponse.getCode() == 513003){
             reqMap.put("deviceSn:",videoId.getDroneSn());
-            playTextService.streamType(reqMap);
+           // playTextService.streamType(reqMap);
         }
         deviceRedisService.setDeviceVideo(videoId.getDroneSn(),videoId);