操作日志更名

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;

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 ="子部门列表")

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;
 
 }

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<LogAction, Long> {
+public interface LogOperateRepository extends BaseRepository<LogOperate, Long> {
 }

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<SysTimeExpression, Long> {
-}
+//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<SysTimeExpression, Long> {
+//}

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<TaskTimedRecording, Long> {
-}
+//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<TaskTimedRecording, Long> {
+//}

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<TaskTimed, Long> {
-}
+//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<TaskTimed, Long> {
+//}