diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java index db28f0b7d6..b131909a76 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java @@ -99,7 +99,7 @@ public class ExecutorController extends BaseController { @ApiImplicitParam(name = "runMode", value = "RUN_MODE", dataType = "RunMode"), @ApiImplicitParam(name = "processInstancePriority", value = "PROCESS_INSTANCE_PRIORITY", required = true, dataType = "Priority"), @ApiImplicitParam(name = "workerGroup", value = "WORKER_GROUP", dataType = "String", example = "default"), - @ApiImplicitParam(name = "environmentCode", value = "ENVIRONMENT_CODE", dataType = "Long", example = "default"), + @ApiImplicitParam(name = "environmentCode", value = "ENVIRONMENT_CODE", dataType = "Long", example = "-1"), @ApiImplicitParam(name = "timeout", value = "TIMEOUT", dataType = "Int", example = "100"), @ApiImplicitParam(name = "expectedParallelismNumber", value = "EXPECTED_PARALLELISM_NUMBER", dataType = "Int", example = "8") }) diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessTaskRelationController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessTaskRelationController.java index 29b8be7b73..562661fe8e 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessTaskRelationController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessTaskRelationController.java @@ -82,9 +82,9 @@ public class ProcessTaskRelationController extends BaseController { @AccessLogAnnotation(ignoreRequestArgs = "loginUser") public Result createProcessTaskRelation(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser, @ApiParam(name = "projectCode", value = "PROJECT_CODE", required = true) @PathVariable long projectCode, - @RequestParam(name = "processDefinitionCode", value = "PROCESS_DEFINITION_CODE", required = true) long processDefinitionCode, - @RequestParam(name = "preTaskCode", value = "PRE_TASK_CODE", required = true) long preTaskCode, - @RequestParam(name = "postTaskCode", value = "POST_TASK_CODE", required = true) long postTaskCode) { + @RequestParam(name = "processDefinitionCode", required = true) long processDefinitionCode, + @RequestParam(name = "preTaskCode", required = true) long preTaskCode, + @RequestParam(name = "postTaskCode", required = true) long postTaskCode) { return returnDataList(processTaskRelationService.createProcessTaskRelation(loginUser, projectCode, processDefinitionCode, preTaskCode, postTaskCode)); } @@ -111,9 +111,9 @@ public class ProcessTaskRelationController extends BaseController { @AccessLogAnnotation(ignoreRequestArgs = "loginUser") public Result moveTaskProcessRelation(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser, @ApiParam(name = "projectCode", value = "PROJECT_CODE", required = true) @PathVariable long projectCode, - @RequestParam(name = "processDefinitionCode", value = "PROCESS_DEFINITION_CODE", required = true) long processDefinitionCode, - @RequestParam(name = "targetProcessDefinitionCode", value = "TARGET_PROCESS_DEFINITION_CODE", required = true) long targetProcessDefinitionCode, - @RequestParam(name = "taskCode", value = "POST_TASK_CODE", required = true) long taskCode) { + @RequestParam(name = "processDefinitionCode", required = true) long processDefinitionCode, + @RequestParam(name = "targetProcessDefinitionCode", required = true) long targetProcessDefinitionCode, + @RequestParam(name = "taskCode", required = true) long taskCode) { return returnDataList(processTaskRelationService.moveTaskProcessRelation(loginUser, projectCode, processDefinitionCode, targetProcessDefinitionCode, taskCode)); } @@ -139,7 +139,7 @@ public class ProcessTaskRelationController extends BaseController { @AccessLogAnnotation(ignoreRequestArgs = "loginUser") public Result deleteTaskProcessRelation(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser, @ApiParam(name = "projectCode", value = "PROJECT_CODE", required = true) @PathVariable long projectCode, - @RequestParam(name = "processDefinitionCode", value = "PROCESS_DEFINITION_CODE", required = true) long processDefinitionCode, + @RequestParam(name = "processDefinitionCode", required = true) long processDefinitionCode, @PathVariable("taskCode") long taskCode) { return returnDataList(processTaskRelationService.deleteTaskProcessRelation(loginUser, projectCode, processDefinitionCode, taskCode)); } @@ -165,7 +165,7 @@ public class ProcessTaskRelationController extends BaseController { @AccessLogAnnotation(ignoreRequestArgs = "loginUser") public Result deleteUpstreamRelation(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser, @ApiParam(name = "projectCode", value = "PROJECT_CODE", required = true) @PathVariable long projectCode, - @RequestParam(name = "preTaskCodes", value = "PRE_TASK_CODES", required = true) String preTaskCodes, + @RequestParam(name = "preTaskCodes", required = true) String preTaskCodes, @PathVariable("taskCode") long taskCode) { return returnDataList(processTaskRelationService.deleteUpstreamRelation(loginUser, projectCode, preTaskCodes, taskCode)); } @@ -191,7 +191,7 @@ public class ProcessTaskRelationController extends BaseController { @AccessLogAnnotation(ignoreRequestArgs = "loginUser") public Result deleteDownstreamRelation(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser, @ApiParam(name = "projectCode", value = "PROJECT_CODE", required = true) @PathVariable long projectCode, - @RequestParam(name = "postTaskCodes", value = "POST_TASK_CODES", required = true) String postTaskCodes, + @RequestParam(name = "postTaskCodes", required = true) String postTaskCodes, @PathVariable("taskCode") long taskCode) { return returnDataList(processTaskRelationService.deleteDownstreamRelation(loginUser, projectCode, postTaskCodes, taskCode)); }