From 37f55403e7573d8c15b6b0f957b7cb1baf6be4ea Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期二, 29 十二月 2020 14:47:15 +0800
Subject: [PATCH] 攀枝花项目服务层异常捕获统一返回给视图层服务
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
index 308d394..daf9ae2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
@@ -9,6 +9,7 @@
import com.panzhihua.applets.model.vos.LoginRequest;
import com.panzhihua.common.model.vos.LoginReturnVO;
import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.service.auth.TokenService;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
@@ -17,9 +18,12 @@
import com.panzhihua.common.exceptions.WeiXinException;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -142,23 +146,22 @@
}
@ApiOperation(value = "查询社区")
- @GetMapping("listcommunity")
+ @PostMapping("listcommunity")
public R listCommunity(@RequestBody ComActVO comActVO){
return communityService.listCommunity(comActVO);
}
+ @ApiOperation(value = "查询小区",response = ComMngStructAreaVO.class)
+ @GetMapping("listarea")
+ @ApiImplicitParam(name ="communityId",value = "社区id",required = true)
+ public R listArea(@RequestParam("communityId") Long communityId){
+ return communityService.listArea(communityId);
+ }
+
@ApiOperation(value = "用户绑定社区、小区")
@PutMapping("putusercommunityarea")
- public R putUserCommunityArea(@RequestBody LoginUserInfoVO loginUserInfoVO){
+ public R putUserCommunityArea(@RequestBody @Validated(PutGroup.class) LoginUserInfoVO loginUserInfoVO){
Long userId = this.getUserId();
- Long communityId = loginUserInfoVO.getCommunityId();
- Long areaId = loginUserInfoVO.getAreaId();
- if (null==communityId||0==communityId) {
- return R.fail("社区未选择");
- }
- if (null==areaId||0==areaId) {
- return R.fail("小区未选择");
- }
loginUserInfoVO.setUserId(userId);
return userService.putUserCommunityArea(loginUserInfoVO);
}
--
Gitblit v1.7.1