From a0315d85ac79f5b34e788b2a267695367bce06a3 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Sat, 3 Nov 2018 08:01:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=20POJO=20=E6=B3=A8=E8=A7=A3=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=A4=8D=E6=9D=82=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 17 +++++++++------ .../estsh/i3plus/pojo/platform/bean/SysMenu.java | 2 +- .../estsh/i3plus/pojo/platform/bean/SysRole.java | 6 +++++- .../estsh/i3plus/pojo/platform/bean/SysUser.java | 6 +++++- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 24 ++++++++++++++++++++++ 5 files changed, 46 insertions(+), 9 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 df8ba4f..54b1d81 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 @@ -227,10 +227,13 @@ public class CommonEnumUtil { /** * 用户状态 * 1正常 - * 2冻结使用 + * 2冻结 * 3账号异常 * 4离职 * 5服务到期 + * 6锁定 + * 7启用 + * 8禁止 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum USER_STATUS { @@ -240,7 +243,8 @@ public class CommonEnumUtil { RESIGNATION(4, "离职", "离职_RESIGNATION"), EXPIRE(5, "服务到期", "服务到期_EXPIRE"), LOCKING(6, "锁定", "fa cell-fa fa-lock"), - ENABLE(7, "启用", "fa fa-success cell-fa fa-check"); + ENABLE(7, "启用", "fa fa-success cell-fa fa-check"), + DISABLE(8, "禁止", "fa fa-disabled cell-fa fa-times-circle"); private int value; private String code; @@ -390,11 +394,12 @@ public class CommonEnumUtil { /** * 是否有效 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum IS_VAILD { VAILD(1, "有效"), INVAILD(2, "无效"); - private int value = 0; - private String description = null; + private int value; + private String description; public int getValue() { return value; @@ -426,8 +431,8 @@ public class CommonEnumUtil { public enum ASC_OR_DESC { ASC(1, "正序"), DESC(2, "倒序"); - private int value = 0; - private String description = null; + private int value; + private String description; public int getValue() { return value; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 3dc903b..b46bcec 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -24,9 +24,9 @@ import java.util.List; **/ @Data @Entity -@Table(name="SYS_MENU") @DynamicInsert @DynamicUpdate +@Table(name="SYS_MENU") @Api(value="系统功能",description = "系统功能") public class SysMenu extends BaseBean { diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java index 46e7909..db5a166 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -18,9 +20,11 @@ import javax.persistence.Table; * @CreateDate : 2018-10-11 11:02 * @Modify: **/ +@Data @Entity +@DynamicInsert +@DynamicUpdate @Table(name="SYS_ROLE") -@Data @Api(value="用户角色表",description = "用户权限角色。") public class SysRole extends BaseBean { 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 c2a3bb7..556e791 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 @@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -19,9 +21,11 @@ import java.util.List; * @CreateDate : 2018-10-11 11:02 * @Modify: **/ +@Data @Entity +@DynamicInsert +@DynamicUpdate @Table(name="sys_user") -@Data @Api(value="用户登陆表",description = "用户登陆系统账户。") public class SysUser extends BaseBean { 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 87b7b0e..22f54cf 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 @@ -230,4 +230,28 @@ public class CoreHqlPack { return result.toString(); } + + /** + * 用戶复杂查询 + * @param user + * @return + */ + public static String packHqlSysUser(SysUser user){ + StringBuffer result = new StringBuffer(); + + // hql拼接 + HqlPack.getStringLikerPack(user.getName(),"name",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(); + } + } \ No newline at end of file