From 9afe46a6b7b3dfa7dc8e3b2fd6334666b01c0b67 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 29 Oct 2018 17:46:17 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/bean/Department.java | 4 +- .../i3plus/pojo/platform/bean/LogOperate.java | 24 ++++----- .../estsh/i3plus/pojo/platform/bean/LogSystem.java | 12 ++--- .../i3plus/pojo/platform/bean/LogUserLogin.java | 9 ++-- .../estsh/i3plus/pojo/platform/bean/Organize.java | 26 ++++++---- .../i3plus/pojo/platform/bean/RefRoleMenu.java | 20 +++++++- .../pojo/platform/bean/RefUserDepartment.java | 22 ++++++-- .../i3plus/pojo/platform/bean/RefUserPosition.java | 25 ++++++++-- .../i3plus/pojo/platform/bean/RefUserRole.java | 23 +++++++-- .../i3plus/pojo/platform/bean/SessionUser.java | 6 +-- .../estsh/i3plus/pojo/platform/bean/SysConfig.java | 14 ++---- .../i3plus/pojo/platform/bean/SysDictionary.java | 23 ++++++--- .../estsh/i3plus/pojo/platform/bean/SysFile.java | 19 ++++--- .../estsh/i3plus/pojo/platform/bean/SysMenu.java | 18 +++++-- .../i3plus/pojo/platform/bean/SysMessage.java | 17 +++---- .../estsh/i3plus/pojo/platform/bean/SysMethod.java | 10 +++- .../i3plus/pojo/platform/bean/SysMethodRole.java | 16 ++++++ .../estsh/i3plus/pojo/platform/bean/SysRole.java | 20 +++++--- .../estsh/i3plus/pojo/platform/bean/SysUser.java | 58 +++++++++++++++++----- .../i3plus/pojo/platform/bean/SysUserInfo.java | 19 ++++++- .../i3plus/pojo/platform/bean/SysUserRole.java | 16 ++++++ .../estsh/i3plus/pojo/platform/bean/TaskTime.java | 35 ++++++++----- .../pojo/platform/bean/TaskTimeExpression.java | 6 +-- .../pojo/platform/bean/TaskTimeRecording.java | 26 ++++++++-- .../cn/estsh/i3plus/pojo/platform/bean/Tool.java | 28 +++++++---- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 4 +- 26 files changed, 355 insertions(+), 145 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Department.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Department.java index 8422d54..b46579f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Department.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Department.java @@ -29,9 +29,9 @@ import java.util.List; @Api(value="部门",description = "部门") public class Department extends BaseBean { - @Column(name="DEPARTMENT_NAME") + @Column(name="NAME") @ApiParam(value ="名称") - private String departmentName; + private String name; @Column(name="DEPARTMENT_CODE") @ApiParam(value ="部门代码") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java index 6e1ee6d..a376260 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java @@ -28,33 +28,33 @@ import java.text.DecimalFormat; public class LogOperate extends BaseBean { - @Column(name="OPERATE_MODULE") - @ApiParam(value ="操作模块" , access ="操作模块") - private String operateModule; + @Column(name="OPERATE_MODULE_ID") + @ApiParam(value ="操作模块（枚举）" , example = "-1") + private Integer operateModuleId; - @Column(name="OPERATE_TYPE") - @ApiParam(value ="操作类型" , access ="操作类型") - private String operateType; + @Column(name="OPERATE_TYPE_ID（枚举）") + @ApiParam(value ="操作类型" , example = "-1") + private Integer operateTypeId; @Column(name="OPERATE_OBJECT") - @ApiParam(value ="操作对象" , access ="操作对象") + @ApiParam(value ="操作对象" ) private String operateObject; @Column(name="OPERATE_FIRST_DATA") - @ApiParam(value ="操作前数据" , access ="操作前数据") + @ApiParam(value ="操作前数据") private String operateFirstData; @Column(name="OPERATE_LAST_DATA") - @ApiParam(value ="操作后数据" , access ="操作后数据") + @ApiParam(value ="操作后数据") private String operateLastData; @Column(name="OPERATE_IP") - @ApiParam(value ="服务器IP" , access ="服务器IP") + @ApiParam(value ="服务器IP") private String operateIp; @Column(name="OPERATE_TERMINAL") - @ApiParam(value ="操作终端" , access ="操作终端") - private String operateTerminal; + @ApiParam(value ="操作终端（枚举）" , example = "1") + private Integer operateTerminal; @Column(name="OPERATE_USER_NAME") @ApiParam(value ="操作人名称" , access ="操作人名称") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogSystem.java index 959f785..f868d5e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogSystem.java @@ -28,9 +28,9 @@ import java.text.DecimalFormat; public class LogSystem extends BaseBean { - @Column(name="LOG_MODULE") - @ApiParam(value ="系统模块" , access ="系统模块") - private String logModule; + @Column(name="LOG_MODULE_ID") + @ApiParam(value ="系统模块（枚举）", example = "1") + private Integer logModuleId; @Column(name="LOG_IP") @ApiParam(value ="服务器IP" , access ="服务器IP") @@ -44,9 +44,9 @@ public class LogSystem extends BaseBean { @ApiParam(value ="触发方法" , access ="触发方法") private String logMethod; - @Column(name="LOG_LEVEL") - @ApiParam(value ="日志级别（1.DEBUG，2.INFO，3.ERROR）" , example ="1" , access ="日志级别（1.DEBUG，2.INFO，3.ERROR）") - private Integer logLevel; + @Column(name="LOG_LEVEL_ID") + @ApiParam(value ="日志级别（1.DEBUG，2.INFO，3.ERROR）" , example ="1") + private Integer logLevelId; @Column(name="LOG_MESSAGE") @ApiParam(value ="日志信息" , access ="日志信息") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogUserLogin.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogUserLogin.java index 010e87d..0cfb115 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogUserLogin.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogUserLogin.java @@ -27,7 +27,6 @@ import java.text.DecimalFormat; @Api(value="用户登录记录",description = "用户登录记录") public class LogUserLogin extends BaseBean { - @Column(name="USER_ID") @ApiParam(value ="用户ID" , access ="用户ID") private Long userId; @@ -37,16 +36,16 @@ public class LogUserLogin extends BaseBean { private String logLoginName; @Column(name="LOG_LOGIN_STATUS") - @ApiParam(value ="登录状态（1.成功，2.失败，3锁定）" , example ="1" , access ="登录状态（1.成功，2.失败，3锁定）") + @ApiParam(value ="登录状态（枚举：1.成功，2.失败，3锁定）" , example ="1") private Integer logLoginStatus; @Column(name="LOG_LOGIN_PLATFORM_ID") - @ApiParam(value ="登录平台ID" , example ="1" , access ="登录平台ID") + @ApiParam(value ="登录平台ID（枚举）" , example ="1") private Integer logLoginPlatformId; @Column(name="LOG_LOGIN_PLATFORM_NAME") - @ApiParam(value ="登录平台名称" , access ="登录平台名称") - private String logLoginPlatformName; + @ApiParam(value ="登录平台名称（枚举）") + private String redLogLoginPlatformName; @Column(name="LOG_LOGIN_HOST") @ApiParam(value ="登录IP" , access ="登录IP") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Organize.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Organize.java index 6923065..7689cbf 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Organize.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Organize.java @@ -31,36 +31,44 @@ public class Organize extends BaseBean { @Column(name="NAME") - @ApiParam(value ="名称" , access ="名称") + @ApiParam(value ="名称") private String name; @Column(name="ORGANIZE_CODE") - @ApiParam(value ="组织代码" , access ="组织代码") + @ApiParam(value ="组织代码") private String organizeCode; @Column(name="ORGANIZE_TYPE_ID") - @ApiParam(value ="组织类型ID（1.集团，2.公司，3.工厂）" , example ="1" , access ="组织类型ID（1.集团，2.公司，3.工厂）") + @ApiParam(value ="组织类型ID（枚举：1.集团，2.公司，3.工厂）" , example ="1") private Integer organizeTypeId; @Column(name="PARENT_ID") - @ApiParam(value ="父节点" , access ="父节点" ,example = "0") + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) + // 默认值 -1 private Long parentId; - + + public Long getParentId() { + if(parentId != null) { + return parentId.longValue(); + }else{ + return parentId; + } + } @Column(name="RED_PARENT_NAME") - @ApiParam(value ="父节点" , access ="父节点") + @ApiParam(value ="父节点") private String redParentName; @Column(name="ORGANIZE_DESCRIPTION") - @ApiParam(value ="组织描述" , access ="组织描述") + @ApiParam(value ="组织描述") private String organizeDescription; @Column(name="ORGANIZE_SORT") - @ApiParam(value ="排序" , example ="1" , access ="排序") + @ApiParam(value ="排序" , example ="1") private Integer organizeSort; @Column(name="ORGANIZE_STATUS") - @ApiParam(value ="组织状态（1.正常，2.禁用）" , example ="1" , access ="组织状态（1.正常，2.禁用）") + @ApiParam(value ="组织状态（枚举：1.正常，2.禁用）" , example ="1") private Integer organizeStatus; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefRoleMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefRoleMenu.java index 8deadce..f318f18 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefRoleMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefRoleMenu.java @@ -31,18 +31,34 @@ public class RefRoleMenu extends BaseBean { @Column(name="MENU_ID") - @ApiParam(value ="菜单ID" ,example = "0") + @ApiParam(value ="菜单ID" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long menuId; + + public Long getMenuId() { + if(menuId != null) { + return menuId.longValue(); + }else{ + return menuId; + } + } @Column(name="RED_MENU_NAME") @ApiParam(value ="菜单名称" , access ="菜单名称") private String redMenuName; @Column(name="ROLE_ID") - @ApiParam(value ="角色ID" , example = "0") + @ApiParam(value ="角色ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long roleId; + + public Long getRoleId() { + if(roleId != null) { + return roleId.longValue(); + }else{ + return roleId; + } + } @Column(name="RED_ROLE_NAME") @ApiParam(value ="角色名称" , access ="角色名称") 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 abee47c..4da1e83 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 @@ -31,17 +31,33 @@ public class RefUserDepartment extends BaseBean { @Column(name="USER_ID") - @ApiParam(value ="用户ID" , example = "0") + @ApiParam(value ="用户ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long userId; + + public Long getUserId() { + if(userId != null) { + return userId.longValue(); + }else{ + return userId; + } + } @Column(name="DEPARTMENT_ID") - @ApiParam(value ="部门ID" , example = "0") + @ApiParam(value ="部门ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long departmentId; + + public Long getDepartmentId() { + if(departmentId != null) { + return userId.longValue(); + }else{ + return departmentId; + } + } @Column(name="RED_DEPARTMENT_NAME") - @ApiParam(value ="部门名称" , access ="部门名称") + @ApiParam(value ="部门名称") private String redDepartmentName; public RefUserDepartment() { 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 4d4da5b..bcbb34c 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 @@ -30,17 +30,34 @@ import java.text.DecimalFormat; public class RefUserPosition extends BaseBean { @Column(name="USER_ID") - @ApiParam(value ="用户ID" , example = "0") + @ApiParam(value ="用户ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long userId; - + + public Long getUserId() { + if(userId != null) { + return userId.longValue(); + }else{ + return userId; + } + } + + @Column(name="POSITION_ID") - @ApiParam(value ="岗位ID" , example = "0") + @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="RED_POSITION_NAME") - @ApiParam(value ="岗位名称" , access ="岗位名称") + @ApiParam(value ="岗位名称") private String redPositionName; public RefUserPosition() { 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 449ec90..290e133 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 @@ -31,17 +31,32 @@ public class RefUserRole extends BaseBean { @Column(name="USER_ID") - @ApiParam(value ="用户ID" , example = "0") + @ApiParam(value ="用户ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long userId; - + + public Long getUserId() { + if(userId != null) { + return userId.longValue(); + }else{ + return userId; + } + } @Column(name="ROLE_ID") - @ApiParam(value ="角色ID" , example = "0") + @ApiParam(value ="角色ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long roleId; + + public Long getRoleId() { + if(roleId != null) { + return roleId.longValue(); + }else{ + return roleId; + } + } @Column(name="RED_ROLE_NAME") - @ApiParam(value ="角色名称" , access ="角色名称") + @ApiParam(value ="角色名称") private String redRoleName; public RefUserRole() { 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 8f922de..1d6dc11 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 @@ -27,7 +27,7 @@ public class SessionUser implements Serializable { @ApiParam("用户类型") //CommonEnumUtil.USER_TYPE.xxx.getCode() - private String userType; + private Integer userTypeId; @ApiParam("用户信息") private SysUser user; @@ -56,11 +56,11 @@ public class SessionUser implements Serializable { } - public SessionUser(String userCode, String userName, String siteCode, String languageCode, String userType) { + public SessionUser(String userCode, String userName, String siteCode, String languageCode, Integer userTypeId) { this.userCode = userCode; this.userName = userName; this.languageCode = languageCode; - this.userType = userType; + this.userTypeId = userTypeId; } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index 0612c1b..f886578 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java @@ -29,27 +29,23 @@ public class SysConfig extends BaseBean { @Column(name="NAME") - @ApiParam(value ="名称" , access ="名称") + @ApiParam(value ="名称") private String name; @Column(name="CONFIG_TYPE_ID") - @ApiParam(value ="配置类型ID（1.系统配置...）" , example ="1" , access ="配置类型ID（1.系统配置...）") + @ApiParam(value ="配置类型ID（枚举：1.系统配置...）" , example ="-1") private Integer configTypeId; - @Column(name="CONFIG_TYPE_NAME") - @ApiParam(value ="配置类型名称" , access ="配置类型名称") - private String configTypeName; - @Column(name="CONFIG_CODE") - @ApiParam(value ="配置代码" , access ="配置代码") + @ApiParam(value ="配置代码") private String configCode; @Column(name="CONFIG_VALUE") - @ApiParam(value ="配置值" , access ="配置值") + @ApiParam(value ="配置值") private String configValue; @Column(name="CONFIG_DESCRIPTION") - @ApiParam(value ="配置描述" , access ="配置描述") + @ApiParam(value ="配置描述") private String configDescription; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java index 3c16c3a..d497c1d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java @@ -31,32 +31,41 @@ public class SysDictionary extends BaseBean { @Column(name="NAME") - @ApiParam(value ="名称" , access ="名称") + @ApiParam(value ="字典名称") private String name; @Column(name="DICTIONARY_CODE") - @ApiParam(value ="字典代码" , access ="字典代码") + @ApiParam(value ="字典代码") private String dictionaryCode; @Column(name="PARENT_ID") - @ApiParam(value ="父节点" , example = "0") + @ApiParam(value ="父节点" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) + // 根节点-1 private Long parentId; + + public Long getParentId() { + if(parentId != null) { + return parentId.longValue(); + }else{ + return parentId; + } + } @Column(name="RED_PARENT_NAME") - @ApiParam(value ="父级节点名称" , access ="父级节点名称") + @ApiParam(value ="父级节点名称") private String redParentName; @Column(name="DICTIONARY_VALUE") - @ApiParam(value ="字典值" , access ="字典值") + @ApiParam(value ="字典值") private String dictionaryValue; @Column(name="DICTIONARY_SORT") - @ApiParam(value ="排序" , example ="1" , access ="排序") + @ApiParam(value ="排序" , example ="1") private Integer dictionarySort; @Column(name="DICTIONARY_DESCRIPTION") - @ApiParam(value ="描述" , access ="描述") + @ApiParam(value ="描述") private String dictionaryDescription; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java index 47e7627..5b4ba72 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java @@ -29,38 +29,37 @@ import java.text.DecimalFormat; @Api(value="文件",description = "文件") public class SysFile extends BaseBean { - @Column(name="NAME") - @ApiParam(value ="名称" , access ="名称") + @ApiParam(value ="文件名称") private String name; @Column(name="USER_ID") - @ApiParam(value ="用户ID" , example = "0") + @ApiParam(value ="用户ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long userId; @Column(name="FILE_PATH") - @ApiParam(value ="文件路径" , access ="文件路径") + @ApiParam(value ="文件路径") private String filePath; @Column(name="FILE_ORIGINAL_NAME") - @ApiParam(value ="原始文件名称" , access ="原始文件名称") + @ApiParam(value ="原始文件名称") private String fileOriginalName; @Column(name="FILE_TYPE_ID") - @ApiParam(value ="文件类型ID(字典)" , access ="文件类型ID(字典)") + @ApiParam(value ="文件类型ID(字典)") private String fileTypeId; @Column(name="FILE_TYPE_NAME") - @ApiParam(value ="文件类型名称" , access ="文件类型名称") + @ApiParam(value ="文件类型名称") private String fileTypeName; @Column(name="FILE_SIZE") - @ApiParam(value ="文件大小(KB)" , access ="文件大小(KB)") - private String fileSize; + @ApiParam(value ="文件大小(KB)" , example ="0") + private Integer fileSize; @Column(name="DOWNLOADS") - @ApiParam(value ="下载次数" , example ="0" , access ="下载次数") + @ApiParam(value ="下载次数" , example ="0") private Integer downloads; } 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 0db5955..655171b 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 @@ -29,20 +29,28 @@ import java.text.DecimalFormat; @Api(value="系统功能",description = "系统功能") public class SysMenu extends BaseBean { - @Column(name="NAME") - @ApiParam(value ="功能名称" , access ="功能名称") + @ApiParam(value ="功能名称") private String name; @Column(name="MENU_TYPE_ID") - @ApiParam(value ="功能类型（1.模块，2.菜单，3.按钮）" , example ="1" , access ="功能类型（1.模块，2.菜单，3.按钮）") + @ApiParam(value ="功能类型（枚举：1.模块，2.菜单，3.按钮）" , example ="-1") private Integer menuTypeId; @Column(name="PARENT_ID") - @ApiParam(value ="父级功能ID" , example = "0") + @ApiParam(value ="父级功能ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) + // 根节点-1 private Long parentId; - + + public Long getParentId() { + if(parentId != null) { + return parentId.longValue(); + }else{ + return parentId; + } + } + @Column(name="RED_PARENT_NAME") @ApiParam(value ="父级功能名称" , access ="父级功能名称") private String redParentName; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index 191cc5f..149d7d9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -29,17 +29,16 @@ import java.text.DecimalFormat; @Api(value="系统消息",description = "系统消息") public class SysMessage extends BaseBean { - @Column(name="MESSAGE_TITLE") @ApiParam(value ="消息标题" , access ="消息标题") private String messageTitle; - @Column(name="MESSAGE_TYPE") - @ApiParam(value ="消息类型(1.通知，2.站内信)" , example ="1" , access ="消息类型(1.通知，2.站内信)") - private Integer messageType; + @Column(name="MESSAGE_TYPE_ID") + @ApiParam(value ="消息类型(枚举：1.通知，2.站内信)" , example ="-1") + private Integer messageTypeId; @Column(name="MESSAGE_SEND_ID") - @ApiParam(value ="发送者id" , example = "0") + @ApiParam(value ="发送者id" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long messageSendId; @@ -57,7 +56,7 @@ public class SysMessage extends BaseBean { private String redSendName; @Column(name="MESSAGE_RECIPIENT_ID") - @ApiParam(value ="接收者id" , example = "0") + @ApiParam(value ="接收者id" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long messageRecipientId; @@ -78,8 +77,8 @@ public class SysMessage extends BaseBean { @ApiParam(value ="消息内容" , access ="消息内容") private String messageContent; - @Column(name="MESSAGE_STATUS") - @ApiParam(value ="消息状态（1.启用，2.禁用）" , example ="1" , access ="消息状态（1.启用，2.禁用）") - private Integer messageStatus; + @Column(name="MESSAGE_STATUS_ID") + @ApiParam(value ="消息状态（枚举：1.已读，2.未读）" , example ="-1") + private Integer messageStatusId; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethod.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethod.java index 1e66bb3..3d8e07f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethod.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethod.java @@ -33,7 +33,7 @@ public class SysMethod extends BaseBean { @Column(name="method_level") @ApiParam(value = "语言名称",example = "前台显示的名称") //CommonEnumUtil.METHOD_LEVEL，分为模块、功能和按钮 - private int methodLevel; + private Integer methodLevel; @Column(name="method_uri") @ApiParam(value = "方法路径",example = "前台显示的名称") @@ -42,4 +42,12 @@ public class SysMethod extends BaseBean { @Column(name="parent_method_id") @ApiParam(value = "上级方法主键") private Long parentMethodId; + + public Long getParentMethodId() { + if(parentMethodId != null) { + return parentMethodId.longValue(); + }else{ + return parentMethodId; + } + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethodRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethodRole.java index 63ba545..98e2595 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethodRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethodRole.java @@ -26,7 +26,23 @@ public class SysMethodRole extends BaseBean { @ApiParam(value = "角色主键") private Long roleId; + public Long getRoleId() { + if(roleId != null) { + return roleId.longValue(); + }else{ + return roleId; + } + } + @Column(name="method_id") @ApiParam(value = "功能权限主键") private Long methodId; + + public Long getMethodId() { + if(methodId != null) { + return methodId.longValue(); + }else{ + return methodId; + } + } } 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 4a273ea..935e27b 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 @@ -25,22 +25,30 @@ import javax.persistence.Table; public class SysRole extends BaseBean { @Column(name="NAME") - @ApiParam(value ="角色名称" , access ="角色名称") + @ApiParam(value ="角色名称") private String name; @Column(name="ROLE_DESCRIPTION") - @ApiParam(value ="资源描述" , access ="配置描述") + @ApiParam(value ="资源描述") private String roleDescription; @Column(name="ROLE_GRADE") - @ApiParam(value ="角色等级（待定）" , example ="1" , access ="角色等级（待定）") + @ApiParam(value ="角色等级（待定）" , example ="-1") private Integer roleGrade; @Column(name="PARENT_ID") - @ApiParam(value ="角色父节点ID" , example = "0") + @ApiParam(value ="角色父节点ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long parentId; + public Long getParentId() { + if(parentId != null) { + return parentId.longValue(); + }else{ + return parentId; + } + } + @Column(name="RED_PARENT_NAME") @ApiParam(value ="角色父节点名称" , access ="角色父节点名称") private String redParentName; @@ -62,8 +70,8 @@ public class SysRole extends BaseBean { private Integer redMenuNumber; @Column(name="ROLE_STATUS") - @ApiParam(value ="角色状态（1.正常，2.状态）" , example ="1" , access ="角色状态（1.正常，2.状态）") - private Integer roleStatus = 1; + @ApiParam(value ="角色状态（枚举：1.正常，2.状态）" , example ="-1") + private Integer roleStatusId; 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 1821328..70abc6a 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 @@ -34,37 +34,69 @@ public class SysUser extends BaseBean { private String userLoginName; @Column(name="USER_EMP_NO") - @ApiParam(value ="工号" , access ="工号") + @ApiParam(value ="工号") private String userEmpNo; @Column(name="USER_LOGIN_PASSWORD") - @ApiParam(value ="登陆密码" , access ="登陆密码") + @ApiParam(value ="登陆密码") private String userLoginPassword; @Column(name="USER_TYPE_ID") - @ApiParam(value ="用户类型（待定）" , example ="1" , access ="用户类型（待定）") + @ApiParam(value ="用户类型（枚举，待定）" , example ="-1") private Integer userTypeId; @Column(name="DEPARTMENT_ID") - @ApiParam(value ="部门ID" , access ="部门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" , access ="主岗位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" , access ="角色ID，多角色机制") + @ApiParam(value ="角色ID" , example ="-1") @JsonSerialize(using = ToStringSerializer.class) private Long roleId; + public Long getRoleId() { + if(roleId != null) { + return roleId.longValue(); + }else{ + return roleId; + } + } + @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") @ApiParam(value ="角色名称" , access ="角色名称") private String redRoleName; @@ -81,9 +113,9 @@ public class SysUser extends BaseBean { @ApiParam(value ="组织名称" , access ="组织名称") private String redOrganizeName; - @Column(name="USER_ONLINE") - @ApiParam(value ="是否在线(1.在线，2.离线)" , example ="2" , access ="是否在线(1.在线，2.离线)") - private Integer userOnline; + @Column(name="USER_ONLINE_ID") + @ApiParam(value ="是否在线(枚举：1.在线，2.离线)" , example ="-1") + private Integer userOnlineId; @Column(name="USER_EMAIL") @ApiParam(value ="邮箱" , access ="邮箱") @@ -93,12 +125,12 @@ public class SysUser extends BaseBean { @ApiParam(value ="手机号" , access ="手机号") private String userPhone; - @Column(name="USER_STATUS") - @ApiParam(value ="用户状态(1正常,2冻结使用,3账号异常,4离职5服务到期)" , example ="1" , access ="用户状态(1正常,2冻结使用,3账号异常,4离职5服务到期)") - private Integer userStatus; + @Column(name="USER_STATUS_ID") + @ApiParam(value ="用户状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1") + private Integer userStatusId; @Column(name="USER_LOGIN_LAST_DATE_TIME") - @ApiParam(value ="用户最后登录时间" , access ="用户最后登录时间") + @ApiParam(value ="用户最后登录时间") private String userLoginLastDateTime; @ApiParam(value ="用户详细信息") 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 c8b528d..e15da67 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 @@ -29,7 +29,6 @@ import java.text.DecimalFormat; @Api(value="用户详细",description = "用户详细") public class SysUserInfo extends BaseBean { - @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") private String name; @@ -39,6 +38,14 @@ public class SysUserInfo extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long userId; + public Long getUserId() { + if(userId != null) { + return userId.longValue(); + }else{ + return userId; + } + } + @Column(name="LANGUAGE_CODE") @ApiParam(value ="用户语言") private String languageCode; @@ -60,9 +67,17 @@ public class SysUserInfo extends BaseBean { private String redOrganizeNames; @Column(name="USER_IMAGE_ID") - @ApiParam(value ="用户图像" , example = "0") + @ApiParam(value ="用户图像" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long userImageId; + + public Long getUserImageId() { + if(userImageId != null) { + return userImageId.longValue(); + }else{ + return userImageId; + } + } @Column(name="USER_SEX") @ApiParam(value ="性别（1.男，2.女）" , example ="1" , access ="性别（1.男，2.女）") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserRole.java index 976aa35..012bf88 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserRole.java @@ -26,7 +26,23 @@ public class SysUserRole extends BaseBean { @ApiParam(value = "用户主键") private Long userId; + public Long getUserId() { + if(userId != null) { + return userId.longValue(); + }else{ + return userId; + } + } + @Column(name="language_code") @ApiParam(value = "角色主键") private Long roleId; + + public Long getRoleId() { + if(roleId != null) { + return roleId.longValue(); + }else{ + return roleId; + } + } } 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 fe17fb3..f138fb0 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,48 +31,57 @@ public class TaskTime extends BaseBean { @Column(name="NAME") - @ApiParam(value ="名称" , access ="名称") + @ApiParam(value ="名称") private String name; @Column(name="TIME_ID") - @ApiParam(value ="时间表达式ID" , example = "0") + @ApiParam(value ="时间表达式ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long timeId; - + + public Long getTimeId() { + if(timeId != null) { + return timeId.longValue(); + }else{ + return timeId; + } + } + + @Column(name="RED_TIME_NAME") - @ApiParam(value ="时间表达式名称" , access ="时间表达式名称") + @ApiParam(value ="时间表达式名称") private String redTimeName; @Column(name="RED_TIME_EXPRESSION") - @ApiParam(value ="时间表达式" , access ="时间表达式") + @ApiParam(value ="时间表达式") private String redTimeExpression; @Column(name="TASK_START_DATE_TIME") - @ApiParam(value ="任务开始时间" , access ="任务开始时间") + @ApiParam(value ="任务开始时间") private String taskStartDateTime; @Column(name="TASK_END_DATE_TIME") - @ApiParam(value ="任务结束时间" , access ="任务结束时间") + @ApiParam(value ="任务结束时间") private String taskEndDateTime; @Column(name="TASK_NUM_SUM") - @ApiParam(value ="执行总次数" , example ="0" , access ="执行总次数") + @ApiParam(value ="执行总次数" , example ="0") private Integer taskNumSum; @Column(name="TASK_NUM_RUN") - @ApiParam(value ="执行次数" , example ="0" , access ="执行次数") + @ApiParam(value ="执行次数" , example ="0") private Integer taskNumRun; @Column(name="TASK_TYPE_ID") - @ApiParam(value ="任务类型（1.定时任务）" , example ="1" , access ="任务类型（1.定时任务）") + @ApiParam(value ="任务类型（枚举：1.定时任务）" , example ="-1") private Integer taskTypeId; @Column(name="TASK_METHOD") - @ApiParam(value ="执行方法" , access ="执行方法") + @ApiParam(value ="执行方法") private String taskMethod; @Column(name="TASK_METHOD_TYPE_ID") - @ApiParam(value ="任务执行类型" ,example = "1", access ="任务执行类型") + @ApiParam(value ="任务执行类型" ,example = "-1") private Integer taskMethodTypeId; @Column(name="TASK_DESCRIPTION") @@ -80,7 +89,7 @@ public class TaskTime extends BaseBean { private String taskDescription; @Column(name="TASK_STATUS") - @ApiParam(value ="任务状态（1.正常，2.禁用）" , example ="1" , access ="任务状态（1.正常，2.禁用）") + @ApiParam(value ="任务状态（1.正常，2.禁用）" , example ="1") private Integer taskStatus = 1; @Column(name="LAST_RUN_DATE_TIME") 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 4df5f98..49878f6 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 @@ -29,15 +29,15 @@ public class TaskTimeExpression extends BaseBean { @Column(name="NAME") - @ApiParam(value ="名称" , access ="名称") + @ApiParam(value ="名称") private String name; @Column(name="TIME_EXPRESSION") - @ApiParam(value ="表达式内容" , access ="表达式内容") + @ApiParam(value ="表达式内容") private String timeExpression; @Column(name="TIME_DESCRIPTION") - @ApiParam(value ="表达式描述" , access ="表达式描述") + @ApiParam(value ="表达式描述") private String timeDescription; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeRecording.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeRecording.java index 989511c..8a61529 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeRecording.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeRecording.java @@ -31,18 +31,34 @@ public class TaskTimeRecording extends BaseBean { @Column(name="NAME") - @ApiParam(value ="任务名称" , access ="任务名称") + @ApiParam(value ="任务名称") private String name; @Column(name="TIMED_TASK_ID") - @ApiParam(value ="任务编号" , example = "0") + @ApiParam(value ="任务编号" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) - private String timedTaskId; + private Long timedTaskId; + + public Long getTimedTaskId() { + if(timedTaskId != null) { + return timedTaskId.longValue(); + }else{ + return timedTaskId; + } + } @Column(name="RED_TIME_ID") - @ApiParam(value ="时间表达式ID" , example = "0") + @ApiParam(value ="时间表达式ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) - private String redTimeId; + private Long redTimeId; + + public Long getRedTimeId() { + if(redTimeId != null) { + return redTimeId.longValue(); + }else{ + return redTimeId; + } + } @Column(name="RED_TIME_EXPRESSION") @ApiParam(value ="时间表达式" , access ="时间表达式") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Tool.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Tool.java index 120bc3b..db88a90 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Tool.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Tool.java @@ -35,17 +35,25 @@ public class Tool extends BaseBean { private String name; @Column(name="TOOL_TYPE_ID") - @ApiParam(value ="类型ID" , example = "0") + @ApiParam(value ="类型ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long toolTypeId; + public Long getToolTypeId() { + if(toolTypeId != null) { + return toolTypeId.longValue(); + }else{ + return toolTypeId; + } + } + @Column(name="RED_TOOL_TYPE_NAME") @ApiParam(value ="类型名称" , access ="类型名称") private String redToolTypeName; - @Column(name="TOOL_STATUS") - @ApiParam(value ="设备状态（1.正常，2.禁用）" , example ="1" , access ="设备状态（1.正常，2.禁用）") - private Integer toolStatus; + @Column(name="TOOL_STATUS_ID") + @ApiParam(value ="设备状态（枚举：枚举：1.正常，2.禁用）" , example ="-1") + private Integer toolStatusId; @Column(name="TOOL_IP") @ApiParam(value ="IP地址" , access ="IP地址") @@ -55,13 +63,13 @@ public class Tool extends BaseBean { @ApiParam(value ="端口" , example ="80" , access ="端口") private Integer toolPort; - @Column(name="TOOL_CONN_TYPE") - @ApiParam(value ="连接方式（1.网口，2.串口，3.USB......）" , example ="1" , access ="连接方式（1.网口，2.串口，3.USB......）") - private Integer toolConnType; + @Column(name="TOOL_CONN_TYPE_ID") + @ApiParam(value ="连接方式（枚举：1.网口，2.串口，3.USB......）" , example ="-1") + private Integer toolConnTypeId; - @Column(name="TOOL_DATA_TYPE") - @ApiParam(value ="传输数据类型（1.字符串，2.二进制数据流....）" , example ="1" , access ="传输数据类型（1.字符串，2.二进制数据流....）") - private Integer toolDataType; + @Column(name="TOOL_DATA_TYPE_ID") + @ApiParam(value ="传输数据类型（枚举：1.字符串，2.二进制数据流....）" , example ="-1") + private Integer toolDataTypeId; @Column(name="TOOL_OPERATING") @ApiParam(value ="操作内容" , access ="操作内容") 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 3cf58e7..987f5b0 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 @@ -97,9 +97,9 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); // 部门名称 - HqlPack.getStringLikerPack(department.getDepartmentName(),"positionName",result); + HqlPack.getStringLikerPack(department.getName(),"positionName",result); // 部门代码 - HqlPack.getStringLikerPack(department.getDepartmentName(),"positionCode",result); + HqlPack.getStringLikerPack(department.getDepartmentCode(),"positionCode",result); // 父级部门id HqlPack.getNumEqualPack(department.getId(),"parentId",result); // 所属组织id From 06d7cf1c9fd0584727656c1dac58f41e86287b21 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 29 Oct 2018 17:51:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/Position.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserRole.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java | 2 ++ 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Position.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Position.java index 6896284..72135d4 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Position.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Position.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description : 岗位 @@ -59,6 +60,7 @@ public class Position extends BaseBean { @ApiParam(value ="描述" , access ="描述") private String positionDescription; - + @ApiParam(value ="子部门列表") + private transient List childList; } 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 449ec90..750c17a 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 @@ -29,7 +29,9 @@ import java.text.DecimalFormat; @Api(value="关系-用户角色",description = "关系-用户角色") public class RefUserRole extends BaseBean { - + private static final long serialVersionUID = 1L; + + @Column(name="USER_ID") @ApiParam(value ="用户ID" , example = "0") @JsonSerialize(using = ToStringSerializer.class) 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 8f922de..fb518a1 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 @@ -16,6 +16,8 @@ import java.util.List; @Data public class SessionUser implements Serializable { + private static final long serialVersionUID = 1L; + @ApiParam("用户工号") private String userCode; @@ -47,6 +49,9 @@ public class SessionUser implements Serializable { @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/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 0db5955..48a70fd 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 @@ -31,11 +31,11 @@ public class SysMenu extends BaseBean { @Column(name="NAME") - @ApiParam(value ="功能名称" , access ="功能名称") + @ApiParam(value ="功能名称" , access ="功能名称", required =true) private String name; @Column(name="MENU_TYPE_ID") - @ApiParam(value ="功能类型（1.模块，2.菜单，3.按钮）" , example ="1" , access ="功能类型（1.模块，2.菜单，3.按钮）") + @ApiParam(value ="功能类型（1.模块，2.菜单，3.按钮）" , example ="1" , access ="功能类型（1.模块，2.菜单，3.按钮）", required = true) private Integer menuTypeId; @Column(name="PARENT_ID") 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 1821328..1ec9ced 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 @@ -25,6 +25,8 @@ import java.util.List; @Api(value="用户登陆表",description = "用户登陆系统账户。") public class SysUser extends BaseBean { + private static final long serialVersionUID = 1L; + @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") private String name; From 8dbcbd17be7795a62bcf6e673038bb02dcf9bf97 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 30 Oct 2018 09:16:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/platform/bean/Organize.java | 4 ++-- .../cn/estsh/i3plus/pojo/platform/bean/SessionUser.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java | 2 +- .../i3plus/pojo/platform/bean/TaskTimeRecording.java | 16 ++++++++-------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Organize.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Organize.java index 7689cbf..a616fbf 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Organize.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Organize.java @@ -67,8 +67,8 @@ public class Organize extends BaseBean { @ApiParam(value ="排序" , example ="1") private Integer organizeSort; - @Column(name="ORGANIZE_STATUS") + @Column(name="ORGANIZE_STATUS_ID") @ApiParam(value ="组织状态（枚举：1.正常，2.禁用）" , example ="1") - private Integer organizeStatus; + private Integer organizeStatusId; } 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 f527e84..5b8fb4a 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 @@ -29,7 +29,7 @@ public class SessionUser implements Serializable { @ApiParam("用户类型") //CommonEnumUtil.USER_TYPE.xxx.getCode() - private Integer userTypeId; + private String userTypeId; @ApiParam("用户信息") private SysUser user; @@ -61,7 +61,7 @@ public class SessionUser implements Serializable { } - public SessionUser(String userCode, String userName, String siteCode, String languageCode, Integer userTypeId) { + public SessionUser(String userCode, String userName, String siteCode, String languageCode, String userTypeId) { this.userCode = userCode; this.userName = userName; this.languageCode = languageCode; 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 935e27b..46e7909 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 @@ -69,7 +69,7 @@ public class SysRole extends BaseBean { @ApiParam(value ="权限功能数量" , example ="0" , access ="权限功能数量") private Integer redMenuNumber; - @Column(name="ROLE_STATUS") + @Column(name="ROLE_STATUS_ID") @ApiParam(value ="角色状态（枚举：1.正常，2.状态）" , example ="-1") private Integer roleStatusId; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeRecording.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeRecording.java index 8a61529..8515436 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeRecording.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeRecording.java @@ -61,27 +61,27 @@ public class TaskTimeRecording extends BaseBean { } @Column(name="RED_TIME_EXPRESSION") - @ApiParam(value ="时间表达式" , access ="时间表达式") + @ApiParam(value ="时间表达式") private String redTimeExpression; @Column(name="TASK_START_DATE_TIME") - @ApiParam(value ="任务开始时间" , access ="任务开始时间") + @ApiParam(value ="任务开始时间") private String taskStartDateTime; @Column(name="TASK_END_DATE_TIME") - @ApiParam(value ="任务结束时间" , access ="任务结束时间") + @ApiParam(value ="任务结束时间") private String taskEndDateTime; - @Column(name="TASK_STATUS") - @ApiParam(value ="任务完成情况" , access ="任务完成情况") - private String taskStatus; + @Column(name="TASK_STATUS_ID") + @ApiParam(value ="任务完成情况(枚举：1正常，2失败)") + private Integer taskStatusId; @Column(name="TASK_LOG") - @ApiParam(value ="任务日志" , access ="任务日志") + @ApiParam(value ="任务日志") private String taskLog; @Column(name="TASK_LOG_ERROR") - @ApiParam(value ="任务异常日志" , access ="任务异常日志") + @ApiParam(value ="任务异常日志") private String taskLogError; } From e853dd63e435618ef815abb4c98194c192890b81 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 30 Oct 2018 16:50:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?count=E6=96=B9=E6=B3=95=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=A3=85=E6=8D=A2=EF=BC=8Clong=E5=BC=BA=E8=BD=AC=E4=B8=BAint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 333cb8b..e55750a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -338,8 +338,9 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int listCount() { - return entityManager.createQuery("select count(distinct model) from " + persistentClass.getName() + " as model",Integer.class) - .getSingleResult(); + Long count = entityManager.createQuery("select count(distinct model) from " + persistentClass.getName() + " as model",Long.class) + .getSingleResult(); + return count == null ? 0 : count.intValue(); } @Override @@ -369,14 +370,15 @@ public class BaseRepositoryImpl extends SimpleJpaRep } } - Query queryObject = entityManager.createQuery(queryString.toString(),Integer.class); + Query queryObject = entityManager.createQuery(queryString.toString(),Long.class); for (int i = 0; i < size; i++) { if(values[i] != null) { queryObject.setParameter(propertyNames[i], values[i]); } } - return (int) queryObject.getSingleResult(); + Long count = (Long) queryObject.getSingleResult(); + return count == null ? 0 : count.intValue(); } @Override @@ -491,7 +493,8 @@ public class BaseRepositoryImpl extends SimpleJpaRep } } - return entityManager.createQuery(queryString.toString(),Integer.class).getSingleResult(); + Long count = entityManager.createQuery(queryString.toString(),Long.class).getSingleResult(); + return count == null ? 0 : count.intValue(); } @Override @@ -548,12 +551,14 @@ public class BaseRepositoryImpl extends SimpleJpaRep queryString.append(hqlWhere); } - return entityManager.createQuery(queryString.toString(),Integer.class).getSingleResult(); + Long count = entityManager.createQuery(queryString.toString(), Long.class).getSingleResult(); + return count == null ? 0 : count.intValue(); } @Override public int findByHqlCount(String hql) { - return entityManager.createQuery(hql,Integer.class).getSingleResult(); + Long count = entityManager.createQuery(hql,Long.class).getSingleResult(); + return count == null ? 0 : count.intValue(); } @Override @@ -630,7 +635,8 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int findBySqlCount(String sql) { - return (int) entityManager.createNativeQuery("select count(*) from ( " + sql + " ) as usertable",Integer.class).getSingleResult(); + Long count = (Long) entityManager.createNativeQuery("select count(*) from ( " + sql + " ) as usertable",Long.class).getSingleResult(); + return count == null ? 0 : count.intValue(); } @Override