wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

...

This commit is contained in:
wangliwen 2022-12-27 10:49:17 +08:00
parent a04571795d
commit 898e499720
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
View File

@ -2910,23 +2910,31 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
*/ */
@Override @Override
public Object selectCensusApplyTableNotPaging(Map params) { public Object selectCensusApplyTableNotPaging(Map params) {
List<Map> resultList; List<Map> resultList = new ArrayList<>();
if (params.containsKey("type") && (null == params.get("type") || org.apache.commons.lang3.StringUtils.isBlank(params.get("type").toString()))) { //查所有 if (params.containsKey("type") && (null == params.get("type") || org.apache.commons.lang3.StringUtils.isBlank(params.get("type").toString()))) { //查所有
resultList = resourceDao.selectCensusApplyTable(params); resultList = resourceDao.selectCensusApplyTable(params);
List<Map> lcApplyDtoList = lcSelectCensusApplyTable(params); try {
resultList.addAll(lcApplyDtoList); List<Map> lcApplyDtoList = lcSelectCensusApplyTable(params);
resultList.addAll(lcApplyDtoList);
} catch (Exception exception) {
logger.error("查询浪潮云资源失败", exception);
}
resultList = resultList.stream() resultList = resultList.stream()
.sorted(Comparator.comparing(x -> { .sorted(Comparator.comparing(x -> {
Map map = (Map) x; Map map = (Map) x;
return DateUtils.parse(map.get("createDate").toString(), DateUtils.DATE_TIME_PATTERN); return DateUtils.parse(map.get("createDate").toString(), DateUtils.DATE_TIME_PATTERN);
}).reversed()).collect(Collectors.toList()); }).reversed()).collect(Collectors.toList());
} else if ("云资源".equals(params.get("type").toString()) || "云视频".equals(params.get("type").toString())) { // 浪潮云资源 } else if ("云资源".equals(params.get("type").toString()) || "云视频".equals(params.get("type").toString())) { // 浪潮云资源
resultList = lcSelectCensusApplyTable(params); try {
resultList = resultList.stream() resultList = lcSelectCensusApplyTable(params);
.sorted(Comparator.comparing(x -> { resultList = resultList.stream()
Map map = (Map) x; .sorted(Comparator.comparing(x -> {
return DateUtils.parse(map.get("createDate").toString(), DateUtils.DATE_TIME_PATTERN); Map map = (Map) x;
}).reversed()).collect(Collectors.toList()); return DateUtils.parse(map.get("createDate").toString(), DateUtils.DATE_TIME_PATTERN);
}).reversed()).collect(Collectors.toList());
} catch (Exception exception) {
logger.error("查询浪潮云资源失败", exception);
}
} else { // ucs 特殊 } else { // ucs 特殊
resultList = resourceDao.selectCensusApplyTable(params); resultList = resourceDao.selectCensusApplyTable(params);
} }