From 73b4d3b9ac69d1df2990e5f622d171ba1551ff6e Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 25 Oct 2018 09:36:19 +0800 Subject: [PATCH] =?UTF-8?q?POJO=20=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/bean/Department.java | 8 ++++---- .../estsh/i3plus/pojo/platform/bean/Organize.java | 24 +++++++++------------- .../estsh/i3plus/pojo/platform/bean/SysMenu.java | 4 ---- .../bean/{TaskTimed.java => TaskTime.java} | 2 +- ...TimeExpression.java => TaskTimeExpression.java} | 6 +++--- ...kTimedRecording.java => TaskTimeRecording.java} | 2 +- 6 files changed, 19 insertions(+), 27 deletions(-) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/{TaskTimed.java => TaskTime.java} (98%) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/{SysTimeExpression.java => TaskTimeExpression.java} (88%) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/{TaskTimedRecording.java => TaskTimeRecording.java} (97%) 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 e245dfc..f5bac9e 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 @@ -52,13 +52,13 @@ public class Department extends BaseBean { @ApiParam(value ="部门状态（1.正常，2.禁用）" , example ="1" , access ="部门状态（1.正常，2.禁用）") private Integer departmentStatus; - @Column(name="RED_ORGANIZATION_NAME") + @Column(name="RED_ORGANIZE_NAME") @ApiParam(value ="所属组织名称" , access ="所属组织名称") - private String redOrganizationName; + private String redOrganizeName; - @Column(name="ORGANIZATION_ID") + @Column(name="ORGANIZE_ID") @ApiParam(value ="所属组织" , access ="所属组织") - private String organizationId; + private String organizeId; @Column(name="DEPARTMENT_SORT") @ApiParam(value ="排序" , example ="1" , access ="排序") 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 c68ddac..25f8bcf 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 @@ -32,17 +32,13 @@ public class Organize extends BaseBean { @ApiParam(value ="名称" , access ="名称") private String name; - @Column(name="ORGANIZATION_CODE") + @Column(name="ORGANIZE_CODE") @ApiParam(value ="组织代码" , access ="组织代码") - private String organizationCode; + private String organizeCode; - @Column(name="ORGANIZATION_TYPE_ID") + @Column(name="ORGANIZE_TYPE_ID") @ApiParam(value ="组织类型ID（1.集团，2.公司，3.工厂）" , example ="1" , access ="组织类型ID（1.集团，2.公司，3.工厂）") - private Integer organizationTypeId; - - @Column(name="ORGANIZATION_TYPE_NAME") - @ApiParam(value ="组织类型名称" , access ="组织类型名称") - private String organizationTypeName; + private Integer organizeTypeId; @Column(name="PARENT_ID") @ApiParam(value ="父节点" , access ="父节点" ,example = "0") @@ -52,16 +48,16 @@ public class Organize extends BaseBean { @ApiParam(value ="父节点" , access ="父节点") private String redParentName; - @Column(name="ORGANIZATION_DESCRIPTION") + @Column(name="ORGANIZE_DESCRIPTION") @ApiParam(value ="组织描述" , access ="组织描述") - private String organizationDescription; + private String organizeDescription; - @Column(name="ORGANIZATION_SORT") + @Column(name="ORGANIZE_SORT") @ApiParam(value ="排序" , example ="1" , access ="排序") - private Integer organizationSort; + private Integer organizeSort; - @Column(name="ORGANIZATION_STATUS") + @Column(name="ORGANIZE_STATUS") @ApiParam(value ="组织状态（1.正常，2.禁用）" , example ="1" , access ="组织状态（1.正常，2.禁用）") - private Integer organizationStatus; + private Integer organizeStatus; } 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 3f45379..2b5ad28 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 @@ -36,10 +36,6 @@ public class SysMenu extends BaseBean { @ApiParam(value ="功能类型（1.模块，2.菜单，3.按钮）" , example ="1" , access ="功能类型（1.模块，2.菜单，3.按钮）") private Integer menuTypeId; - @Column(name="RED_MENU_TYPE_NAME") - @ApiParam(value ="功能类型名称" , access ="功能类型名称") - private String redMenuTypeName; - @Column(name="PARENT_ID") @ApiParam(value ="父级功能ID" , access ="父级功能ID" ) private Long parentId; 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/TaskTime.java similarity index 98% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimed.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java index d8fdbce..d2f124c 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/TaskTime.java @@ -25,7 +25,7 @@ import java.text.DecimalFormat; @DynamicInsert @DynamicUpdate @Api(value="定时任务",description = "定时任务") -public class TaskTimed extends BaseBean { +public class TaskTime extends BaseBean { @Column(name="NAME") 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/TaskTimeExpression.java similarity index 88% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTimeExpression.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeExpression.java index dc0274a..4df5f98 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/TaskTimeExpression.java @@ -13,7 +13,7 @@ import javax.persistence.Table; import java.text.DecimalFormat; /** - * @Description : 系统时间表达式 + * @Description : 定时任务时间表达式 * @Reference : * @Author : wei.peng * @Date : 2018-10-22 16:58:43.801 @@ -21,11 +21,11 @@ import java.text.DecimalFormat; **/ @Data @Entity -@Table(name="SYS_TIME_EXPRESSION") +@Table(name="Task_TIME_EXPRESSION") @DynamicInsert @DynamicUpdate @Api(value="系统时间表达式",description = "系统时间表达式") -public class SysTimeExpression extends BaseBean { +public class TaskTimeExpression extends BaseBean { @Column(name="NAME") 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/TaskTimeRecording.java similarity index 97% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimedRecording.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeRecording.java index 60ed868..33e5390 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/TaskTimeRecording.java @@ -25,7 +25,7 @@ import java.text.DecimalFormat; @DynamicInsert @DynamicUpdate @Api(value="定时任务执行记录",description = "定时任务执行记录") -public class TaskTimedRecording extends BaseBean { +public class TaskTimeRecording extends BaseBean { @Column(name="NAME")