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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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

@@ -7,6 +7,7 @@
import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
import com.panzhihua.service_community.service.ComActNeighborCircleService;
import com.panzhihua.service_community.service.ComActNeighborCircleTopicService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -25,6 +26,8 @@

    @Resource
    private ComActNeighborCircleService comActNeighborCircleService;
    @Resource
    private ComActNeighborCircleTopicService comActNeighborCircleTopicService;

    /**
     * 分页查询邻里圈列表
@@ -72,7 +75,7 @@
     * @return 邻里圈列表
     */
    @PostMapping("addNeighborByAdmin")
    public R pageNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO) {
    public R addNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO) {
        return comActNeighborCircleService.addNeighborByAdmin(addNeighborCircleAdminVO);
    }

@@ -253,4 +256,44 @@
        return comActNeighborCircleService.neighborCommentReplyByApp(commentReplyAppDTO);
    }

    /**
     * 分页查询邻里圈话题列表
     * @param circleTopicAdminDTO   请求参数
     * @return  邻里圈话题列表
     */
    @PostMapping("pageNeighborTopicByAdmin")
    public R pageNeighborTopicByAdmin(@RequestBody ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO) {
        return comActNeighborCircleTopicService.pageNeighborTopicByAdmin(circleTopicAdminDTO);
    }

    /**
     * 添加邻里圈话题
     * @param addCircleTopicAdminDTO    请求参数
     * @return  添加结果
     */
    @PostMapping("addNeighborTopicByAdmin")
    public R addNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO) {
        return comActNeighborCircleTopicService.addNeighborTopicByAdmin(addCircleTopicAdminDTO);
    }

    /**
     * 编辑邻里圈话题
     * @param addCircleTopicAdminDTO    请求参数
     * @return  编辑结果
     */
    @PostMapping("editNeighborTopicByAdmin")
    public R editNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO) {
        return comActNeighborCircleTopicService.editNeighborTopicByAdmin(addCircleTopicAdminDTO);
    }

    /**
     * 小程序查询邻里圈话题列表
     * @param communityId   社区id
     * @return  邻里圈话题列表
     */
    @GetMapping("getNeighborTopicByApp")
    public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId) {
        return comActNeighborCircleTopicService.getNeighborTopicByApp(communityId);
    }

}