springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenApi.java
@@ -41,7 +41,11 @@ @ApiOperation(value = "党员党支部统计信息", response = BigScreenStatisticPartyOrg.class) @PostMapping("/orgmembers") public R<BigScreenStatisticPartyOrg> orgmembers(@Validated @RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg){ pageBigScreenStatisticPartyOrg.setCommunityId(2L); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } pageBigScreenStatisticPartyOrg.setCommunityId(id); return communityService.bigscreenPartyOrgmembers(pageBigScreenStatisticPartyOrg); } @@ -50,52 +54,80 @@ @GetMapping("/agegender") public R<BigScreenStatisticAgeGender> agegender(){ BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO = new BigScreenStatisticAgeGenderDTO(); bigScreenStatisticAgeGenderDTO.setCommunityId(2L); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } bigScreenStatisticAgeGenderDTO.setCommunityId(id); return communityService.ageGender(bigScreenStatisticAgeGenderDTO); } @ApiOperation(value = "党建数据概览", response = BigScreenStatisticPartyBuild.class) @GetMapping("/partybuild") public R<BigScreenStatisticPartyBuild> partybuild(){ return communityService.bigscreenPartybuild(2L); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } return communityService.bigscreenPartybuild(id); } @ApiOperation(value = "党员活动(按月-最近12个月)",response = BigScreenStatisticPartyActivity.class) @PostMapping("/partyactivity") public R<List<BigScreenStatisticPartyActivity>> partyactivity(@Validated @RequestBody BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO){ bigScreenStatisticPartyActivityDTO.setCommunityId(2L); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } bigScreenStatisticPartyActivityDTO.setCommunityId(id); return communityService.bigscreenPartyactivity(bigScreenStatisticPartyActivityDTO); } @ApiOperation(value = "党员活动参加用户排行榜-TOP3", response = PartyBuildingMemberVO.class) @GetMapping("/partyactivitytopuser") public R<List<PartyBuildingMemberVO>> partyactivitytopuser(){ return communityService.bigscreenPartyactivitytopuser(2L); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } return communityService.bigscreenPartyactivitytopuser(id); } @ApiOperation(value = "党建动态", response = BigScreenStatisticPartyOrg.class) @PostMapping("/partydyn") public R<BigScreenStatisticPartyOrg> partydyn(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) { Integer type = 1; Long communityId = 2L; // Integer type = 1; // Long communityId = 2L; Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } partyBuildingComPbDynVO.setType(1); partyBuildingComPbDynVO.setCommunityId(communityId); partyBuildingComPbDynVO.setCommunityId(id); return partyBuildingService.pageYnamic(partyBuildingComPbDynVO); } @ApiOperation(value = "社区党委", response = BigScreenStatisticPartyMemeber.class) @PostMapping("/pagePartyCommittee") public R<BigScreenStatisticPartyMemeber> pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) { partyCommitteeVO.setCommunityId(2L); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } partyCommitteeVO.setCommunityId(id); return partyBuildingService.pagePartyCommittee(partyCommitteeVO); } @ApiOperation(value = "党员分页查询", response = com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO.class) @PostMapping("/pagepartyorganization") public R pagePartyOrganization(@RequestBody PagePartyOrganizationMemberVO pagePartyOrganizationMemberVO) { Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } PagePartyOrganizationVO pagePartyOrganizationVO = new PagePartyOrganizationVO(); BeanUtils.copyProperties(pagePartyOrganizationMemberVO, pagePartyOrganizationVO); pagePartyOrganizationVO.setCommunityId(2L); pagePartyOrganizationVO.setCommunityId(id); return partyBuildingService.pagePartyOrganization(pagePartyOrganizationVO); } } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
@@ -1,5 +1,6 @@ package com.panzhihua.community_backstage.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO; import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO; import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenDrawEventListDTO; @@ -24,7 +25,7 @@ @Api(tags = {"大屏统计数据模块"}) @RestController @RequestMapping("/screen/") public class BigScreenStatisticsApi { public class BigScreenStatisticsApi extends BaseController { @Resource private CommunityService communityService; @@ -40,20 +41,23 @@ } @ApiOperation(value = "首页大屏统计接口@lyq",response = IndexStatisticsVO.class) @GetMapping("/index/noToken") @GetMapping("/index") public R index(@RequestParam("communityId") Long communityId) { if(communityId == null){ return R.fail("参数错误"); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } return communityService.getScreenIndex(communityId); return communityService.getScreenIndex(id); } @ApiOperation(value = "事件大屏统计接口@lyq",response = EventStatisticsVO.class) @PostMapping("/event/noToken") @PostMapping("/event") public R event(@RequestBody BigScreenEventDTO screenEventDTO) { if(screenEventDTO.getCommunityId() == null){ return R.fail("参数错误"); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } screenEventDTO.setCommunityId(id); return communityService.getScreenEvent(screenEventDTO); } @@ -67,38 +71,50 @@ } @ApiOperation(value = "民生大屏统计接口@lyq",response = CivilStatisticsVO.class) @GetMapping("/civil/noToken") @GetMapping("/civil") public R civil(@RequestParam("communityId") Long communityId) { if(communityId == null){ return R.fail("参数错误"); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } return communityService.getScreenCivil(communityId); return communityService.getScreenCivil(id); } @ApiOperation(value = "获取社区网格接口@lyq",response = EventGridStatisticsVO.class) @GetMapping("/event/grids/noToken") @GetMapping("/event/grids") public R grids(@RequestParam("communityId") Long communityId) { if(communityId == null){ return R.fail("参数错误"); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } return communityService.getScreenGirds(communityId); return communityService.getScreenGirds(id); } @ApiOperation(value = "事件大屏事件列表接口@lyq",response = EventListVO.class) @PostMapping("/civil/list/noToken") @PostMapping("/civil/list") public R eventList(@RequestBody ScreenEventListDTO eventListDTO) { if(eventListDTO.getCommunityId() == null){ return R.fail("参数错误"); // if(eventListDTO.getCommunityId() == null){ // return R.fail("参数错误"); // } Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } eventListDTO.setCommunityId(id); return gridService.getScreenEventList(eventListDTO); } @ApiOperation(value = "事件大屏画圈展示事件坐标点接口@lyq",response = ScreenDrawEventVO.class) @PostMapping("/civil/draw/list/noToken") @PostMapping("/civil/draw/list") public R civilDrawList(@RequestBody ScreenDrawEventListDTO eventListDTO) { if(eventListDTO.getCommunityId() == null){ return R.fail("参数错误"); // if(eventListDTO.getCommunityId() == null){ // return R.fail("参数错误"); // } Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } eventListDTO.setCommunityId(id); return gridService.getCivilDrawList(eventListDTO); } @@ -112,11 +128,15 @@ } @ApiOperation(value = "获取社区网格员列表接口@lyq",response = EventGridMemberVO.class) @GetMapping("/grids/member/noToken") @GetMapping("/grids/member") public R getGridsMemberList(@RequestParam("communityId") Long communityId) { if(communityId == null){ return R.fail("参数错误"); // if(communityId == null){ // return R.fail("参数错误"); // } Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } return userService.getGridsMemberList(communityId); return userService.getGridsMemberList(id); } } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ScreenPopulationApi.java
@@ -22,7 +22,7 @@ @Slf4j @Api(tags = {"大屏-人口"}) @RestController @RequestMapping("/screen/population/noToken") @RequestMapping("/screen/population/") public class ScreenPopulationApi extends BaseController { @Resource @@ -31,8 +31,11 @@ @ApiOperation(value = "人口@xyh",response = ComActPopulationScreenVO.class) @GetMapping("/statistic") public R statistic(@RequestParam("communityId") Long communityId){ return communityService.statistic(communityId); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } return communityService.statistic(id); }
@@ -36,7 +36,7 @@ @Slf4j @Api(tags = {"大屏-工作"}) @RestController @RequestMapping("/screen/work/noToken") @RequestMapping("/screen/work") public class ScreenWorkApi extends BaseController { @Resource @@ -52,8 +52,11 @@ @ApiOperation(value = "邻里圈@xyh",response = ComActNeighborCircleScreenVO.class) @GetMapping("/eighborCircle") public R statisticNeighborCircle(@RequestParam("communityId") Long communityId){ return communityService.statisticNeighborCircle(communityId); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } return communityService.statisticNeighborCircle(id); } /** @@ -64,8 +67,11 @@ @ApiOperation(value = "微心愿@xyh",response = ComActMicroWishScreenVO.class) @GetMapping("/wish") public R wish(@RequestParam("communityId") Long communityId){ return communityService.wish(communityId); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } return communityService.wish(id); } /** @@ -76,8 +82,11 @@ @ApiOperation(value = "社区活动@xyh",response = ComActActivityScreenVO.class) @GetMapping("/activity") public R activity(@RequestParam("communityId") Long communityId){ return communityService.activity(communityId); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } return communityService.activity(id); } /** @@ -88,8 +97,11 @@ @ApiOperation(value = "一起议@xyh",response = ComActDiscussScreenVO.class) @GetMapping("/discuss") public R discuss(@RequestParam("communityId") Long communityId){ return communityService.discuss(communityId); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } return communityService.discuss(id); } /** @@ -100,20 +112,31 @@ @ApiOperation(value = "党建工作@xyh",response = ComPbWorkScreenVO.class) @GetMapping("/pbWork") public R pbWork(@RequestParam("communityId") Long communityId){ return communityService.pbWork(communityId); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } return communityService.pbWork(id); } @ApiOperation(value = "社区动态@lyq",response = ComDynamicWorkScreenVO.class) @GetMapping("/dynamicWork") public R dynamicWork(@RequestParam("communityId") Long communityId){ return communityService.dynamicWork(communityId); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } return communityService.dynamicWork(id); } @ApiOperation(value = "事件管理@lyq",response = EventWorkScreenVO.class) @GetMapping("/eventWork") public R eventWork(@RequestParam("communityId") Long communityId){ return gridService.eventWork(communityId); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } return gridService.eventWork(id); } /** @@ -124,8 +147,11 @@ @ApiOperation(value = "随手拍@xyh",response = ComActEasyPhotoScreenVO.class) @GetMapping("/easyPhoto") public R easyPhoto(@RequestParam("communityId") Long communityId){ return communityService.easyPhoto(communityId); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } return communityService.easyPhoto(id); } /** @@ -136,30 +162,44 @@ @ApiOperation(value = "工作情况@xyh",response = ComActWorkScreenVO.class) @GetMapping("/workCount") public R workCount(@RequestParam("communityId") Long communityId){ return communityService.workCount(communityId); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } return communityService.workCount(id); } @ApiOperation(value = "工作大屏一起议列表接口@lyq",response = DiscussListVO.class) @PostMapping("/discuss/list") public R discussList(@RequestBody ScreenDiscussListDTO discussListDTO) { if(discussListDTO.getCommunityId() == null){ return R.fail("参数错误"); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } discussListDTO.setCommunityId(id); // if(discussListDTO.getCommunityId() == null){ // return R.fail("参数错误"); // } return communityService.getScreenDiscussList(discussListDTO); } @ApiOperation(value = "工作大屏社区活动列表接口@lyq",response = ActActivityListVO.class) @PostMapping("/act/activity/list") public R actActivityList(@RequestBody ScreenActActivityListDTO actActivityListDTO) { if(actActivityListDTO.getCommunityId() == null){ return R.fail("参数错误"); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } actActivityListDTO.setCommunityId(id); // if(actActivityListDTO.getCommunityId() == null){ // return R.fail("参数错误"); // } return communityService.getScreenActActivityList(actActivityListDTO); } @ApiOperation(value = "工作大屏社区活动报名详情接口@lyq",response = ActActivityPeopleListVO.class) @PostMapping("/act/activity/people/list") @PostMapping("/noToken/act/activity/people/list") public R actActivityPeopleList(@RequestBody ScreenActActivityPeopleListDTO activityPeopleListDTO) { return communityService.getActActivityPeopleList(activityPeopleListDTO); } @@ -167,41 +207,51 @@ @ApiOperation(value = "工作大屏微心愿列表接口@lyq",response = MicroListVO.class) @PostMapping("/micro/list") public R microList(@RequestBody ScreenMicroListDTO microListDTO) { if(microListDTO.getCommunityId() == null){ return R.fail("参数错误"); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } microListDTO.setCommunityId(id); // if(microListDTO.getCommunityId() == null){ // return R.fail("参数错误"); // } return communityService.getScreenMicroList(microListDTO); } @ApiOperation(value = "工作大屏邻里圈列表接口@lyq",response = ComActNeighborCircleAdminVO.class) @PostMapping("/neighbor/list") public R neighborList(@RequestBody ComActNeighborCircleAdminDTO neighborCircleAdminDTO) { if(neighborCircleAdminDTO.getCommunityId() == null){ return R.fail("参数错误"); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } neighborCircleAdminDTO.setCommunityId(id); // if(neighborCircleAdminDTO.getCommunityId() == null){ // return R.fail("参数错误"); // } return communityService.pageNeighborByAdmin(neighborCircleAdminDTO); } @ApiOperation(value = "工作大屏邻里圈详情接口@lyq",response = ComActNeighborCircleAdminVO.class) @GetMapping("/neighbor/detail") @GetMapping("/noToken/neighbor/detail") public R neighborDetail(@RequestParam("id")Long id) { return communityService.detailNeighborByAdmin(id); } @ApiOperation(value = "工作大屏邻里圈详情的所有评论接口@lyq",response = ComActNeighborCommentByAdminVO.class) @PostMapping("/neighbor/detail/comment") @PostMapping("/noToken/neighbor/detail/comment") public R detailNeighborAllCommentByAdmin(@RequestBody DetailNeighborAllCommentByAdminDTO dto){ return communityService.detailNeighborAllCommentByAdmin(dto); } @ApiOperation(value = "工作大屏邻里圈评论详情接口@lyq",response = ComActNeighborCommentByAdminVO.class) @GetMapping("/neighbor/detail/comment/detail") @GetMapping("/noToken/neighbor/detail/comment/detail") public R detailNeighborCommentByAdmin(@RequestParam("id") Long id){ return communityService.detailNeighborCommentByAdmin(id); } @ApiOperation(value = "工作大屏邻里圈评论详情回复列表接口@lyq",response = ComActNeighborCommentReplyByAdminVO.class) @PostMapping("/neighbor/detail/comment/reply") @PostMapping("/noToken/neighbor/detail/comment/reply") public R detailNeighborCommentAllReply(@RequestBody DetailNeighborCommentReplyByAdminDTO dto){ return communityService.detailNeighborCommentAllReply(dto); } @@ -209,14 +259,19 @@ @ApiOperation(value = "分页查询社区动态", response = ComActDynVO.class) @PostMapping("pagedynamic") public R pageDynamic(@RequestBody ComActDynVO comActDynVO) { if(comActDynVO.getCommunityId() == null){ return R.fail("参数错误"); Long id = this.getCommunityId(); if(id == null){ return R.fail(401,"请先登录"); } comActDynVO.setCommunityId(id); // if(comActDynVO.getCommunityId() == null){ // return R.fail("参数错误"); // } return communityService.pageDynamicByAdmin(comActDynVO); } @ApiOperation(value = "社区动态详情", response = ComActDynVO.class) @GetMapping("detaildynamic") @GetMapping("/noToken/detaildynamic") @ApiImplicitParam(name = "id", value = "社区动态主键", required = true) public R detailDynamic(@RequestParam("id") Long id) { return communityService.detailDynamic(id); springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java
@@ -81,7 +81,7 @@ boolean isShop = requestURI.contains("isShop"); boolean noToken = requestURI.contains("noToken"); boolean listadvertisement = requestURI.contains("listadvertisement"); boolean bigscreen = requestURI.contains("/bigscreen/party"); // boolean bigscreen = requestURI.contains("/bigscreen/party"); // boolean pageworkguide = !requestURI.contains("workguide/pageworkguide"); // boolean detailworkguide = !requestURI.contains("workguide/detailworkguide"); // boolean pagedynamic = !requestURI.contains("partybuilding/pagedynamic"); @@ -89,7 +89,8 @@ SafeboxRequestWrapper safeboxRequestWrapper = new SafeboxRequestWrapper(request); if (login||doc||css||js||ui||swagger||ico||docs||error||refreshToken||useragreement||wxPay ||wxCgi||isShop||listadvertisement||noToken||bigscreen) { // ||wxCgi||isShop||listadvertisement||noToken||bigscreen) { ||wxCgi||isShop||listadvertisement||noToken) { //什么也不做 } else { // 获取请求头中JWT的Token
