消息推送调整

This commit is contained in:
xy
2024-09-05 15:34:19 +08:00
parent 9c95d740d2
commit 14d79d4fe8

View File

@@ -294,18 +294,17 @@ public class SendEventUtils {
} }
} }
/** /**
* 获取所有需要推送的用户id * 获取所有需要推送的用户id
*/ */
public List<String> getEventUser(String devId,boolean isAdmin) { public List<String> getEventUser(String devId,boolean isAdmin) {
List<String> list = csDeviceUserFeignClient.findUserById(devId).getData(); List<User> adminUser = appUserFeignClient.getAdminInfo().getData();
List<String> adminList = adminUser.stream().map(User::getId).collect(Collectors.toList());
if (isAdmin) { if (isAdmin) {
List<User> adminUser = appUserFeignClient.getAdminInfo().getData(); List<String> list = csDeviceUserFeignClient.findUserById(devId).getData();
List<String> adminList = adminUser.stream().map(User::getId).collect(Collectors.toList()); adminList.addAll(list);
list.addAll(adminList);
} }
return list; return adminList;
} }