定时任务 完成

表达式   完成
邮件工具类

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

@@ -87,9 +87,9 @@ public class ImppEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TASK_METHOD_TYPE{
-        TYPE_GROUP(1,"类方法","Java Class 方法"),
-        TYPE_COMPANY(2,"链接","Http URL"),
-        TYPE_FACTORY(3,"权限CODE","权限CODE");
+        TYPE_GROUP(1,"类方法","Java Class 方法");
+//        TYPE_COMPANY(2,"链接","Http URL"),
+//        TYPE_FACTORY(3,"权限CODE","权限CODE");
 
         private int value;
         private String name;

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

@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.platform.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 关系-表达式与触发器
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2018-11-14 13:28
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="REF_EXPRESSION_TRIGGER")
+@Api(value="关系-表达式与触发器",description = "关系-表达式与触发器")
+public class RefExpressionTrigger extends BaseBean {
+
+    @Column(name="EXPRESSION_ID")
+    @ApiParam(value ="表达式_ID" ,example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long expressionId;
+
+    public Long getExpressionId() {
+        if(expressionId != null) {
+            return expressionId.longValue();
+        }else{
+            return expressionId;
+        }
+    }
+
+    @Column(name="TRIGGER_NAME")
+    @ApiParam(value ="触发器名称")
+    private String triggerName;
+
+    @Column(name="TRIGGER_GROUP_NAME")
+    @ApiParam(value ="触发器名称")
+    private String triggerGroupName;
+}

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

@@ -39,34 +39,26 @@ public class TaskTime extends BaseBean {
     @ApiParam(value ="名称")
     private String groupName;
 
-    @Column(name="TIME_ID")
+    @Column(name="TIME_EXPRESSION_ID")
     @ApiParam(value ="时间表达式ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long timeId;
+    private Long timeExpressionId;
 
-    public Long getTimeId() {
-        if(timeId != null) {
-            return timeId.longValue();
+    public Long getTimeExpressionId() {
+        if(timeExpressionId != null) {
+            return timeExpressionId.longValue();
         }else{
-            return timeId;
+            return timeExpressionId;
         }
     }
 
     @Column(name="RED_TIME_NAME")
     @ApiParam(value ="时间表达式名称")
-    private String redTimeName;
+    private String timeExpressionNameRdd;
 
-    @Column(name="RED_TIME_EXPRESSION")
+    @Column(name="TIME_EXPRESSION_CONTENT_RDD")
     @ApiParam(value ="时间表达式")
-    private String redTimeExpression;
-
-    @Column(name="TASK_START_DATE_TIME")
-    @ApiParam(value ="任务开始时间")
-    private String taskStartDateTime;
-
-    @Column(name="TASK_END_DATE_TIME")
-    @ApiParam(value ="任务结束时间")
-    private String taskEndDateTime;
+    private String timeExpressionContentRdd;
 
     @Column(name="TASK_NUM_SUM")
     @ApiParam(value ="执行总次数" , example ="0")
@@ -80,14 +72,26 @@ public class TaskTime extends BaseBean {
     @ApiParam(value ="任务类型（枚举：1.定时任务）" , example ="-1")
     private Integer taskTypeId;
 
-    @Column(name="TASK_METHOD")
-    @ApiParam(value ="执行方法")
-    private String taskMethod;
-
     @Column(name="TASK_METHOD_TYPE_ID")
     @ApiParam(value ="任务执行类型" ,example = "-1")
     private Integer taskMethodTypeId;
 
+    @Column(name="TASK_PACKAGE")
+    @ApiParam(value ="任务包名")
+    private String taskPackage;
+
+    @Column(name="TASK_CLASS")
+    @ApiParam(value ="任务类名")
+    private String taskClass;
+
+    @Column(name="TASK_START_DATE_TIME_RDD")
+    @ApiParam(value ="任务开始时间")
+    private String taskStartDateTimeRdd;
+
+    @Column(name="TASK_END_DATE_TIME_RDD")
+    @ApiParam(value ="任务结束时间")
+    private String taskEndDateTimeRdd;
+
     @Column(name="TASK_DESCRIPTION")
     @ApiParam(value ="任务描述" , access ="任务描述")
     private String taskDescription;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefExpressionTriggerRepository.java

@@ -0,0 +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.RefExpressionTrigger;
+
+/**
+ * @Description : 关系-表达式与触发器
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2018-11-14 13:36
+ * @Modify:
+ **/
+public interface RefExpressionTriggerRepository extends BaseRepository<RefExpressionTrigger, Long> {
+}

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

@@ -280,7 +280,7 @@ public class CoreHqlPack {
         // hql拼接
         HqlPack.getStringLikerPack(taskTime.getName(),"name",result);
         HqlPack.getNumEqualPack(taskTime.getTaskStatus(),"taskStatus",result);
-        HqlPack.getNumEqualPack(taskTime.getTimeId(),"timeId",result);
+        HqlPack.getNumEqualPack(taskTime.getTimeExpressionId(),"timeExpressionId",result);
 
         return  result.toString();
     }