From 7a9e30c24c84b53033e8ef0a8c64cbb20e0a714f Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 26 Oct 2018 17:24:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=9B=B4?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/ResourceEnumUtil.java | 3 +- .../i3plus/pojo/platform/bean/Department.java | 3 +- .../bean/{LogAction.java => LogOperate.java} | 36 +++++++++++----------- ...onRepository.java => LogOperateRepository.java} | 4 +-- .../repository/SysTimeExpressionRepository.java | 28 ++++++++--------- .../repository/TaskTimedRecordingRepository.java | 28 ++++++++--------- .../platform/repository/TaskTimedRepository.java | 28 ++++++++--------- 7 files changed, 66 insertions(+), 64 deletions(-) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/{LogAction.java => LogOperate.java} (65%) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/{LogActionRepository.java => LogOperateRepository.java} (65%) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ResourceEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ResourceEnumUtil.java index d275376..1a7d0cd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ResourceEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ResourceEnumUtil.java @@ -57,7 +57,8 @@ public class ResourceEnumUtil { */ public enum MESSAGE { SUCCESS("20001", "成功"), - FAIL("20002", "失败"); + FAIL("20002", "失败"), + EMPTY("20003", "数据不存在"); private String code; private String description; 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 3e90f0a..3df1ceb 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 @@ -43,8 +43,9 @@ public class Department extends BaseBean { private String redParentName; @Column(name="PARENT_ID") - @ApiParam(value ="父节点ID" , example = "0") + @ApiParam(value ="父节点ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) + // 根节点-1 private Long parentId; @ApiParam(value ="子部门列表") 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/LogOperate.java similarity index 65% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogAction.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java index 5bb5fd7..9933950 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/LogOperate.java @@ -21,43 +21,43 @@ import java.text.DecimalFormat; **/ @Data @Entity -@Table(name="LOG_ACTION") +@Table(name="LOG_OPERATE") @DynamicInsert @DynamicUpdate @Api(value="操作日志表",description = "操作日志表") -public class LogAction extends BaseBean { +public class LogOperate extends BaseBean { - @Column(name="ACTION_MODULE_NAME") + @Column(name="OPERATE_MODULE_NAME") @ApiParam(value ="模块名称" , access ="模块名称") - private String actionModuleName; + private String operateModuleName; - @Column(name="ACTION_TYPE_ID") + @Column(name="OPERATE_TYPE_ID") @ApiParam(value ="操作类型" , access ="操作类型") - private String actionTypeId; + private String operateTypeId; - @Column(name="ACTION_OBJECT") + @Column(name="OPERATE_OBJECT") @ApiParam(value ="操作对象" , access ="操作对象") - private String actionObject; + private String operateObject; - @Column(name="ACTION_FIRST_DATA") + @Column(name="OPERATE_FIRST_DATA") @ApiParam(value ="操作前数据" , access ="操作前数据") - private String actionFirstData; + private String operateFirstData; - @Column(name="ACTION_LAST_DATA") + @Column(name="OPERATE_LAST_DATA") @ApiParam(value ="操作后数据" , access ="操作后数据") - private String actionLastData; + private String operateLastData; - @Column(name="ACTION_IP") + @Column(name="OPERATE_IP") @ApiParam(value ="服务器IP" , access ="服务器IP") - private String actionIp; + private String operateIp; - @Column(name="ACTION_TERMINAL") + @Column(name="OPERATE_TERMINAL") @ApiParam(value ="操作终端" , access ="操作终端") - private String actionTerminal; + private String operateTerminal; - @Column(name="ACTION_USER_NAME") + @Column(name="OPERATE_USER_NAME") @ApiParam(value ="操作人名称" , access ="操作人名称") - private String actionUserName; + private String operateUserName; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogActionRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java similarity index 65% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogActionRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java index 939bd04..5085132 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogActionRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.platform.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.platform.bean.LogAction; +import cn.estsh.i3plus.pojo.platform.bean.LogOperate; /** * @Description : 操作日志表 @@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.LogAction; * @Date : 2018-10-22 12:03:00.118 * @Modify : **/ -public interface LogActionRepository extends BaseRepository { +public interface LogOperateRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTimeExpressionRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTimeExpressionRepository.java index 2db95ef..5ea4435 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTimeExpressionRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTimeExpressionRepository.java @@ -1,14 +1,14 @@ -package cn.estsh.i3plus.pojo.platform.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.platform.bean.SysTimeExpression; - -/** - * @Description : 系统时间表达式 - * @Reference : - * @Author : wei.peng - * @Date : 2018-10-22 12:03:01.252 - * @Modify : - **/ -public interface SysTimeExpressionRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.platform.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.platform.bean.SysTimeExpression; +// +///** +// * @Description : 系统时间表达式 +// * @Reference : +// * @Author : wei.peng +// * @Date : 2018-10-22 12:03:01.252 +// * @Modify : +// **/ +//public interface SysTimeExpressionRepository extends BaseRepository { +//} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimedRecordingRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimedRecordingRepository.java index d40e1c5..9591594 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimedRecordingRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimedRecordingRepository.java @@ -1,14 +1,14 @@ -package cn.estsh.i3plus.pojo.platform.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.platform.bean.TaskTimedRecording; - -/** - * @Description : 定时任务执行记录 - * @Reference : - * @Author : wei.peng - * @Date : 2018-10-22 12:03:01.409 - * @Modify : - **/ -public interface TaskTimedRecordingRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.platform.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.platform.bean.TaskTimedRecording; +// +///** +// * @Description : 定时任务执行记录 +// * @Reference : +// * @Author : wei.peng +// * @Date : 2018-10-22 12:03:01.409 +// * @Modify : +// **/ +//public interface TaskTimedRecordingRepository extends BaseRepository { +//} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimedRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimedRepository.java index 8d71b8c..8aaeff2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimedRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimedRepository.java @@ -1,14 +1,14 @@ -package cn.estsh.i3plus.pojo.platform.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.platform.bean.TaskTimed; - -/** - * @Description : 定时任务 - * @Reference : - * @Author : wei.peng - * @Date : 2018-10-22 12:03:01.372 - * @Modify : - **/ -public interface TaskTimedRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.platform.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.platform.bean.TaskTimed; +// +///** +// * @Description : 定时任务 +// * @Reference : +// * @Author : wei.peng +// * @Date : 2018-10-22 12:03:01.372 +// * @Modify : +// **/ +//public interface TaskTimedRepository extends BaseRepository { +//}