From f2d86046f9b5a122e7593a95b6ff3ce911ac98b6 Mon Sep 17 00:00:00 2001
From: Null <281575458@qq.com>
Date: 星期四, 18 三月 2021 08:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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..613cb29 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,7 +7,6 @@
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;
@@ -39,6 +38,14 @@
private CommunityService communityService;
@Resource
private UserService userService;
+
+ @ApiOperation(value = "分页查询小区",response =ComMngStructAreaVO.class )
+ @PostMapping("pagearea")
+ public R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO){
+ Long communityId = this.getCommunityId();
+ comMngStructAreaVO.setCommunityId(communityId);
+ return communityService.pageArea(comMngStructAreaVO);
+ }
@ApiOperation(value = "分页获取社区动态",response = ComActDynVO.class)
@PostMapping("pagedynamic")
@@ -174,9 +181,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 +192,15 @@
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());
+ }
}
--
Gitblit v1.7.1