Merge branch 'develop'

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/dto/LoginSuccessDTO.java

 package com.mmc.iuav.user.model.dto;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.mmc.iuav.user.model.vo.CompanyInfoVO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/UserMessageVO.java

@@ -23,4 +23,6 @@ public class UserMessageVO implements Serializable {
 
     @ApiModelProperty(value = "消息内容")
     private String content;
+    @ApiModelProperty(value = "发送的图片")
+    private String imgUrl;
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/BaseController.java

@@ -58,7 +58,13 @@ public abstract class BaseController {
         if (StringUtils.isBlank(json)){
             throw new BizException(ResultEnum.LOGIN_ACCOUNT_STATUS_ERROR);
         }
+        // 版本问题，需要修改json字符串，去除最外侧""和转义\
+        if (json.startsWith("\"") && json.endsWith("\"")) {
+            json = json.substring(1, json.length() - 1);
+        }
+        json = json.replace("\\","");
         LoginSuccessDTO loginSuccessDTO = JSONObject.parseObject(json, LoginSuccessDTO.class);
         return loginSuccessDTO;
     }
+
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/MessageDao.java

@@ -93,6 +93,7 @@ public interface MessageDao {
     int insertUserMessage(UserMessageDO messageDO);
 
     List<UserMessageDO> selectUserMessage(@Param("messageQO")MessageUserQO messageQO,@Param("senderUserId")Integer  senderUserId);
+    UserMessageDO selectEndUserMessage(@Param("receiverUserId") Integer receiverUserId,@Param("senderUserId")Integer  senderUserId);
 
     int countUserMessage(@Param("receiverUserId") Integer receiverUserId,@Param("senderUserId") Integer senderUserId);
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/UserDO.java

@@ -38,4 +38,8 @@ public class UserDO implements Serializable {
     private Integer unreadCount;
     @ApiModelProperty(value = "手机号")
     private String phoneNum;
+    @ApiModelProperty(value = "最新消息")
+    private String endMessage;
+    @ApiModelProperty(value = "最新消息创建时间")
+    private Date createTime;
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/UserMessageDO.java

@@ -53,5 +53,6 @@ public class UserMessageDO implements Serializable {
     public UserMessageDO(UserMessageVO message) {
         this.receiverUserId = message.getReceiverUserId();
         this.content = message.getContent();
+        this.imgUrl = message.getImgUrl();
     }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/MessageServiceImpl.java

@@ -154,7 +154,7 @@ public class MessageServiceImpl implements MessageService {
 
     @Override
     public PageResult selectUserMessage(MessageUserQO messageQO,Integer senderUserId) {
-        scheduledTaskUtil.destroy(messageQO.getReceiverUserId());
+        scheduledTaskUtil.destroy(senderUserId);
         int count = messageDao.countUserMessage(messageQO.getReceiverUserId(),senderUserId);
         if (count == 0) {
             return PageResult.buildPage(messageQO.getPageNo(), messageQO.getPageSize(), count);
@@ -181,8 +181,17 @@ public class MessageServiceImpl implements MessageService {
             UserAccountDO userAccount = userServiceDao.getUserAccountById(userMessageLogDO.getReceiverUserId());
             UserDO userDO = userAccount.buildUserDO();
             userDO.setUnreadCount(userMessageLogDO.getMessageCount());
+            UserMessageDO userMessageDO = messageDao.selectEndUserMessage(userMessageLogDO.getReceiverUserId(), senderUserId);
+            if(userMessageDO.getContent() != null){
+                userDO.setEndMessage(userMessageDO.getContent());
+            }else {
+                userDO.setEndMessage(userMessageDO.getImgUrl());
+            }
+            userDO.setCreateTime(userMessageDO.getCreateTime());
             userAccountDOList.add(userDO);
         }
+        // 使用 Collections.sort() 方法和自定义的比较器进行排序
+        Collections.sort(userAccountDOList, Comparator.comparing(UserDO::getCreateTime).reversed());
         return ResultBody.success(userAccountDOList);
     }
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/util/ScheduledTaskUtil.java

@@ -50,7 +50,11 @@ public class ScheduledTaskUtil {
 
     public void destroy(Integer userAccountId){
         redisTemplate.setValueSerializer(RedisSerializer.json());
-        MyTask task = new Gson().fromJson(redisTemplate.opsForValue().get("task"+userAccountId), MyTask.class);
+        String s = redisTemplate.opsForValue().get("task" + userAccountId);
+        if(s == null || s == ""){
+            return;
+        }
+        MyTask task = new Gson().fromJson(s, MyTask.class);
         ScheduledFuture<?> scheduledFuture = scheduledTasks.get(userAccountId);
         if (task != null && scheduledFuture != null) {
             scheduledFuture.cancel(false);

csm-service/cms-service-user/src/main/resources/mapper/MessageDao.xml

@@ -41,17 +41,20 @@
         where is_deleted = 0
     </select>
     <select id="selectUserMessage" resultType="com.mmc.iuav.user.entity.UserMessageDO">
-        select
-            id, img_url, content, sender_user_id,receiver_user_id, create_time
-        from user_message
-        where is_deleted = 0 and sender_user_id in(#{senderUserId} ,#{messageQO.receiverUserId})
-        order by create_time desc
-            LIMIT #{messageQO.pageNo},#{messageQO.pageSize}
+        SELECT id, img_url, content, sender_user_id, receiver_user_id, create_time
+        FROM (
+                 SELECT id, img_url, content, sender_user_id, receiver_user_id, create_time
+                 FROM user_message
+                 WHERE is_deleted = 0 AND sender_user_id IN (#{senderUserId} ,#{messageQO.receiverUserId}) AND receiver_user_id IN (#{senderUserId} ,#{messageQO.receiverUserId})
+                 ORDER BY create_time desc
+                     LIMIT #{messageQO.pageNo},#{messageQO.pageSize}
+             ) AS subquery
+        ORDER BY create_time ASC;
     </select>
     <select id="countUserMessage" resultType="java.lang.Integer">
         select count(*)
         from user_message
-        where is_deleted = 0 and sender_user_id in(#{senderUserId} ,#{receiverUserId})
+        where is_deleted = 0 and sender_user_id in(#{senderUserId} ,#{receiverUserId}) and receiver_user_id in(#{senderUserId} ,#{receiverUserId})
     </select>
     <select id="selectUserListBySenderUserId" resultType="java.lang.Integer">
         select
@@ -81,6 +84,14 @@
         from user_message
         where is_deleted = 0 and id = #{id}
     </select>
+    <select id="selectEndUserMessage" resultType="com.mmc.iuav.user.entity.UserMessageDO">
+        select
+            id, img_url, content, sender_user_id,receiver_user_id, create_time
+        from user_message
+        where is_deleted = 0 and sender_user_id in(#{senderUserId} ,#{receiverUserId}) and receiver_user_id in(#{senderUserId} ,#{receiverUserId})
+        order by create_time desc
+            LIMIT 1
+    </select>
 
     <insert id="insertSystemMessage">
         insert into message

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 630bc290b85f8591c38152668845af8ec7d400f1
+  newTag: dc89a6cdd82582e2e1308b924144dd3c8b2253bc