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

DESKTOP-71BH0QO\L、ming

2021-04-28 7ea43dac46900dab7535bdd3ec957b45e43b5270

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

@@ -1,7 +1,9 @@
package com.panzhihua.service_community.api;

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.EditNeighborCircleAdminVO;
@@ -9,12 +11,20 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

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

    @Resource
    private ComActNeighborCircleService comActNeighborCircleService;

    /**
@@ -28,6 +38,21 @@
    }

    /**
     * 用户发布邻里圈审核
     * @param addNeighborCircleAppDTO   邻里圈请求参数
     * @return  发布结果
     */
    @PostMapping("addNeighborByApp")
    public R addNeighborByApp(@RequestBody AddComActNeighborCircleAppDTO addNeighborCircleAppDTO) {
        return comActNeighborCircleService.addNeighborByApp(addNeighborCircleAppDTO);
    }

    @PostMapping("neighborDetailByApp")
    public R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) {
        return comActNeighborCircleService.neighborDetailByApp(neighborCircleAppDTO);
    }

    /**
     * 管理后台查询邻里圈列表
     * @param comActNeighborCircleAdminDTO  请求参数
     * @return  邻里圈列表