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 5fc55f1..c292b80 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 @@ -18,6 +18,7 @@ import com.njcn.user.pojo.po.app.AppInfoSet; import com.njcn.zlevent.pojo.dto.NoticeUserDto; import com.njcn.zlevent.service.ICsEventUserService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -86,6 +87,7 @@ public class SendEventUtils { List users = new ArrayList<>(); List eventUser; List devCodeList; + List userList = new ArrayList<>(); List csEventSendMsgList = new ArrayList<>(); NoticeUserDto noticeUserDto = new NoticeUserDto(); NoticeUserDto.Payload payload = new NoticeUserDto.Payload(); @@ -111,9 +113,10 @@ public class SendEventUtils { users = getSendUser(eventUser,2); if (CollectionUtil.isNotEmpty(users)){ for (User user : users){ - noticeUserDto.setPushClientId(Collections.singletonList(user.getDevCode())); - noticeUserDto.setTitle("设备事件"); + userList.add(user.getDevCode()); } + noticeUserDto.setPushClientId(userList); + noticeUserDto.setTitle("设备事件"); } } break; @@ -224,11 +227,13 @@ public class SendEventUtils { } if (CollectionUtil.isNotEmpty(noticeUserDto.getPushClientId())) { List filteredList = noticeUserDto.getPushClientId().stream() - //过滤掉null .filter(Objects::nonNull) + .distinct() .collect(Collectors.toList()); - noticeUserDto.setPushClientId(filteredList); - sendEventToUser(noticeUserDto); + if (CollectionUtil.isNotEmpty(filteredList)) { + noticeUserDto.setPushClientId(filteredList); + sendEventToUser(noticeUserDto); + } } //记录推送日志 for (User item : users) {