消息推送调整
This commit is contained in:
@@ -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();
|
|
||||||
if (isAdmin) {
|
|
||||||
List<User> adminUser = appUserFeignClient.getAdminInfo().getData();
|
List<User> adminUser = appUserFeignClient.getAdminInfo().getData();
|
||||||
List<String> adminList = adminUser.stream().map(User::getId).collect(Collectors.toList());
|
List<String> adminList = adminUser.stream().map(User::getId).collect(Collectors.toList());
|
||||||
list.addAll(adminList);
|
if (isAdmin) {
|
||||||
|
List<String> list = csDeviceUserFeignClient.findUserById(devId).getData();
|
||||||
|
adminList.addAll(list);
|
||||||
}
|
}
|
||||||
return list;
|
return adminList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user