From 43c6e133a84d50f4952cd1df2f409d07be338cc4 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 28 四月 2021 13:18:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
index 1800518..a5dc02a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
@@ -1,18 +1,14 @@
 package com.panzhihua.service_community.api;
 
 import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
-import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
 import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
 import com.panzhihua.common.model.vos.community.ComMngVillageVO;
-import com.panzhihua.common.model.vos.community.ComStreetVO;
 import com.panzhihua.service_community.service.ComMngVillageService;
-import com.panzhihua.service_community.service.ComStreetService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
-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 org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
@@ -37,7 +33,7 @@
     @PostMapping("addvillage")
     @Transactional(rollbackFor = Exception.class)
     public R addVillage(@Valid  @RequestBody ComMngVillageVO comMngVillageVO) {
-        R r = comMngVillageService.addComMngVillage(comMngVillageVO);
+        R r = comMngVillageService.addComActVillage(comMngVillageVO);
         return R.ok(r);
     }
 
@@ -48,7 +44,7 @@
      */
     @PostMapping("pagevillage")
     public R pageVillage(@RequestBody PageComMngVillageDTO pageComMngVillageDTO) {
-        R r = comMngVillageService.pageComMngVillage(pageComMngVillageDTO);
+        R r = comMngVillageService.pageComActVillage(pageComMngVillageDTO);
         return R.ok(r);
     }
 
@@ -59,7 +55,7 @@
      */
     @PostMapping("listvillage")
     public R listVillage(@RequestBody ComMngVillageVO comMngVillageVO) {
-        R r = comMngVillageService.listComMngVillage(comMngVillageVO);
+        R r = comMngVillageService.listComActVillage(comMngVillageVO);
         return R.ok(r);
     }
 
@@ -71,8 +67,20 @@
     @PostMapping("deletevillage")
     @Transactional(rollbackFor = Exception.class)
     public R delectVillage(@RequestBody List<Long> Ids) {
-        R r = comMngVillageService.delecComMngVillage(Ids);
+        R r = comMngVillageService.delecComActVillage(Ids);
         return R.ok(r);
     }
 
+    /**
+     * 社区后台导入实有房屋
+     * @param list 数据
+     * @param communityId 社区编号
+     * @return
+     */
+    @PostMapping("/village/import")
+    @Transactional(rollbackFor = Exception.class)
+    public R listSaveMngCarExcelVO(@RequestBody List<ComMngVillageServeExcelVO> list, @RequestParam(value = "communityId") Long communityId){
+        return comMngVillageService.listSaveVillage(list,communityId);
+    }
+
 }

--
Gitblit v1.7.1