Merge branch 'hemenkou_dev' into dev

101captain

2022-03-09 9c5b811fb700bc66e66dbf38ed8733e57a4edac6

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java

@@ -2,6 +2,8 @@

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;
@@ -22,6 +24,8 @@

    @Resource
    private ComMngPopulationService comMngPopulationService;
    @Resource
    private ComActService comActService;
    @Resource
    private BigScreenService bigScreenService;
    @Resource
@@ -87,6 +91,29 @@
        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);
    }
    /**
     * 新版大屏首页接口
     */
@@ -270,4 +297,80 @@
        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);
    }
}