From 7c7c20fb9df0b440e6c4ee1b2e8d655ebaf9192d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 26 四月 2021 18:13:01 +0800
Subject: [PATCH] bugfixed: 78648

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 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 1f68a9b..2301858 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
@@ -3,7 +3,6 @@
 import com.alibaba.fastjson.JSONObject;
 import com.panzhihua.common.controller.BaseController;
 import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO;
-import com.panzhihua.common.model.dtos.community.PageComActDTO;
 import com.panzhihua.common.model.dtos.community.PageVolunteerDTO;
 import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.common.model.vos.R;
@@ -13,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.*;
@@ -40,10 +36,10 @@
     @Resource
     private UserService userService;
 
-    @ApiOperation(value = "分页查询社区",response = ComActVO.class)
-    @PostMapping("pagecommunity")
-    public R pageCommunity(@RequestBody PageComActDTO pageComActDTO){
-        return communityService.pageCommunity(pageComActDTO);
+    @ApiOperation(value = "分页查询小区",response =ComMngStructAreaVO.class )
+    @PostMapping("pagearea")
+    public R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO){
+        return communityService.pageArea(comMngStructAreaVO);
     }
 
     @ApiOperation(value = "分页获取社区动态",response = ComActDynVO.class)
@@ -159,6 +155,7 @@
     public R addVolunteer(@RequestBody @Validated(AddGroup.class) ComMngVolunteerMngVO comMngVolunteerMngVO){
         comMngVolunteerMngVO.setState(1);
         comMngVolunteerMngVO.setCommunityId(this.getCommunityId());
+        comMngVolunteerMngVO.setSubmitUserId(this.getUserId());
         return communityService.addVolunteer(comMngVolunteerMngVO);
     }
 
@@ -201,5 +198,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