From b0a0cbf6cd8f3beacbca9a962b45b0baf3935176 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期六, 15 十月 2022 11:15:21 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 insertions(+), 0 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 7d00b5e..21999a0 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
@@ -9,10 +9,13 @@
import javax.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
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.model.vos.user.RoleVO;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.common.validated.PutGroup;
@@ -31,6 +34,7 @@
public class LoginUserInfoVO {
@ApiModelProperty("user_id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@ApiModelProperty("微信会话密钥")
@@ -61,6 +65,7 @@
@ApiModelProperty("社区id")
@Min(value = 1, groups = {PutGroup.class}, message = "社区id不能为空")
@NotNull(groups = {PutGroup.class}, message = "社区id不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long communityId;
@ApiModelProperty("社区名字")
@@ -120,6 +125,7 @@
private String tags;
@ApiModelProperty("家庭id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long familyId;
@ApiModelProperty(value = "分页每页数量", example = "10")
@@ -141,6 +147,7 @@
private List<ComMngStructHouseVO> comMngStructHouseVOS;
@ApiModelProperty("用户小区id")
+ @JsonSerialize(using = ToStringSerializer.class)
// @Min(value = 1,groups = {PutGroup.class},message = "用户小区id不能为空")
// @NotNull(groups = {PutGroup.class},message = "用户小区id不能为空")
private Long areaId;
@@ -184,9 +191,66 @@
@ApiModelProperty("是否社区工作人员 1.是 2.否")
private Integer isCommunityWorker;
+ @ApiModelProperty("是否社工 1.是 2.否")
+ private Integer isSocialWorker;
+
@ApiModelProperty("实名认证地址")
private String address;
@ApiModelProperty("是否物业工作人员 1.是 2.否")
private Integer isPropertyWorker;
+
+ @ApiModelProperty("是否微团队成员 1.是 2.否")
+ private Integer isFmsMember;
+ @ApiModelProperty("是否网格员 1.是 2.否")
+ private Integer isEasyPhotoMember;
+ @ApiModelProperty("是否社会组织联系人 1.是 2.否")
+ private Integer isOrgContactPeople;
+
+ @ApiModelProperty("是否人大代表成员 1.是 2.否")
+ private Integer isDpcMember;
+ @ApiModelProperty("appid")
+ private String appId;
+ @ApiModelProperty("appSecret")
+ private String appSecret;
+ @ApiModelProperty("areaCode")
+ private String areaCode;
+ @ApiModelProperty("街道id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long streetId;
+
+ @ApiModelProperty("账号类型 1街道 2社区 3社会组织")
+ private Integer userType;
+
+ @ApiModelProperty("社会组织Id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long orgId;
+
+ @ApiModelProperty("是否是防疫工作人员 1.是 2.否")
+ private Integer isAcidMember;
+
+ @ApiModelProperty("绑定单位")
+ private String relationName;
+
+ @ApiModelProperty("区域划分")
+ private String areaName;
+
+ @ApiModelProperty("是否单位管理员 1是 0否")
+ private Integer isCheckUnitAdmin;
+
+ @ApiModelProperty("报道单位id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long checkUnitId;
+
+ private Long bindingCheckUnitId;
+
+ private Integer backstageType;
+
+
+ public String retrieveRelationName() {
+ return this.type == 3 ? relationName : name;
+ }
+
+ @ApiModelProperty("权限等级1-5：超管-行业分中心-街道-社区-专家")
+ private Integer level;
}
--
Gitblit v1.7.1