From 6991ab1599e8f7b4d142ee93a32c1834651cfcc9 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 13 Nov 2018 19:24:28 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 69 +++++++++++- .../pojo/platform/bean/RefUserDepartment.java | 13 ++- .../i3plus/pojo/platform/bean/RefUserPosition.java | 12 +- .../i3plus/pojo/platform/bean/RefUserRole.java | 13 ++- .../i3plus/pojo/platform/bean/SessionUser.java | 14 +-- .../estsh/i3plus/pojo/platform/bean/SysUser.java | 124 ++++++++------------- .../i3plus/pojo/platform/bean/SysUserInfo.java | 123 +++++++++++++++----- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 35 ++++-- 8 files changed, 255 insertions(+), 148 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 30cb2cf..07a2adb 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -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; + } } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserDepartment.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserDepartment.java index 4da1e83..dbd6789 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserDepartment.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserDepartment.java @@ -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; } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserPosition.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserPosition.java index bcbb34c..bb3b8b7 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserPosition.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserPosition.java @@ -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; } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserRole.java index bb0d117..19b3619 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserRole.java @@ -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; } } 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 fdf9dec..1c59a91 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 @@ -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 roleList; - @ApiParam(value = "岗位信息",access = "用户所拥有岗位信息集合") - private List positionList; - - @ApiParam(value = "部门信息",access = "用户所有用部门信息集合") - private List departmentList; - - @ApiParam(value = "组织信息",access = "用户所拥有的组织信息集合") - private Organize organize; - - @ApiParam(value = "岗位信息",access = "用户主岗位信息") - private Position position; 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 556e791..fc0109f 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 @@ -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 menuList; - - @ApiParam(value ="用户所有部门信息") - private transient List departmentList; - - @ApiParam(value ="用户所有岗位信息") - private transient List positionList; - - @ApiParam(value ="用户组织信息") - private transient Organize organize; - } 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 e15da67..51d0fa2 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 @@ -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 departmentList; + + @ApiParam(value ="用户所有岗位信息") + private transient List positionList; + + @ApiParam(value ="用户组织信息") + private transient Organize organize; + + @ApiParam(value = "岗位信息",access = "用户主岗位信息") + private transient Position position; + @JsonIgnore + @ApiParam(value ="用户详细信息") + private transient SysUser user; } 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 3214b6b..f06098a 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 @@ -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(); + } + } \ No newline at end of file From f8579cdfc62c10436fe92c0eb43c8668b75714cf Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 13 Nov 2018 20:27:12 +0800 Subject: [PATCH 2/6] Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java # modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java 语言管理 完成 资源管理 完成 --- .../cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 1 + .../cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 30cb2cf..5a04284 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -150,6 +150,7 @@ public class CommonEnumUtil { /** * 处理标识 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYS_LOCALE_RESOURCE_TYPE { COMMON(1, "通用"),EXCEPTION(2, "异常"), MODULE(10, "模块"), METHOD(11, "功能"), BUTTON(12, "按钮"); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index c739e77..f5a576f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -33,13 +33,21 @@ public class SysLocaleResource extends BaseBean { private transient String resourceTypeTxt; public String getResourceTypeTxt(){ - return CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.valueOf(this.resourceType); + if(this.resourceType != null){ + return CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.valueOf(this.resourceType); + } else { + return null; + } } @Column(name="language_code") @ApiParam(value = "语言编码",example = "浏览器语言编码") private String languageCode; + @Column(name="language_name_rdd") + @ApiParam(value = "语言名称",example = "浏览器语言名称") + private String languageNameRdd; + @Column(name="resource_key") @ApiParam(value = "资源KEY",example = "格式A.B，全部大写，参考命名规范开发文档") private String resourceKey; From b77fc7f291f9f34230009a776346d90e9f32bcc2 Mon Sep 17 00:00:00 2001 From: "frin.fei" <123456> Date: Tue, 13 Nov 2018 20:35:40 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 0bd8dae..eabf7ff 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -16,7 +16,8 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SOFT_TYPE { - IMPP(1, "IMPP", "IMPP平台"), CORE(2, "CORE", "i3业务平台"), WMS(3, "WMS", "仓库管理软件"), MES(4, "MES", "生产管理软件"); + IMPP(1, "IMPP", "IMPP平台"), CORE(2, "CORE", "i3业务平台"), WMS(3, "WMS", "仓库管理软件"), MES(4, "MES", "生产管理软件"), + CENTER(99,"CENTER","注册服务中心"); private int value; private String code; From 30683429a9c39c2f789f16a735acc6743641b9bd Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 13 Nov 2018 22:31:18 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 1 + 1 file changed, 1 insertion(+) 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 0c70f65..7b51eb8 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 @@ -296,6 +296,7 @@ public class CoreHqlPack { // And X = X HqlPack.getNumEqualPack(user.getIsValid(),"isValid",result); HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); + HqlPack.getNumEqualPack(user.getRoleId(),"roleId",result); // And Like % % HqlPack.getStringLikerPack(user.getUserName(),"userName",result); HqlPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); From 5231aa7a6cefebe746d7433246d5b5930078d191 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 13 Nov 2018 22:40:48 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/platform/bean/TaskTime.java | 29 ++++++++++++---------- .../pojo/platform/bean/TaskTimeExpression.java | 29 ++++++++++++++++------ 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java index 0658d8f..74e7961 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java @@ -31,11 +31,14 @@ import java.text.DecimalFormat; @Api(value="定时任务",description = "定时任务") public class TaskTime extends BaseBean { - @Column(name="NAME") @ApiParam(value ="名称") private String name; - + + @Column(name="GROUP_NAME") + @ApiParam(value ="名称") + private String groupName; + @Column(name="TIME_ID") @ApiParam(value ="时间表达式ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -52,47 +55,47 @@ public class TaskTime extends BaseBean { @Column(name="RED_TIME_NAME") @ApiParam(value ="时间表达式名称") private String redTimeName; - + @Column(name="RED_TIME_EXPRESSION") @ApiParam(value ="时间表达式") private String redTimeExpression; - + @Column(name="TASK_START_DATE_TIME") @ApiParam(value ="任务开始时间") private String taskStartDateTime; - + @Column(name="TASK_END_DATE_TIME") @ApiParam(value ="任务结束时间") private String taskEndDateTime; - + @Column(name="TASK_NUM_SUM") @ApiParam(value ="执行总次数" , example ="0") private Integer taskNumSum; - + @Column(name="TASK_NUM_RUN") @ApiParam(value ="执行次数" , example ="0") private Integer taskNumRun; - + @Column(name="TASK_TYPE_ID") @ApiParam(value ="任务类型（枚举：1.定时任务）" , example ="-1") private Integer taskTypeId; - + @Column(name="TASK_METHOD") @ApiParam(value ="执行方法") private String taskMethod; - + @Column(name="TASK_METHOD_TYPE_ID") @ApiParam(value ="任务执行类型" ,example = "-1") private Integer taskMethodTypeId; - + @Column(name="TASK_DESCRIPTION") @ApiParam(value ="任务描述" , access ="任务描述") private String taskDescription; - + @Column(name="TASK_STATUS") @ApiParam(value ="任务状态（1.正常，2.禁用）" , example ="1") private Integer taskStatus; - + @Column(name="LAST_RUN_DATE_TIME") @ApiParam(value ="最后运行时间" , access ="最后运行时间") private String lastRunDateTime; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeExpression.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeExpression.java index 5339240..c354c91 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeExpression.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeExpression.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -26,20 +27,32 @@ import java.text.DecimalFormat; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="TASK_TIME_EXPRESSION") -@Api(value="系统时间表达式",description = "系统时间表达式") +@Api(value="任务表达式",description = "任务表达式") public class TaskTimeExpression extends BaseBean { - @Column(name="NAME") @ApiParam(value ="名称") private String name; - - @Column(name="TIME_EXPRESSION") + + @Column(name="GROUP_NAME") + @ApiParam(value ="组名称") + private String groupName; + + @Column(name="EXPRESSION_CONTENT") @ApiParam(value ="表达式内容") - private String timeExpression; - + private String expressionContent; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Column(name="expression_start_date") + @ApiParam(value ="开始时间") + private String expressionStartDatetime; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Column(name="expression_end_date") + @ApiParam(value ="结束时间") + private String expressionEndDatetime; + @Column(name="TIME_DESCRIPTION") @ApiParam(value ="表达式描述") - private String timeDescription; - + private String expressionDescription; } From cf32b4c92a1bd91531dfbbb874fa39d2eb6f2374 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Wed, 14 Nov 2018 09:31:18 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9PO=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index e151350..43aadf0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -28,6 +28,9 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "zTime", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "zDate", result); + HqlPack.getNumEqualPack(wmsPOMasterDetails.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(wmsPOMasterDetails.getIsDeleted(), "isDeleted", result); + HqlPack.getStringEqualPack(wmsPOMasterDetails.getOrganizeCode(), "organizeCode", result); return result.toString(); }