Microservice/iot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

消息推送调整

Browse Source
This commit is contained in:
xy
2024-09-03 13:41:41 +08:00
parent c9e6f43729
commit 81286c33cb
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/utils/SendEventUtils.java
View File

@@ -100,15 +100,17 @@ public class SendEventUtils {
//设备自身事件 不推送给用户，推送给业务管理 //设备自身事件 不推送给用户，推送给业务管理
users = getAdminUser(); users = getAdminUser();
if (CollectionUtil.isNotEmpty(users)){ if (CollectionUtil.isNotEmpty(users)){
noticeUserDto.setPushClientId(Collections.singletonList(users.get(0).getDevCode())); for (User user : users){
noticeUserDto.setPushClientId(Collections.singletonList(user.getDevCode()));
noticeUserDto.setTitle("设备事件"); noticeUserDto.setTitle("设备事件");
//记录需要通知的用户和事件关系 //记录需要通知的用户和事件关系
CsEventUserPO csEventUser = new CsEventUserPO(); CsEventUserPO csEventUser = new CsEventUserPO();
csEventUser.setUserId(users.get(0).getId()); csEventUser.setUserId(user.getId());
csEventUser.setStatus(0); csEventUser.setStatus(0);
csEventUser.setEventId(id); csEventUser.setEventId(id);
result.add(csEventUser); result.add(csEventUser);
} }
}
break; break;
case "2": case "2":
code = 0; code = 0;
@@ -164,7 +166,8 @@ public class SendEventUtils {
users = getAdminUser(); users = getAdminUser();
if (CollectionUtil.isNotEmpty(users)){ if (CollectionUtil.isNotEmpty(users)){
eventName = epdFeignClient.findByName(eventName).getData().getShowName(); eventName = epdFeignClient.findByName(eventName).getData().getShowName();
noticeUserDto.setPushClientId(Collections.singletonList(users.get(0).getDevCode())); for (User user : users){
noticeUserDto.setPushClientId(Collections.singletonList(user.getDevCode()));
//记录需要通知的用户和事件关系 //记录需要通知的用户和事件关系
users.forEach(item->{ users.forEach(item->{
CsEventUserPO csEventUser = new CsEventUserPO(); CsEventUserPO csEventUser = new CsEventUserPO();
@@ -174,6 +177,7 @@ public class SendEventUtils {
result.add(csEventUser); result.add(csEventUser);
}); });
} }
}
break; break;
case "2": case "2":
eventName = epdFeignClient.findByName(eventName).getData().getShowName(); eventName = epdFeignClient.findByName(eventName).getData().getShowName();
@@ -303,7 +307,7 @@ public class SendEventUtils {
} }
} }
if (CollectionUtil.isNotEmpty(result)){ if (CollectionUtil.isNotEmpty(result)){
users = userFeignClient.getUserByIdList(result).getData(); users = userFeignClient.appuserByIdList(result).getData();
} }
return users; return users;
} }
@@ -319,7 +323,7 @@ public class SendEventUtils {
.map(AppInfoSet::getUserId).collect(Collectors.toList()); .map(AppInfoSet::getUserId).collect(Collectors.toList());
} }
if (CollectionUtil.isNotEmpty(result)){ if (CollectionUtil.isNotEmpty(result)){
users = userFeignClient.getUserByIdList(result).getData(); users = userFeignClient.appuserByIdList(result).getData();
} }
return users; return users;
} }