ak
/
xx-job
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

任务终止fix

This commit is contained in:
xueli.xue 2016-06-12 20:20:49 +08:00
parent 0c4491a1b8
commit 7c0aaea0b6
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java
View File

@ -18,7 +18,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
import com.xxl.job.admin.core.constant.Constants.JobGroupEnum;
import com.xxl.job.admin.core.model.ReturnT;
import com.xxl.job.admin.core.model.XxlJobInfo;
import com.xxl.job.admin.core.model.XxlJobLog;
import com.xxl.job.admin.dao.IXxlJobInfoDao;
import com.xxl.job.admin.dao.IXxlJobLogDao;
import com.xxl.job.core.handler.HandlerRepository.ActionEnum;
import com.xxl.job.core.handler.HandlerRepository.HandlerParamEnum;
@ -35,6 +37,8 @@ public class JobLogController {
@Resource
public IXxlJobLogDao xxlJobLogDao;
@Resource
public IXxlJobInfoDao xxlJobInfoDao;
@RequestMapping
public String index(Model model, String jobGroup, String jobName) {
@ -132,7 +136,8 @@ public class JobLogController {
public ReturnT<String> logKill(int id){
// base check
XxlJobLog log = xxlJobLogDao.load(id);
if (log == null) {
XxlJobInfo jobInfo = xxlJobInfoDao.load(log.getJobGroup(), log.getJobName());
if (log == null || jobInfo==null) {
return new ReturnT<String>(500, "参数异常");
}
if (!RemoteCallBack.SUCCESS.equals(log.getTriggerStatus())) {
@ -143,6 +148,7 @@ public class JobLogController {
Map<String, String> reqMap = new HashMap<String, String>();
reqMap.put(HandlerParamEnum.TIMESTAMP.name(), String.valueOf(System.currentTimeMillis()));
reqMap.put(HandlerParamEnum.ACTION.name(), ActionEnum.KILL.name());
reqMap.put(HandlerParamEnum.GLUE_SWITCH.name(), String.valueOf(jobInfo.getGlueSwitch()));
reqMap.put(HandlerParamEnum.EXECUTOR_HANDLER.name(), log.getExecutorHandler());
reqMap.put(HandlerParamEnum.JOB_GROUP.name(), log.getJobGroup());
reqMap.put(HandlerParamEnum.JOB_NAME.name(), log.getJobName());