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