From 31eff910777d11d752a161f19c8cd2a52d938d4f Mon Sep 17 00:00:00 2001
From: weiye <jingwk@greatld.com>
Date: Tue, 18 Feb 2020 11:07:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=9C=80=E8=BF=91=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/wugui/datax/admin/dto/RunJobDto.java  | 21 -------------------
 .../com/wugui/datax/admin/entity/JobInfo.java |  3 +++
 .../datax/admin/mapper/JobInfoMapper.java     |  1 +
 .../admin/service/impl/AdminBizImpl.java      |  6 ++++--
 .../mybatis-mapper/JobInfoMapper.xml          | 19 +++++++++++++----
 doc/db/datax_web.sql                          |  6 ++++++
 6 files changed, 29 insertions(+), 27 deletions(-)
 delete mode 100644 datax-admin/src/main/java/com/wugui/datax/admin/dto/RunJobDto.java

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 @@
 		<result column="inc_start_time" property="incStartTime" />
 		<result column="partition_info" property="partitionInfo" />
 
+		<result column="last_handle_code" property="lastHandleCode" />
 	</resultMap>
 
 	<sql id="Base_Column_List">
@@ -69,7 +70,8 @@
 		t.replace_param,
 		t.jvm_param,
 		t.inc_start_time,
-		t.partition_info
+		t.partition_info,
+		t.last_handle_code
 	</sql>
 
 	<select id="pageList" parameterType="java.util.HashMap" resultMap="JobInfo">
@@ -145,7 +147,8 @@
 			replace_param,
 			jvm_param,
 			inc_start_time,
-			partition_info
+			partition_info,
+			last_handle_code
 		) VALUES (
 			#{jobGroup},
 			#{jobCron},
@@ -172,7 +175,8 @@
 			#{replaceParam},
 			#{jvmParam},
 			#{incStartTime},
-			#{partitionInfo}
+			#{partitionInfo},
+			#{lastHandleCode}
 		);
 		<!--<selectKey resultType="java.lang.Integer" order="AFTER" keyProperty="id">
 			SELECT LAST_INSERT_ID()
@@ -213,7 +217,8 @@
 			replace_param=#{replaceParam},
 			jvm_param=#{jvmParam},
 			inc_start_time=#{incStartTime},
-			partition_info=#{partitionInfo}
+			partition_info=#{partitionInfo},
+			last_handle_code=#{lastHandleCode}
 		WHERE id = #{id}
 	</update>
 
@@ -260,4 +265,10 @@
 		WHERE id = #{id}
 	</update>
 
+	<update id="updateLastHandleCode" parameterType="java.util.HashMap">
+		UPDATE job_info
+		SET
+			last_handle_code = #{lastHandleCode}
+		WHERE id = #{id}
+	</update>
 </mapper>
\ No newline at end of file
diff --git a/doc/db/datax_web.sql b/doc/db/datax_web.sql
index 91180ea2..1c559fbc 100644
--- a/doc/db/datax_web.sql
+++ b/doc/db/datax_web.sql
@@ -299,3 +299,9 @@ ADD COLUMN `partition_info` VARCHAR(100) NULL DEFAULT NULL COMMENT '分区信息
 
 ALTER TABLE `datax_web`.`job_template`
 ADD COLUMN `partition_info` VARCHAR(100) NULL DEFAULT NULL COMMENT '分区信息' AFTER `inc_start_time`;
+
+/**
+最近一次执行状态
+ */
+ALTER TABLE `datax_web`.`job_info`
+ADD COLUMN `last_handle_code` INT(11) NULL DEFAULT '0' COMMENT '最近一次执行状态' AFTER `partition_info`;