From 7ea43dac46900dab7535bdd3ec957b45e43b5270 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期三, 28 四月 2021 17:38:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java |   70 ++++++++++++++++++++++++++++++++++-
 1 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
index 942d6ce..4c1be89 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
@@ -1,19 +1,30 @@
 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;
 import com.panzhihua.service_community.service.ComActNeighborCircleService;
 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;
 
     /**
@@ -21,9 +32,64 @@
      * @param neighborCircleAppDTO  请求参数
      * @return  邻里圈列表
      */
-    @PostMapping("pageNeighbor")
+    @PostMapping("pageNeighborByApp")
     public R pageNeighbor(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
-        return comActNeighborCircleService.pageNeighbor(neighborCircleAppDTO);
+        return comActNeighborCircleService.pageNeighborByApp(neighborCircleAppDTO);
+    }
+
+    /**
+     * 用户发布邻里圈审核
+     * @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  邻里圈列表
+     */
+    @PostMapping("pageNeighborByAdmin")
+    public R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO) {
+        return comActNeighborCircleService.pageNeighborByAdmin(comActNeighborCircleAdminDTO);
+    }
+
+    /**
+     * 后台添加邻里圈
+     * @param addNeighborCircleAdminVO  请求参数
+     * @return  邻里圈列表
+     */
+    @PostMapping("addNeighborByAdmin")
+    public R pageNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO) {
+        return comActNeighborCircleService.addNeighborByAdmin(addNeighborCircleAdminVO);
+    }
+
+    /**
+     * 后台修改邻里圈
+     * @param editNeighborCircleAdminVO  请求参数
+     */
+    @PostMapping("changeStatusByAdmin")
+    public R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO) {
+        return comActNeighborCircleService.changeStatusByAdmin(editNeighborCircleAdminVO);
+    }
+
+    /**
+     * 后台修改邻里圈
+     * @param id  邻里圈id
+     * @return  邻里圈列表
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @PostMapping("deleteByAdmin")
+    public R deleteByAdmin(@RequestParam("id")Long id) {
+        return comActNeighborCircleService.deleteByAdmin(id);
     }
 
 }

--
Gitblit v1.7.1