From 3750b11b8830e9cb8a7bf1f1cc65d90c4a845db7 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 25 Dec 2018 18:21:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/platform/UserDetailModel.java | 202 +++++++++++++++++++++ .../pojo/platform/bean/SysRefUserDepartment.java | 2 +- .../platform/bean/SysRefUserInfoDepartment.java | 69 +++++++ .../estsh/i3plus/pojo/platform/bean/SysUser.java | 89 ++++++--- .../i3plus/pojo/platform/bean/SysUserInfo.java | 167 +++++++++++------ .../repository/SysRefUserDepartmentRepository.java | 2 +- .../SysRefUserInfoDepartmentRepository.java | 14 ++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 4 +- 8 files changed, 464 insertions(+), 85 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserInfoDepartment.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserInfoDepartmentRepository.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java new file mode 100644 index 0000000..111a5b3 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java @@ -0,0 +1,202 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.platform.bean.SysUser; +import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2018-12-22 17:29 + * @Modify: + **/ +@Data +public class UserDetailModel extends BaseBean { + + @ApiParam(value ="账号ID") + private String userId; + + @ApiParam(value ="用户ID") + private String userInfoId; + + @ApiParam(value ="用户语言") + private String userLanguageCode; + + @ApiParam(value ="登陆名称" , access ="登陆名称") + private String userLoginName; + + @ApiParam(value ="登陆密码") + private String userLoginPassword; + + @ApiParam(value ="邮箱" , access ="邮箱") + private String userEmail; + + @ApiParam(value ="手机号" , access ="手机号") + private String userPhone; + + @ApiParam(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1") + private Integer userStatus; + + @ApiParam(value ="组织ID 集合") + private List userOrganizeIdList; + + @ApiParam(value ="部门ID") + private String userDepartmentId; + + @ApiParam(value ="部门ID 集合") + private List userDepartmentIdList; + + @ApiParam(value ="角色ID 集合") + private List userRoleIdList; + + @ApiParam(value ="姓名" , access ="名称") + private String infoName; + + @ApiParam(value ="工号") + private String infoEmpNo; + + @ApiParam(value ="员工类型", access ="实习、试用期、正式") + private Integer infoEmployeeType; + + @ApiParam(value ="员工等级") + private Integer infoGrade; + + @ApiParam(value ="入职日期" , access ="默认当前时间") + private String infoJoinDate; + + @ApiParam(value ="离职日期" , access ="默认当前时间") + private String infoResignationDate; + + @ApiParam(value ="证件类型") + private Integer infoCardType; + + @ApiParam(value ="证件编号") + private String infoCardNumber; + + @ApiParam(value ="毕业院校") + private String infoSchool; + + @ApiParam(value ="毕业专业") + private String infoSchoolProfession; + + @ApiParam(value ="毕业时间") + private String infoSchoolLeaveDate; + + @ApiParam(value ="学历") + private Integer infoSchoolEducation; + + @ApiParam(value ="性别（1.男，2.女）" , example ="1" , access ="性别（1.男，2.女）") + private Integer infoSex; + + @ApiParam(value ="籍贯") + private String infoBirthplace; + + @ApiParam(value ="种族") + private Integer infoRace; + + @ApiParam(value ="婚姻" , example ="1" , access ="性别（1.未知，2.已婚,3未婚）") + private Integer infoMarriage; + + @ApiParam(value ="紧急联系人") + private String infoEmergencyContact; + + @ApiParam(value ="紧急联系人-电话") + private String infoEmergencyPhone; + + @ApiParam(value ="家庭地址") + private String infoFamilyAddress; + + @ApiParam(value ="出生日期") + private String infoBornDate; + + @ApiParam(value ="政治面貌") + private Integer infoPoliticalStatus; + + @ApiParam(value ="兴趣爱好") + private String infoHobby; + + @ApiParam(value ="用户状态" , example ="-1") + private Integer infoStatus; + + @ApiParam(value ="用户图像" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private String infoImageId; + + @ApiParam(value ="部门ID" , example ="-1") + @JsonSerialize(using = ToStringSerializer.class) + private String infoDepartmentId; + + @ApiParam(value ="岗位ID" , example ="-1") + @JsonSerialize(using = ToStringSerializer.class) + private String infoPositionId; + + @ApiParam(value ="组织ID" , example = "0") + @JsonSerialize(using = ToStringSerializer.class) + private String infoOrganizeId; + + @ApiParam(value ="用户所有部门信息") + private List infoDepartmentIdList; + + @ApiParam(value ="用户所有岗位信息") + private List infoPositionIdList; + + @ApiParam(value ="用户所有组织信息") + private List infoOrganizeIdList; + + public SysUser getSysUser(){ + SysUser user = new SysUser(); + user.setId(!StringUtils.isBlank(this.userId) ? Long.parseLong(this.userId) : null); + user.setUserInfoId(!StringUtils.isBlank(this.userInfoId) ? Long.parseLong(this.userInfoId) : null); + user.setUserLoginName(this.userLoginName); + user.setUserName(this.infoName); + user.setUserEmail(this.userEmail); + user.setUserPhone(this.userPhone); + user.setUserLoginPassword(this.userLoginPassword); + user.setUserEmpNo(this.infoEmpNo); + + return user; + } + + public SysUserInfo getSysUserInfo(){ + SysUserInfo info = new SysUserInfo(); + + info.setId(!StringUtils.isAnyBlank(this.userInfoId)? Long.parseLong(this.userInfoId) : null); + info.setUserId(!StringUtils.isAnyBlank(this.userId)? Long.parseLong(this.userId) : null); + info.setUserImageId(!StringUtils.isAnyBlank(this.infoImageId)? Long.parseLong(this.infoImageId) : null); + info.setPositionId(!StringUtils.isAnyBlank(this.infoPositionId)? Long.parseLong(this.infoPositionId) : null); + info.setName(this.infoName); + info.setUserEmpNo(this.infoEmpNo); + info.setUserJoinDate(this.infoJoinDate); + info.setUserResignationDate(this.infoResignationDate); + info.setUserCardType(this.infoCardType); + info.setUserCardNumber(this.infoCardNumber); + info.setUserSchool(this.infoSchool); + info.setUserSchoolProfession(this.infoSchoolProfession); + info.setUserSchoolLeaveDate(this.infoSchoolLeaveDate); + info.setUserSchoolEducation(this.infoSchoolEducation); + info.setUserSex(this.infoSex); + info.setUserBirthplace(this.infoBirthplace); + info.setUserRace(this.infoRace); + info.setUserMarriage(this.infoMarriage); + info.setUserEmergencyContact(this.infoEmergencyContact); + info.setUserEmergencyPhone(this.infoEmergencyPhone); + info.setUserFamilyAddress(this.infoFamilyAddress); + info.setUserBornDate(this.infoBornDate); + info.setUserHobby(this.infoHobby); + info.setUserPoliticalStatus(this.infoPoliticalStatus); + info.setUserGrade(this.infoGrade); + info.setUserEmployeeType(this.infoEmployeeType); + + + return info; + } + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java index c312892..5350620 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java @@ -28,7 +28,7 @@ import java.text.DecimalFormat; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="SYS_REF_USER_DEPARTMENT") -@Api(value="关系-用户部门",description = "关系-用户部门") +@Api(value="关系-账号部门",description = "关系-账号部门") public class SysRefUserDepartment extends BaseBean { @Column(name="USER_ID") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserInfoDepartment.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserInfoDepartment.java new file mode 100644 index 0000000..81dc295 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserInfoDepartment.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 关系-用户部门 + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-22 16:58:43.239 + * @Modify : + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_REF_USER_INFO_DEPARTMENT") +@Api(value="关系-用户部门",description = "关系-用户部门") +public class SysRefUserInfoDepartment extends BaseBean { + + @Column(name="USER_ID") + @ApiParam(value ="用户ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; + + @Column(name="USER_NAME") + @ApiParam(value ="用户名称") + private String userNameRdd; + + @Column(name="DEPARTMENT_ID") + @ApiParam(value ="部门ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long departmentId; + + @Column(name="DEPARTMENT_NAME_RDD") + @ApiParam(value ="部门名称") + private String departmentNameRdd; + + @Column(name="ORGANIZE_ID") + @ApiParam(value ="组织ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long organizeId; + + @Column(name="ORGANIZE_NAME_RDD") + @ApiParam(value ="组织名称") + private String organizeNameRdd; + + public SysRefUserInfoDepartment() { + } + + public SysRefUserInfoDepartment(Long userId, String userName, Long departmentId, String departmentNameRdd) { + this.userId = userId; + this.userNameRdd = userName; + this.departmentId = departmentId; + this.departmentNameRdd = departmentNameRdd; + } +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 22aa6ae..9d03fa4 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -17,7 +17,7 @@ import javax.persistence.Transient; import java.util.List; /** - * @Description : 用户登陆表 + * @Description : 账号登陆表 * @Reference : * @Author : alwaysfrin * @CreateDate : 2018-10-11 11:02 @@ -28,37 +28,38 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="sys_user") -@Api(value="用户登陆表",description = "用户登陆系统账户。") +@Table(name="SYS_USER") +@Api(value="账号登陆表",description = "账号登陆系统账户。") public class SysUser extends BaseBean { - private static final long serialVersionUID = 1L; - @Column(name="USER_INFO_ID") - @ApiParam(value ="用户ID" , example = "0") + @ApiParam(value ="人员ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long userInfoId; + @Column(name="LANGUAGE_CODE") + @ApiParam(value ="用户语言") + private String languageCode; + @Column(name="USER_NAME_RDD") - @ApiParam(value ="用户名称" , access ="用户名称") + @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; + @Column(name="USER_LOGIN_PASSWORD") @ApiParam(value ="登陆密码") private String userLoginPassword; - @Column(name="ROLE_ID") - @ApiParam(value ="角色ID" , example ="-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long roleId; - - @Column(name="ROLE_NAME_RDD") - @ApiParam(value ="角色名称" , access ="角色名称") - private String roleNameRdd; + @Column(name="USER_TYPE") + @ApiParam(value ="账号类型（枚举，待定）" , example ="-1") + private Integer userType; @Column(name="USER_EMAIL") @ApiParam(value ="邮箱" , access ="邮箱") @@ -69,35 +70,73 @@ public class SysUser extends BaseBean { private String userPhone; @Column(name="USER_STATUS") - @ApiParam(value ="用户状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1") + @ApiParam(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1") private Integer userStatus; - @Column(name="USER_LOGIN_LAST_DATE_TIME") - @ApiParam(value ="用户最后登录时间") - private String userLoginLastDateTime; - @Column(name="USER_LOGIN_NUM") @ApiParam(value ="登录次数",example = "0") private Integer userLoginNum; + @Column(name="USER_LOGIN_LAST_DATE_TIME") + @ApiParam(value ="账号最后登录时间") + private String userLoginLastDateTime; + +/********************************** 关系信息 ********************************/ + @Column(name="DEPARTMENT_ID") @ApiParam(value ="部门ID" , example ="-1") @JsonSerialize(using = ToStringSerializer.class) private Long departmentId; + @Column(name="ORGANIZE_ID") + @ApiParam(value ="组织ID" , example = "0") + @JsonSerialize(using = ToStringSerializer.class) + private Long organizeId; + + @Column(name="ROLE_IDS") + @ApiParam(value ="角色ID集合" , example = "0") + @JsonSerialize(using = ToStringSerializer.class) + private String roleIds; + +/********************************** 冗余信息 ********************************/ + @Column(name="DEPARTMENT_NAME_RDD") @ApiParam(value ="部门名称" , access ="部门名称") private String departmentNameRdd; - @Column(name="USER_TYPE") - @ApiParam(value ="用户类型（枚举，待定）" , example ="-1") - private Integer userType; + @Column(name="ORGANIZE_NAME_RDD") + @ApiParam(value ="组织名称" , access ="组织名称") + private String organizeNameRdd; + + @Column(name="ROLE_NAMES_RDD",columnDefinition = "TEXT") + @ApiParam(value ="角色名称集合") + private String roleNamesRdd; + @Column(name="DEPARTMENT_NAMES_RDD",columnDefinition = "TEXT") + @ApiParam(value ="部门名称集合") + private String departmentNamesRdd; + + @Column(name="ORGANIZE_NAMES_RDD",columnDefinition = "TEXT") + @ApiParam(value ="组织名称集合") + private String organizeNamesRdd; + +/********************************** 非数据库信息 ********************************/ + + @Transient + @ApiParam(value ="账号所有操作组织信息") + private List organizeList; + @Transient - @ApiParam(value ="用户所有角色信息") + @ApiParam(value ="账号所有操作部门信息") + private List departmentList; + + @Transient + @ApiParam(value ="账号所有角色信息") private List roleList; @Transient - @ApiParam(value ="用户所有权限信息") + @ApiParam(value ="账号所有操作权限信息") private List menuList; + + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index 28742da..17cf947 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -33,6 +33,11 @@ import java.util.List; @Api(value="用户详细",description = "用户详细") public class SysUserInfo extends BaseBean { + @Column(name="USER_ID") + @ApiParam(value ="账号ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; + @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") private String name; @@ -41,22 +46,104 @@ public class SysUserInfo extends BaseBean { @ApiParam(value ="工号") private String userEmpNo; - @Column(name="LANGUAGE_CODE") - @ApiParam(value ="用户语言") - private String languageCode; + @Column(name="USER_EMPLOYEE_TYPE") + @ApiParam(value ="员工类型", access ="实习、试用期、正式") + private Integer userEmployeeType; - @Column(name="USER_IMAGE_ID") - @ApiParam(value ="用户图像" , example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long userImageId; + @Column(name="USER_GRADE") + @ApiParam(value ="员工等级") + private Integer userGrade; + + @Column(name="USER_JOIN_DATE") + @ApiParam(value ="入职日期" , access ="默认当前时间") + private String userJoinDate; + + @Column(name="USER_RESIGNATION_DATE") + @ApiParam(value ="离职日期" , access ="默认当前时间") + private String userResignationDate; + + @Column(name="USER_CARD_TYPE") + @ApiParam(value ="证件类型") + private Integer userCardType; + + @Column(name="USER_CARD_NUMBER") + @ApiParam(value ="证件编号") + private String userCardNumber; + + @Column(name="USER_SCHOOL") + @ApiParam(value ="毕业院校") + private String userSchool; + + @Column(name="USER_SCHOOL_PROFESSION") + @ApiParam(value ="毕业专业") + private String userSchoolProfession; + + @Column(name="USER_SCHOOL_LEAVE_DATE") + @ApiParam(value ="毕业时间") + private String userSchoolLeaveDate; + + @Column(name="user_School_Education") + @ApiParam(value ="学历") + private Integer userSchoolEducation; @Column(name="USER_SEX") @ApiParam(value ="性别（1.男，2.女）" , example ="1" , access ="性别（1.男，2.女）") private Integer userSex; - @Column(name="USER_AGE") - @ApiParam(value ="年龄" , example ="1" , access ="年龄") - private Integer userAge; + @Column(name="USER_BIRTHPLACE") + @ApiParam(value ="籍贯") + private String userBirthplace; + + @Column(name="USER_RACE") + @ApiParam(value ="种族") + private Integer userRace; + + @Column(name="USER_MARRIAGE") + @ApiParam(value ="婚姻" , example ="1" , access ="性别（1.未知，2.已婚,3未婚）") + private Integer userMarriage; + + @Column(name="USER_EMERGENCY_CONTACT") + @ApiParam(value ="紧急联系人") + private String userEmergencyContact; + + @Column(name="USER_EMERGENCY_PHONE") + @ApiParam(value ="紧急联系人-电话") + private String userEmergencyPhone; + + @Column(name="USER_FAMILY_ADDRESS") + @ApiParam(value ="家庭地址") + private String userFamilyAddress; + + @Column(name="USER_BORN_DATE") + @ApiParam(value ="出生日期") + private String userBornDate; + + @Column(name="USER_POLITICAL_STATUS") + @ApiParam(value ="政治面貌") + private Integer userPoliticalStatus; + + @Column(name="USER_HOBBY") + @ApiParam(value ="兴趣爱好") + private String userHobby; + + @Column(name="USER_INFO_STATUS") + @ApiParam(value ="用户状态" , example ="-1") + private Integer userInfoStatus; + + @Column(name="USER_LOGIN_NUM") + @ApiParam(value ="登录次数",example = "0") + private Integer userLoginNum; + + @Column(name="USER_LOGIN_LAST_DATE_TIME") + @ApiParam(value ="用户最后登录时间") + private String userLoginLastDateTime; + +/********************************** 关系信息 ********************************/ + + @Column(name="USER_IMAGE_ID") + @ApiParam(value ="用户图像" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userImageId; @Column(name="DEPARTMENT_ID") @ApiParam(value ="部门ID" , example ="-1") @@ -73,75 +160,47 @@ public class SysUserInfo extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long organizeId; +/********************************** 冗余信息 ********************************/ + + @Column(name="DEPARTMENT_NAME_RDD") + @ApiParam(value ="部门名称" , access ="部门名称") + private String departmentNameRdd; + @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="POSITION_NAMES_RDD") + @ApiParam(value ="岗位集合" , access ="岗位集合") + private String positionNamesRdd; @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; - - @Column(name="USER_LOGIN_NUM") - @ApiParam(value ="登录次数",example = "0") - private Integer userLoginNum; + @Column(name="ORGANIZE_NAMES_RDD") + @ApiParam(value ="组织集合" , access ="组织集合") + private String organizeNamesRdd; - @Column(name="USER_NUM") - @ApiParam(value ="用户账号数",example = "0") - private Integer userNum; +/********************************** 非数据库信息 ********************************/ @Transient @ApiParam(value ="用户所有部门信息") private List departmentList; @Transient - @ApiParam("用户的部门ID信息集合") - private List departmentIdList; - - @Transient @ApiParam(value ="用户所有岗位信息") private List positionList; @Transient - @ApiParam("用户的岗位ID信息") - private List positionIdList; - - @Transient @ApiParam(value ="用户所有组织信息") private List organizeList; @Transient - @ApiParam("用户的组织ID信息集合") - private List organizeIdList; - - @Transient @ApiParam(value ="用户岗位信息") private SysDepartment department; @@ -150,11 +209,7 @@ public class SysUserInfo extends BaseBean { private SysOrganize organize; @Transient - @ApiParam(value = "岗位信息",access = "用户主岗位信息") + @ApiParam(value = "岗位信息") private SysPosition position; - @Transient - @JsonIgnore - @ApiParam(value ="用户详细信息") - private SysUser user; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserDepartmentRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserDepartmentRepository.java index 836ed10..fc6ba45 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserDepartmentRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserDepartmentRepository.java @@ -4,7 +4,7 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.platform.bean.SysRefUserDepartment; /** - * @Description : 关系-用户部门 + * @Description : 关系-账号部门 * @Reference : * @Author : wei.peng * @Date : 2018-10-22 12:03:00.596 diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserInfoDepartmentRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserInfoDepartmentRepository.java new file mode 100644 index 0000000..1871f70 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserInfoDepartmentRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysRefUserInfoDepartment; + +/** + * @Description : 关系-用户部门 + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-22 12:03:00.596 + * @Modify : + **/ +public interface SysRefUserInfoDepartmentRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index c3dbd1b..4690ad4 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -324,8 +324,8 @@ public class CoreHqlPack { // And X = X HqlPack.getNumEqualPack(user.getIsValid(),"isValid",result); - HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); - HqlPack.getNumEqualPack(user.getRoleId(),"roleId",result); +// HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); +// HqlPack.getNumEqualPack(user.getRoleId(),"roleId",result); HqlPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); // And Like % % HqlPack.getStringLikerPack(user.getUserName(),"userName",result); From 0550adce28a05318c7da7b5902edaab40343d6f1 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 26 Dec 2018 18:58:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/model/platform/UserDetailModel.java | 4 ++-- .../cn/estsh/i3plus/pojo/platform/bean/SessionUser.java | 13 +++++++++++++ .../java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java | 15 ++++++++++----- .../estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 11 ++++++++--- 4 files changed, 33 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java index 111a5b3..4df40f1 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java @@ -156,11 +156,12 @@ public class UserDetailModel extends BaseBean { user.setId(!StringUtils.isBlank(this.userId) ? Long.parseLong(this.userId) : null); user.setUserInfoId(!StringUtils.isBlank(this.userInfoId) ? Long.parseLong(this.userInfoId) : null); user.setUserLoginName(this.userLoginName); + user.setUserEmpNo(this.infoEmpNo); user.setUserName(this.infoName); user.setUserEmail(this.userEmail); user.setUserPhone(this.userPhone); user.setUserLoginPassword(this.userLoginPassword); - user.setUserEmpNo(this.infoEmpNo); + user.setLanguageCode(this.userLanguageCode); return user; } @@ -195,7 +196,6 @@ public class UserDetailModel extends BaseBean { info.setUserGrade(this.infoGrade); info.setUserEmployeeType(this.infoEmployeeType); - return info; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java index 4f09c5a..47dd135 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @Description : 操作人对象，用于登陆，非持久化 @@ -39,6 +40,18 @@ public class SessionUser implements Serializable { @ApiParam("用户对象信息") private SysUserInfo userInfo; + @ApiParam("主要组织信息") + private SysOrganize organize; + + @ApiParam("主要组织集合") + private List organizeList; + + @ApiParam("主要部门信息") + private SysDepartment department; + + @ApiParam("主要部门集合") + private List departmentList; + public SessionUser() { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 9d03fa4..1f34eb8 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -93,10 +93,6 @@ public class SysUser extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long organizeId; - @Column(name="ROLE_IDS") - @ApiParam(value ="角色ID集合" , example = "0") - @JsonSerialize(using = ToStringSerializer.class) - private String roleIds; /********************************** 冗余信息 ********************************/ @@ -129,6 +125,16 @@ public class SysUser extends BaseBean { @Transient @ApiParam(value ="账号所有操作部门信息") private List departmentList; + + @Transient + @ApiParam(value ="角色ID" , example = "0") + @JsonSerialize(using = ToStringSerializer.class) + private String roleId; + + @Transient + @ApiParam(value ="角色ID集合" , example = "0") + @JsonSerialize(using = ToStringSerializer.class) + private List roleIdList; @Transient @ApiParam(value ="账号所有角色信息") @@ -138,5 +144,4 @@ public class SysUser extends BaseBean { @ApiParam(value ="账号所有操作权限信息") private List menuList; - } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 7111828..0244102 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -324,10 +324,14 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); // And X = X - HqlPack.getNumEqualPack(user.getIsValid(),"isValid",result); -// HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); -// HqlPack.getNumEqualPack(user.getRoleId(),"roleId",result); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); + HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); HqlPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); + + if(user.getRoleIdList() != null){ + HqlPack.getInPack(StringUtils.join(user.getRoleIdList(),","),"id",result); + } + // And Like % % HqlPack.getStringLikerPack(user.getUserName(),"userName",result); HqlPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); @@ -379,6 +383,7 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); // And + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); HqlPack.getNumEqualPack(userInfo.getOrganizeId(),"organizeId",result); HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result); HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result); From 00715312f09d539293fb35c430981e393400f0ae Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 26 Dec 2018 20:15:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=BB=84=E7=BB=87Id=20?= =?UTF-8?q?=E9=9B=86=E5=90=88=E3=80=81=E9=83=A8=E9=97=A8ID=20=E9=9B=86?= =?UTF-8?q?=E5=90=88=20=E6=9F=A5=E8=AF=A2=E8=B4=A6=E5=8F=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 1f34eb8..19050c4 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -42,7 +42,7 @@ public class SysUser extends BaseBean { private String languageCode; @Column(name="USER_NAME_RDD") - @ApiParam(value ="账号名称" , access ="账号名称") + @ApiParam(value ="用户名称" , access ="账号名称") private String userName; @Column(name="USER_LOGIN_NAME") From bb9444fc9113def379a9d47c71b8b0d654233a7d Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 26 Dec 2018 21:28:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java | 12 ------------ .../java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java index 47dd135..59baf96 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java @@ -40,18 +40,6 @@ public class SessionUser implements Serializable { @ApiParam("用户对象信息") private SysUserInfo userInfo; - @ApiParam("主要组织信息") - private SysOrganize organize; - - @ApiParam("主要组织集合") - private List organizeList; - - @ApiParam("主要部门信息") - private SysDepartment department; - - @ApiParam("主要部门集合") - private List departmentList; - public SessionUser() { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 19050c4..80dedea 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -119,6 +119,14 @@ public class SysUser extends BaseBean { /********************************** 非数据库信息 ********************************/ @Transient + @ApiParam(value ="用户部门信息") + private SysDepartment department; + + @Transient + @ApiParam(value ="用户组织信息") + private SysOrganize organize; + + @Transient @ApiParam(value ="账号所有操作组织信息") private List organizeList; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index 17cf947..68ba901 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -201,7 +201,7 @@ public class SysUserInfo extends BaseBean { private List organizeList; @Transient - @ApiParam(value ="用户岗位信息") + @ApiParam(value ="用户部门信息") private SysDepartment department; @Transient