From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java
index c5cb049..b82fb85 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java
@@ -4,10 +4,13 @@
 
 import javax.annotation.Resource;
 
+import com.panzhihua.common.model.vos.community.ComActVO;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
@@ -81,4 +84,40 @@
         return r;
     }
 
+    /**
+     * 街道详情
+     * @param id
+     * @return
+     */
+    @GetMapping("detailStreet")
+    public R detailStreet(@RequestParam("id") Long id) {
+        return comStreetService.detailStreet(id);
+    }
+
+
+    @PostMapping("/updateStreet")
+    public R updateStreet(@RequestBody ComStreetVO comStreetVO){
+        return comStreetService.update(comStreetVO);
+    }
+
+    @GetMapping("/removeStreet")
+    public R remove(@RequestParam(value = "id",required = false)Long id){
+        return comStreetService.remove(id);
+    }
+
+    @GetMapping("/removeCommunity")
+    public R removeCommunity(@RequestParam(value = "id",required = false)Long id){
+        return comStreetService.removeCommunity(id);
+    }
+
+    @PostMapping("/repassCommunity")
+    public R repassCommunity(@RequestBody ComActVO comActVO){
+       return comStreetService.repassCommunity(comActVO);
+    }
+
+    @PostMapping("/repassStreet")
+    public R repassStreet(@RequestBody ComStreetVO comActVO){
+        return comStreetService.repssStreet(comActVO);
+    }
+
 }

--
Gitblit v1.7.1