Merge remote-tracking branch 'origin/test' into test

xyh

2021-06-23 d01be9f1ec9a393818ea64deca3cbe7fa9372e08

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

@@ -1,11 +1,15 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComActActivityService;
import com.panzhihua.service_community.service.ComActDiscussService;
import com.panzhihua.service_community.service.ComActMicroWishService;
import com.panzhihua.service_community.service.ScreenWorkService;
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 org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@@ -19,6 +23,12 @@

    @Resource
    private ScreenWorkService screenWorkService;
    @Resource
    private ComActDiscussService comActDiscussService;
    @Resource
    private ComActActivityService comActActivityService;
    @Resource
    private ComActMicroWishService comActMicroWishService;

    /**
     * 大屏统计邻里圈
@@ -89,4 +99,29 @@
    R workCount(@RequestParam("communityId")Long communityId){
        return screenWorkService.workCount(communityId);
    }

    /**
     * 工作大屏-一起议列表
     * @param discussListDTO    请求参数
     * @return  一起议列表
     */
    @PostMapping("/getScreenDiscussList")
    public R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO) {
        return comActDiscussService.getScreenDiscussList(discussListDTO);
    }

    @PostMapping("/getScreenActActivityList")
    public R getScreenActActivityList(@RequestBody ScreenActActivityListDTO actActivityListDTO) {
        return comActActivityService.getScreenActActivityList(actActivityListDTO);
    }

    @PostMapping("/getActActivityPeopleList")
    public R getActActivityPeopleList(@RequestBody ScreenActActivityPeopleListDTO activityPeopleListDTO) {
        return comActActivityService.getActActivityPeopleList(activityPeopleListDTO);
    }

    @PostMapping("/getScreenMicroList")
    public R getScreenMicroList(@RequestBody ScreenMicroListDTO microListDTO) {
        return comActMicroWishService.getScreenMicroList(microListDTO);
    }
}