I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

用户信息拆分

Browse Source
yun-zuoyi
wei.peng 7 years ago
parent 947471e553
commit 6991ab1599
8 changed files with 255 additions and 148 deletions
Show Stats Download Patch File Download Diff File

69
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
Unescape Escape View File

@ -299,6 +299,54 @@ public class CommonEnumUtil {
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum USER_INFO_STATUS {
INCUMBENT(1, "正常", "正常_NORMAL"),
RESIGNATION(2, "离职", "离职_RESIGNATION");
private int value;
private String code;
private String description;
private USER_INFO_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 数据状态
* 1 启用
@ -503,11 +551,12 @@ public class CommonEnumUtil {
}
/**
* 启用或禁用
* 性别
*/
public enum OPEN_CLOSE {
OPEN(1, "启用"),
CLOSE(2, "禁用");
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum USER_ESX {
MALE(1, "男"),
FEMALE(2, "女");
private int value;
private String description;
@ -520,9 +569,19 @@ public class CommonEnumUtil {
return description;
}
OPEN_CLOSE(int value, String description) {
private USER_ESX(int value, String description) {
this.value = value;
this.description = description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

13
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserDepartment.java
Unescape Escape View File

@ -42,6 +42,10 @@ public class RefUserDepartment extends BaseBean {
return userId;
}
}
@Column(name="USER_NAME")
@ApiParam(value ="用户名称")
private String userNameRdd;
@Column(name="DEPARTMENT_ID")
@ApiParam(value ="部门ID" , example = "-1")
@ -56,16 +60,17 @@ public class RefUserDepartment extends BaseBean {
}
}
@Column(name="RED_DEPARTMENT_NAME")
@Column(name="DEPARTMENT_NAME_RDD")
@ApiParam(value ="部门名称")
private String redDepartmentName;
private String departmentNameRdd;
public RefUserDepartment() {
}
public RefUserDepartment(Long userId, Long departmentId, String redDepartmentName) {
public RefUserDepartment(Long userId, String userName,Long departmentId, String departmentNameRdd) {
this.userId = userId;
this.userNameRdd = userName;
this.departmentId = departmentId;
this.redDepartmentName = redDepartmentName;
this.departmentNameRdd = departmentNameRdd;
}
}

12
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserPosition.java
Unescape Escape View File

@ -42,6 +42,9 @@ public class RefUserPosition extends BaseBean {
}
}
@Column(name="USER_NAME_RDD")
@ApiParam(value ="用户名称")
private String userNameRdd;
@Column(name="POSITION_ID")
@ApiParam(value ="岗位ID" , example = "-1")
@ -56,16 +59,17 @@ public class RefUserPosition extends BaseBean {
}
}
@Column(name="RED_POSITION_NAME")
@Column(name="POSITION_NAME_RDD")
@ApiParam(value ="岗位名称")
private String redPositionName;
private String positionNameRdd;
public RefUserPosition() {
}
public RefUserPosition(Long userId, Long positionId, String redPositionName) {
public RefUserPosition(Long userId,String userNameRdd, Long positionId, String positionNameRdd) {
this.userId = userId;
this.userNameRdd = userNameRdd;
this.positionId = positionId;
this.redPositionName = redPositionName;
this.positionNameRdd = positionNameRdd;
}
}

13
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserRole.java
Unescape Escape View File

@ -44,6 +44,11 @@ public class RefUserRole extends BaseBean {
return userId;
}
}
@Column(name="USER_NAME_RDD")
@ApiParam(value ="角色名称")
private String userNameRdd;
@Column(name="ROLE_ID")
@ApiParam(value ="角色ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
@ -57,16 +62,16 @@ public class RefUserRole extends BaseBean {
}
}
@Column(name="RED_ROLE_NAME")
@Column(name="ROLE_NAME_RDD")
@ApiParam(value ="角色名称")
private String redRoleName;
private String roleNameRdd;
public RefUserRole() {
}
public RefUserRole(Long userId, Long roleId, String redRoleName) {
public RefUserRole(Long userId, Long roleId, String roleNameRdd) {
this.userId = userId;
this.roleId = roleId;
this.redRoleName = redRoleName;
this.roleNameRdd = roleNameRdd;
}
}

14
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.platform.bean;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -37,20 +38,7 @@ public class SessionUser implements Serializable {
@ApiParam("用户对象信息")
private SysUserInfo userInfo;
@ApiParam(value = "角色信息",access = "用户所拥有岗位信息集合")
private List<SysRole> roleList;
@ApiParam(value = "岗位信息",access = "用户所拥有岗位信息集合")
private List<Position> positionList;
@ApiParam(value = "部门信息",access = "用户所有用部门信息集合")
private List<Department> departmentList;
@ApiParam(value = "组织信息",access = "用户所拥有的组织信息集合")
private Organize organize;
@ApiParam(value = "岗位信息",access = "用户主岗位信息")
private Position position;
public SessionUser() {
}

124
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java
Unescape Escape View File

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -31,52 +32,33 @@ public class SysUser extends BaseBean {
private static final long serialVersionUID = 1L;
@Column(name="NAME")
@ApiParam(value ="名称" , access ="名称")
private String name;
@Column(name="USER_INFO_ID")
@ApiParam(value ="用户ID" , example = "0")
@JsonSerialize(using = ToStringSerializer.class)
private Long userInfoId;
public Long getUserInfoId() {
if(userInfoId != null) {
return userInfoId.longValue();
}else{
return userInfoId;
}
}
@Column(name="USER_NAME_RDD")
@ApiParam(value ="用户名称" , access ="用户名称")
private String userName;
@Column(name="USER_LOGIN_NAME")
@ApiParam(value ="登陆名称" , access ="登陆名称")
private String userLoginName;
@Column(name="USER_EMP_NO")
@ApiParam(value ="工号")
private String userEmpNo;
@JsonIgnore
@Column(name="USER_LOGIN_PASSWORD")
@ApiParam(value ="登陆密码")
private String userLoginPassword;
@Column(name="USER_TYPE_ID")
@ApiParam(value ="用户类型（枚举，待定）" , example ="-1")
private Integer userTypeId;
@Column(name="DEPARTMENT_ID")
@ApiParam(value ="部门ID" , example ="-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long departmentId;
public Long getDepartmentId() {
if(departmentId != null) {
return departmentId.longValue();
}else{
return departmentId;
}
}
@Column(name="POSITION_ID")
@ApiParam(value ="岗位ID" , example ="-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long positionId;
public Long getPositionId() {
if(positionId != null) {
return positionId.longValue();
}else{
return positionId;
}
}
@Column(name="ROLE_ID")
@ApiParam(value ="角色ID" , example ="-1")
@JsonSerialize(using = ToStringSerializer.class)
@ -90,38 +72,9 @@ public class SysUser extends BaseBean {
}
}
@Column(name="ORGANIZE_ID")
@ApiParam(value ="组织ID" , example = "0")
@JsonSerialize(using = ToStringSerializer.class)
private Long organizeId;
public Long getOrganizeId() {
if(organizeId != null) {
return organizeId.longValue();
}else{
return organizeId;
}
}
@Column(name="RED_ROLE_NAME")
@Column(name="ROLE_NAME_RDD")
@ApiParam(value ="角色名称" , access ="角色名称")
private String redRoleName;
@Column(name="RED_POSITION_NAME")
@ApiParam(value ="岗位名称" , access ="岗位名称")
private String redPositionName;
@Column(name="RED_DEPARTMENT_NAME")
@ApiParam(value ="部门名称" , access ="部门名称")
private String redDepartmentName;
@Column(name="RED_ORGANIZE_NAME")
@ApiParam(value ="组织名称" , access ="组织名称")
private String redOrganizeName;
@Column(name="USER_ONLINE_ID")
@ApiParam(value ="是否在线(枚举：1.在线，2.离线)" , example ="-1")
private Integer userOnlineId;
private String roleNameRdd;
@Column(name="USER_EMAIL")
@ApiParam(value ="邮箱" , access ="邮箱")
@ -133,13 +86,34 @@ public class SysUser extends BaseBean {
@Column(name="USER_STATUS_ID")
@ApiParam(value ="用户状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1")
private Integer userStatusId;
private Integer userStatus;
@Column(name="USER_LOGIN_LAST_DATE_TIME")
@ApiParam(value ="用户最后登录时间")
private String userLoginLastDateTime;
@ApiParam(value ="用户详细信息")
@Column(name="DEPARTMENT_ID")
@ApiParam(value ="部门ID" , example ="-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long departmentId;
public Long getDepartmentId() {
if(departmentId != null) {
return departmentId.longValue();
}else{
return departmentId;
}
}
@Column(name="DEPARTMENT_NAME_RDD")
@ApiParam(value ="部门名称" , access ="部门名称")
private String departmentNameRdd;
@Column(name="USER_TYPE_ID")
@ApiParam(value ="用户类型（枚举，待定）" , example ="-1")
private Integer userTypeId;
@ApiParam(value ="用户信息")
private transient SysUserInfo userInfo;
@ApiParam(value ="用户所有角色信息")
@ -147,14 +121,4 @@ public class SysUser extends BaseBean {
@ApiParam(value ="用户所有权限信息")
private transient List<SysMenu> menuList;
@ApiParam(value ="用户所有部门信息")
private transient List<Department> departmentList;
@ApiParam(value ="用户所有岗位信息")
private transient List<Position> positionList;
@ApiParam(value ="用户组织信息")
private transient Organize organize;
}

123
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java
Unescape Escape View File

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -13,6 +14,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.text.DecimalFormat;
import java.util.List;
/**
* @Description : 用户详细
@ -32,40 +34,15 @@ public class SysUserInfo extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称" , access ="名称")
private String name;
@Column(name="USER_ID")
@ApiParam(value ="用户ID" , example = "0")
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
public Long getUserId() {
if(userId != null) {
return userId.longValue();
}else{
return userId;
}
}
@Column(name="USER_EMP_NO")
@ApiParam(value ="工号")
private String userEmpNo;
@Column(name="LANGUAGE_CODE")
@ApiParam(value ="用户语言")
private String languageCode;
@Column(name="RED_DEPARTMENT_NAMES")
@ApiParam(value ="部门集合" , access ="部门集合")
private String redDepartmentNames;
@Column(name="RED_POSITION_NAMES")
@ApiParam(value ="岗位集合" , access ="岗位集合")
private String redPositionNames;
@Column(name="RED_ROLE_NAMES")
@ApiParam(value ="角色集合" , access ="角色集合")
private String redRoleNames;
@Column(name="RED_ORGANIZE_NAMES")
@ApiParam(value ="组织集合" , access ="组织集合")
private String redOrganizeNames;
@Column(name="USER_IMAGE_ID")
@ApiParam(value ="用户图像" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
@ -86,7 +63,95 @@ public class SysUserInfo extends BaseBean {
@Column(name="USER_AGE")
@ApiParam(value ="年龄" , example ="1" , access ="年龄")
private Integer userAge;
@Column(name="DEPARTMENT_ID")
@ApiParam(value ="部门ID" , example ="-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long departmentId;
public Long getDepartmentId() {
if(departmentId != null) {
return departmentId.longValue();
}else{
return departmentId;
}
}
@Column(name="POSITION_ID")
@ApiParam(value ="岗位ID" , example ="-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long positionId;
public Long getPositionId() {
if(positionId != null) {
return positionId.longValue();
}else{
return positionId;
}
}
@Column(name="ORGANIZE_ID")
@ApiParam(value ="组织ID" , example = "0")
@JsonSerialize(using = ToStringSerializer.class)
private Long organizeId;
public Long getOrganizeId() {
if(organizeId != null) {
return organizeId.longValue();
}else{
return organizeId;
}
}
@Column(name="DEPARTMENT_NAMES_RDD")
@ApiParam(value ="部门集合" , access ="部门集合")
private String departmentNamesRdd;
@Column(name="POSITION_NAMES_RDD")
@ApiParam(value ="岗位集合" , access ="岗位集合")
private String positionNamesRdd;
@Column(name="ORGANIZE_NAMES_RDD")
@ApiParam(value ="组织集合" , access ="组织集合")
private String organizeNamesRdd;
@Column(name="POSITION_NAME_RDD")
@ApiParam(value ="岗位名称" , access ="岗位名称")
private String positionNameRdd;
@Column(name="DEPARTMENT_NAME_RDD")
@ApiParam(value ="部门名称" , access ="部门名称")
private String departmentNameRdd;
@Column(name="ORGANIZE_NAME_RDD")
@ApiParam(value ="组织名称" , access ="组织名称")
private String organizeNameRdd;
@Column(name="USER_ONLINE_STATUS")
@ApiParam(value ="是否在线(枚举：1.在线，2.离线)" , example ="-1")
private Integer userOnlineStatus;
@Column(name="USER_INFO_STATUS")
@ApiParam(value ="用户状态" , example ="-1")
private Integer userInfoStatus;
@Column(name="USER_LOGIN_LAST_DATE_TIME")
@ApiParam(value ="用户最后登录时间")
private String userLoginLastDateTime;
@ApiParam(value ="用户所有部门信息")
private transient List<Department> departmentList;
@ApiParam(value ="用户所有岗位信息")
private transient List<Position> positionList;
@ApiParam(value ="用户组织信息")
private transient Organize organize;
@ApiParam(value = "岗位信息",access = "用户主岗位信息")
private transient Position position;
@JsonIgnore
@ApiParam(value ="用户详细信息")
private transient SysUser user;
}

35
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
Unescape Escape View File

@ -284,24 +284,21 @@ public class CoreHqlPack {
}
/**
* 用戶复杂查询
* 账号复杂查询
* @param user
* @return
*/
public static String packHqlSysUser(SysUser user){
StringBuffer result = new StringBuffer();
// hql拼接
HqlPack.getStringLikerPack(user.getName(),"name",result);
// And X = X
HqlPack.getNumEqualPack(user.getIsValid(),"isValid",result);
HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
// And Like % %
HqlPack.getStringLikerPack(user.getUserName(),"userName",result);
HqlPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);
HqlPack.getStringLikerPack(user.getUserEmail(),"userEmail",result);
HqlPack.getStringLikerPack(user.getUserEmpNo(),"userEmpNo",result);
HqlPack.getStringLikerPack(user.getUserPhone(),"userPhone",result);
HqlPack.getNumLikerPack(user.getUserStatusId(),"userStatusId",result);
HqlPack.getNumLikerPack(user.getDepartmentId(),"departmentId",result);
HqlPack.getNumEqualPack(user.getPositionId(),"positionId",result);
HqlPack.getNumEqualPack(user.getRoleId(),"roleId",result);
HqlPack.getNumEqualPack(user.getIsValid(),"isValid",result);
return result.toString();
}
@ -317,4 +314,24 @@ public class CoreHqlPack {
return result.toString();
}
/**
* 用户信息 复杂查询拼接
* @param userInfo
* @return
*/
public static String packHqlSysUserInfo(SysUserInfo userInfo){
StringBuffer result = new StringBuffer();
// And
HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result);
HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result);
HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);
// Like
HqlPack.getStringLikerPack(userInfo.getName(),"name",result);
HqlPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result);
return result.toString();
}
}
Write Preview
Loading…
Cancel
Save