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(消息中心)
@@ -312,8 +311,52 @@ public class MessageListService extends MybatisBaseService iPage = PagerUtil.queryToPage(pq);
IPage page = baseMapper.getAppMsgListByUserSid(iPage, qw);
PagerVo pagerVo = PagerUtil.pageToVo(page, null);
- pagerVo.getRecords().stream().forEach(vo -> {
+ //定义的app的sid的index集合
+ Map> appVer = new HashMap<>();
+ List 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 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 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 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