From 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期五, 14 一月 2022 13:15:59 +0800 Subject: [PATCH] Merge branch 'renhequ' into dev --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java | 277 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 277 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java index 2fb96f6..b1ef9b9 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java @@ -2,6 +2,11 @@ import javax.annotation.Resource; +import com.panzhihua.service_community.service.ComActService; +import com.panzhihua.common.model.dtos.PageBaseDTO; +import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO; +import com.panzhihua.service_community.service.BigScreenStatisticsService; +import com.panzhihua.service_community.service.BigScreenService; import org.springframework.web.bind.annotation.*; import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO; @@ -18,6 +23,12 @@ @Resource private ComMngPopulationService comMngPopulationService; + @Resource + private ComActService comActService; + @Resource + private BigScreenService bigScreenService; + @Resource + private BigScreenStatisticsService bigScreenStatisticsService; /** * 首页大屏统计接口 @@ -79,4 +90,270 @@ return R.ok(comMngPopulationService.getScreenEventDetail(eventDetailDTO)); } + /** + * 西区大屏治理数据 + */ + @GetMapping("/getWestScreenStatics") + public R westScreenStatics(){ + return comMngPopulationService.westScreenStatics(); + } + + @GetMapping("/getComprehensivePopulationStatics") + public R getComprehensivePopulationStatics(@RequestParam("streetId") Long streetId){ + return comMngPopulationService.getComprehensivePopulationStatics(streetId); + } + + @GetMapping("/getComprehensiveStreetList") + public R getComprehensiveStreetList(){ + return comMngPopulationService.getComprehensiveStreetList(); + } + + + @GetMapping("/getCommunityPassword") + public R getCommunityPassword(@RequestParam("communityId") Long communityId){ + return comActService.getCommunityPassword(communityId); + } + /** + * 新版大屏首页接口 + */ + @GetMapping("/indexInfo") + public R indexInfo(@RequestParam("communityId") Long communityId){ + return comMngPopulationService.indexInfo(communityId); + } + + /** + * 首页二级页面-微心愿 + * @param communityId + * @return + */ + @GetMapping("/index/microWish") + public R indexMicroWish(@RequestParam("communityId") Long communityId) { + return bigScreenStatisticsService.indexMicroWish(communityId); + } + + /** + * 首页二级页面-随手拍 + * @param communityId + * @return + */ + @GetMapping("/index/easyPhoto") + public R indexEasyPhoto(@RequestParam("communityId") Long communityId) { + return bigScreenStatisticsService.indexEasyPhoto(communityId); + } + + /** + * 首页二级页面-随手拍展示列表 + * @return + */ + @PostMapping("/index/easyPhotoList") + public R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO) { + return bigScreenStatisticsService.indexEasyPhotoList(pageBaseDTO); + } + + /** + * 首页二级页面-社区问卷 + * @param communityId + * @return + */ + @GetMapping("/index/questionnaire") + public R indexQuestionnaire(@RequestParam("communityId") Long communityId) { + return bigScreenStatisticsService.indexQuestionnaire(communityId); + } + + /** + * 首页二级页面-社区动态 + * @param communityId + * @return + */ + @GetMapping("/index/dyn") + public R indexDyn(@RequestParam("communityId") Long communityId) { + return bigScreenStatisticsService.indexDyn(communityId); + } + + /** + * 首页二级页面-社区动态展示列表 + * @param pageBaseDTO + * @return + */ + @PostMapping("/index/dynList") + public R indexDynList(@RequestBody PageBaseDTO pageBaseDTO) { + return bigScreenStatisticsService.indexDynList(pageBaseDTO); + } + + /** + * 首页二级页面-邻里圈 + * @param communityId + * @return + */ + @GetMapping("/index/neighbor") + public R indexNeighbor(@RequestParam("communityId") Long communityId) { + return bigScreenStatisticsService.indexNeighbor(communityId); + } + + /** + * 首页二级页面-邻里圈展示列表 + * @param pageBaseDTO + * @return + */ + @PostMapping("/index/neighborList") + public R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO) { + return bigScreenStatisticsService.indexNeighborList(pageBaseDTO); + } + + /** + * 首页二级页面-便民商家 + * @param communityId + * @return + */ + @GetMapping("/index/merchant") + public R indexMerchant(@RequestParam("communityId") Long communityId) { + return bigScreenStatisticsService.indexMerchant(communityId); + } + + /** + * 首页二级页面-商家展示列表 + * @param pageBaseDTO + * @return + */ + @PostMapping("/index/merchantList") + public R indexMerchantList(@RequestBody PageBaseDTO pageBaseDTO) { + return bigScreenStatisticsService.indexMerchantList(pageBaseDTO); + } + + /** + * 首页二级页面-微心愿展示列表 + * @param pageBaseDTO + * @return + */ + @PostMapping("/index/microWishList") + public R indexMicroWishList(@RequestBody PageBaseDTO pageBaseDTO) { + return bigScreenStatisticsService.indexMicroWishList(pageBaseDTO); + } + + /** + * 首页二级页面-社区问卷展示列表 + * @param pageBaseDTO + * @return + */ + @PostMapping("/index/questionnaireList") + public R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO) { + return bigScreenStatisticsService.indexQuestionnaireList(pageBaseDTO); + } + + /** + * 社区服务大屏数据分析接口 + */ + @GetMapping("/serviceData") + public R serviceData(@RequestParam("communityId")Long communityId){ + return this.bigScreenService.serviceData(communityId); + } + + /** + * 服务居民接口 + */ + @GetMapping("/serviceUser") + public R serviceUser(@RequestParam("communityId") Long communityId){ + return this.bigScreenService.serviceUser(communityId); + } + + /** + * 大数据分析平台-居民自治 + * @param communityId + * @return + */ + @GetMapping("/resident/autonomy") + public R getResidentAutonomy(@RequestParam("communityId") Long communityId) { + return bigScreenStatisticsService.getResidentAutonomy(communityId); + } + + /** + * 大数据分析平台-清网治格 + * @param communityId + * @return + */ + @GetMapping("/grids/governance") + public R getGridsGovernance(@RequestParam("communityId") Long communityId) { + return bigScreenStatisticsService.getGridsGovernance(communityId); + } + + /** + * 大数据分析平台-社区服务 + * @param communityId + * @return + */ + @GetMapping("/community/service") + public R getCommunityServiceStatistics(@RequestParam("communityId") Long communityId) { + return bigScreenStatisticsService.getCommunityServiceStatistics(communityId); + } + + /** + * 分页获取热度排行商家 + * @param pagePopularMerchantDTO + * @return + */ + @PostMapping("/merchant/popular") + public R getScreenPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO) { + return bigScreenStatisticsService.getScreenPopularMerchants(pagePopularMerchantDTO); + } + + /** + * 首页二级页面-居民活动 + * @param communityId + * @return + */ + @GetMapping("/index/residentAct") + public R indexResidentAct(@RequestParam("communityId") Long communityId) { + return bigScreenStatisticsService.indexResidentAct(communityId); + } + + /** + * 首页二级页面-居民活动展示列表 + * @param pageBaseDTO + * @return + */ + @PostMapping("/index/residentActList") + public R indexResidentActList(@RequestBody PageBaseDTO pageBaseDTO) { + return bigScreenStatisticsService.indexResidentActList(pageBaseDTO); + } + + /** + * 首页二级页面-志愿者活动 + * @param communityId + * @return + */ + @GetMapping("/index/volunteerAct") + public R indexVolunteerAct(@RequestParam("communityId") Long communityId) { + return bigScreenStatisticsService.indexVolunteerAct(communityId); + } + + /** + * 首页二级页面-志愿者活动展示列表 + * @param pageBaseDTO + * @return + */ + @PostMapping("/index/volunteerActList") + public R indexVolunteerActList(@RequestBody PageBaseDTO pageBaseDTO) { + return bigScreenStatisticsService.indexVolunteerActList(pageBaseDTO); + } + + /** + * 清网治格-根据事件分类获取近1月的社区事件数据 + * @param type + * @param communityId + * @return + */ + @GetMapping("/event/list") + public R getEventList(@RequestParam(value = "type") Integer type, @RequestParam(value = "communityId") Long communityId) { + return bigScreenStatisticsService.getEventList(type, communityId); + } + + /** + * 清网治格-社区事件数据分页 + * @param pageBaseDTO + * @return + */ + @PostMapping("/event/page") + public R pageEventList(@RequestBody PageBaseDTO pageBaseDTO) { + return bigScreenStatisticsService.pageEventList(pageBaseDTO); + } } -- Gitblit v1.7.1