Merge branch 'bigscreen_dev'

101captain

2021-12-23 3a5655d1124cb56d7b7f045d18dd4855451507cc

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

@@ -3,6 +3,7 @@
import javax.annotation.Resource;

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;
@@ -142,14 +143,11 @@

    /**
     * 首页二级页面-随手拍展示列表
     * @param communityId
     * @param classifyId
     * @return
     */
    @GetMapping("/index/easyPhotoList")
    public R indexEasyPhotoList(@RequestParam("communityId") Long communityId,
                                @RequestParam(value = "classifyId", required = false) Long classifyId) {
        return bigScreenStatisticsService.indexEasyPhotoList(communityId, classifyId);
    @PostMapping("/index/easyPhotoList")
    public R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.indexEasyPhotoList(pageBaseDTO);
    }

    /**
@@ -174,14 +172,12 @@

    /**
     * 首页二级页面-社区动态展示列表
     * @param communityId
     * @param type
     * @param pageBaseDTO
     * @return
     */
    @GetMapping("/index/dynList")
    public R indexDynList(@RequestParam("communityId") Long communityId,
                          @RequestParam(value = "type", required = false) Long type) {
        return bigScreenStatisticsService.indexDynList(communityId, type);
    @PostMapping("/index/dynList")
    public R indexDynList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.indexDynList(pageBaseDTO);
    }

    /**
@@ -196,14 +192,12 @@

    /**
     * 首页二级页面-邻里圈展示列表
     * @param communityId
     * @param topicId
     * @param pageBaseDTO
     * @return
     */
    @GetMapping("/index/neighborList")
    public R indexNeighborList(@RequestParam("communityId") Long communityId,
                               @RequestParam(value = "topicId", required = false) Long topicId) {
        return bigScreenStatisticsService.indexNeighborList(communityId, topicId);
    @PostMapping("/index/neighborList")
    public R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.indexNeighborList(pageBaseDTO);
    }

    /**
@@ -218,14 +212,32 @@

    /**
     * 首页二级页面-商家展示列表
     * @param communityId
     * @param categoryId
     * @param pageBaseDTO
     * @return
     */
    @GetMapping("/index/merchantList")
    public R indexMerchantList(@RequestParam("communityId") Long communityId,
                               @RequestParam(value = "categoryId", required = false) Long categoryId) {
        return bigScreenStatisticsService.indexMerchantList(communityId, categoryId);
    @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);
    }

    /**