From bbf2dc57d0f921c4e73763d38160f9cf5547255c Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Tue, 20 May 2025 17:56:05 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[feat]=E4=BF=AE=E6=94=B9=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/business/BusinessAlertMapper.xml   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
index 4a938ec..8e7b549 100644
--- a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
+++ b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
@@ -111,51 +111,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="listMonthAlert" resultType="java.util.Map">
         SELECT DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -11 MONTH), '%Y-%m') AS dateMonth,count(1) total from business_alert ba
-         where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(DATE_FORMAT(CURDATE(), '%Y-01-01'), INTERVAL 0 MONTH), '%Y-%m')
+         where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -11 MONTH), '%Y-%m')
         <include refid="searchSql"></include>
         union all
         SELECT DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -10 MONTH), '%Y-%m') AS dateMonth,count(1) total from business_alert ba
-           where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(DATE_FORMAT(CURDATE(), '%Y-01-01'), INTERVAL 1 MONTH), '%Y-%m')
+           where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -10 MONTH), '%Y-%m')
         <include refid="searchSql"></include>
         union all
         SELECT DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -9 MONTH), '%Y-%m') AS dateMonth,count(1) total from business_alert ba
-           where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(DATE_FORMAT(CURDATE(), '%Y-01-01'), INTERVAL 2 MONTH), '%Y-%m')
+           where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -9 MONTH), '%Y-%m')
         <include refid="searchSql"></include>
         union all
         SELECT DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -8 MONTH), '%Y-%m') AS dateMonth,count(1) total from business_alert ba
-           where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(DATE_FORMAT(CURDATE(), '%Y-01-01'), INTERVAL 3 MONTH), '%Y-%m')
+           where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -8 MONTH), '%Y-%m')
         <include refid="searchSql"></include>
         union all
         SELECT DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -7 MONTH), '%Y-%m') AS dateMonth,count(1) total from business_alert ba
-           where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(DATE_FORMAT(CURDATE(), '%Y-01-01'), INTERVAL 4 MONTH), '%Y-%m')
+           where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -7 MONTH), '%Y-%m')
         <include refid="searchSql"></include>
         union all
         SELECT DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -6 MONTH), '%Y-%m') AS dateMonth,count(1) total from business_alert ba
-          where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(DATE_FORMAT(CURDATE(), '%Y-01-01'), INTERVAL 5 MONTH), '%Y-%m')
+          where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -6 MONTH), '%Y-%m')
         <include refid="searchSql"></include>
         union all
         SELECT DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -5 MONTH), '%Y-%m') AS dateMonth,count(1) total from business_alert ba
-         where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(DATE_FORMAT(CURDATE(), '%Y-01-01'), INTERVAL 6 MONTH), '%Y-%m')
+         where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -5 MONTH), '%Y-%m')
         <include refid="searchSql"></include>
         union all
         SELECT DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -4 MONTH), '%Y-%m') AS dateMonth,count(1) total from business_alert ba
-        where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(DATE_FORMAT(CURDATE(), '%Y-01-01'), INTERVAL 7 MONTH), '%Y-%m')
+        where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -4 MONTH), '%Y-%m')
         <include refid="searchSql"></include>
         union all
         SELECT DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -3 MONTH), '%Y-%m') AS dateMonth,count(1) total from business_alert ba
-         where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(DATE_FORMAT(CURDATE(), '%Y-01-01'), INTERVAL 8 MONTH), '%Y-%m')
+         where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -3 MONTH), '%Y-%m')
         <include refid="searchSql"></include>
         union all
         SELECT DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -2 MONTH), '%Y-%m') AS dateMonth,count(1) total from business_alert ba
-        where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(DATE_FORMAT(CURDATE(), '%Y-01-01'), INTERVAL 9 MONTH), '%Y-%m')
+        where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -2 MONTH), '%Y-%m')
         <include refid="searchSql"></include>
         union all
         SELECT DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -1 MONTH), '%Y-%m') AS dateMonth,count(1) total from business_alert ba
-          where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(DATE_FORMAT(CURDATE(), '%Y-01-01'), INTERVAL 10 MONTH), '%Y-%m')
+          where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -1 MONTH), '%Y-%m')
         <include refid="searchSql"></include>
         union all
         SELECT DATE_FORMAT(CURDATE(), '%Y-%m') AS dateMonth,count(1) total from business_alert ba
-        where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(DATE_FORMAT(CURDATE(), '%Y-01-01'), INTERVAL 11 MONTH), '%Y-%m')
+        where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(CURDATE(), '%Y-%m')
         <include refid="searchSql"></include>
     </select>
 

From 3e713dc9ced0b32134ab5e470f716645435be626 Mon Sep 17 00:00:00 2001
From: yq183 <645046984@qq.com>
Date: Tue, 20 May 2025 18:05:17 +0800
Subject: [PATCH 2/3] =?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

---
 .../org/dromara/business/controller/BusinessAlertController.java | 1 +
 1 file changed, 1 insertion(+)

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 5f28a52..8b9cd7c 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
@@ -108,6 +108,7 @@ public class BusinessAlertController extends BaseController {
     @PostMapping("/saveAlert")
     public R  saveAlert(@RequestBody BusinessAlertVo vo) {
         vo.setBusinessType(2);
+        vo.setHandleType("verify");
         BusinessAlert businessAlert = businessAlertService.addBusinessAlert(vo);
         return R.ok();
     }

From 188fa5595d33bc926dca07512c81bed66048d765 Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Tue, 20 May 2025 18:16:45 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[feat]=E4=BF=AE=E6=94=B9ai=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E6=B5=81=E9=A2=84=E8=AD=A6=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/system/dubbo/RemoteNoticeServiceImpl.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteNoticeServiceImpl.java b/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteNoticeServiceImpl.java
index e2a7c21..12f890d 100644
--- a/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteNoticeServiceImpl.java
+++ b/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteNoticeServiceImpl.java
@@ -16,6 +16,8 @@ import org.dromara.system.service.ISysDictTypeService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 
 /**
@@ -33,6 +35,8 @@ public class RemoteNoticeServiceImpl implements RemoteNoticeService {
     private final RemoteMessageService remoteMessageService;
     private final ISysDictTypeService dictTypeService;
 
+    private final ScheduledExecutorService scheduledExecutorService;
+
     @Override
     public int saveNotice(RemoteNoticeBo bo) {
         SysNotice notice = MapstructUtils.convert(bo, SysNotice.class);
@@ -40,7 +44,10 @@ public class RemoteNoticeServiceImpl implements RemoteNoticeService {
         List<SysDictDataVo> data = dictTypeService.selectDictDataByType("ai_push");
         List<Long> list = data.stream().map(SysDictDataVo::getDictValue).distinct().toList().stream().map(Long::parseLong).toList();
         //获取字典值
-        remoteMessageService.publishMessage(list,bo.getParam());
+        scheduledExecutorService.schedule(() -> {
+            remoteMessageService.publishMessage(list, bo.getParam());
+        }, 3, TimeUnit.SECONDS);
+
         return sysNoticeMapper.insert(notice);
     }
 }