From 47de8ceefb38ee55fc577f94bfda09dd5adbd29d Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期二, 22 十二月 2020 17:18:39 +0800
Subject: [PATCH] 测试更新
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index 78f253e..1cad8cd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -10,10 +10,12 @@
import com.panzhihua.common.exceptions.UnAuthenticationException;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -38,10 +40,6 @@
@GetMapping("info")
public R getUserInfo() {
Long userId = this.getUserId();
- boolean empty = ObjectUtils.isEmpty(userId);
- if (empty) {
- throw new UnAuthenticationException();
- }
R<LoginUserInfoVO> r = userService.getUserInfoByUserId(userId + "");
if (R.isOk(r)) {
Object data = r.getData();
@@ -80,7 +78,7 @@
return r;
}
- @ApiOperation(value = "修改用户手机号")
+ @ApiOperation(value = "修改用户信息")
@PutMapping("user")
public R putUser(@RequestBody LoginUserInfoVO loginUserInfoVO) {
Long userId = this.getUserId();
@@ -101,7 +99,7 @@
@ApiOperation(value = "新增房屋")
@PostMapping("houses")
- public R addHouses(@RequestBody ComMngStructHouseVO comMngStructHouseVO) {
+ public R addHouses(@RequestBody @Validated(AddGroup.class) ComMngStructHouseVO comMngStructHouseVO) {
String houseCode = comMngStructHouseVO.getHouseCode();
if (ObjectUtils.isEmpty(houseCode)) {
return R.fail("房屋地址编码不能为空");
@@ -120,8 +118,8 @@
}
@ApiOperation(value = "新增家庭成员")
- @GetMapping("addfamily")
- public R addFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO) {
+ @PostMapping("addfamily")
+ public R addFamily(@RequestBody @Validated(AddGroup.class) ComMngFamilyInfoVO comMngFamilyInfoVO) {
Long userId = this.getUserId();
comMngFamilyInfoVO.setUserId(userId);
return userService.addFamily(comMngFamilyInfoVO);
--
Gitblit v1.7.1