other_project/message-center
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

移动端修改消息推送的人员查询方式

Browse Source
This commit is contained in:
dimengzhe
2022-08-22 16:46:42 +08:00
parent 94546c44e3
commit 3fbbfb2dd2
1 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java
View File

@@ -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;
}