From e785007f5c4807e7731e8f6eea27ac2b4e5dc022 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Fri, 3 Nov 2023 14:43:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=BB=B4=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/zlevent/utils/SendEventUtils.java   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/utils/SendEventUtils.java b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/utils/SendEventUtils.java
index 98f46de..0d8a1da 100644
--- a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/utils/SendEventUtils.java
+++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/utils/SendEventUtils.java
@@ -149,15 +149,17 @@ public class SendEventUtils {
                     users = appUserFeignClient.getAdminInfo().getData();
                     noticeUserDto.setPushClientId(Collections.singletonList(users.get(0).getDevCode()));
                     //记录需要通知的用户和事件关系
-                    CsEventUserPO csEventUser = new CsEventUserPO();
-                    csEventUser.setUserId(users.get(0).getId());
-                    csEventUser.setStatus(0);
-                    csEventUser.setEventId(id);
-                    result.add(csEventUser);
+                    users.forEach(item->{
+                        CsEventUserPO csEventUser = new CsEventUserPO();
+                        csEventUser.setUserId(item.getId());
+                        csEventUser.setStatus(0);
+                        csEventUser.setEventId(id);
+                        result.add(csEventUser);
+                    });
                     break;
                 case "2":
                 case "3":
-                    //Ⅱ、Ⅲ级告警推送相关用户
+                    //Ⅱ、Ⅲ级告警推送相关用户及业务管理员
                     users = getEventUser(devId);
                     devCodeList = users.stream().map(User::getDevCode).collect(Collectors.toList());
                     noticeUserDto.setPushClientId(devCodeList);
@@ -263,6 +265,8 @@ public class SendEventUtils {
         if (CollectionUtil.isNotEmpty(list)){
             users = userFeignClient.getUserByIdList(result).getData();
         }
+        List<User> adminUser = appUserFeignClient.getAdminInfo().getData();
+        users.addAll(adminUser);
         return users;
     }