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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
liyongbo2 2022-06-23 13:53:07 +08:00
parent 826f9f2866 b140d7f4d6
commit 3a9c3e47af
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
renren-admin/src/main/java/io/renren/common/controller/CensusController.java
View File

@ -59,35 +59,28 @@ public class CensusController {
@ApiOperation("各类资源数目") @ApiOperation("各类资源数目")
public Result<List<Map<String, Object>>> resourceAmount() { public Result<List<Map<String, Object>>> resourceAmount() {
List<Map<String, Object>> dbAmount = resourceService.getAmountGroupByType(); List<Map<String, Object>> dbAmount = resourceService.getAmountGroupByType();
List<String> temp = dbAmount.stream().map(index -> index.get("type").toString()).collect(Collectors.toList()); dbAmount = dbAmount.stream().filter(index -> Arrays.asList(censusTypes).contains(index.get("type").toString())).collect(Collectors.toList());
List<Map<String, Object>> finalDbAmount = dbAmount;
List<String> temp = finalDbAmount.stream().map(index -> index.get("type").toString()).collect(Collectors.toList());
Arrays.stream(censusTypes).filter(index -> !temp.contains(index)).forEach(index -> { // 数据库内不存在的资源类型 Arrays.stream(censusTypes).filter(index -> !temp.contains(index)).forEach(index -> { // 数据库内不存在的资源类型
if (index.equals("数据资源")) { Map<String, Object> nullMap = new HashMap<String, Object>() {
Map<String, Object> nullMap = new HashMap<String, Object>() { {
{ put("amount", 0);
put("amount", 10413); put("type", index);
put("type", "数据资源"); }
} };
}; finalDbAmount.add(nullMap);
dbAmount.add(nullMap);
} else {
Map<String, Object> nullMap = new HashMap<String, Object>() {
{
put("amount", 0);
put("type", index);
}
};
dbAmount.add(nullMap);
}
}); });
Long sum = dbAmount.stream().mapToLong(index -> Long.valueOf(index.get("amount").toString())).sum(); Long sum = finalDbAmount.stream().mapToLong(index -> Long.valueOf(index.get("amount").toString())).sum();
Map<String, Object> sumMap = new HashMap<String, Object>() { Map<String, Object> sumMap = new HashMap<String, Object>() {
{ {
put("amount", sum); put("amount", sum);
put("type", "资源汇聚总量"); put("type", "资源汇聚总量");
} }
}; };
dbAmount.add(sumMap); finalDbAmount.add(sumMap);
return new Result<List<Map<String, Object>>>().ok(dbAmount); return new Result<List<Map<String, Object>>>().ok(finalDbAmount);
} }
@GetMapping(value = "/whole_amount") @GetMapping(value = "/whole_amount")

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

@ -420,8 +420,8 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
}).thenAccept(sum -> { }).thenAccept(sum -> {
re.add(new HashMap<String, Object>() { re.add(new HashMap<String, Object>() {
{ {
put("amount", sum); put("count", sum + "");
put("type", "视频资源数量"); put("type", "基础设施");
} }
}); });
}); });