springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexStatisticsVO.java
@@ -1,5 +1,6 @@ package com.panzhihua.common.model.vos.community.screen.index; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -27,4 +28,7 @@ @ApiModelProperty("特殊人群统计模块数据") private List<IndexSpecialStatisticsVO> specialStatisticsVOList; @ApiModelProperty("党建模块数据") private BigScreenStatisticPartyBuild statisticPartyBuild; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -2900,12 +2900,27 @@ @PostMapping("/bigscreen/party/bigscreenPartyactivity") R<List<BigScreenStatisticPartyActivity>> bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO); /** * 首页大屏统计接口 * @param communityId 社区id * @return 统计结果 */ @GetMapping("/screen/getScreenIndex") R getScreenIndex(@RequestParam("communityId")Long communityId); /** * 事件大屏统计接口 * @param communityId 社区id * @return 统计结果 */ @GetMapping("/screen/getScreenEvent") R getScreenEvent(@RequestParam("communityId")Long communityId); /** * 民生大屏统计接口 * @param communityId 社区id * @return 统计结果 */ @GetMapping("/screen/getScreenCivil") R getScreenCivil(@RequestParam("communityId")Long communityId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
@@ -18,16 +18,31 @@ @Resource private ComMngPopulationService comMngPopulationService; /** * 首页大屏统计接口 * @param communityId 社区id * @return 统计结果 */ @GetMapping("/getScreenIndex") public R index(@RequestParam("communityId") Long communityId) { return R.ok(comMngPopulationService.getScreenIndex(communityId)); } /** * 事件大屏统计接口 * @param communityId 社区id * @return 统计结果 */ @GetMapping("/getScreenEvent") public R event(@RequestParam("communityId") Long communityId) { return R.ok(comMngPopulationService.getScreenEvent(communityId)); } /** * 民生大屏统计接口 * @param communityId 社区id * @return 统计结果 */ @GetMapping("/getScreenCivil") public R civil(@RequestParam("communityId") Long communityId) { return R.ok(comMngPopulationService.getScreenCivil(communityId)); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
@@ -145,9 +145,24 @@ */ R getPopulationTotalByAdmin(Long communityId); /** * 首页大屏统计接口 * @param communityId 社区id * @return 统计结果 */ R getScreenIndex(Long communityId); /** * 事件大屏统计接口 * @param communityId 社区id * @return 统计结果 */ R getScreenEvent(Long communityId); /** * 民生大屏统计接口 * @param communityId 社区id * @return 统计结果 */ R getScreenCivil(Long communityId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -17,6 +17,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.area.AreaAddressVO; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild; import com.panzhihua.common.model.vos.community.screen.civil.CivilPopulationStatisticsVO; import com.panzhihua.common.model.vos.community.screen.civil.CivilStatisticsVO; import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO; @@ -67,6 +68,8 @@ private ComMngPopulationHouseUserService comMngPopulationHouseUserService; @Resource private EventResourceService eventResourceService; @Resource private BigScreenDAO bigScreenDAO; @Value("${domain.aesKey:}") private String aesKey; @@ -792,6 +795,11 @@ return R.ok(this.baseMapper.getPopulationTotalByAdmin(communityId)); } /** * 首页大屏统计接口 * @param communityId 社区id * @return 统计结果 */ @Override public R getScreenIndex(Long communityId){ //创建统计返回参数 @@ -845,6 +853,9 @@ eventGridStatisticsVO.setGridStatisticsList(gridStatisticsList); statisticsVO.setEventGridStatisticsVO(eventGridStatisticsVO); //查询党建数据 BigScreenStatisticPartyBuild statisticPartyBuild = bigScreenDAO.partybuild(communityId); statisticsVO.setStatisticPartyBuild(statisticPartyBuild); //查询特殊人群统计 List<IndexSpecialStatisticsVO> specialStatisticsVOList = new ArrayList<>(); @@ -924,6 +935,11 @@ return agePopulationList; } /** * 事件大屏统计接口 * @param communityId 社区id * @return 统计结果 */ @Override public R getScreenEvent(Long communityId){ //创建统计返回参数 @@ -988,6 +1004,12 @@ return R.ok(statisticsVO); } /** * 民生大屏统计接口 * @param communityId 社区id * @return 统计结果 */ @Override public R getScreenCivil(Long communityId){ //创建统计返回参数 CivilStatisticsVO civilStatisticsVO = new CivilStatisticsVO();