Merge branch 'pt' of gitee.com:ccsens_s/ccsenscloud into pt

tall/src/main/java/com/ccsens/tall/bean/dto/message/BaseMessageDto.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.ccsens.util.bean.message.common.InMessage;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -21,6 +22,10 @@ public class BaseMessageDto {
         public MessageUser(){
             hasRead = false;
         }
+        public MessageUser(Long userId){
+            hasRead = false;
+            this.userId = userId;
+        }
         public MessageUser(Long id,Long userId,String nickname,String avatarUrl){
             this();
             this.id = id;
@@ -28,6 +33,14 @@ public class BaseMessageDto {
             this.nickname = nickname;
             this.avatarUrl = avatarUrl;
         }
+
+        public static List<MessageUser> userIdToUsers(List<Long> userIds) {
+            List<MessageUser> users = new ArrayList<>();
+            userIds.forEach(userId ->{
+                users.add(new MessageUser(userId));
+            });
+            return users;
+        }
     }
 
     private Long time;

tall/src/main/java/com/ccsens/tall/service/ProjectMessageService.java

@@ -5,6 +5,7 @@ import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.ccsens.tall.bean.dto.ProjectMessageDto;
+import com.ccsens.tall.bean.dto.message.BaseMessageDto;
 import com.ccsens.tall.bean.po.SysMessageSend;
 import com.ccsens.tall.bean.po.SysMessageSendExample;
 import com.ccsens.tall.bean.po.SysOperation;
@@ -98,6 +99,7 @@ public class ProjectMessageService implements IProjectMessageService {
 //        log.info("mq通知消息:{}", inMessage);
 
         com.ccsens.tall.bean.dto.message.ProjectMessageDto dto = new com.ccsens.tall.bean.dto.message.ProjectMessageDto();
+        dto.setReceivers(BaseMessageDto.MessageUser.userIdToUsers(userIds));
         List<com.ccsens.tall.bean.dto.message.ProjectMessageDto.Message> messages = JSONObject.parseArray(JSONObject.toJSONString(newMessages), com.ccsens.tall.bean.dto.message.ProjectMessageDto.Message.class);
         dto.getData().setMessages(messages);