From b3c6911c1e78563dc04998dd7bfb510130a9fcec Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期一, 01 二月 2021 16:37:52 +0800
Subject: [PATCH] auth
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
index cbd32da..8d70ed7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -1,11 +1,19 @@
package com.panzhihua.common.model.vos;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
import java.util.Set;
@@ -45,9 +53,12 @@
private String nickName;
@ApiModelProperty("真实名字")
+ @NotBlank(groups = {AddGroup.class},message = "真实名字不能为空")
private String name;
@ApiModelProperty("社区id")
+ @Min(value = 1,groups = {PutGroup.class},message = "社区id不能为空")
+ @NotNull(groups = {PutGroup.class},message = "社区id不能为空")
private Long communityId;
@ApiModelProperty("社区名字")
@@ -57,12 +68,13 @@
private Integer sex;
@ApiModelProperty("生日")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date birthday;
@ApiModelProperty("头像")
private String imageUrl;
- @ApiModelProperty("用户类型 1 小程序 2 运营平台 3 社区平台")
+ @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台")
private Integer type;
@ApiModelProperty("职业")
@@ -96,6 +108,7 @@
private String rejectReson;
@ApiModelProperty("身份证号")
+ @NotBlank(groups = {AddGroup.class},message = "身份证号不能为空")
private String idCard;
@ApiModelProperty("标签 多个用,隔开")
@@ -123,8 +136,19 @@
private List<ComMngStructHouseVO> comMngStructHouseVOS;
@ApiModelProperty("用户小区id")
+ @Min(value = 1,groups = {PutGroup.class},message = "用户小区id不能为空")
+ @NotNull(groups = {PutGroup.class},message = "用户小区id不能为空")
private Long areaId;
+ @ApiModelProperty("用户所在社区信息")
+ private ComActVO comActVO;
+
+ @ApiModelProperty("小区信息")
+ private ComMngStructAreaVO comMngStructAreaVO;
+
+ @ApiModelProperty("0 未申请 1 申请中 2 通过 3 驳回")
+ private Integer volunteerStatus;
+
--
Gitblit v1.7.1