From 3ffa739e77cdafdc4be1aa153acb3423071cd102 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期三, 21 四月 2021 11:26:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
index 613cb29..8fb47aa 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -12,10 +12,7 @@
 import com.panzhihua.common.service.user.UserService;
 import com.panzhihua.common.validated.AddGroup;
 import com.panzhihua.common.validated.PageGroup;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -42,8 +39,6 @@
     @ApiOperation(value = "分页查询小区",response =ComMngStructAreaVO.class )
     @PostMapping("pagearea")
     public R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO){
-        Long communityId = this.getCommunityId();
-        comMngStructAreaVO.setCommunityId(communityId);
         return communityService.pageArea(comMngStructAreaVO);
     }
 
@@ -202,5 +197,11 @@
     public R comMngCarList() {
         return communityService.userComMngCarList(this.getUserId());
     }
+
+    @ApiOperation(value = "获取树结构区域信息")
+    @GetMapping(value = "arealist")
+    public R getAllArea(@ApiParam(name = "城市编码:四川510000", required = true) @RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
+        return communityService.getCityTreeByProvinceCode(provinceAdcode);
+    }
 }
 

--
Gitblit v1.7.1