From 14d79d4fe8891f59c36210f43b6c0d0dd24ebdc6 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Thu, 5 Sep 2024 15:34:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/zlevent/utils/SendEventUtils.java | 11 +++++------ 1 file changed, 5 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 089c7c4..5fc55f1 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 @@ -294,18 +294,17 @@ public class SendEventUtils { } } - /** * 获取所有需要推送的用户id */ public List getEventUser(String devId,boolean isAdmin) { - List list = csDeviceUserFeignClient.findUserById(devId).getData(); + List adminUser = appUserFeignClient.getAdminInfo().getData(); + List adminList = adminUser.stream().map(User::getId).collect(Collectors.toList()); if (isAdmin) { - List adminUser = appUserFeignClient.getAdminInfo().getData(); - List adminList = adminUser.stream().map(User::getId).collect(Collectors.toList()); - list.addAll(adminList); + List list = csDeviceUserFeignClient.findUserById(devId).getData(); + adminList.addAll(list); } - return list; + return adminList; }