From 12cbe6b75a2cd522dbff3e68df7b2f6f6b86bedf Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 29 四月 2021 16:59:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 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 d31ffea..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
@@ -7,16 +7,12 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
-import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
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.*;
@@ -39,6 +35,12 @@
private CommunityService communityService;
@Resource
private UserService userService;
+
+ @ApiOperation(value = "分页查询小区",response =ComMngStructAreaVO.class )
+ @PostMapping("pagearea")
+ public R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO){
+ return communityService.pageArea(comMngStructAreaVO);
+ }
@ApiOperation(value = "分页获取社区动态",response = ComActDynVO.class)
@PostMapping("pagedynamic")
@@ -153,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);
}
@@ -174,9 +177,9 @@
}
- @ApiOperation(value = "车辆登记",response = ComMngVolunteerMngAppletsVO.class)
- @PostMapping("car/add")
- public R addComMngCarApplet(@RequestBody ComMngCarAppletDTO comMngCarAppletDTO) {
+ @ApiOperation(value = "车辆登记")
+ @PostMapping("car/register")
+ public R addComMngCar(@RequestBody ComMngCarAppletDTO comMngCarAppletDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long communityId = loginUserInfo.getCommunityId();
if (null!=communityId && 0!=communityId) {
@@ -185,9 +188,21 @@
comMngCarAppletDTO.setUserName(loginUserInfo.getName());
comMngCarAppletDTO.setUserId(loginUserInfo.getUserId());
comMngCarAppletDTO.setMobile(loginUserInfo.getPhone());
+ comMngCarAppletDTO.setSource(1);
}
return communityService.addComMngCarApplet(comMngCarAppletDTO);
}
+ @ApiOperation(value = "登记车辆列表",response = ComMngCarVO.class)
+ @GetMapping("car/list")
+ 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