非datax任务无法正常手工终止的bug修复

Author: LockiJiang

datax-admin/src/main/java/com/wugui/datax/admin/controller/JobLogController.java

@@ -3,6 +3,7 @@
 import com.wugui.datatx.core.biz.ExecutorBiz;
 import com.wugui.datatx.core.biz.model.LogResult;
 import com.wugui.datatx.core.biz.model.ReturnT;
+import com.wugui.datatx.core.glue.GlueTypeEnum;
 import com.wugui.datatx.core.util.DateUtil;
 import com.wugui.datax.admin.core.kill.KillJob;
 import com.wugui.datax.admin.core.scheduler.JobScheduler;
@@ -94,7 +95,7 @@ public ReturnT<LogResult> logDetailCat(String executorAddress, long triggerTime,
 
     @RequestMapping(value = "/logKill", method = RequestMethod.POST)
     @ApiOperation("kill任务")
-    public ReturnT<String> logKill(int id) {
+    public ReturnT<String> logKill(long id) {
         // base check
         JobLog log = jobLogMapper.load(id);
         JobInfo jobInfo = jobInfoMapper.loadById(log.getJobId());
@@ -168,6 +169,11 @@ public ReturnT<String> clearLog(int jobGroup, int jobId, int type) {
     @ApiOperation("停止该job作业")
     @PostMapping("/killJob")
     public ReturnT<String> killJob(@RequestBody JobLog log) {
-        return KillJob.trigger(log.getId(), log.getTriggerTime(), log.getExecutorAddress(), log.getProcessId());
+        JobInfo jobInfo = jobInfoMapper.loadById(log.getJobId());
+        if (GlueTypeEnum.match(jobInfo.getGlueType()) == GlueTypeEnum.DATAX) {
+            return KillJob.trigger(log.getId(), log.getTriggerTime(), log.getExecutorAddress(), log.getProcessId());
+        } else {
+            return this.logKill(log.getId());
+        }
     }
 }