diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScreenPopulationController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScreenPopulationController.java index c5bcc162..4695c6dc 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScreenPopulationController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScreenPopulationController.java @@ -5,6 +5,7 @@ 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.DeptOption; +import com.elink.esua.epdc.dto.PopulationInfoOverviewDTO; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.service.AppUserService; @@ -142,4 +143,29 @@ public class ApiScreenPopulationController { ValidatorUtils.validateEntity(dto); return appUserService.gridRanking(dto); } + + /** + * @Description 获取居民信息采集总览数据 - 街道 + * @Author songyunpeng + * @Date 2020/8/27 + * @Param [] + * @return com.elink.esua.epdc.dto.PopulationInfoOverviewDTO + **/ + @GetMapping("getPopulationInfoOverviewForStreet") + @ReportData + public Result getPopulationInfoOverview() { + return appUserService.getPopulationInfoOverview(); + } + /** + * @Description 获取居民信息采集总览数据 - screen - 社区 + * @Author songyunpeng + * @Date 2021/6/24 + * @Param [communityId] + * @return com.elink.esua.epdc.dto.PopulationInfoOverviewDTO + **/ + @GetMapping("getPopulationInfoOverviewForCommunity/{communityId}") + @ReportData + public Result getPopulationInfoOverviewForScreen(@PathVariable("communityId")String communityId) { + return appUserService.getPopulationInfoOverviewForScreen(communityId); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 9038e209..35dd202b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -1,6 +1,5 @@ package com.elink.esua.epdc.feign; -import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -554,6 +553,26 @@ public interface UserFeignClient { @PostMapping(value = "app-user/screenPopulationInfo/selectPeopleByCurrentAddress", consumes = MediaType.APPLICATION_JSON_VALUE) Result> selectPeopleByCurrentAddress(@RequestBody EpdcScreenResidentInfoByCurrentAddressFormDTO dto); + /** + * @Description 社区获取居民信息采集总览数据 + * @Author songyunpeng + * @Date 2021/6/24 + * @Param [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @GetMapping(value = "app-user/screenPopulationInfo/getPopulationInfoOverviewForCommunity/{communityId}", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getPopulationInfoOverviewForScreen(@PathVariable("communityId")String communityId); + /** + * @Description 街道获取居民信息采集总览数据 + * @Author songyunpeng + * @Date 2021/6/24 + * @Param [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @GetMapping(value = "app-user/screenPopulationInfo/getPopulationInfoOverviewForStreet", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getPopulationInfoOverview(); + + /** * @Description 获取用户积分接口 * @Author songyunpeng diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index 1a8d4c94..dfaa177e 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java @@ -1,6 +1,5 @@ package com.elink.esua.epdc.feign.fallback; -import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; @@ -259,6 +258,16 @@ public class UserFeignClientFallback implements UserFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "selectPeopleByCurrentAddress", dto); } + @Override + public Result getPopulationInfoOverviewForScreen(String communityId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getPopulationInfoOverviewForScreen", communityId); + } + + @Override + public Result getPopulationInfoOverview() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getPopulationInfoOverview"); + } + @Override public Result getPointsByUserId(String userId) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getPointsByUserId", userId); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java index 4e44115b..a7a59c10 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java @@ -4,6 +4,7 @@ import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.DeptOption; +import com.elink.esua.epdc.dto.PopulationInfoOverviewDTO; import com.elink.esua.epdc.dto.VolunteerInfoDTO; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO; @@ -410,4 +411,20 @@ public interface AppUserService { * @since 2021/1/25 15:03 */ Result> listOfVolunteerTags(); + /** + * @Description 获取居民信息采集总览数据 - 街道 + * @Author songyunpeng + * @Date 2021/6/24 + * @Param [] + * @return com.elink.esua.epdc.dto.PopulationInfoOverviewDTO + **/ + Result getPopulationInfoOverview(); + /** + * @Description 获取居民信息采集总览数据 - screen - 社区 + * @Author songyunpeng + * @Date 2021/6/24 + * @Param [communityId] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result getPopulationInfoOverviewForScreen(String communityId); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 35b42017..9214f96a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -1744,4 +1744,14 @@ public class AppUserServiceImpl implements AppUserService { return userFeignClient.getVolunteerTags(); } + @Override + public Result getPopulationInfoOverview() { + return userFeignClient.getPopulationInfoOverview(); + } + + @Override + public Result getPopulationInfoOverviewForScreen(String communityId) { + return userFeignClient.getPopulationInfoOverviewForScreen(communityId); + } + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcScreenPopulationInformationController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcScreenPopulationInformationController.java index 17a88980..b4192060 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcScreenPopulationInformationController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcScreenPopulationInformationController.java @@ -19,14 +19,12 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.PopulationInfoOverviewDTO; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.service.PopulationInformationService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** @@ -38,7 +36,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("screenPopulationInfo") public class EpdcScreenPopulationInformationController { - + @Autowired private PopulationInformationService populationInformationService; /** @@ -125,7 +123,27 @@ public class EpdcScreenPopulationInformationController { public Result> gridRanking(@RequestBody EpdcScreenGridRankingFormDTO dto){ return new Result>().ok(populationInformationService.gridRanking(dto)); } + /** + * @Description 获取居民信息采集总览数据 - 街道 + * @Author songyunpeng + * @Date 2020/8/27 + * @Param [] + * @return com.elink.esua.epdc.dto.PopulationInfoOverviewDTO + **/ + @GetMapping("getPopulationInfoOverviewForStreet") + public Result getPopulationInfoOverview() { + return new Result().ok(populationInformationService.getPopulationInfoOverview()); + } + /** + * @Description 获取居民信息采集总览数据 - screen - 社区 + * @Author songyunpeng + * @Date 2021/6/24 + * @Param [communityId] + * @return com.elink.esua.epdc.dto.PopulationInfoOverviewDTO + **/ + @GetMapping("getPopulationInfoOverviewForCommunity/{communityId}") + public Result getPopulationInfoOverviewForScreen(@PathVariable("communityId")String communityId) { + return new Result().ok(populationInformationService.getPopulationInfoOverviewForScreen(communityId)); + } - - -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PopulationInformationController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PopulationInformationController.java index 07d77cd2..d62f4eab 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PopulationInformationController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PopulationInformationController.java @@ -48,7 +48,7 @@ import java.util.*; /** - * 人口信息表 + * 人口信息表 * * @author qu qu@elink-cn.com * @since v1.0.0 2020-08-19 @@ -56,7 +56,7 @@ import java.util.*; @RestController @RequestMapping("populationinformation") public class PopulationInformationController { - + @Autowired private PopulationInformationService populationInformationService; @@ -232,4 +232,4 @@ public class PopulationInformationController { } -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PopulationInformationDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PopulationInformationDao.java index d68ed81d..abef067d 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PopulationInformationDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PopulationInformationDao.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; /** - * 人口信息表 + * 人口信息表 * * @author qu qu@elink-cn.com * @since v1.0.0 2020-08-19 @@ -38,7 +38,7 @@ import java.util.Map; @Mapper public interface PopulationInformationDao extends BaseDao { /** - * @Description 根据身份证信息获取人口信息 + * @Description 根据身份证信息获取人口信息 * @Author songyunpeng * @Date 2020/8/21 * @Param [residentsIdentityNo] @@ -86,6 +86,14 @@ public interface PopulationInformationDao extends BaseDao **/ List selectPeopleByCurrentAddressExportList(Map params); -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PopulationInformationService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PopulationInformationService.java index 52be0de0..85bc15ce 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PopulationInformationService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PopulationInformationService.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; /** - * 人口信息表 + * 人口信息表 * * @author qu qu@elink-cn.com * @since v1.0.0 2020-08-19 @@ -97,7 +97,7 @@ public interface PopulationInformationService extends BaseService listPage(Map params); /** - * @Description 获取机动车列表信息 + * @Description 获取机动车列表信息 * @Author songyunpeng * @Date 2020/8/26 * @Param [params] @@ -138,7 +138,7 @@ public interface PopulationInformationService extends BaseService motorVehicleList(Map params); /** - * @Description 获取居民信息采集总览数据 + * @Description 获取居民信息采集总览数据 * @Author songyunpeng * @Date 2020/8/28 * @Param [] @@ -146,7 +146,15 @@ public interface PopulationInformationService extends BaseService selectPeople(EpdcScreenSelectPeopleFormDTO epdcScreenSelectPeopleFormDTO); /** - * @Description 大屏找人详情接口 + * @Description 大屏找人详情接口 * @Author songyunpeng * @Date 2020/9/14 * @Param [dto] @@ -178,7 +186,7 @@ public interface PopulationInformationService extends BaseService selectPeopleDetail(EpdcScreenSelectPeopleDetailFormDTO dto); /** - * @Description 房屋用途数据接口 + * @Description 房屋用途数据接口 * @Author songyunpeng * @Date 2020/9/15 * @Param [] @@ -186,7 +194,7 @@ public interface PopulationInformationService extends BaseService housingUse(); /** - * @Description 网格排名 + * @Description 网格排名 * @Author songyunpeng * @Date 2020/9/15 * @Param [dto] @@ -202,7 +210,7 @@ public interface PopulationInformationService extends BaseService selectHouseByPeople(EpdcScreenHouseInfoByPeopleFormDTO dto); /** - * @Description 以房找人接口 + * @Description 以房找人接口 * @Author songyunpeng * @Date 2020/9/19 * @Param [dto] @@ -243,4 +251,4 @@ public interface PopulationInformationService extends BaseService **/ Integer selectCountPeopleByCurrentAddressForPc(Map params); -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PopulationInformationServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PopulationInformationServiceImpl.java index 5a9eb963..f96465ec 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PopulationInformationServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PopulationInformationServiceImpl.java @@ -302,6 +302,11 @@ public class PopulationInformationServiceImpl extends BaseServiceImpl + - \ No newline at end of file +