java/zhihuishenqu.git

			@@ -2,6 +2,11 @@

			import javax.annotation.Resource;

			import com.panzhihua.common.model.dtos.property.CommonPage;
			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.*;

			@@ -20,7 +25,11 @@
			@Resource
			private ComMngPopulationService comMngPopulationService;
			@Resource
			private ComActService comActService;
			@Resource
			private BigScreenService bigScreenService;
			@Resource
			private BigScreenStatisticsService bigScreenStatisticsService;

			/**
			* 首页大屏统计接口
			@@ -83,11 +92,153 @@
			}

			/**
			* 西区大屏治理数据
			*/
			@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 R.ok(comMngPopulationService.indexInfo(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);
			}

			/**
			@@ -106,4 +257,339 @@
			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);
			}
			@PostMapping("/hmk/baseInfo")
			public R getHmkBaseInfo(@RequestBody CommonPage commonPage){
			return bigScreenStatisticsService.hmkBaseInfo(commonPage);
			}
			@GetMapping("/hmk/partyProjectActivityLine")
			public R partyActivityLine(){
			return bigScreenStatisticsService.partyProjectActivityLine();
			}
			@PostMapping("/hmk/projectActivityTop")
			public R projectActivityTop(@RequestBody CommonPage commonPage){
			return bigScreenStatisticsService.projectActivityProject(commonPage);
			}
			@GetMapping("/hmk/projectType")
			public R projectType(@RequestParam("name") String name){
			return bigScreenStatisticsService.projectType(name);
			}

			/**
			* 金沙定制页面-党建引领基础数据
			* @param communityId
			* @return
			*/
			@GetMapping("/partyBuildIng/base")
			public R getPartyBuildIngBaseData(@RequestParam("communityId") Long communityId) {
			return bigScreenStatisticsService.getPartyBuildIngBaseData(communityId);
			}

			/**
			* 党员活动展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/partyBuildIng/partyAct")
			public R pagePartyBuildIngAct(@RequestBody PageBaseDTO pageBaseDTO) {
			return bigScreenStatisticsService.pagePartyBuildIngAct(pageBaseDTO);
			}

			/**
			* 议事投票展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/partyBuildIng/discuss")
			public R pagePartyBuildIngDiscuss(@RequestBody PageBaseDTO pageBaseDTO) {
			return bigScreenStatisticsService.pagePartyBuildIngDiscuss(pageBaseDTO);
			}

			/**
			* 金沙定制页面-四长四员
			* @param communityId
			* @return
			*/
			@GetMapping("/fourMember/base")
			public R getFourMemberBaseData(@RequestParam("communityId") Long communityId) {
			return bigScreenStatisticsService.getFourMemberBaseData(communityId);
			}

			/**
			* 杨家坪定制页面-五微服务
			* @param communityId
			* @return
			*/
			@GetMapping("/fms/base")
			public R getFmsBaseData(@RequestParam("communityId") Long communityId) {
			return bigScreenStatisticsService.getFmsBaseData(communityId);
			}

			/**
			* 杨家坪定制页面-微团队展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/fms/team")
			public R pageFmsTeam(@RequestBody PageBaseDTO pageBaseDTO) {
			return bigScreenStatisticsService.pageFmsTeam(pageBaseDTO);
			}

			/**
			* 杨家坪定制页面-居家养老基础数据
			* @param communityId
			* @return
			*/
			@GetMapping("/alarm/base")
			public R getAlarmBaseData(@RequestParam("communityId") Long communityId) {
			return bigScreenStatisticsService.getAlarmBaseData(communityId);
			}

			/**
			* 杨家坪定制页面-报警记录展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/alarm/record")
			public R pageAlarmRecord(@RequestBody PageBaseDTO pageBaseDTO) {
			return bigScreenStatisticsService.pageAlarmRecord(pageBaseDTO);
			}

			/**
			* 杨家坪定制页面-报警设备点位图
			* @param communityId
			* @return
			*/
			@GetMapping("/alarm/pointMap")
			public R getAlarmPointMap(@RequestParam("communityId") Long communityId) {
			return bigScreenStatisticsService.getAlarmPointMap(communityId);
			}

			/**
			* 杨家坪定制页面-志愿服务
			* @param communityId
			* @return
			*/
			@GetMapping("/volunteer/base")
			public R getVolunteerBaseData(@RequestParam("communityId") Long communityId) {
			return bigScreenStatisticsService.getVolunteerBaseData(communityId);
			}

			/**
			* 金沙定制页面-志愿线展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/partyBuildIng/microWish")
			public R pagePartyBuildIngMicroWish(@RequestBody PageBaseDTO pageBaseDTO) {
			return bigScreenStatisticsService.pagePartyBuildIngMicroWish(pageBaseDTO);
			}

			/**
			* 金沙定制页面-四长四员解决问题展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/fourMember/resolve")
			public R pageFourMemberResolve(@RequestBody PageBaseDTO pageBaseDTO) {
			return bigScreenStatisticsService.pageFourMemberResolve(pageBaseDTO);
			}

			/**
			* 金沙定制页面-四长四员院落议事展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/courtyard/list")
			public R pageCourtyardDiscuss(@RequestBody PageBaseDTO pageBaseDTO) {
			return bigScreenStatisticsService.pageCourtyardDiscuss(pageBaseDTO);
			}

			/**
			* 金沙定制页面-院落议事
			* @param communityId
			* @return
			*/
			@GetMapping("/courtyard/base")
			public R getCourtyardBaseData(@RequestParam("communityId") Long communityId) {
			return bigScreenStatisticsService.getCourtyardBaseData(communityId);
			}

			/**
			* 孵化中心-基础数据
			* @param communityId
			* @return
			*/
			@GetMapping("/hatch/base")
			public R getHatchBaseData(@RequestParam("communityId") Long communityId) {
			return bigScreenStatisticsService.getHatchBaseData(communityId);
			}

			/**
			* 孵化中心-孵化成果展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/hatchResult/list")
			public R pageHatchResult(@RequestBody PageBaseDTO pageBaseDTO) {
			return bigScreenStatisticsService.pageHatchResult(pageBaseDTO);
			}

			/**
			* 孵化中心-孵化进度展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/hatchSchedule/list")
			public R pageHatchSchedule(@RequestBody PageBaseDTO pageBaseDTO) {
			return bigScreenStatisticsService.pageHatchSchedule(pageBaseDTO);
			}

			/**
			* 五社联动基础数据
			* @param communityId
			* @return
			*/
			@GetMapping("/fiveAssociations/base")
			public R getFiveAssociationsBaseData(@RequestParam("communityId") Long communityId) {
			return bigScreenStatisticsService.getFiveAssociationsBaseData(communityId);
			}

			/**
			* 五社联动项目展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/socialProject/list")
			public R pageSocialProjectList(@RequestBody PageBaseDTO pageBaseDTO) {
			return bigScreenStatisticsService.pageSocialProjectList(pageBaseDTO);
			}

			/**
			* 五社联动社会组织展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/socialOrg/list")
			public R pageSocialOrgList(@RequestBody PageBaseDTO pageBaseDTO) {
			return bigScreenStatisticsService.pageSocialOrgList(pageBaseDTO);
			}

			/**
			* 人大代表
			* @param communityId
			* @return
			*/
			@GetMapping("/dpc/base")
			public R dpcBase(@RequestParam("communityId") Long communityId) {
			return bigScreenStatisticsService.dpcBase(communityId);
			}

			/**
			* 人大代表-随手拍展示列表
			* @return
			*/
			@PostMapping("/dpc/easyPhotoList")
			public R dpcEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO) {
			return bigScreenStatisticsService.dpcEasyPhotoList(pageBaseDTO);
			}
			}