diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java new file mode 100644 index 000000000..ea322bef9 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java @@ -0,0 +1,23 @@ +package com.elink.esua.epdc.dto.user.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @program: esua-epdc-cloud + * @description: 用户数据统计/网格开通数量 + * @author: wangtong + * @create: 2020-02-12 10:03 + **/ +@Data +public class UserCountDTO{ + + + /** + * 部门id + */ + @NotNull(message = "部门id不能为空") + private String deptId; + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java new file mode 100644 index 000000000..b0e72f93a --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java @@ -0,0 +1,24 @@ +package com.elink.esua.epdc.dto.user.result; + +import java.io.Serializable; + +/** + * @program: esua-epdc-cloud + * @description: 网格数量统计Serializable + * @author: wangtong + * @create: 2020-02-11 14:50 + **/ +public class GriddingCountDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 网格总计 + **/ + private String gridTotle; + + /** + * 开通网格数量 + **/ + private String gridCount; +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java new file mode 100644 index 000000000..d53f876da --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java @@ -0,0 +1,33 @@ +package com.elink.esua.epdc.dto.user.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @program: esua-epdc-cloud + * @description: 用户数据统计 + * @author: wangtong + * @create: 2020-02-11 12:14 + **/ +@Data +public class UserAnalysisCountDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 所有用户数 + **/ + private Integer allUserCount; + + /** + * 党员数 + **/ + private Integer partyMemberCount; + + /** + * 居民数 + **/ + private Integer userCount; + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java index 439851946..ed1283e6e 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java @@ -1,10 +1,16 @@ package com.elink.esua.epdc.modules.user.controller; +import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; import com.elink.esua.epdc.dto.user.form.UserSortRankFormDTO; import com.elink.esua.epdc.dto.user.result.*; +import com.elink.esua.epdc.dto.user.form.UserCountDTO; +import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO; +import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; +import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO; +import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO; import com.elink.esua.epdc.modules.user.service.OldMemberRankService; import com.elink.esua.epdc.modules.user.service.YoungMemberRankService; import org.springframework.beans.factory.annotation.Autowired; @@ -15,8 +21,11 @@ import org.springframework.web.bind.annotation.RestController; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.modules.user.service.UserAnalysisService; +import com.elink.esua.epdc.modules.user.service.YoungMemberRankService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; import org.springframework.web.bind.annotation.GetMapping; @@ -90,7 +99,7 @@ public class UserAnalysisController { * @Param [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ - @GetMapping("partyMemberyoungSort") + @GetMapping("partyMemberYoungSort") public Result> listYoungMemberRankByDeptId(@RequestBody MemberRankFormDTO formDto) { ValidatorUtils.validateEntity(formDto); return this.youngMemberRankService.listYoungMemberRankByDeptId(formDto); @@ -107,4 +116,32 @@ public class UserAnalysisController { ValidatorUtils.validateEntity(formDto); return this.userAnalysisService.userRegisterSort(formDto); } + + /** + *用户数据统计 + * + * @author wangtong + * @date 2020/2/11 11:57 + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getUserStatistics") + public Result getUserStatistics(@RequestBody UserCountDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return userAnalysisService.getUserStatistics(formDto); + } + + /** + *网格开通状况 + * + * @author wangtong + * @date 2020/2/11 14:26 + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getGridStatistics") + public Result getGridStatistics(@RequestBody UserCountDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return userAnalysisService.getGridStatistics(formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java index 2cd9a458d..0be55f270 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java @@ -2,8 +2,11 @@ package com.elink.esua.epdc.modules.user.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.elink.esua.epdc.dto.user.UserAnalysisDTO; +import com.elink.esua.epdc.dto.user.form.UserCountDTO; import com.elink.esua.epdc.dto.user.form.UserSortRankFormDTO; import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO; +import com.elink.esua.epdc.dto.user.result.GriddingCountDTO; +import com.elink.esua.epdc.dto.user.result.UserAnalysisCountDTO; import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO; import com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO; import org.apache.ibatis.annotations.Mapper; @@ -146,6 +149,27 @@ public interface UserAnalysisDao extends BaseMapper { */ List selectListCommunityTopicCount(); + /** + *用户数据统计 + * + * @author wangtong + * @date 2020/2/11 14:55 + * @param [formDTO] + * @return com.elink.esua.epdc.dto.user.result.UserAnalysisCountDTO + */ + UserAnalysisCountDTO getUserStatistics(UserCountDTO formDto); + + + /** + *网格数量统计 + * + * @author wangtong + * @date 2020/2/11 14:55 + * @param [formDTO] + * @return com.elink.esua.epdc.dto.user.result.GriddingCountDTO + */ + GriddingCountDTO getGridStatistics(UserCountDTO formDto); + /** * @Description 注册用户数排名 * @Author lpf diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java index 7cf5f4fa3..80113224f 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java @@ -3,11 +3,12 @@ package com.elink.esua.epdc.modules.user.service; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.user.form.UserSortRankFormDTO; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.user.form.UserCountDTO; import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO; import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO; import com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO; -import java.util.List; import java.util.Map; /** @@ -47,4 +48,24 @@ public interface UserAnalysisService { Result> userRegisterSort(UserSortRankFormDTO formDto); + /** + *用户数据统计 + * + * @author wangtong + * @date 2020/2/11 17:14 + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getUserStatistics(UserCountDTO formDto); + + /** + *网格开通状况 + * + * @author wangtong + * @date 2020/2/11 17:15 + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getGridStatistics(UserCountDTO formDto); + } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java index c9b871489..dfba5a3a7 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java @@ -14,13 +14,15 @@ import com.elink.esua.epdc.datasources.DataSourceNames; import com.elink.esua.epdc.datasources.annotation.DataSource; import com.elink.esua.epdc.dto.user.UserAnalysisDTO; import com.elink.esua.epdc.dto.user.form.UserSortRankFormDTO; +import com.elink.esua.epdc.dto.user.form.UserCountDTO; import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO; +import com.elink.esua.epdc.dto.user.result.GriddingCountDTO; +import com.elink.esua.epdc.dto.user.result.UserAnalysisCountDTO; import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO; import com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO; import com.elink.esua.epdc.modules.user.dao.UserAnalysisDao; import com.elink.esua.epdc.modules.user.service.UserAnalysisService; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -127,6 +129,35 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl().ok(message); + } + + + /** + *网格开通状况 + * + * @author wangtong + * @date 2020/2/11 14:33 + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @Override + public Result getGridStatistics(UserCountDTO formDto) { + GriddingCountDTO message = baseDao.getGridStatistics(formDto); + return new Result().ok(message); + } + @Override public Result> userRegisterSort(UserSortRankFormDTO formDto) { int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml index dda276219..ae45ad3c2 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml @@ -415,6 +415,42 @@ ORDER BY t0.id ASC + +