From 6a9e2849ada44d0874675c3ce8b566790c9b373b Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 22 Oct 2018 17:02:38 +0800 Subject: [PATCH] POJO Commit --- .../i3plus/pojo/platform/bean/Department.java | 18 ++++++------ .../i3plus/pojo/platform/bean/Enterprise.java | 28 +++++++++---------- .../pojo/platform/bean/EnterpriseConfig.java | 16 +++++------ .../estsh/i3plus/pojo/platform/bean/LogAction.java | 18 ++++++------ .../estsh/i3plus/pojo/platform/bean/LogSystem.java | 16 +++++------ .../i3plus/pojo/platform/bean/LogUserLogin.java | 16 +++++------ .../estsh/i3plus/pojo/platform/bean/Organize.java | 20 +++++++------- .../estsh/i3plus/pojo/platform/bean/Position.java | 14 +++++----- .../i3plus/pojo/platform/bean/RefRoleMenu.java | 10 +++---- .../pojo/platform/bean/RefUserDepartment.java | 8 +++--- .../i3plus/pojo/platform/bean/RefUserPosition.java | 10 +++---- .../i3plus/pojo/platform/bean/RefUserRole.java | 8 +++--- .../estsh/i3plus/pojo/platform/bean/SysConfig.java | 14 +++++----- .../i3plus/pojo/platform/bean/SysDictionary.java | 16 +++++------ .../estsh/i3plus/pojo/platform/bean/SysFile.java | 20 +++++++------- .../estsh/i3plus/pojo/platform/bean/SysMenu.java | 22 +++++++-------- .../i3plus/pojo/platform/bean/SysMessage.java | 16 +++++------ .../pojo/platform/bean/SysTimeExpression.java | 8 +++--- .../i3plus/pojo/platform/bean/SysUserInfo.java | 16 +++++------ .../estsh/i3plus/pojo/platform/bean/TaskTimed.java | 32 +++++++++++----------- .../pojo/platform/bean/TaskTimedRecording.java | 20 +++++++------- .../cn/estsh/i3plus/pojo/platform/bean/Tool.java | 22 +++++++-------- .../estsh/i3plus/pojo/platform/bean/ToolType.java | 4 +-- 23 files changed, 186 insertions(+), 186 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 9294632..2415e31 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 @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 部门 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:44.054 + * @Date : 2018-10-22 16:58:42.539 * @Modify : **/ @Data @@ -29,35 +29,35 @@ public class Department extends BaseBean { @Column(name="NAME") - @ApiParam(name ="名称") + @ApiParam(value ="名称" , access ="名称") private String name; @Column(name="DEPARTMENT_CODE") - @ApiParam(name ="部门代码") + @ApiParam(value ="部门代码" , access ="部门代码") private String departmentCode; @Column(name="RED_PARENT_NAME") - @ApiParam(name ="父节点名称") + @ApiParam(value ="父节点名称" , access ="父节点名称") private String redParentName; @Column(name="PARENT_ID") - @ApiParam(name ="父节点ID") + @ApiParam(value ="父节点ID" , access ="父节点ID") private String parentId; @Column(name="DEPARTMENT_STATUS") - @ApiParam(name ="部门状态（1.正常，2.禁用）" , example ="1") + @ApiParam(value ="部门状态（1.正常，2.禁用）" , example ="1" , access ="部门状态（1.正常，2.禁用）") private Integer departmentStatus; @Column(name="RED_ORGANIZATION_NAME") - @ApiParam(name ="所属组织名称") + @ApiParam(value ="所属组织名称" , access ="所属组织名称") private String redOrganizationName; @Column(name="ORGANIZATION_ID") - @ApiParam(name ="所属组织") + @ApiParam(value ="所属组织" , access ="所属组织") private String organizationId; @Column(name="DEPARTMENT_SORT") - @ApiParam(name ="排序" , example ="1") + @ApiParam(value ="排序" , example ="1" , access ="排序") private Integer departmentSort; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Enterprise.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Enterprise.java index d8a8e6a..8abbfa2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Enterprise.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Enterprise.java @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 企业信息 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:44.107 + * @Date : 2018-10-22 16:58:42.607 * @Modify : **/ @Data @@ -29,55 +29,55 @@ public class Enterprise extends BaseBean { @Column(name="NAME") - @ApiParam(name ="名称") + @ApiParam(value ="名称" , access ="名称") private String name; @Column(name="ENTERPRISE_STATUS") - @ApiParam(name ="企业状态(1.正常，2.到期，3.试用)" , example ="1") + @ApiParam(value ="企业状态(1.正常，2.到期，3.试用)" , example ="1" , access ="企业状态(1.正常，2.到期，3.试用)") private Integer enterpriseStatus; @Column(name="ENTERPRISE_EQUIPMENT_ID") - @ApiParam(name ="服务器设备ID") + @ApiParam(value ="服务器设备ID" , access ="服务器设备ID") private String enterpriseEquipmentId; @Column(name="ENTERPRISE_START_DATE_TIME") - @ApiParam(name ="企业开始使用时间") + @ApiParam(value ="企业开始使用时间" , access ="企业开始使用时间") private String enterpriseStartDateTime; @Column(name="ENTERPRISE_END_DATE_TIME") - @ApiParam(name ="企业结束使用时间") + @ApiParam(value ="企业结束使用时间" , access ="企业结束使用时间") private String enterpriseEndDateTime; @Column(name="ENTERPRISE_NUM_REG_USER") - @ApiParam(name ="用户注册数" , example ="0") + @ApiParam(value ="用户注册数" , example ="0" , access ="用户注册数") private Integer enterpriseNumRegUser; @Column(name="ENTERPRISE_NUM_SYN_USER") - @ApiParam(name ="用户同时在线" , example ="0") + @ApiParam(value ="用户同时在线" , example ="0" , access ="用户同时在线") private Integer enterpriseNumSynUser; @Column(name="ENTERPRISE_NUM_FACTORY") - @ApiParam(name ="工厂数量" , example ="0") + @ApiParam(value ="工厂数量" , example ="0" , access ="工厂数量") private Integer enterpriseNumFactory; @Column(name="ENTERPRISE_NUM_WAREHOUSE") - @ApiParam(name ="仓库数量" , example ="0") + @ApiParam(value ="仓库数量" , example ="0" , access ="仓库数量") private Integer enterpriseNumWarehouse; @Column(name="ENTERPRISE_CONTACT_NAME") - @ApiParam(name ="企业联系人") + @ApiParam(value ="企业联系人" , access ="企业联系人") private String enterpriseContactName; @Column(name="ENTERPRISE_CONTACT_EMAIL") - @ApiParam(name ="企业邮箱") + @ApiParam(value ="企业邮箱" , access ="企业邮箱") private String enterpriseContactEmail; @Column(name="ENTERPRISE_CONTACT_PHONE") - @ApiParam(name ="企业联系电话") + @ApiParam(value ="企业联系电话" , access ="企业联系电话") private String enterpriseContactPhone; @Column(name="ENTERPRISE_ADDR") - @ApiParam(name ="企业公司地址") + @ApiParam(value ="企业公司地址" , access ="企业公司地址") private String enterpriseAddr; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/EnterpriseConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/EnterpriseConfig.java index 15468d8..26890b8 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/EnterpriseConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/EnterpriseConfig.java @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 企业配置信息 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:44.166 + * @Date : 2018-10-22 16:58:42.664 * @Modify : **/ @Data @@ -29,31 +29,31 @@ public class EnterpriseConfig extends BaseBean { @Column(name="ENTERPRISE_ID") - @ApiParam(name ="企业id") + @ApiParam(value ="企业id" , access ="企业id") private String enterpriseId; @Column(name="NAME") - @ApiParam(name ="配置名称") + @ApiParam(value ="配置名称" , access ="配置名称") private String name; @Column(name="CONFIG_TYPE_ID") - @ApiParam(name ="配置类型" , example ="0") + @ApiParam(value ="配置类型" , example ="0" , access ="配置类型") private Integer configTypeId; @Column(name="CONFIG_PARENT_ID") - @ApiParam(name ="配置父节点") + @ApiParam(value ="配置父节点" , access ="配置父节点") private String configParentId; @Column(name="CONFIG_KEY") - @ApiParam(name ="配置代码") + @ApiParam(value ="配置代码" , access ="配置代码") private String configKey; @Column(name="CONFIG_VALUE") - @ApiParam(name ="配置值") + @ApiParam(value ="配置值" , access ="配置值") private String configValue; @Column(name="CONFIG_DESCRIPTION") - @ApiParam(name ="配置说明") + @ApiParam(value ="配置说明" , access ="配置说明") private String configDescription; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogAction.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogAction.java index d3df9c0..a8255b2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogAction.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogAction.java @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 操作日志表 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:44.217 + * @Date : 2018-10-22 16:58:42.720 * @Modify : **/ @Data @@ -29,35 +29,35 @@ public class LogAction extends BaseBean { @Column(name="ACTION_MODULE_NAME") - @ApiParam(name ="模块名称") + @ApiParam(value ="模块名称" , access ="模块名称") private String actionModuleName; @Column(name="ACTION_TYPE_ID") - @ApiParam(name ="操作类型") + @ApiParam(value ="操作类型" , access ="操作类型") private String actionTypeId; @Column(name="ACTION_OBJECT") - @ApiParam(name ="操作对象") + @ApiParam(value ="操作对象" , access ="操作对象") private String actionObject; @Column(name="ACTION_FIRST_DATA") - @ApiParam(name ="操作前数据") + @ApiParam(value ="操作前数据" , access ="操作前数据") private String actionFirstData; @Column(name="ACTION_LAST_DATA") - @ApiParam(name ="操作后数据") + @ApiParam(value ="操作后数据" , access ="操作后数据") private String actionLastData; @Column(name="ACTION_IP") - @ApiParam(name ="服务器IP") + @ApiParam(value ="服务器IP" , access ="服务器IP") private String actionIp; @Column(name="ACTION_TERMINAL") - @ApiParam(name ="操作终端") + @ApiParam(value ="操作终端" , access ="操作终端") private String actionTerminal; @Column(name="ACTION_USER_NAME") - @ApiParam(name ="操作人名称") + @ApiParam(value ="操作人名称" , access ="操作人名称") private String actionUserName; } 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 617cde4..864c7b4 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 @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 系统日志表 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:44.260 + * @Date : 2018-10-22 16:58:42.784 * @Modify : **/ @Data @@ -29,31 +29,31 @@ public class LogSystem extends BaseBean { @Column(name="LOG_MOULE_NAME") - @ApiParam(name ="服务名称") + @ApiParam(value ="服务名称" , access ="服务名称") private String logMouleName; @Column(name="LOG_IP") - @ApiParam(name ="服务器IP") + @ApiParam(value ="服务器IP" , access ="服务器IP") private String logIp; @Column(name="LOG_CLASS") - @ApiParam(name ="触发路径") + @ApiParam(value ="触发路径" , access ="触发路径") private String logClass; @Column(name="LOG_METHOD") - @ApiParam(name ="触发方法") + @ApiParam(value ="触发方法" , access ="触发方法") private String logMethod; @Column(name="LOG_LEVEL") - @ApiParam(name ="日志级别（1.DEBUG，2.INFO，3.ERROR）" , example ="1") + @ApiParam(value ="日志级别（1.DEBUG，2.INFO，3.ERROR）" , example ="1" , access ="日志级别（1.DEBUG，2.INFO，3.ERROR）") private Integer logLevel; @Column(name="LOG_MESSAGE") - @ApiParam(name ="日志信息") + @ApiParam(value ="日志信息" , access ="日志信息") private String logMessage; @Column(name="LOG_USER_NAME") - @ApiParam(name ="操作人名称") + @ApiParam(value ="操作人名称" , access ="操作人名称") private String logUserName; } 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 e1d4ecd..fce82ef 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 @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 用户登录记录 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:44.309 + * @Date : 2018-10-22 16:58:42.856 * @Modify : **/ @Data @@ -29,31 +29,31 @@ public class LogUserLogin extends BaseBean { @Column(name="USER_ID") - @ApiParam(name ="用户ID") + @ApiParam(value ="用户ID" , access ="用户ID") private String userId; @Column(name="LOG_LOGIN_NAME") - @ApiParam(name ="登录名称") + @ApiParam(value ="登录名称" , access ="登录名称") private String logLoginName; @Column(name="LOG_LOGIN_STATUS") - @ApiParam(name ="登录状态（1.成功，2.失败，3锁定）" , example ="1") + @ApiParam(value ="登录状态（1.成功，2.失败，3锁定）" , example ="1" , access ="登录状态（1.成功，2.失败，3锁定）") private Integer logLoginStatus; @Column(name="LOG_LOGIN_PLATFORM_ID") - @ApiParam(name ="登录平台ID" , example ="1") + @ApiParam(value ="登录平台ID" , example ="1" , access ="登录平台ID") private Integer logLoginPlatformId; @Column(name="LOG_LOGIN_PLATFORM_NAME") - @ApiParam(name ="登录平台名称") + @ApiParam(value ="登录平台名称" , access ="登录平台名称") private String logLoginPlatformName; @Column(name="LOG_LOGIN_HOST") - @ApiParam(name ="登录IP") + @ApiParam(value ="登录IP" , access ="登录IP") private String logLoginHost; @Column(name="LOG_LOGIN_DATE_TIME") - @ApiParam(name ="登录时间") + @ApiParam(value ="登录时间" , access ="登录时间") private String logLoginDateTime; } 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 4cb7327..5338f14 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 @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 组织 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:44.358 + * @Date : 2018-10-22 16:58:42.923 * @Modify : **/ @Data @@ -29,39 +29,39 @@ public class Organize extends BaseBean { @Column(name="NAME") - @ApiParam(name ="名称") + @ApiParam(value ="名称" , access ="名称") private String name; @Column(name="ORGANIZATION_CODE") - @ApiParam(name ="组织代码") + @ApiParam(value ="组织代码" , access ="组织代码") private String organizationCode; @Column(name="ORGANIZATION_TYPE_ID") - @ApiParam(name ="组织类型ID（1.集团，2.公司，3.工厂）" , example ="1") + @ApiParam(value ="组织类型ID（1.集团，2.公司，3.工厂）" , example ="1" , access ="组织类型ID（1.集团，2.公司，3.工厂）") private Integer organizationTypeId; @Column(name="ORGANIZATION_TYPE_NAME") - @ApiParam(name ="组织类型名称") + @ApiParam(value ="组织类型名称" , access ="组织类型名称") private String organizationTypeName; @Column(name="PARENT_ID") - @ApiParam(name ="父节点") + @ApiParam(value ="父节点" , access ="父节点") private String parentId; @Column(name="RED_PARENT_NAME") - @ApiParam(name ="父节点") + @ApiParam(value ="父节点" , access ="父节点") private String redParentName; @Column(name="ORGANIZATION_DESCRIPTION") - @ApiParam(name ="组织描述") + @ApiParam(value ="组织描述" , access ="组织描述") private String organizationDescription; @Column(name="ORGANIZATION_SORT") - @ApiParam(name ="排序" , example ="1") + @ApiParam(value ="排序" , example ="1" , access ="排序") private Integer organizationSort; @Column(name="ORGANIZATION_STATUS") - @ApiParam(name ="组织状态（1.正常，2.禁用）" , example ="1") + @ApiParam(value ="组织状态（1.正常，2.禁用）" , example ="1" , access ="组织状态（1.正常，2.禁用）") private Integer organizationStatus; } 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 40ea45e..5de5454 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 @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 岗位 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:44.422 + * @Date : 2018-10-22 16:58:43.026 * @Modify : **/ @Data @@ -29,27 +29,27 @@ public class Position extends BaseBean { @Column(name="NAME") - @ApiParam(name ="名称") + @ApiParam(value ="名称" , access ="名称") private String name; @Column(name="POSITION_CODE") - @ApiParam(name ="岗位代码") + @ApiParam(value ="岗位代码" , access ="岗位代码") private String positionCode; @Column(name="PARENT_ID") - @ApiParam(name ="上级岗位") + @ApiParam(value ="上级岗位" , access ="上级岗位") private String parentId; @Column(name="RED_PARENT_NAME") - @ApiParam(name ="上级岗位名称") + @ApiParam(value ="上级岗位名称" , access ="上级岗位名称") private String redParentName; @Column(name="POSITION_STATUS") - @ApiParam(name ="状态（1.正常，2.禁用）" , example ="1") + @ApiParam(value ="状态（1.正常，2.禁用）" , example ="1" , access ="状态（1.正常，2.禁用）") private Integer positionStatus; @Column(name="POSITION_DESCRIPTION") - @ApiParam(name ="描述") + @ApiParam(value ="描述" , access ="描述") private String positionDescription; } 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 82098fc..2af71eb 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 @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 关系-角色菜单 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:44.497 + * @Date : 2018-10-22 16:58:43.135 * @Modify : **/ @Data @@ -29,19 +29,19 @@ public class RefRoleMenu extends BaseBean { @Column(name="MENU_ID") - @ApiParam(name ="菜单ID") + @ApiParam(value ="菜单ID" , access ="菜单ID") private String menuId; @Column(name="RED_MENU_NAME") - @ApiParam(name ="菜单名称") + @ApiParam(value ="菜单名称" , access ="菜单名称") private String redMenuName; @Column(name="ROLE_ID") - @ApiParam(name ="角色ID") + @ApiParam(value ="角色ID" , access ="角色ID") private String roleId; @Column(name="RED_ROLE_NAME") - @ApiParam(name ="角色名称") + @ApiParam(value ="角色名称" , access ="角色名称") private String redRoleName; } 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 af43453..439853f 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 @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 关系-用户部门 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:44.622 + * @Date : 2018-10-22 16:58:43.239 * @Modify : **/ @Data @@ -29,15 +29,15 @@ public class RefUserDepartment extends BaseBean { @Column(name="USER_ID") - @ApiParam(name ="用户ID") + @ApiParam(value ="用户ID" , access ="用户ID") private String userId; @Column(name="DEPARTMENT_ID") - @ApiParam(name ="部门ID") + @ApiParam(value ="部门ID" , access ="部门ID") private String departmentId; @Column(name="RED_DEPARTMENT_NAME") - @ApiParam(name ="部门名称") + @ApiParam(value ="部门名称" , access ="部门名称") private String redDepartmentName; } 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 791ec6b..d55a657 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 @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 关系-用户岗位 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:44.704 + * @Date : 2018-10-22 16:58:43.341 * @Modify : **/ @Data @@ -29,19 +29,19 @@ public class RefUserPosition extends BaseBean { @Column(name="ORGANIZE_ID") - @ApiParam(name ="组织ID") + @ApiParam(value ="组织ID" , access ="组织ID") private String organizeId; @Column(name="USER_ID") - @ApiParam(name ="用户ID") + @ApiParam(value ="用户ID" , access ="用户ID") private String userId; @Column(name="POSITION_ID") - @ApiParam(name ="岗位ID") + @ApiParam(value ="岗位ID" , access ="岗位ID") private String positionId; @Column(name="RED_POSITION_NAME") - @ApiParam(name ="岗位名称") + @ApiParam(value ="岗位名称" , access ="岗位名称") private String redPositionName; } 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 efa4e76..57bc719 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 @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 关系-用户角色 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:44.790 + * @Date : 2018-10-22 16:58:43.417 * @Modify : **/ @Data @@ -29,15 +29,15 @@ public class RefUserRole extends BaseBean { @Column(name="USER_ID") - @ApiParam(name ="用户ID") + @ApiParam(value ="用户ID" , access ="用户ID") private String userId; @Column(name="ROLE_ID") - @ApiParam(name ="角色ID") + @ApiParam(value ="角色ID" , access ="角色ID") private String roleId; @Column(name="RED_ROLE_ID") - @ApiParam(name ="角色名称") + @ApiParam(value ="角色名称" , access ="角色名称") private String redRoleId; } 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 23fc21f..e338a68 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 @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 系统配置 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:44.889 + * @Date : 2018-10-22 16:58:43.499 * @Modify : **/ @Data @@ -29,27 +29,27 @@ public class SysConfig extends BaseBean { @Column(name="NAME") - @ApiParam(name ="名称") + @ApiParam(value ="名称" , access ="名称") private String name; @Column(name="CONFIG_TYPE_ID") - @ApiParam(name ="配置类型ID（1.系统配置...）" , example ="1") + @ApiParam(value ="配置类型ID（1.系统配置...）" , example ="1" , access ="配置类型ID（1.系统配置...）") private Integer configTypeId; @Column(name="CONFIG_TYPE_NAME") - @ApiParam(name ="配置类型名称") + @ApiParam(value ="配置类型名称" , access ="配置类型名称") private String configTypeName; @Column(name="CONFIG_CODE") - @ApiParam(name ="配置代码") + @ApiParam(value ="配置代码" , access ="配置代码") private String configCode; @Column(name="CONFIG_VALUE") - @ApiParam(name ="配置值") + @ApiParam(value ="配置值" , access ="配置值") private String configValue; @Column(name="CONFIG_DESCRIPTION") - @ApiParam(name ="配置描述") + @ApiParam(value ="配置描述" , access ="配置描述") 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 488dac9..988a003 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 @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 系统字典 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:44.944 + * @Date : 2018-10-22 16:58:43.550 * @Modify : **/ @Data @@ -29,31 +29,31 @@ public class SysDictionary extends BaseBean { @Column(name="NAME") - @ApiParam(name ="名称") + @ApiParam(value ="名称" , access ="名称") private String name; @Column(name="DICTIONART_CODE") - @ApiParam(name ="字典代码") + @ApiParam(value ="字典代码" , access ="字典代码") private String dictionartCode; @Column(name="PARENT_ID") - @ApiParam(name ="父节点") + @ApiParam(value ="父节点" , access ="父节点") private String parentId; @Column(name="RED_PARENT_NAME") - @ApiParam(name ="父级节点名称") + @ApiParam(value ="父级节点名称" , access ="父级节点名称") private String redParentName; @Column(name="DICTIONARY_VALUE") - @ApiParam(name ="字典值") + @ApiParam(value ="字典值" , access ="字典值") private String dictionaryValue; @Column(name="DICTIONARY_SORT") - @ApiParam(name ="排序" , example ="1") + @ApiParam(value ="排序" , example ="1" , access ="排序") private Integer dictionarySort; @Column(name="DICTIONARY_DESCRIPTION") - @ApiParam(name ="描述") + @ApiParam(value ="描述" , access ="描述") 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 7c52207..24b06a0 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 @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 文件 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:44.996 + * @Date : 2018-10-22 16:58:43.593 * @Modify : **/ @Data @@ -29,35 +29,35 @@ public class SysFile extends BaseBean { @Column(name="NAME") - @ApiParam(name ="名称") + @ApiParam(value ="名称" , access ="名称") private String name; @Column(name="USER_ID") - @ApiParam(name ="用户ID") + @ApiParam(value ="用户ID" , access ="用户ID") private String userId; @Column(name="FILE_PATH") - @ApiParam(name ="文件路径") + @ApiParam(value ="文件路径" , access ="文件路径") private String filePath; @Column(name="FILE_ORIGINAL_NAME") - @ApiParam(name ="原始文件名称") + @ApiParam(value ="原始文件名称" , access ="原始文件名称") private String fileOriginalName; @Column(name="FILE_TYPE_ID") - @ApiParam(name ="文件类型ID(字典)") + @ApiParam(value ="文件类型ID(字典)" , access ="文件类型ID(字典)") private String fileTypeId; @Column(name="FILE_TYPE_NAME") - @ApiParam(name ="文件类型名称") + @ApiParam(value ="文件类型名称" , access ="文件类型名称") private String fileTypeName; @Column(name="FILE_SIZE") - @ApiParam(name ="文件大小(KB)") - private Integer fileSize; + @ApiParam(value ="文件大小(KB)" , access ="文件大小(KB)") + private String fileSize; @Column(name="DOWNLOADS") - @ApiParam(name ="下载次数" , example ="0") + @ApiParam(value ="下载次数" , example ="0" , access ="下载次数") 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 e28c886..5f7b0bb 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 @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 系统功能 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:45.067 + * @Date : 2018-10-22 16:58:43.641 * @Modify : **/ @Data @@ -29,43 +29,43 @@ public class SysMenu extends BaseBean { @Column(name="NAME") - @ApiParam(name ="功能名称") + @ApiParam(value ="功能名称" , access ="功能名称") private String name; @Column(name="MENU_TYPE_ID") - @ApiParam(name ="功能类型（1.模块，2.菜单，3.按钮）" , example ="1") + @ApiParam(value ="功能类型（1.模块，2.菜单，3.按钮）" , example ="1" , access ="功能类型（1.模块，2.菜单，3.按钮）") private Integer menuTypeId; @Column(name="RED_MENU_TYPE_NAME") - @ApiParam(name ="功能类型名称") + @ApiParam(value ="功能类型名称" , access ="功能类型名称") private String redMenuTypeName; @Column(name="PARENT_ID") - @ApiParam(name ="父级功能ID") + @ApiParam(value ="父级功能ID" , access ="父级功能ID") private String parentId; @Column(name="RED_PARENT_NAME") - @ApiParam(name ="父级功能名称") + @ApiParam(value ="父级功能名称" , access ="父级功能名称") private String redParentName; @Column(name="MENU_CLASS_PATH") - @ApiParam(name ="资源class path") + @ApiParam(value ="资源class path" , access ="资源class path") private String menuClassPath; @Column(name="MENU_URL") - @ApiParam(name ="资源 url") + @ApiParam(value ="资源 url" , access ="资源 url") private String menuUrl; @Column(name="MENU_CSS") - @ApiParam(name ="资源css") + @ApiParam(value ="资源css" , access ="资源css") private String menuCss; @Column(name="MENU_ICON") - @ApiParam(name ="资源icon") + @ApiParam(value ="资源icon" , access ="资源icon") private String menuIcon; @Column(name="MENU_STATUS") - @ApiParam(name ="功能状态（1.正常，2.禁用）" , example ="1") + @ApiParam(value ="功能状态（1.正常，2.禁用）" , example ="1" , access ="功能状态（1.正常，2.禁用）") private Integer menuStatus; } 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 d326126..73ebcec 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 @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 系统消息 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:45.125 + * @Date : 2018-10-22 16:58:43.689 * @Modify : **/ @Data @@ -29,31 +29,31 @@ public class SysMessage extends BaseBean { @Column(name="MESSAGE_TITLE") - @ApiParam(name ="消息标题") + @ApiParam(value ="消息标题" , access ="消息标题") private String messageTitle; @Column(name="MESSAGE_TYPE_ID") - @ApiParam(name ="消息类型(1.通知，2.站内信)" , example ="1") + @ApiParam(value ="消息类型(1.通知，2.站内信)" , example ="1" , access ="消息类型(1.通知，2.站内信)") private Integer messageTypeId; @Column(name="RED_MESSAGE_TYPE_NAME") - @ApiParam(name ="消息类型名称") + @ApiParam(value ="消息类型名称" , access ="消息类型名称") private String redMessageTypeName; @Column(name="MESSAGE_SEND_ID") - @ApiParam(name ="发送者") + @ApiParam(value ="发送者" , access ="发送者") private String messageSendId; @Column(name="MESSAGE_ACCEPT_ID") - @ApiParam(name ="接受者") + @ApiParam(value ="接受者" , access ="接受者") private String messageAcceptId; @Column(name="MESSAGE_CONTENT") - @ApiParam(name ="消息内容") + @ApiParam(value ="消息内容" , access ="消息内容") private String messageContent; @Column(name="MESSAGE_STATUS") - @ApiParam(name ="消息状态（1.启用，2.禁用）" , example ="1") + @ApiParam(value ="消息状态（1.启用，2.禁用）" , example ="1" , access ="消息状态（1.启用，2.禁用）") private Integer messageStatus; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTimeExpression.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTimeExpression.java index 36583dd..6e85f26 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTimeExpression.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTimeExpression.java @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 系统时间表达式 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:45.259 + * @Date : 2018-10-22 16:58:43.801 * @Modify : **/ @Data @@ -29,15 +29,15 @@ public class SysTimeExpression extends BaseBean { @Column(name="NAME") - @ApiParam(name ="名称") + @ApiParam(value ="名称" , access ="名称") private String name; @Column(name="TIME_EXPRESSION") - @ApiParam(name ="表达式内容") + @ApiParam(value ="表达式内容" , access ="表达式内容") private String timeExpression; @Column(name="TIME_DESCRIPTION") - @ApiParam(name ="表达式描述") + @ApiParam(value ="表达式描述" , access ="表达式描述") private String timeDescription; } 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 5dba262..b0d5479 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 @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 用户详细 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:45.352 + * @Date : 2018-10-22 16:58:43.910 * @Modify : **/ @Data @@ -29,31 +29,31 @@ public class SysUserInfo extends BaseBean { @Column(name="NAME") - @ApiParam(name ="名称") + @ApiParam(value ="名称" , access ="名称") private String name; @Column(name="USER_ID") - @ApiParam(name ="用户ID") + @ApiParam(value ="用户ID" , access ="用户ID") private String userId; @Column(name="ORGANIZE_ID") - @ApiParam(name ="组织ID") + @ApiParam(value ="组织ID" , access ="组织ID") private String organizeId; @Column(name="USER_IMAGE_ID") - @ApiParam(name ="用户图像") + @ApiParam(value ="用户图像" , access ="用户图像") private String userImageId; @Column(name="USER_SEX") - @ApiParam(name ="性别（1.男，2.女）" , example ="1") + @ApiParam(value ="性别（1.男，2.女）" , example ="1" , access ="性别（1.男，2.女）") private Integer userSex; @Column(name="USER_AGE") - @ApiParam(name ="年龄" , example ="1") + @ApiParam(value ="年龄" , example ="1" , access ="年龄") private Integer userAge; @Column(name="USER_LOGIN_LASTAAA_DATE_TIME") - @ApiParam(name ="用户最后登录时间") + @ApiParam(value ="用户最后登录时间" , access ="用户最后登录时间") private String userLoginLastaaaDateTime; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimed.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimed.java index 1ebfde5..c6ddb75 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimed.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimed.java @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 定时任务 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:45.399 + * @Date : 2018-10-22 16:58:43.952 * @Modify : **/ @Data @@ -29,63 +29,63 @@ public class TaskTimed extends BaseBean { @Column(name="NAME") - @ApiParam(name ="名称") + @ApiParam(value ="名称" , access ="名称") private String name; @Column(name="TIME_ID") - @ApiParam(name ="时间表达式ID") + @ApiParam(value ="时间表达式ID" , access ="时间表达式ID") private String timeId; @Column(name="RED_TIME_NAME") - @ApiParam(name ="时间表达式名称") + @ApiParam(value ="时间表达式名称" , access ="时间表达式名称") private String redTimeName; @Column(name="RED_TIME_EXPRESSION") - @ApiParam(name ="时间表达式") + @ApiParam(value ="时间表达式" , access ="时间表达式") private String redTimeExpression; @Column(name="TASK_START_DATE_TIME") - @ApiParam(name ="任务开始时间") + @ApiParam(value ="任务开始时间" , access ="任务开始时间") private String taskStartDateTime; @Column(name="TASK_END_DATE_TIME") - @ApiParam(name ="任务结束时间") + @ApiParam(value ="任务结束时间" , access ="任务结束时间") private String taskEndDateTime; @Column(name="TASK_NUM_SUM") - @ApiParam(name ="执行总次数" , example ="0") + @ApiParam(value ="执行总次数" , example ="0" , access ="执行总次数") private Integer taskNumSum; @Column(name="TASK_NUM_RUN") - @ApiParam(name ="执行次数" , example ="0") + @ApiParam(value ="执行次数" , example ="0" , access ="执行次数") private Integer taskNumRun; @Column(name="TASK_TYPE_ID") - @ApiParam(name ="任务类型（1.定时任务）" , example ="1") + @ApiParam(value ="任务类型（1.定时任务）" , example ="1" , access ="任务类型（1.定时任务）") private Integer taskTypeId; @Column(name="RESOURCE_CODE") - @ApiParam(name ="资源代码") + @ApiParam(value ="资源代码" , access ="资源代码") private String resourceCode; @Column(name="TASK_CLASS_PATH") - @ApiParam(name ="任务 class path") + @ApiParam(value ="任务 class path" , access ="任务 class path") private String taskClassPath; @Column(name="TASK_URL") - @ApiParam(name ="任务 url") + @ApiParam(value ="任务 url" , access ="任务 url") private String taskUrl; @Column(name="TASK_DESCRIPTION") - @ApiParam(name ="任务描述") + @ApiParam(value ="任务描述" , access ="任务描述") private String taskDescription; @Column(name="TASK_STATUS") - @ApiParam(name ="任务状态（1.正常，2.禁用）" , example ="1") + @ApiParam(value ="任务状态（1.正常，2.禁用）" , example ="1" , access ="任务状态（1.正常，2.禁用）") private Integer taskStatus; @Column(name="LAST_RUN_DATE_TIME") - @ApiParam(name ="最后运行时间") + @ApiParam(value ="最后运行时间" , access ="最后运行时间") private String lastRunDateTime; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimedRecording.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimedRecording.java index cbef4d4..e36a095 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimedRecording.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimedRecording.java @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 定时任务执行记录 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:45.447 + * @Date : 2018-10-22 16:58:43.992 * @Modify : **/ @Data @@ -29,39 +29,39 @@ public class TaskTimedRecording extends BaseBean { @Column(name="NAME") - @ApiParam(name ="任务名称") + @ApiParam(value ="任务名称" , access ="任务名称") private String name; @Column(name="TIMED_TASK_ID") - @ApiParam(name ="任务编号") + @ApiParam(value ="任务编号" , access ="任务编号") private String timedTaskId; @Column(name="RED_TIME_ID") - @ApiParam(name ="时间表达式ID") + @ApiParam(value ="时间表达式ID" , access ="时间表达式ID") private String redTimeId; @Column(name="RED_TIME_EXPRESSION") - @ApiParam(name ="时间表达式") + @ApiParam(value ="时间表达式" , access ="时间表达式") private String redTimeExpression; @Column(name="TASK_START_DATE_TIME") - @ApiParam(name ="任务开始时间") + @ApiParam(value ="任务开始时间" , access ="任务开始时间") private String taskStartDateTime; @Column(name="TASK_END_DATE_TIME") - @ApiParam(name ="任务结束时间") + @ApiParam(value ="任务结束时间" , access ="任务结束时间") private String taskEndDateTime; @Column(name="TASK_STATUS") - @ApiParam(name ="任务完成情况") + @ApiParam(value ="任务完成情况" , access ="任务完成情况") private String taskStatus; @Column(name="TASK_LOG") - @ApiParam(name ="任务日志") + @ApiParam(value ="任务日志" , access ="任务日志") private String taskLog; @Column(name="TASK_LOG_ERROR") - @ApiParam(name ="任务异常日志") + @ApiParam(value ="任务异常日志" , access ="任务异常日志") private String taskLogError; } 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 7287cd1..9408cf6 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 @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 硬件设备表 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:45.483 + * @Date : 2018-10-22 16:58:44.033 * @Modify : **/ @Data @@ -29,43 +29,43 @@ public class Tool extends BaseBean { @Column(name="NAME") - @ApiParam(name ="名称") + @ApiParam(value ="名称" , access ="名称") private String name; @Column(name="TOOL_TYPE_ID") - @ApiParam(name ="类型ID") + @ApiParam(value ="类型ID" , access ="类型ID") private String toolTypeId; @Column(name="RED_TOOL_TYPE_NAME") - @ApiParam(name ="类型名称") + @ApiParam(value ="类型名称" , access ="类型名称") private String redToolTypeName; @Column(name="TOOL_STATUS") - @ApiParam(name ="设备状态（1.正常，2.禁用）" , example ="1") + @ApiParam(value ="设备状态（1.正常，2.禁用）" , example ="1" , access ="设备状态（1.正常，2.禁用）") private Integer toolStatus; @Column(name="TOOL_HOST") - @ApiParam(name ="IP地址") + @ApiParam(value ="IP地址" , access ="IP地址") private String toolHost; @Column(name="TOOL_PORT") - @ApiParam(name ="端口" , example ="80") + @ApiParam(value ="端口" , example ="80" , access ="端口") private Integer toolPort; @Column(name="TOOL_CONN_TYPE") - @ApiParam(name ="连接方式（1.网口，2.串口，3.USB......）" , example ="1") + @ApiParam(value ="连接方式（1.网口，2.串口，3.USB......）" , example ="1" , access ="连接方式（1.网口，2.串口，3.USB......）") private Integer toolConnType; @Column(name="TOOL_DATA_TYPE") - @ApiParam(name ="传输数据类型（1.字符串，2.二进制数据流....）" , example ="1") + @ApiParam(value ="传输数据类型（1.字符串，2.二进制数据流....）" , example ="1" , access ="传输数据类型（1.字符串，2.二进制数据流....）") private Integer toolDataType; @Column(name="TOOL_OPERATING") - @ApiParam(name ="操作内容") + @ApiParam(value ="操作内容" , access ="操作内容") private String toolOperating; @Column(name="TOOL_DESCRIPTION") - @ApiParam(name ="描述") + @ApiParam(value ="描述" , access ="描述") private String toolDescription; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/ToolType.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/ToolType.java index 0eaa46f..bc286c4 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/ToolType.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/ToolType.java @@ -16,7 +16,7 @@ import java.text.DecimalFormat; * @Description : 设备类型 * @Reference : * @Author : wei.peng - * @Date : 2018-10-22 14:50:45.523 + * @Date : 2018-10-22 16:58:44.081 * @Modify : **/ @Data @@ -29,7 +29,7 @@ public class ToolType extends BaseBean { @Column(name="NAME") - @ApiParam(name ="名称") + @ApiParam(value ="名称" , access ="名称") private String name; }