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

huanghongfa

2021-04-29 131aa1302bd7edab443f01800e322602d1b269ea

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

@@ -1,12 +1,10 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
import com.panzhihua.service_community.service.ComActNeighborCircleService;
import lombok.extern.slf4j.Slf4j;
@@ -22,7 +20,7 @@

@Slf4j
@RestController
@RequestMapping("/neighbor")
@RequestMapping("/neighbor/")
public class NeighborApi {

    @Resource
@@ -60,8 +58,8 @@

    /**
     * 管理后台查询邻里圈列表
     * @param comActNeighborCircleAdminDTO  请求参数
     * @return  邻里圈列表
     * @param comActNeighborCircleAdminDTO 请求参数
     * @return 邻里圈列表
     */
    @PostMapping("pageNeighborByAdmin")
    public R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO) {
@@ -70,8 +68,8 @@

    /**
     * 后台添加邻里圈
     * @param addNeighborCircleAdminVO  请求参数
     * @return  邻里圈列表
     * @param addNeighborCircleAdminVO 请求参数
     * @return 邻里圈列表
     */
    @PostMapping("addNeighborByAdmin")
    public R pageNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO) {
@@ -80,7 +78,7 @@

    /**
     * 后台修改邻里圈
     * @param editNeighborCircleAdminVO  请求参数
     * @param editNeighborCircleAdminVO 请求参数
     */
    @PostMapping("changeStatusByAdmin")
    public R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO) {
@@ -88,13 +86,14 @@
    }

    /**
     * 后台修改邻里圈
     * @param id  邻里圈id
     * @return  邻里圈列表
     * 邻里圈_后台删除
     * 待审核状态不可删除，显示、隐藏、已驳回的都可以删除）
     * @param id 邻里圈id
     * @return 邻里圈列表
     */
    @Transactional(rollbackFor = Exception.class)
    @PostMapping("deleteByAdmin")
    public R deleteByAdmin(@RequestParam("id")Long id) {
    public R deleteByAdmin(@RequestParam("id") Long id) {
        return comActNeighborCircleService.deleteByAdmin(id);
    }

@@ -158,6 +157,72 @@
    }

    /**
     * 查看邻里圈基础_详情
     * @param id 邻里圈id
     * @return 邻里圈列表
     */
    @GetMapping("detailNeighborByAdmin")
    public R detailNeighborByAdmin(@RequestParam("id") Long id) {
        return comActNeighborCircleService.detailNeighborByAdmin(id);
    }


    /**
     * 邻里圈的所有评论_分页
     * @param dto 请求参数
     * @return 评论列表
     */
    @PostMapping("detailNeighborAllCommentByAdmin")
    public R detailNeighborAllCommentByAdmin(@RequestBody DetailNeighborAllCommentByAdminDTO dto) {
        return comActNeighborCircleService.detailNeighborAllCommentByAdmin(dto);
    }

    /**
     * 评论的状态_修改
     * @param vo 请求参数
     */
    @PostMapping("changeCommentStatusByAdmin")
    public R changeCommentStatusByAdmin(@RequestBody ChangeCommentStatusByAdminVO vo) {
        return comActNeighborCircleService.changeCommentStatusByAdmin(vo);
    }

    /**
     * 邻里圈评论_详情
     * @param id 评论id
     */
    @GetMapping("detailNeighborCommentByAdmin")
    public R detailNeighborCommentByAdmin(@RequestParam("id") Long id) {
        return comActNeighborCircleService.detailNeighborCommentByAdmin(id);
    }

    /**
     * 邻里圈评论回复_分页
     * @param dto 参数
     */
    @PostMapping("detailNeighborCommentAllReply")
    public R detailNeighborCommentAllReply(@RequestBody DetailNeighborCommentReplyByAdminDTO dto) {
        return comActNeighborCircleService.detailNeighborCommentAllReply(dto);
    }

    /**
     * 邻里圈评论回复_基本详情
     * @param id 参数
     */
    @PostMapping("detailNeighborCommentReply")
    public R detailNeighborCommentReply(@RequestParam("id") Long id) {
        return comActNeighborCircleService.detailNeighborCommentReply(id);
    }

    /**
     * 评论的状态_修改
     * @param changeStatusReplyVO 参数
     */
    @PostMapping("changeCommentReplyStatusByAdmin")
    public R changeCommentReplyStatusByAdmin(@RequestBody ChangeCommentReplyStatusByAdminVO changeStatusReplyVO) {
        return comActNeighborCircleService.changeCommentReplyStatusByAdmin(changeStatusReplyVO);
    }

    /**
     * 邻里圈取消点赞
     * @param fabulousAppDTO    请求参数
     * @return  取消点赞结果