From 4403a428edc18482c5aa561e603b26ebe13d328f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 02 四月 2024 18:27:02 +0800
Subject: [PATCH] 部门端登录、基础数据导入优化、得分计算优化
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 94 ++++++++++++++++++++++++++++++++++------------
1 files changed, 69 insertions(+), 25 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index b49a187..6f9439e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -1,19 +1,22 @@
package com.ruoyi.common.core.domain.entity;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import javax.validation.constraints.*;
-
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.enums.DisabledEnum;
+import com.ruoyi.common.xss.Xss;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.domain.BaseEntity;
-import com.ruoyi.common.xss.Xss;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
/**
* 用户对象 sys_user
@@ -21,6 +24,7 @@
* @author ruoyi
*/
@Data
+@TableName("sys_user")
public class SysUser extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -28,65 +32,82 @@
/** 用户ID */
//@Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
@ApiModelProperty(value = "用户id")
+ @TableId(value = "user_id", type = IdType.AUTO)
@TableField("user_id")
private Long userId;
/** 部门ID */
//@Excel(name = "部门编号", type = Type.IMPORT)
@ApiModelProperty(value = "部门id")
+ @TableField("dept_id")
private Long deptId;
+
+ @ApiModelProperty(value = "用户类型")
+ @TableField("user_type")
+ private String userType;
/** 用户账号 */
//@Excel(name = "登录名称")
@ApiModelProperty(value = "登录名称")
+ @TableField("user_name")
private String userName;
/** 用户昵称 */
//@Excel(name = "用户名称")
@ApiModelProperty(value = "用户名称")
+ @TableField("nick_name")
private String nickName;
/** 用户邮箱 */
//@Excel(name = "用户邮箱")
@ApiModelProperty(value = "用户邮箱")
+ @TableField("email")
private String email;
/** 手机号码 */
//@Excel(name = "手机号码")
@ApiModelProperty(value = "手机号码")
- private String phonenumber;
+ @TableField("phone_number")
+ private String phoneNumber;
/** 用户性别 */
//@Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
@ApiModelProperty(value = "用户性别 0=男,1=女,2=未知")
+ @TableField("sex")
private String sex;
/** 用户头像 */
@ApiModelProperty(value = "用户头像")
+ @TableField("avatar")
private String avatar;
/** 密码 */
@ApiModelProperty(value = "密码")
+ @TableField("password")
private String password;
/** 帐号状态（0正常 1停用） */
//@Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
@ApiModelProperty(value = "帐号状态 0=正常,1=停用")
+ @TableField("status")
private String status;
/** 删除标志（0代表存在 2代表删除） */
@ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+ @TableField("del_flag")
private String delFlag;
/** 最后登录IP */
//@Excel(name = "最后登录IP", type = Type.EXPORT)
@ApiModelProperty(value = "最后登录IP")
+ @TableField("login_ip")
private String loginIp;
/** 最后登录时间 */
//@Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "最后登录时间")
+ @TableField("login_date")
private Date loginDate;
/** 部门对象 */
@@ -94,34 +115,64 @@
//@Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
//@Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
// })
+ @TableField(exist = false)
@ApiModelProperty(value = "部门对象")
private SysDept dept;
/** 角色对象 */
+ @TableField(exist = false)
@ApiModelProperty(value = "角色对象")
private List<SysRole> roles;
/** 角色组 */
+ @TableField(exist = false)
@ApiModelProperty(value = "角色组")
private Long[] roleIds;
/** 岗位组 */
+ @TableField(exist = false)
@ApiModelProperty(value = "岗位组")
private Long[] postIds;
/** 角色ID */
+ @TableField(exist = false)
@ApiModelProperty(value = "角色ID")
private Long roleId;
- /**
- * 是否为黑名单 1是 0否
- */
- @ApiModelProperty(value = "是否为黑名单 1是 0否")
- private Integer ifBlack;
@TableField(exist = false)
private String roleName;
+ @TableField(exist = false)
private String deptName;
+
+ @ApiModelProperty(value = "部门地区")
+ @TableField("area_name")
+ private String areaName;
+
+ @ApiModelProperty(value = "别名")
+ @TableField("area_alias")
+ private String areaAlias;
+
+ @ApiModelProperty(value = "区划代码")
+ @TableField("area_code")
+ private String areaCode;
+
+ @ApiModelProperty(value = "级次（省、市、县）")
+ @TableField("area_level")
+ private String areaLevel;
+
+ @ApiModelProperty(value = "县级标志（不包含直辖市的区 0：否 1：是）")
+ @TableField("county_flag")
+ private DisabledEnum countyFlag;
+
+ @ApiModelProperty(value = "负责人")
+ @TableField("person_in_charge")
+ private String personInCharge;
+
+ @ApiModelProperty(value = "是否重点关注(0：否 1：是)")
+ @TableField("focussed")
+ private DisabledEnum focussed;
+
public String getRoleName() {
return roleName;
@@ -208,14 +259,14 @@
}
@Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
- public String getPhonenumber()
+ public String getPhoneNumber()
{
- return phonenumber;
+ return phoneNumber;
}
- public void setPhonenumber(String phonenumber)
+ public void setPhoneNumber(String phoneNumber)
{
- this.phonenumber = phonenumber;
+ this.phoneNumber = phoneNumber;
}
public String getSex()
@@ -338,13 +389,6 @@
this.roleId = roleId;
}
- public Integer getIfBlack() {
- return ifBlack;
- }
-
- public void setIfBlack(Integer ifBlack) {
- this.ifBlack = ifBlack;
- }
@Override
public String toString() {
@@ -354,7 +398,7 @@
.append("userName", getUserName())
.append("nickName", getNickName())
.append("email", getEmail())
- .append("phonenumber", getPhonenumber())
+ .append("phoneNumber", getPhoneNumber())
.append("sex", getSex())
.append("avatar", getAvatar())
.append("password", getPassword())
--
Gitblit v1.7.1