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

Merge branch 'dev'

This commit is contained in:
wangliwen 2022-10-13 10:17:56 +08:00
parent 09998753b2 35b53fa901
commit 6cc646b959
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.*; import java.util.*;
@ -54,6 +55,9 @@ public class CensusController {
@Autowired @Autowired
private ResourceDao resourceDao; private ResourceDao resourceDao;
@Autowired
private JdbcTemplate jdbcTemplate;
@Value("${census.type}") @Value("${census.type}")
private String[] censusTypes; // 需要进行统计的资源类型 private String[] censusTypes; // 需要进行统计的资源类型
@ -108,7 +112,7 @@ public class CensusController {
}, executor).thenAccept(sum -> result.add(new HashMap<String, Object>() { }, executor).thenAccept(sum -> result.add(new HashMap<String, Object>() {
{ {
put("amount", sum); put("amount", sum);
put("type", "资源汇聚总量"); put("type", "资源上架总量");
} }
})); }));
CompletableFuture<Void> userAmount = CompletableFuture.supplyAsync(() -> { // 获取平台用户总数 CompletableFuture<Void> userAmount = CompletableFuture.supplyAsync(() -> { // 获取平台用户总数
@ -134,7 +138,7 @@ public class CensusController {
}, executor).thenAccept(sum -> result.add(new HashMap<String, Object>() { }, executor).thenAccept(sum -> result.add(new HashMap<String, Object>() {
{ {
put("amount", sum); put("amount", sum);
put("type", "资源汇聚部门量"); put("type", "已上架部门数");
} }
})); }));