diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/dto/RunJobDto.java b/datax-admin/src/main/java/com/wugui/datax/admin/dto/RunJobDto.java deleted file mode 100644 index b8ca1932..00000000 --- a/datax-admin/src/main/java/com/wugui/datax/admin/dto/RunJobDto.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.wugui.datax.admin.dto; - -import lombok.Data; - -import java.io.Serializable; - -/** - * 用于启动任务接收的实体 - * - * @author zhouhongfa@gz-yibo.com - * @ClassName RunJobDto - * @Version 1.0 - * @since 2019/6/27 16:12 - */ -@Data -public class RunJobDto implements Serializable { - - private String jobJson; - - private Long jobConfigId; -} diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/entity/JobInfo.java b/datax-admin/src/main/java/com/wugui/datax/admin/entity/JobInfo.java index 5115f3d1..1a9f367d 100644 --- a/datax-admin/src/main/java/com/wugui/datax/admin/entity/JobInfo.java +++ b/datax-admin/src/main/java/com/wugui/datax/admin/entity/JobInfo.java @@ -91,4 +91,7 @@ public class JobInfo { @ApiModelProperty("分区信息") private String partitionInfo; + + @ApiModelProperty("最近一次执行状态") + private int lastHandleCode; } diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobInfoMapper.java b/datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobInfoMapper.java index 423c115b..c6ab1310 100644 --- a/datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobInfoMapper.java +++ b/datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobInfoMapper.java @@ -48,5 +48,6 @@ public interface JobInfoMapper { public int incrementTimeUpdate(@Param("id") int id, @Param("incStartTime") Date incStartTime); + public int updateLastHandleCode(@Param("id") int id,@Param("lastHandleCode")int lastHandleCode); } diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/service/impl/AdminBizImpl.java b/datax-admin/src/main/java/com/wugui/datax/admin/service/impl/AdminBizImpl.java index 792aecf7..ba9cdf48 100644 --- a/datax-admin/src/main/java/com/wugui/datax/admin/service/impl/AdminBizImpl.java +++ b/datax-admin/src/main/java/com/wugui/datax/admin/service/impl/AdminBizImpl.java @@ -77,7 +77,8 @@ public class AdminBizImpl implements AdminBiz { // trigger success, to trigger child job String callbackMsg = null; - if (IJobHandler.SUCCESS.getCode() == handleCallbackParam.getExecuteResult().getCode()) { + int resultCode = handleCallbackParam.getExecuteResult().getCode(); + if (IJobHandler.SUCCESS.getCode() == resultCode) { JobInfo jobInfo = jobInfoMapper.loadById(log.getJobId()); jobInfoMapper.incrementTimeUpdate(log.getJobId(),log.getTriggerTime()); if (jobInfo != null && jobInfo.getChildJobId() != null && jobInfo.getChildJobId().trim().length() > 0) { @@ -123,9 +124,10 @@ public class AdminBizImpl implements AdminBiz { // success, save log log.setHandleTime(new Date()); - log.setHandleCode(handleCallbackParam.getExecuteResult().getCode()); + log.setHandleCode(resultCode); log.setHandleMsg(handleMsg.toString()); jobLogMapper.updateHandleInfo(log); + jobInfoMapper.updateLastHandleCode(log.getJobId(), resultCode); return ReturnT.SUCCESS; } diff --git a/datax-admin/src/main/resources/mybatis-mapper/JobInfoMapper.xml b/datax-admin/src/main/resources/mybatis-mapper/JobInfoMapper.xml index 1bfd4f9d..2758411f 100644 --- a/datax-admin/src/main/resources/mybatis-mapper/JobInfoMapper.xml +++ b/datax-admin/src/main/resources/mybatis-mapper/JobInfoMapper.xml @@ -40,6 +40,7 @@ + @@ -69,7 +70,8 @@ t.replace_param, t.jvm_param, t.inc_start_time, - t.partition_info + t.partition_info, + t.last_handle_code