From 318db06ca38791c45632019c454e8ca19c230fe8 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Fri, 26 Dec 2025 15:50:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8A=A5=E8=AD=A6=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EnableMessageDevRuleController.java       | 1 +
 .../service/impl/EnableMessageDevRuleServiceImpl.java    | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/project/controller/EnableMessageDevRuleController.java b/src/main/java/com/zhgd/xmgl/modules/project/controller/EnableMessageDevRuleController.java
index f2c56e111..ea43647f4 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/controller/EnableMessageDevRuleController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/project/controller/EnableMessageDevRuleController.java
@@ -228,6 +228,7 @@ public class EnableMessageDevRuleController {
                     v.setEnableSystemMessagePush(0);
                     v.setEnableSystemMessagePromptTone(0);
                     v.setEnableBroadcastNotification(0);
+                    v.setParameterId(parameterId);
                     return v;
                 });
     }
diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/EnableMessageDevRuleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/EnableMessageDevRuleServiceImpl.java
index 28df17ba3..3ca262d5a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/EnableMessageDevRuleServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/EnableMessageDevRuleServiceImpl.java
@@ -22,6 +22,7 @@ import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService;
 import com.zhgd.xmgl.modules.basicdata.service.impl.NoticeServiceImpl;
 import com.zhgd.xmgl.modules.project.entity.EnableMessageDev;
 import com.zhgd.xmgl.modules.project.entity.EnableMessageDevRule;
+import com.zhgd.xmgl.modules.project.entity.Project;
 import com.zhgd.xmgl.modules.project.entity.dto.EnableMessageDevRuleDto;
 import com.zhgd.xmgl.modules.project.entity.vo.EnableMessageDevRuleVo;
 import com.zhgd.xmgl.modules.project.mapper.EnableMessageDevRuleMapper;
@@ -55,6 +56,9 @@ public class EnableMessageDevRuleServiceImpl extends ServiceImpl<EnableMessageDe
     @Lazy
     @Resource
     BroadcastManufacturerFactory broadcastManufacturerFactory;
+    @Lazy
+    @Autowired
+    ProjectServiceImpl projectService;
     @Autowired
     private EnableMessageDevRuleMapper enableMessageDevRuleMapper;
     @Lazy
@@ -235,9 +239,12 @@ public class EnableMessageDevRuleServiceImpl extends ServiceImpl<EnableMessageDe
             }
             String title = "设备报警通知";
             String msg = rule.getMessageTemplateContent();
+            Project project = projectService.getProjectInfoBySn(rule.getProjectSn());
             List<Long> companyUsers = systemUserService.getCompanyUserIdsByProjectSn(rule.getProjectSn());
             if (CollUtil.isNotEmpty(companyUsers)) {
-                ids.addAll(companyUsers);
+                for (Long id : companyUsers) {
+                    noticeService.addUserNoticeAndApp(id, title, project.getProjectName() + "," + msg, type, tone);
+                }
             }
             List<SystemUser> systemUsers = systemUserService.getSystemUsersBySn(new MapBuilder<String, Object>().put(Cts.SN, rule.getProjectSn()).put(Cts.QUERY_TYPE, Cts.PROJECT_LEVEL).build());
             if (CollUtil.isNotEmpty(systemUsers)) {