diff --git a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java index bb18aa55..3d3cfa45 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java +++ b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java @@ -73,7 +73,8 @@ public class CensusController { @GetMapping(value = "/whole_amount") @ApiOperation("平台整体情况") public Result>> wholeAmount() { - List> result = new ArrayList<>(); + List> result = Collections.synchronizedList(new ArrayList<>()); + CompletableFuture resourceAmount = CompletableFuture.supplyAsync(() -> { // 获取资源汇聚总量 List> dbAmount = resourceService.getAmountGroupByType(); Long sum = dbAmount.stream().mapToLong(index -> Long.valueOf(index.get("amount").toString())).sum(); @@ -97,7 +98,7 @@ public class CensusController { }); }); - CompletableFuture applyAmount = CompletableFuture.supplyAsync(() -> { // 获取平台用户总数 + CompletableFuture applyAmount = CompletableFuture.supplyAsync(() -> { // 资源申请量 return tAbilityApplicationService.countApplyAll(); }).thenAccept(sum -> { result.add(new HashMap() { @@ -107,7 +108,29 @@ public class CensusController { } }); }); - CompletableFuture all = CompletableFuture.allOf(resourceAmount, userAmount, applyAmount); + + CompletableFuture deptAmount = CompletableFuture.supplyAsync(() -> { // 覆盖部门量 + return resourceService.countAllDept(); + }).thenAccept(sum -> { + result.add(new HashMap() { + { + put("amount", sum); + put("type", "覆盖部门量"); + } + }); + }); + + CompletableFuture pvAmount = CompletableFuture.supplyAsync(() -> { // 平台访问量 + return 0; + }).thenAccept(sum -> { + result.add(new HashMap() { + { + put("amount", sum); + put("type", "平台访问量"); + } + }); + }); + CompletableFuture all = CompletableFuture.allOf(resourceAmount, userAmount, applyAmount, deptAmount, pvAmount); all.join(); return new Result>>().ok(result); } diff --git a/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java b/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java index f2da6ec5..ef1981a6 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java @@ -46,4 +46,10 @@ public interface ResourceDao extends BaseDao { */ @MapKey("type") List> getAmountGroupByType(); + + /** + * 介入部门数目 + * @return + */ + Long countAllDept(); } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java b/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java index b9a31045..cd507a2d 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java @@ -40,4 +40,6 @@ public interface ResourceService extends CrudService> getAmountGroupByType(); + + Long countAllDept(); } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java index 479bfe96..5fa19a20 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java @@ -257,4 +257,9 @@ public class ResourceServiceImpl extends CrudServiceImpl> amountInfo = resourceDao.getAmountGroupByType(); return amountInfo; } + + @Override + public Long countAllDept() { + return baseDao.countAllDept(); + } } \ No newline at end of file diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 9fab0694..0d7e6dbd 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -318,4 +318,12 @@ GROUP BY type + \ No newline at end of file