From 045159043f227ec05114b06be7fc5fa5a3adce4f Mon Sep 17 00:00:00 2001
From: yq183 <645046984@qq.com>
Date: Tue, 20 May 2025 12:27:31 +0800
Subject: [PATCH] =?UTF-8?q?[bug]=E5=AE=9E=E6=97=B6=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BusinessAlertController.java   | 23 ++++++++++++++-----
 .../service/IBusinessAlertService.java        |  1 +
 .../impl/BusinessAlertServiceImpl.java        |  5 ++++
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertController.java b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertController.java
index 01079b0..5f28a52 100644
--- a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertController.java
+++ b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertController.java
@@ -1,6 +1,7 @@
 package org.dromara.business.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.nacos.client.utils.TenantUtil;
 import io.swagger.v3.oas.annotations.Operation;
@@ -108,27 +109,37 @@ public class BusinessAlertController extends BaseController {
     public R  saveAlert(@RequestBody BusinessAlertVo vo) {
         vo.setBusinessType(2);
         BusinessAlert businessAlert = businessAlertService.addBusinessAlert(vo);
+        return R.ok();
+    }
+
+    /**
+     * ai实时流预警保存
+     */
+    @Operation(summary ="预警推送-实时预警模块专用",description = "预警推送-实时预警模块专用")
+    @GetMapping("/pushAlert")
+    public R  pushAlert(Long alertId) {
+        BusinessAlert  businessAlert= businessAlertService.getBusinessAlert(alertId);
         RemoteStartProcess startProcess = new RemoteStartProcess();
         startProcess.setBusinessId(String.valueOf(businessAlert.getId()));
         startProcess.setFlowCode("alertChz");
         remoteWorkflowService.startWorkFlowBatch(List.of(startProcess));
         RemoteNoticeBo remoteNoticeBo = new RemoteNoticeBo();
-        remoteNoticeBo.setNoticeTitle(vo.getDeptName()+"产生预警,预警类型["+vo.getLabelCn()+"],请立即查看");
+        remoteNoticeBo.setNoticeTitle(businessAlert.getDeptName()+"产生预警,预警类型["+businessAlert.getLabelCn()+"],请立即查看");
         remoteNoticeBo.setNoticeType("3");
-        remoteNoticeBo.setNoticeContent(vo.getDeptName()+"产生预警,预警类型["+vo.getLabelCn()+"],请立即查看");
+        remoteNoticeBo.setNoticeContent(businessAlert.getDeptName()+"产生预警,预警类型["+businessAlert.getLabelCn()+"],请立即查看");
         remoteNoticeBo.setStatus("0");
         remoteNoticeBo.setIsRead(0);
         remoteNoticeBo.setCreateBy(1L);
         remoteNoticeBo.setCreateDept(1L);
         remoteNoticeBo.setCreateTime(businessAlert.getCreateTime());
         if (businessAlert.getBusinessType() == 2){
-            businessAlert.setImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_DKCY, vo.getImages(), 3600).toString());
+            businessAlert.setImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_DKCY, businessAlert.getImages(), 3600).toString());
         }
-        remoteNoticeBo.setDeviceSn(vo.getDeviceSn());
-        businessAlert.setDeviceSn(vo.getDeviceSn());
+        remoteNoticeBo.setDeviceSn(businessAlert.getDeviceSn());
+        businessAlert.setDeviceSn(businessAlert.getDeviceSn());
         remoteNoticeBo.setParam(JSON.toJSONString(businessAlert));
         remoteNoticeService.saveNotice(remoteNoticeBo);
-        remoteSubmailConfigService.remoteCmdSend("smsMultixsend", JSON.toJSONString(vo));
+        remoteSubmailConfigService.remoteCmdSend("smsMultixsend", JSON.toJSONString(businessAlert));
         return R.ok();
     }
 
diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java
index 6a1bac8..641c988 100644
--- a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java
+++ b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java
@@ -94,4 +94,5 @@ public interface IBusinessAlertService {
     List<BusinessAlert> listHandleHistory(String lng, String lat, String createTime);
 
     Boolean transferAlert(BusinessAlertVo vo);
+    BusinessAlert getBusinessAlert(Long alertId);
 }
diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java
index 90408da..038de9d 100644
--- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java
+++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java
@@ -831,6 +831,11 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService {
         return this.baseMapper.update(wrapper) > 0;
     }
 
+    @Override
+    public BusinessAlert getBusinessAlert(Long alertId) {
+        return baseMapper.selectById(alertId);
+    }
+
 
     public static void main(String[] args) {
         System.out.println(getLastSixDays());