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,7 @@

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;
@@ -296,8 +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(){
        return null;
    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);
    }
}