From 59d3d6ad85bad326c35aa196fdb0550b2de1731d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 07 五月 2021 09:21:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 14 ++++++++------
1 files changed, 8 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..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
@@ -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);
}
@@ -160,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);
}
@@ -202,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