From 1d0c7ca501a78de258d43e5c0a6fc7431c242dd4 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Mon, 15 Aug 2022 11:32:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83=E5=9B=BE=E6=A0=87=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/messagelist/MessageListService.java   | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java
index a337e8a..49574e0 100644
--- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java
+++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign;
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -45,6 +46,8 @@ public class MessageListService extends MybatisBaseService<MessageListMapper, Me
     private MessageService messageService;
     @Autowired
     private AppSubsetVersionFeign appSubsetVersionFeign;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
 
     public List<MessageList> listAll(MessageListQuery query) {
         QueryWrapper<MessageList> qw = createQueryWrapper(query);
@@ -141,7 +144,7 @@ public class MessageListService extends MybatisBaseService<MessageListMapper, Me
         return vo;
     }
 
-    public PagerVo<MessageListJoinMsgVo> noreadListPage(PagerQuery<MessageListQuery> pq,String userSid) {
+    public PagerVo<MessageListJoinMsgVo> noreadListPage(PagerQuery<MessageListQuery> pq, String userSid) {
         MessageListQuery query = pq.getParams();
         query.setReceiverSid(userSid);
         QueryWrapper<MessageList> qw = createQueryWrapper(query);
@@ -151,7 +154,7 @@ public class MessageListService extends MybatisBaseService<MessageListMapper, Me
         return p;
     }
 
-    public PagerVo<MessageListJoinMsgVo> readListPage(PagerQuery<MessageListQuery> pq,String userSid) {
+    public PagerVo<MessageListJoinMsgVo> readListPage(PagerQuery<MessageListQuery> pq, String userSid) {
         MessageListQuery query = pq.getParams();
         query.setReceiverSid(userSid);
         QueryWrapper<MessageList> qw = createQueryWrapper(query);
@@ -238,6 +241,7 @@ public class MessageListService extends MybatisBaseService<MessageListMapper, Me
 
     /**
      * 查询未读数量
+     *
      * @param msgTypeSid
      * @param userSid
      * @return
@@ -248,6 +252,7 @@ public class MessageListService extends MybatisBaseService<MessageListMapper, Me
 
     /**
      * 手机端查询消息主页面
+     *
      * @param userSid
      * @return
      */
@@ -267,13 +272,15 @@ public class MessageListService extends MybatisBaseService<MessageListMapper, Me
                 AppCrossIcon crossIcon = new AppCrossIcon();
                 crossIcon.setMsgTypeSid(messageTypeVo.getMsgTypeSid());
                 crossIcon.setMsgType(messageTypeVo.getMsgType());
-                crossIcon.setIconUrl(messageTypeVo.getCrossIconUrl());
+                crossIcon.setIconUrl(fileUploadComponent.getUrlPrefix() + messageTypeVo.getCrossIconUrl());
                 crossIcon.setNum(num);
                 crossIconList.add(crossIcon);
             } else { // 纵排消息
                 AppLongsIcon longsIcon = new AppLongsIcon();
                 longsIcon.setMsgType(messageTypeVo.getMsgType());
-                longsIcon.setIconUrl(messageTypeVo.getLongIconUrl());
+                if (StringUtils.isNotBlank(messageTypeVo.getLongIconUrl())) {
+                    longsIcon.setIconUrl(fileUploadComponent.getUrlPrefix() + messageTypeVo.getLongIconUrl());
+                }
                 AppLastMsgVo lastMsg = baseMapper.selectLastMsg(userSid, messageTypeVo.getMsgTypeSid());
                 longsIcon.setMsgTypeSid(messageTypeVo.getMsgTypeSid());
                 longsIcon.setTitle(lastMsg == null ? "" : lastMsg.getMsgTitle());
@@ -287,19 +294,20 @@ public class MessageListService extends MybatisBaseService<MessageListMapper, Me
         vo.setLongIconList(longIconList);
         int unReadCount = baseMapper.selectUnReadCount("", userSid);
         if (unReadCount != 0) {
-            vo.setMsgTotal("未读消息"+unReadCount+"条");
+            vo.setMsgTotal("未读消息" + unReadCount + "条");
         }
         return vo;
     }
 
     /**
      * 手机端查询消息列表
+     *
      * @param pq
      * @return
      */
     public PagerVo<AppMessageListVo> getAppMsgListByUserSid(PagerQuery<AppMessageListQuery> pq) {
         QueryWrapper<MessageList> qw = new QueryWrapper<>();
-        qw.eq("ml.receiverSid",  pq.getParams().getUserSid());
+        qw.eq("ml.receiverSid", pq.getParams().getUserSid());
         qw.eq("m.msgTypeSid", pq.getParams().getMsgTypeSid());
         IPage<AppMessageListQuery> iPage = PagerUtil.queryToPage(pq);
         IPage<AppMessageListVo> page = baseMapper.getAppMsgListByUserSid(iPage, qw);
@@ -317,12 +325,13 @@ public class MessageListService extends MybatisBaseService<MessageListMapper, Me
                 vo.setJson("{}");
             }
         });
-        pagerVo.setMsg("共查询出"+pagerVo.getTotal()+"条消息");
+        pagerVo.setMsg("共查询出" + pagerVo.getTotal() + "条消息");
         return pagerVo;
     }
 
-     /**
+    /**
      * 手机端用户根据消息类型批量设为已读
+     *
      * @param msgTypeSid
      * @return
      */