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-05 17:52:54 +08:00
parent 14d79d4fe8
commit 9dab90ab88
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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