From 3fbbfb2dd2a3f115bc3c8774b40e4a4b9b928fff Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Mon, 22 Aug 2022 16:46:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=E7=9A=84=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/messagelist/MessageListService.java   | 51 +++++++++++++++++--
 1 file changed, 47 insertions(+), 4 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 8e0be8c..a733517 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
@@ -21,8 +21,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 /**
  * Project: message-center(消息中心) <br/>
@@ -312,8 +311,52 @@ public class MessageListService extends MybatisBaseService<MessageListMapper, Me
         IPage<AppMessageListQuery> iPage = PagerUtil.queryToPage(pq);
         IPage<AppMessageListVo> page = baseMapper.getAppMsgListByUserSid(iPage, qw);
         PagerVo<AppMessageListVo> pagerVo = PagerUtil.pageToVo(page, null);
-        pagerVo.getRecords().stream().forEach(vo -> {
+        //定义的app的sid的index集合
+        Map<String, List<Integer>> appVer = new HashMap<>();
+        List<AppMessageListVo> records = page.getRecords();
+        records.removeAll(Collections.singleton(null));
+        if (!records.isEmpty()) {
+            for (int i = 0; i < records.size(); i++) {
+                AppMessageListVo vo = records.get(i);
+                if (vo.getType().equals("2")) {
+                    //插件
+                    List<Integer> integers = appVer.get(vo.getModuleSid());
+                    if (integers == null) {
+                        integers = new ArrayList<>();
+                    }
+                    integers.add(i);
+                    appVer.put(vo.getModuleSid(), integers);
+                }
+                if (StringUtils.isBlank(vo.getJson())) {
+                    vo.setJson("{}");
+                }
+            }
+            // 循环取map:若为同一个app版本，则只查询一次
+            for (String key : appVer.keySet()) {
+                AppSubsetVersionVo appSubsetVersions = appSubsetVersionFeign.getLastByAppSid(key).getData();
+                if (appSubsetVersions != null) {
+                    List<Integer> integers = appVer.get(key);
+                    for (int i = 0; i < integers.size(); i++) {
+                        Integer integer = integers.get(i);
+                        String path = fileUploadComponent.getUrlPrefix();
+                        records.get(integer).setPath(path + appSubsetVersions.getUpdateUrl());
+                        records.get(integer).setModuleVersion(appSubsetVersions.getVersionCode());
+                        records.get(integer).setModulePluginName(appSubsetVersions.getModulePluginName());
+                    }
+                }
+            }
+        }
+
+       /* pagerVo.getRecords().stream().forEach(vo -> {
+            vo.setPath(fileUploadComponent.getUploadPath()+vo.getPath());
             if (vo.getType().equals("2")) {
+                //插件
+                List<Integer> integers = appVer.get(vo.getModuleSid());
+                if (integers == null) {
+                    integers = new ArrayList<>();
+                }
+                integers.add(i);
+                appVer.put(appSid2, integers);
                 AppSubsetVersionVo subsetVersionVo = appSubsetVersionFeign.getLastByAppSid(vo.getModuleSid()).getData();
                 vo.setPath(subsetVersionVo.getUpdateUrl());
                 vo.setModulePluginName(subsetVersionVo.getModulePluginName());
@@ -324,7 +367,7 @@ public class MessageListService extends MybatisBaseService<MessageListMapper, Me
             if (StringUtils.isBlank(vo.getJson())) {
                 vo.setJson("{}");
             }
-        });
+        });*/
         pagerVo.setMsg("共查询出" + pagerVo.getTotal() + "条消息");
         return pagerVo;
     }