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); + } + }