定时任务重写

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java

@@ -826,4 +826,74 @@ public class ImppEnumUtil {
             return tmp;
         }
     }
+    /**
+     * 系统参数值类型
+     * 1. String
+     * 2. Number
+     * 3. Date
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SYS_CONFIG_VALUE_TYPE {
+
+        STRING(1,"text","文本值"),
+        NUMBER(2,"number","数字值"),
+        DATE(3,"date","时间值"),
+        BOOLEAN(4,"switch","布尔值"),
+        SELECT(5,"select","多选值");
+
+        private int value;
+        private String name;
+        private String description;
+
+        SYS_CONFIG_VALUE_TYPE() {
+        }
+
+        SYS_CONFIG_VALUE_TYPE(int value, String name, String description) {
+            this.value = value;
+            this.name = name;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].name;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].name.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -40,6 +41,11 @@ public class SysConfig extends BaseBean {
     @ApiParam(value ="配置代码")
     private String configCode;
 
+    // 枚举 ImppEnumUtil.SYS_CONFIG_VALUE_TYPE
+    @Column(name="CONFIG_VALUE_TYPE")
+    @ApiParam(value ="配置值类型")
+    private String configValueType;
+
     @Column(name="CONFIG_VALUE")
     @ApiParam(value ="配置值")
     private String configValue;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskCycle.java

@@ -34,7 +34,7 @@ public class SysTaskCycle extends BaseBean {
     private String name;
 
     @Column(name="TASK_CYCLE_EXPS")
-    @ApiParam(value ="表达式内容")
+    @ApiParam(value ="任务周期表达式")
     private String taskCycleExps;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java

@@ -64,6 +64,7 @@ public class SysTaskPlan extends BaseBean {
 
     @Column(name="TASK_ID")
     @ApiParam(value ="定时任务id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long taskId;
 
     @Column(name="TASK_NAME_RDD")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java

@@ -38,18 +38,18 @@ public class SysLogTaskTime extends BaseBean {
     @ApiParam(value ="任务组名称")
     private String groupName;
 
-    @Column(name="TIME_TASK_ID")
-    @ApiParam(value ="任务编号" , example = "-1")
+    @Column(name="TASK_PLAN_ID")
+    @ApiParam(value ="任务计划id" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long timeTaskId;
+    private Long taskPlanId;
 
-    @Column(name="TIME_EXPRESSION_NAME_Rdd")
-    @ApiParam(value ="时间表达式名称")
-    private String timeExpressionNameRdd;
+    @Column(name="TASK_CYCLE_NAME_RDD")
+    @ApiParam(value ="任务周期名称")
+    private String taskCycleNameRdd;
 
-    @Column(name="TIME_EXPRESSION_CONTENT_RDD")
-    @ApiParam(value ="时间表达式")
-    private String timeExpressionContentRdd;
+    @Column(name="TASK_CYCLE_EXPS_RDD")
+    @ApiParam(value ="任务周期表达式")
+    private String taskCycleExpsRdd;
 
     @Column(name="EXECUTE_TIME")
     @ApiParam(value ="执行耗时")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -493,4 +493,17 @@ public class CoreHqlPack {
 
         return result.toString();
     }
+
+    /**
+     * 任务复杂查询
+     * @param sysTask
+     * @return
+     */
+    public static String packHqlSysTask(SysTask sysTask){
+        StringBuffer result =  new StringBuffer();
+
+        HqlPack.getStringLikerPack(sysTask.getName(),"name",result);
+
+        return result.toString();
+    }
 }