springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ScreenPopulationApi.java
@@ -3,12 +3,14 @@ import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.screen.ComActNeighborCircleScreenVO; import com.panzhihua.common.model.vos.screen.ComActPopulationScreenVO; import com.panzhihua.common.service.community.CommunityService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -20,17 +22,17 @@ @Slf4j @Api(tags = {"大屏-人口"}) @RestController @RequestMapping("/screen/population") @RequestMapping("/screen/population/noToken") public class ScreenPopulationApi extends BaseController { @Resource private CommunityService communityService; @ApiOperation(value = "人口@xyh",response = ComActNeighborCircleScreenVO.class) @ApiOperation(value = "人口@xyh",response = ComActPopulationScreenVO.class) @GetMapping("/statistic") public R statistic(){ public R statistic(@RequestParam("communityId") Long communityId){ return communityService.statistic(45L); return communityService.statistic(communityId); }
@@ -2,13 +2,14 @@ import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.screen.ComActNeighborCircleScreenVO; import com.panzhihua.common.model.vos.screen.*; import com.panzhihua.common.service.community.CommunityService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -20,18 +21,99 @@ @Slf4j @Api(tags = {"大屏-工作"}) @RestController @RequestMapping("/screen/work") @RequestMapping("/screen/work/noToken") public class ScreenWorkApi extends BaseController { @Resource private CommunityService communityService; /** * 邻里圈 * @param communityId * @return */ @ApiOperation(value = "邻里圈@xyh",response = ComActNeighborCircleScreenVO.class) @GetMapping("/statisticNeighborCircle") public R statisticNeighborCircle(){ @GetMapping("/eighborCircle") public R statisticNeighborCircle(@RequestParam("communityId") Long communityId){ return communityService.statisticNeighborCircle(this.getLoginUserInfo().getCommunityId()); return communityService.statisticNeighborCircle(communityId); } /** * 微心愿 * @param communityId * @return */ @ApiOperation(value = "微心愿@xyh",response = ComActMicroWishScreenVO.class) @GetMapping("/wish") public R wish(@RequestParam("communityId") Long communityId){ return communityService.wish(communityId); } /** * 社区活动 * @param communityId * @return */ @ApiOperation(value = "社区活动@xyh",response = ComActNeighborCircleScreenVO.class) @GetMapping("/activity") public R activity(@RequestParam("communityId") Long communityId){ return communityService.activity(communityId); } /** * 一起议 * @param communityId * @return */ @ApiOperation(value = "一起议@xyh",response = ComActDiscussScreenVO.class) @GetMapping("/discuss") public R discuss(@RequestParam("communityId") Long communityId){ return communityService.discuss(communityId); } /** * 党建工作 * @param communityId * @return */ @ApiOperation(value = "党建工作@xyh",response = ComPbWorkScreenVO.class) @GetMapping("/pbWork") public R pbWork(@RequestParam("communityId") Long communityId){ return communityService.pbWork(communityId); } /** * 随手拍 * @param communityId * @return */ @ApiOperation(value = "随手拍@xyh",response = ComActEasyPhotoScreenVO.class) @GetMapping("/easyPhoto") public R easyPhoto(@RequestParam("communityId") Long communityId){ return communityService.easyPhoto(communityId); } /** * 工作情况 * @param communityId * @return */ @ApiOperation(value = "工作情况@xyh",response = ComActEasyPhotoScreenVO.class) @GetMapping("/workCount") public R workCount(@RequestParam("communityId") Long communityId){ return communityService.workCount(communityId); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ScreenWorkApi.java
@@ -23,18 +23,67 @@ * @param communityId * @return */ @GetMapping("/screen/work/neighborCircle") @GetMapping("/neighborCircle") R statisticNeighborCircle(@RequestParam("communityId") Long communityId){ return screenWorkService.statisticNeighborCircle(communityId); } /** * 大屏统计党建工作 * 大屏统计心愿单 * @param communityId * @return */ // @GetMapping("/screen/work/neighborCircle") // R statisticNeighborCircle(@RequestParam("communityId") Long communityId){ // return screenWorkService.statisticNeighborCircle(communityId); // } @GetMapping("/wish") R wish(@RequestParam("communityId") Long communityId){ return screenWorkService.wish(communityId); } /** * 大屏统计社区活动 * @param communityId * @return */ @GetMapping("/activity") R activity(@RequestParam("communityId") Long communityId){ return screenWorkService.activity(communityId); } /** * 大屏统计一起议 * @param communityId * @return */ @GetMapping("/discuss") R discuss(@RequestParam("communityId") Long communityId){ return screenWorkService.discuss(communityId); } /** * 大屏统计党建工作 * @param communityId * @return */ @GetMapping("/pbWork") R pbWork(@RequestParam("communityId")Long communityId){ return screenWorkService.pbWork(communityId); } /** * 大屏统计随手拍 * @param communityId * @return */ @GetMapping("/easyPhoto") R easyPhoto(@RequestParam("communityId")Long communityId){ return screenWorkService.easyPhoto(communityId); } /** * 大屏统计工作情况 * @param communityId * @return */ R workCount(@RequestParam("communityId")Long communityId){ return screenWorkService.workCount(communityId); } }
