copy process feature #2412 (#2471) (64d335d9) · Commits · SUMMER2020 / students / proj-2002251

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java

+24 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,30 @@ public class ProcessDefinitionController extends BaseController {
		return returnDataList(result);
		}

		/**
		* copy process definition
		*
		* @param loginUser login user
		* @param projectName project name
		* @param processId process definition id
		* @return copy result code
		*/
		@ApiOperation(value = "copyProcessDefinition", notes= "COPY_PROCESS_DEFINITION_NOTES")
		@ApiImplicitParams({
		@ApiImplicitParam(name = "processId", value = "PROCESS_DEFINITION_ID", required = true, dataType = "Int", example = "100")
		})
		@PostMapping(value = "/copy")
		@ResponseStatus(HttpStatus.OK)
		@ApiException(COPY_PROCESS_DEFINITION_ERROR)
		public Result copyProcessDefinition(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
		@ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
		@RequestParam(value = "processId", required = true) int processId) throws JsonProcessingException {
		logger.info("copy process definition, login user:{}, project name:{}, process definition id:{}",
		loginUser.getUserName(), projectName, processId);
		Map<String, Object> result = processDefinitionService.copyProcessDefinition(loginUser, projectName, processId);
		return returnDataList(result);
		}

		/**
		* verify process definition name unique
		*

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java

+7 −9

Original line number	Diff line number	Diff line
		@@ -168,15 +168,13 @@ public enum Status {
		PREVIEW_SCHEDULE_ERROR(10139,"preview schedule error", "预览调度配置错误"),
		PARSE_TO_CRON_EXPRESSION_ERROR(10140,"parse cron to cron expression error", "解析调度表达式错误"),
		SCHEDULE_START_TIME_END_TIME_SAME(10141,"The start time must not be the same as the end", "开始时间不能和结束时间一样"),
		DELETE_TENANT_BY_ID_FAIL(100142,"delete tenant by id fail, for there are {0} process instances in executing using it", "删除租户失败，有[{0}]个运行中的工作流实例正在使用"),
		DELETE_TENANT_BY_ID_FAIL_DEFINES(100143,"delete tenant by id fail, for there are {0} process definitions using it", "删除租户失败，有[{0}]个工作流定义正在使用"),
		DELETE_TENANT_BY_ID_FAIL_USERS(100144,"delete tenant by id fail, for there are {0} users using it", "删除租户失败，有[{0}]个用户正在使用"),

		DELETE_WORKER_GROUP_BY_ID_FAIL(100145,"delete worker group by id fail, for there are {0} process instances in executing using it", "删除Worker分组失败，有[{0}]个运行中的工作流实例正在使用"),

		QUERY_WORKER_GROUP_FAIL(100146,"query worker group fail ", "查询worker分组失败"),
		DELETE_WORKER_GROUP_FAIL(100147,"delete worker group fail ", "删除worker分组失败"),

		DELETE_TENANT_BY_ID_FAIL(10142,"delete tenant by id fail, for there are {0} process instances in executing using it", "删除租户失败，有[{0}]个运行中的工作流实例正在使用"),
		DELETE_TENANT_BY_ID_FAIL_DEFINES(10143,"delete tenant by id fail, for there are {0} process definitions using it", "删除租户失败，有[{0}]个工作流定义正在使用"),
		DELETE_TENANT_BY_ID_FAIL_USERS(10144,"delete tenant by id fail, for there are {0} users using it", "删除租户失败，有[{0}]个用户正在使用"),
		DELETE_WORKER_GROUP_BY_ID_FAIL(10145,"delete worker group by id fail, for there are {0} process instances in executing using it", "删除Worker分组失败，有[{0}]个运行中的工作流实例正在使用"),
		QUERY_WORKER_GROUP_FAIL(10146,"query worker group fail ", "查询worker分组失败"),
		DELETE_WORKER_GROUP_FAIL(10147,"delete worker group fail ", "删除worker分组失败"),
		COPY_PROCESS_DEFINITION_ERROR(10148,"copy process definition error", "复制工作流错误"),

		UDF_FUNCTION_NOT_EXIST(20001, "UDF function not found", "UDF函数不存在"),
		UDF_FUNCTION_EXISTS(20002, "UDF function already exists", "UDF函数已存在"),

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java

+42 −2

Original line number	Diff line number	Diff line
		@@ -112,8 +112,13 @@ public class ProcessDefinitionService extends BaseDAGService {
		* @return create result code
		* @throws JsonProcessingException JsonProcessingException
		*/
		public Map<String, Object> createProcessDefinition(User loginUser, String projectName, String name,
		String processDefinitionJson, String desc, String locations, String connects) throws JsonProcessingException {
		public Map<String, Object> createProcessDefinition(User loginUser,
		String projectName,
		String name,
		String processDefinitionJson,
		String desc,
		String locations,
		String connects) throws JsonProcessingException {

		Map<String, Object> result = new HashMap<>(5);
		Project project = projectMapper.queryByName(projectName);
		@@ -281,6 +286,41 @@ public class ProcessDefinitionService extends BaseDAGService {
		return result;
		}

		/**
		* copy process definition
		*
		* @param loginUser login user
		* @param projectName project name
		* @param processId process definition id
		* @return copy result code
		*/
		public Map<String, Object> copyProcessDefinition(User loginUser, String projectName, Integer processId) throws JsonProcessingException{

		Map<String, Object> result = new HashMap<>(5);
		Project project = projectMapper.queryByName(projectName);

		Map<String, Object> checkResult = projectService.checkProjectAndAuth(loginUser, project, projectName);
		Status resultStatus = (Status) checkResult.get(Constants.STATUS);
		if (resultStatus != Status.SUCCESS) {
		return checkResult;
		}

		ProcessDefinition processDefinition = processDefineMapper.selectById(processId);
		if (processDefinition == null) {
		putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, processId);
		return result;
		} else {
		return createProcessDefinition(
		loginUser,
		projectName,
		processDefinition.getName()+"_copy_"+System.currentTimeMillis(),
		processDefinition.getProcessDefinitionJson(),
		processDefinition.getDescription(),
		processDefinition.getLocations(),
		processDefinition.getConnects());
		}
		}

		/**
		* update process definition
		*

dolphinscheduler-api/src/main/resources/i18n/messages.properties

+1 −0

Original line number	Diff line number	Diff line
		@@ -173,6 +173,7 @@ PROCESS_DEFINITION_ID=process definition id
		PROCESS_DEFINITION_IDS=process definition ids
		RELEASE_PROCESS_DEFINITION_NOTES=release process definition
		QUERY_PROCESS_DEFINITION_BY_ID_NOTES=query process definition by id
		COPY_PROCESS_DEFINITION_NOTES=copy process definition
		QUERY_PROCESS_DEFINITION_LIST_NOTES=query process definition list
		QUERY_PROCESS_DEFINITION_LIST_PAGING_NOTES=query process definition list paging
		QUERY_ALL_DEFINITION_LIST_NOTES=query all definition list

dolphinscheduler-api/src/main/resources/i18n/messages_en_US.properties

+1 −0

Original line number	Diff line number	Diff line
		@@ -173,6 +173,7 @@ PROCESS_DEFINITION_ID=process definition id
		PROCESS_DEFINITION_IDS=process definition ids
		RELEASE_PROCESS_DEFINITION_NOTES=release process definition
		QUERY_PROCESS_DEFINITION_BY_ID_NOTES=query process definition by id
		COPY_PROCESS_DEFINITION_NOTES=copy process definition
		QUERY_PROCESS_DEFINITION_LIST_NOTES=query process definition list
		QUERY_PROCESS_DEFINITION_LIST_PAGING_NOTES=query process definition list paging
		QUERY_ALL_DEFINITION_LIST_NOTES=query all definition list