消息id 转化

lift-push-pc/src/main/java/cn/com/ty/lift/push/conf/SystemConfiguration.java

@@ -27,15 +27,15 @@ import java.time.format.DateTimeFormatter;
 
 /**
  * <p>
- *     配置bean注入
+ * 配置bean注入
  * </p>
+ *
  * @author wcz
- * @since  2019/12/3
+ * @since 2019/12/3
  */
 @Slf4j
 @Data
 @Configuration
-@ConfigurationProperties(prefix = "xinge")
 public class SystemConfiguration {
 
     /**
@@ -61,7 +61,7 @@ public class SystemConfiguration {
      */
     @Bean
     @ConditionalOnMissingBean(PerformanceInterceptor.class)
-    public SqlAnalysisInterceptor sqlAnalysisInterceptor(){
+    public SqlAnalysisInterceptor sqlAnalysisInterceptor() {
         SqlAnalysisInterceptor sqlAnalysisInterceptor = new SqlAnalysisInterceptor();
         //格式化执行的sql
         sqlAnalysisInterceptor.setFormat(true);
@@ -75,13 +75,14 @@ public class SystemConfiguration {
      */
 //    @Bean
 //    @ConditionalOnMissingBean
-    public SqlIllegalInterceptor sqlIllegalInterceptor(){
+    public SqlIllegalInterceptor sqlIllegalInterceptor() {
         SqlIllegalInterceptor sqlIllegalInterceptor = new SqlIllegalInterceptor();
         return sqlIllegalInterceptor;
     }
 
     /**
      * 分页插件
+     *
      * @return 分页插件
      */
     @Bean

lift-push-pc/src/main/java/cn/com/ty/lift/push/websocket/handler/TimeyMessageHandler.java

@@ -5,6 +5,7 @@ import cn.com.ty.lift.common.constants.WebSocketConstants;
 import cn.com.ty.lift.common.model.TimeMessage;
 import cn.com.ty.lift.push.message.service.TimeMessageService;
 import cn.com.ty.lift.push.websocket.model.RealTimeMessage;
+import cn.com.ty.lift.push.websocket.model.TimeMessageVo;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,13 +45,13 @@ public class TimeyMessageHandler implements WebSocketHandler {
         if (userId != null) {
             users.put(userId, session);
             //获取用户实时消息
-            List<TimeMessage> TimeMessageList = timeMessageService.list(new QueryWrapper<TimeMessage>()
+            List<TimeMessage> timeMessageList = timeMessageService.list(new QueryWrapper<TimeMessage>()
                     .eq("view_flag", WebSocketConstants.IS_NOT_VIEW)
                     .eq("user_id", userId)
                     .eq("device_model", ApiConstants.DeviceModel.PC)
             );
             //将消息推送给用户
-            pushMessageToUser(userId, TimeMessageList);
+            pushMessageToUser(userId, timeMessageList);
         }
     }
 
@@ -87,7 +88,7 @@ public class TimeyMessageHandler implements WebSocketHandler {
      * @Date 21:36 2019-04-19
      * @Param [userIds, TimeMessages, count]
      **/
-    public static boolean pushMessageToUsers(List<Long> userIds, List<TimeMessage> TimeMessages) {
+    public static boolean pushMessageToUsers(List<Long> userIds, List<TimeMessage> timeMessages) {
         try {
             if (userIds != null && userIds.size() > 0) {
                 for (Long userId : userIds) {
@@ -95,9 +96,10 @@ public class TimeyMessageHandler implements WebSocketHandler {
                     if (session != null) {
                         //新建消息体
                         RealTimeMessage realTimeMessage;
-                        if (TimeMessages != null && TimeMessages.size() > 0) {
-                            realTimeMessage = new RealTimeMessage(TimeMessages);
-                            realTimeMessage.setSize((long) TimeMessages.size());
+                        if (timeMessages != null && timeMessages.size() > 0) {
+                            //将消息实体转化为消息vo
+                            realTimeMessage = new RealTimeMessage(transToVo(timeMessages));
+                            realTimeMessage.setSize((long) timeMessages.size());
                         } else {
                             realTimeMessage = new RealTimeMessage();
                             realTimeMessage.setSize(0L);
@@ -171,10 +173,36 @@ public class TimeyMessageHandler implements WebSocketHandler {
      */
     private Long getCurrentUser(WebSocketSession session) {
         String userId = (String) session.getAttributes().get(ApiConstants.CURRENT_USER_ID);
-        if(StringUtils.isNotBlank(userId)) {
+        if (StringUtils.isNotBlank(userId)) {
             return Long.parseLong(userId);
         }
         return null;
     }
 
+    /**
+     * @param
+     * @return
+     * @description 消息二次封装
+     * @date 2020/6/1 4:27 下午
+     */
+    private static List<TimeMessageVo> transToVo(List<TimeMessage> timeMessageList) {
+        List<TimeMessageVo> voList = new ArrayList<>();
+        if (timeMessageList != null && timeMessageList.size() > 0) {
+            timeMessageList.forEach(timeMessage -> {
+                if (timeMessage.getId() != null) {
+                    TimeMessageVo vo = new TimeMessageVo();
+                    vo.setId(timeMessage.getId().toString());
+                    vo.setContent(timeMessage.getContent());
+                    vo.setCreateTime(timeMessage.getCreateTime());
+                    vo.setCreateUserId(timeMessage.getCreateUserId());
+                    vo.setDeviceModel(timeMessage.getDeviceModel());
+                    vo.setUserId(timeMessage.getUserId());
+                    vo.setViewFlag(timeMessage.getViewFlag());
+                    vo.setType(timeMessage.getType());
+                }
+            });
+        }
+        return voList;
+    }
+
 }

lift-push-pc/src/main/java/cn/com/ty/lift/push/websocket/model/RealTimeMessage.java

@@ -15,11 +15,11 @@ import java.util.List;
 public class RealTimeMessage {
 	
 	private Long size;//消息数量
-	private List<TimeMessage> msgList = new ArrayList<>();//及时消息列表
+	private List<TimeMessageVo> msgList = new ArrayList<>();//及时消息列表
 	
 	public RealTimeMessage() {}
 	
-	public RealTimeMessage(List<TimeMessage> msgList) {
+	public RealTimeMessage(List<TimeMessageVo> msgList) {
 		this.msgList = msgList;
 	}
 	

lift-push-pc/src/main/java/cn/com/ty/lift/push/websocket/model/TimeMessageVo.java

@@ -0,0 +1,31 @@
+package cn.com.ty.lift.push.websocket.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @author huangyuan
+ * @date 2020/6/1
+ * @description
+ */
+@Data
+public class TimeMessageVo implements Serializable {
+
+    private static final long serialVersionUID = 4125096758372084309L;
+    private String id;
+    private Long userId;
+    private String content;
+    private Integer type;
+    private Integer viewFlag;
+    private Integer deviceModel;
+    private Long createUserId;
+    private LocalDateTime createTime;
+
+
+
+}