From 9656864596827ffd11f8f17b0a7748206addf943 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Wed, 12 Feb 2020 10:42:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=B9=B4=E8=BD=BB?= =?UTF-8?q?=E5=8C=96=E6=8E=A5=E5=8F=A3=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/user/controller/UserAnalysisController.java | 2 +- .../elink/esua/epdc/controller/ApiAnalysisUserController.java | 2 +- .../com/elink/esua/epdc/feign/AnalysisUserFeignClient.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) 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 366574934..7886e39be 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 @@ -91,7 +91,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); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java index 32f4beac7..86a85bb62 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java @@ -47,7 +47,7 @@ public class ApiAnalysisUserController { public Result> listOldMemberRankByDeptId(MemberRankFormDTO formDto) { return analysisUserService.listOldMemberRankByDeptId(formDto); } - @GetMapping("/partyMemberyoungSort") + @GetMapping("/partyMemberYoungSort") public Result> listYoungMemberRankByDeptId(MemberRankFormDTO formDto) { return analysisUserService.listYoungMemberRankByDeptId(formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisUserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisUserFeignClient.java index c3ad9e5c2..6798779eb 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisUserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisUserFeignClient.java @@ -21,7 +21,7 @@ import java.util.List; * @Author LPF * @Date 2019/11/18 16:39 */ -@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisUserFeignClientFallback.class, configuration = FeignRequestInterceptor.class) +@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisUserFeignClientFallback.class, configuration = FeignRequestInterceptor.class,url = "http://127.0.0.1:9077") public interface AnalysisUserFeignClient { @@ -52,7 +52,7 @@ public interface AnalysisUserFeignClient { * @Param [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ - @GetMapping(value = "analysis/user/partyMemberyoungSort", consumes = MediaType.APPLICATION_JSON_VALUE) + @GetMapping(value = "analysis/user/partyMemberYoungSort", consumes = MediaType.APPLICATION_JSON_VALUE) Result> listYoungMemberRankByDeptId(MemberRankFormDTO formDto); From c638187771ddc56b87daa76fb421c51b89e5cae0 Mon Sep 17 00:00:00 2001 From: Jackwang <373747285@qq.com> Date: Wed, 12 Feb 2020 11:15:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=A1=97=E5=8F=A3,=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=BC=80=E9=80=9A=E7=8A=B6=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/user/form/UserCountDTO.java | 30 +++++++++++ .../dto/user/result/GriddingCountDTO.java | 24 +++++++++ .../dto/user/result/UserAnalysisCountDTO.java | 33 ++++++++++++ .../controller/UserAnalysisController.java | 51 +++++++++++++------ .../modules/user/dao/UserAnalysisDao.java | 24 +++++++++ .../user/service/UserAnalysisService.java | 23 ++++++++- .../service/impl/UserAnalysisServiceImpl.java | 36 ++++++++++++- .../resources/mapper/user/UserAnalysisDao.xml | 36 +++++++++++++ .../controller/ApiAnalysisUserController.java | 31 +++++++++-- .../epdc/feign/AnalysisUserFeignClient.java | 26 ++++++++-- .../AnalysisUserFeignClientFallback.java | 12 ++++- .../epdc/service/AnalysisUserService.java | 24 +++++++-- .../service/impl/AnalysisUserServiceImpl.java | 18 +++++-- 13 files changed, 335 insertions(+), 33 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java 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..dfbd436bf --- /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,30 @@ +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; + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = 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 7886e39be..5b706429b 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,31 +1,22 @@ 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.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; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -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.dto.user.result.UserDataRankResultDTO; 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 java.util.Map; -import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * 数据端，用户数据分析相关接口 @@ -96,4 +87,32 @@ public class UserAnalysisController { ValidatorUtils.validateEntity(formDto); return this.youngMemberRankService.listYoungMemberRankByDeptId(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 fd3694b12..e61d4f242 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,7 +2,10 @@ 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.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 org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -144,4 +147,25 @@ 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); + } 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 fa8191378..f63e9a828 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 @@ -1,10 +1,11 @@ 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.UserCountDTO; import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO; import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO; -import java.util.List; import java.util.Map; /** @@ -35,4 +36,24 @@ public interface UserAnalysisService { PageData pageUserDataRank(Map params); + /** + *用户数据统计 + * + * @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 821a43b85..df3301616 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 @@ -8,15 +8,18 @@ import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; +import com.elink.esua.epdc.commons.tools.utils.Result; 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.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.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; @@ -122,4 +125,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 + */ + @DataSource(name = DataSourceNames.FOURTH) + @Override + public Result getGridStatistics(UserCountDTO formDto) { + GriddingCountDTO message = baseDao.getGridStatistics(formDto); + return new Result().ok(message); + } } 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 fce6f69f1..74136864b 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,4 +415,40 @@ ORDER BY t0.id ASC + + diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java index 86a85bb62..eeee43010 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java @@ -3,13 +3,10 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.dto.item.form.ItemFormDTO; -import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; +import com.elink.esua.epdc.dto.user.form.UserCountDTO; import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO; -import com.elink.esua.epdc.service.AnalysisItemService; import com.elink.esua.epdc.service.AnalysisUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -51,4 +48,30 @@ public class ApiAnalysisUserController { public Result> listYoungMemberRankByDeptId(MemberRankFormDTO formDto) { return analysisUserService.listYoungMemberRankByDeptId(formDto); } + + /** + *用户数据统计 + * + * @author wangtong + * @date 2020/2/11 11:32 + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("/getUserStatistics") + public Result getUserStatistics(UserCountDTO formDto) { + return analysisUserService.getUserStatistics(formDto); + } + + /** + *网格开通状况 + * + * @author wangtong + * @date 2020/2/11 14:22 + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("/getGridStatistics") + public Result getGridStatistics(UserCountDTO formDto) { + return analysisUserService.getGridStatistics(formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisUserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisUserFeignClient.java index 6798779eb..d645ccbe8 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisUserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisUserFeignClient.java @@ -3,12 +3,10 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.config.FeignRequestInterceptor; -import com.elink.esua.epdc.dto.item.form.ItemFormDTO; -import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; +import com.elink.esua.epdc.dto.user.form.UserCountDTO; import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO; -import com.elink.esua.epdc.feign.fallback.AnalysisIssueFeignClientFallback; import com.elink.esua.epdc.feign.fallback.AnalysisUserFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; @@ -55,5 +53,27 @@ public interface AnalysisUserFeignClient { @GetMapping(value = "analysis/user/partyMemberYoungSort", consumes = MediaType.APPLICATION_JSON_VALUE) Result> listYoungMemberRankByDeptId(MemberRankFormDTO formDto); + /** + *用户数据统计 + * + * @author wangtong + * @date 2020/2/12 10:10 + * @param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping(value = "analysis/user/getUserStatistics", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getUserStatistics(UserCountDTO formDto); + + /** + *网格开通状况 + * + * @author wangtong + * @date 2020/2/12 10:10 + * @param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping(value = "analysis/user/getGridStatistics", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getGridStatistics(UserCountDTO formDto); + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisUserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisUserFeignClientFallback.java index 0be69b21c..155c2693a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisUserFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisUserFeignClientFallback.java @@ -4,9 +4,9 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; +import com.elink.esua.epdc.dto.user.form.UserCountDTO; import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO; -import com.elink.esua.epdc.feign.AnalysisIssueFeignClient; import com.elink.esua.epdc.feign.AnalysisUserFeignClient; import org.springframework.stereotype.Component; @@ -35,4 +35,14 @@ public class AnalysisUserFeignClientFallback implements AnalysisUserFeignClient return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "listYoungMemberRankByDeptId",formDto); } + @Override + public Result getUserStatistics(UserCountDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getUserStatistics",formDto); + } + + @Override + public Result getGridStatistics(UserCountDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getGridStatistics",formDto); + } + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisUserService.java index d155937d1..a63ae623b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisUserService.java @@ -1,10 +1,8 @@ package com.elink.esua.epdc.service; -import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.item.form.ItemFormDTO; -import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; +import com.elink.esua.epdc.dto.user.form.UserCountDTO; import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO; @@ -42,4 +40,24 @@ public interface AnalysisUserService { **/ Result> listYoungMemberRankByDeptId(MemberRankFormDTO formDto); + + /** + *网格开通状况 + * + * @author wangtong + * @date 2020/2/12 10:08 + * @param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getGridStatistics(UserCountDTO formDto); + + /** + *用户数据统计 + * + * @author wangtong + * @date 2020/2/12 10:08 + * @param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getUserStatistics(UserCountDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisUserServiceImpl.java index 4acd8ba71..5a5447e95 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisUserServiceImpl.java @@ -1,15 +1,12 @@ package com.elink.esua.epdc.service.impl; -import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; +import com.elink.esua.epdc.dto.user.form.UserCountDTO; import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO; -import com.elink.esua.epdc.feign.AnalysisIssueFeignClient; import com.elink.esua.epdc.feign.AnalysisUserFeignClient; -import com.elink.esua.epdc.service.AnalysisIssueService; import com.elink.esua.epdc.service.AnalysisUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -43,4 +40,17 @@ public class AnalysisUserServiceImpl implements AnalysisUserService { public Result> listYoungMemberRankByDeptId(MemberRankFormDTO formDto) { return analysisUserFeignClient.listYoungMemberRankByDeptId(formDto); } + + + + @Override + public Result getGridStatistics(UserCountDTO formDto) { + return analysisUserFeignClient.getUserStatistics(formDto); + } + + @Override + public Result getUserStatistics(UserCountDTO formDto) { + return analysisUserFeignClient.getGridStatistics(formDto); + } + } From 39b8ae99c32ec02e7ca381fb7b3377760a3b78ff Mon Sep 17 00:00:00 2001 From: Jackwang <373747285@qq.com> Date: Wed, 12 Feb 2020 11:53:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1,=E7=BD=91=E6=A0=BC=E5=BC=80=E9=80=9A?= =?UTF-8?q?=E7=8A=B6=E5=86=B5=20=E5=8F=82=E6=95=B0=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/user/form/UserCountDTO.java | 7 ------- .../user/service/impl/UserAnalysisServiceImpl.java | 2 -- .../src/main/resources/mapper/user/UserAnalysisDao.xml | 8 ++++---- 3 files changed, 4 insertions(+), 13 deletions(-) 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 index dfbd436bf..ea322bef9 100644 --- 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 @@ -20,11 +20,4 @@ public class UserCountDTO{ @NotNull(message = "部门id不能为空") private String deptId; - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } } 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 df3301616..bed64539f 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 @@ -134,7 +134,6 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl - SELECT t.userCount, t.partyMemberCount, @@ -430,10 +430,10 @@ esua_epdc_user.epdc_user u WHERE u.DEL_FLAG = '0' - AND u.DEPT_ID = #{formDto.deptId} + AND u.DEPT_ID = #{deptId} )t - SELECT COUNT( ad.id) gridTotle, COUNT( ac.ID) gridCount @@ -447,7 +447,7 @@ ad.type_key = 'grid_party' AND ad2.id != 1191534129122230274 AND ad2.id != 1201319745506598913 - AND ad2.id = #{formDto.deptId} + AND ad2.id = #{deptId} ORDER BY ad.create_date ASC