diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceController.java index 089eb03cb5..f46e7d8ffc 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceController.java @@ -165,7 +165,6 @@ public class ProcessInstanceController extends BaseController { * @param processInstanceId process instance id * @param scheduleTime schedule time * @param syncDefine sync define - * @param flag flag * @param locations locations * @param tenantCode tenantCode * @return update result code @@ -179,8 +178,7 @@ public class ProcessInstanceController extends BaseController { @ApiImplicitParam(name = "globalParams", value = "PROCESS_GLOBAL_PARAMS", type = "String"), @ApiImplicitParam(name = "locations", value = "PROCESS_INSTANCE_LOCATIONS", type = "String"), @ApiImplicitParam(name = "timeout", value = "PROCESS_TIMEOUT", type = "String"), - @ApiImplicitParam(name = "tenantCode", value = "TENANT_CODE", type = "Int", example = "0"), - @ApiImplicitParam(name = "flag", value = "RECOVERY_PROCESS_INSTANCE_FLAG", type = "Flag") + @ApiImplicitParam(name = "tenantCode", value = "TENANT_CODE", type = "Int", example = "0") }) @PostMapping(value = "/update") @ResponseStatus(HttpStatus.OK) @@ -195,10 +193,9 @@ public class ProcessInstanceController extends BaseController { @RequestParam(value = "globalParams", required = false, defaultValue = "[]") String globalParams, @RequestParam(value = "locations", required = false) String locations, @RequestParam(value = "timeout", required = false, defaultValue = "0") int timeout, - @RequestParam(value = "tenantCode", required = true) String tenantCode, - @RequestParam(value = "flag", required = false) Flag flag) { + @RequestParam(value = "tenantCode", required = true) String tenantCode) { Map result = processInstanceService.updateProcessInstance(loginUser, projectCode, processInstanceId, - taskRelationJson, scheduleTime, syncDefine, flag, globalParams, locations, timeout, tenantCode); + taskRelationJson, scheduleTime, syncDefine, globalParams, locations, timeout, tenantCode); return returnDataList(result); } diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java index cd4cfd5365..0190d177ba 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java @@ -119,7 +119,6 @@ public interface ProcessInstanceService { * @param processInstanceId process instance id * @param scheduleTime schedule time * @param syncDefine sync define - * @param flag flag * @param globalParams global params * @param locations locations for nodes * @param timeout timeout @@ -132,7 +131,6 @@ public interface ProcessInstanceService { String taskRelationJson, String scheduleTime, Boolean syncDefine, - Flag flag, String globalParams, String locations, int timeout, diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java index 842b6b71d4..9a6fa3e18c 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java @@ -404,7 +404,6 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce * @param processInstanceId process instance id * @param scheduleTime schedule time * @param syncDefine sync define - * @param flag flag * @param globalParams global params * @param locations locations for nodes * @param timeout timeout @@ -414,7 +413,7 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce @Transactional @Override public Map updateProcessInstance(User loginUser, long projectCode, Integer processInstanceId, String taskRelationJson, - String scheduleTime, Boolean syncDefine, Flag flag, String globalParams, + String scheduleTime, Boolean syncDefine, String globalParams, String locations, int timeout, String tenantCode) { Project project = projectMapper.queryByCode(projectCode); //check user access for project diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java index cbca3b683a..820d5fba98 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java @@ -372,7 +372,7 @@ public class ProcessInstanceServiceTest { when(projectMapper.queryByCode(projectCode)).thenReturn(project); when(projectService.checkProjectAndAuth(loginUser, project, projectCode)).thenReturn(result); Map proejctAuthFailRes = processInstanceService.updateProcessInstance(loginUser, projectCode, 1, - shellJson, "2020-02-21 00:00:00", true, Flag.YES, "", "", 0, ""); + shellJson, "2020-02-21 00:00:00", true, "", "", 0, ""); Assert.assertEquals(Status.PROJECT_NOT_FOUNT, proejctAuthFailRes.get(Constants.STATUS)); //process instance null @@ -382,7 +382,7 @@ public class ProcessInstanceServiceTest { when(projectService.checkProjectAndAuth(loginUser, project, projectCode)).thenReturn(result); when(processService.findProcessInstanceDetailById(1)).thenReturn(null); Map processInstanceNullRes = processInstanceService.updateProcessInstance(loginUser, projectCode, 1, - shellJson, "2020-02-21 00:00:00", true, Flag.YES, "", "", 0, ""); + shellJson, "2020-02-21 00:00:00", true, "", "", 0, ""); Assert.assertEquals(Status.PROCESS_INSTANCE_NOT_EXIST, processInstanceNullRes.get(Constants.STATUS)); //process instance not finish @@ -390,7 +390,7 @@ public class ProcessInstanceServiceTest { processInstance.setState(ExecutionStatus.RUNNING_EXECUTION); putMsg(result, Status.SUCCESS, projectCode); Map processInstanceNotFinishRes = processInstanceService.updateProcessInstance(loginUser, projectCode, 1, - shellJson, "2020-02-21 00:00:00", true, Flag.YES, "", "", 0, ""); + shellJson, "2020-02-21 00:00:00", true, "", "", 0, ""); Assert.assertEquals(Status.PROCESS_INSTANCE_STATE_OPERATION_ERROR, processInstanceNotFinishRes.get(Constants.STATUS)); //process instance finish @@ -410,7 +410,7 @@ public class ProcessInstanceServiceTest { when(processDefinitionService.checkProcessNodeList(shellJson)).thenReturn(result); putMsg(result, Status.SUCCESS, projectCode); Map processInstanceFinishRes = processInstanceService.updateProcessInstance(loginUser, projectCode, 1, - shellJson, "2020-02-21 00:00:00", true, Flag.YES, "", "", 0, "root"); + shellJson, "2020-02-21 00:00:00", true, "", "", 0, "root"); Assert.assertEquals(Status.UPDATE_PROCESS_DEFINITION_ERROR, processInstanceFinishRes.get(Constants.STATUS)); //success @@ -418,7 +418,7 @@ public class ProcessInstanceServiceTest { putMsg(result, Status.SUCCESS, projectCode); Map successRes = processInstanceService.updateProcessInstance(loginUser, projectCode, 1, - shellJson, "2020-02-21 00:00:00", false, Flag.YES, "", "", 0, "root"); + shellJson, "2020-02-21 00:00:00", false, "", "", 0, "root"); Assert.assertEquals(Status.SUCCESS, successRes.get(Constants.STATUS)); } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java index 622e9d17d4..fa69f2978d 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java @@ -34,8 +34,7 @@ public enum Flag { NO(0, "no"), YES(1, "yes"); - - Flag(int code, String descp){ + Flag(int code, String descp) { this.code = code; this.descp = descp; } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Priority.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Priority.java index bdd7128eac..53ca3f9c74 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Priority.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Priority.java @@ -35,7 +35,7 @@ public enum Priority { LOW(3, "low"), LOWEST(4, "lowest"); - Priority(int code, String descp){ + Priority(int code, String descp) { this.code = code; this.descp = descp; } diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionMapper.xml index 6e14de911b..61f55430d0 100644 --- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionMapper.xml @@ -86,7 +86,7 @@ #{taskDefinition.delayTime},#{taskDefinition.resourceIds},#{taskDefinition.createTime},#{taskDefinition.updateTime}) - select td.id, td.code, td.name, td.version, td.description, td.project_code, td.user_id, td.task_type, td.task_params, td.flag, td.task_priority, td.worker_group, td.fail_retry_times, td.fail_retry_interval, td.timeout_flag, td.timeout_notify_strategy, td.timeout, td.delay_time, td.resource_ids, td.create_time, td.update_time, u.user_name,p.name as project_name