java任务的临时数据状态

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/JavaTaskService.java

@@ -33,4 +33,6 @@ public interface JavaTaskService {
      * @param record
      */
     void updateById(JavaTask record);
+
+    void deleteJob(Integer id);
 }

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/impl/JavaTaskServiceImpl.java

@@ -52,4 +52,9 @@ public class JavaTaskServiceImpl implements JavaTaskService {
     public void updateById(JavaTask record) {
         javaTaskMapper.updateByIdSelective(record);
     }
+
+    @Override
+    public void deleteJob(Integer id) {
+        javaTaskMapper.deleteById(id);
+    }
 }

byit-myth-core/myth-admin-core/src/main/java/com/byit/thread/helper/JavaTaskThreadRunHelper.java

@@ -5,6 +5,7 @@ import com.byit.dto.plugin.JavaTask;
 import com.byit.service.JavaTaskService;
 import com.byit.service.mapservice.JavaTaskAndLogService;
 import com.byit.thread.BaseThreadRunHelper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import javax.sql.DataSource;
@@ -36,9 +37,17 @@ public class JavaTaskThreadRunHelper  extends BaseThreadRunHelper {
         if(CollectionUtil.isNotEmpty(javaTasks)){
             for (JavaTask javaTask : javaTasks)  {
                 //查看该任务的剩余执行次数
-                Integer repeatCount = javaTask.getRepeatCount();
-                if(repeatCount > 0){
-                    javaTask.setRepeatCount(javaTask.getRepeatCount()-1);
+                Integer remainingCount = javaTask.getRemainingCount();
+                if(remainingCount > 0){
+                    javaTask.setRemainingCount(javaTask.getRemainingCount()-1);
+                }
+                //当发现该数据为临时数据而且剩余执行次数为1时  删除该数据
+                if(StringUtils.isNoneBlank(javaTask.getDelMark()) && javaTask.getDelMark().equals("1")){
+                    if(javaTask.getRemainingCount() <= 0) {
+                        //删除该任务
+                        javaTaskService.deleteJob(javaTask.getId());
+                    }
+
                 }
                 javaTaskAndLogService.updateJavaTaskAndSaveLog(javaTask);
             }

byit-myth-core/myth-admin-core/src/main/resources/mapper/JavaTaskMapper.xml

@@ -15,11 +15,12 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="alarml_action" jdbcType="CHAR" property="alarmlAction" />
     <result column="alarm_email" jdbcType="VARCHAR" property="alarmEmail" />
+    <result column="del_mark" jdbcType="CHAR" property="delMark" />
   </resultMap>
   <sql id="Base_Column_List">
     <!-- generated @mbg.generated date: 2020-04-14 -->
     id, job_name, task_name, repeat_count, param, trigger_time, cron, remaining_count, 
-    create_time, update_time, alarml_action, alarm_email
+    create_time, update_time, alarml_action, alarm_email, del_mark
   </sql>
 
   <select id="findAll" resultMap="BaseResultMap">
@@ -97,6 +98,9 @@
       <if test="alarmEmail != null">
         alarm_email,
       </if>
+      <if test="delMark != null">
+        del_mark,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -135,6 +139,9 @@
       <if test="alarmEmail != null">
         #{alarmEmail,jdbcType=VARCHAR},
       </if>
+      <if test="delMark != null">
+        #{delMark,jdbcType=CHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByIdSelective" parameterType="com.byit.dto.plugin.JavaTask">
@@ -174,6 +181,9 @@
       <if test="alarmEmail != null">
         alarm_email = #{alarmEmail,jdbcType=VARCHAR},
       </if>
+      <if test="delMark != null">
+        del_mark = #{delMark,jdbcType=CHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -211,6 +221,9 @@
       <if test="alarmEmail != null">
         alarm_email = #{alarmEmail,jdbcType=VARCHAR},
       </if>
+      <if test="delMark != null">
+        del_mark = #{delMark,jdbcType=CHAR},
+      </if>
     </set>
     where job_name = #{jobName,jdbcType=VARCHAR}
   </update>

byit-myth-core/myth-dto-core/src/main/java/com/byit/dto/plugin/JavaTask.java

@@ -85,6 +85,10 @@ public class JavaTask implements Serializable {
      */
     private String jobType;
 
+    /**
+     * 删除标记
+     */
+    private String delMark;
 
     /**
      */