You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by we...@apache.org on 2021/07/12 03:39:48 UTC
[dolphinscheduler] branch json_split_two updated:
[Feature][JsonSplit-api]queryAllByProjectCode of processDefinition (#5801)
This is an automated email from the ASF dual-hosted git repository.
wenhemin pushed a commit to branch json_split_two
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/json_split_two by this push:
new 006ef97 [Feature][JsonSplit-api]queryAllByProjectCode of processDefinition (#5801)
006ef97 is described below
commit 006ef971254fdddd70ff8b5e9923a5905d18d00d
Author: JinyLeeChina <42...@users.noreply.github.com>
AuthorDate: Mon Jul 12 11:39:39 2021 +0800
[Feature][JsonSplit-api]queryAllByProjectCode of processDefinition (#5801)
* fix processDefinitonController projectCode
* queryAllByProjectCode of processDefinition
Co-authored-by: JinyLeeChina <29...@qq.com>
---
.../api/controller/ProcessDefinitionController.java | 6 +++---
.../api/service/impl/ProcessDefinitionServiceImpl.java | 14 +++++---------
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
index 6f49f3c..03c3842 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
@@ -376,10 +376,10 @@ public class ProcessDefinitionController extends BaseController {
*
* @param loginUser login user
* @param projectCode project code
- * @param code process definition id
+ * @param code process definition code
* @return process definition detail
*/
- @ApiOperation(value = "queryProcessDefinitionByCode", notes = "QUERY_PROCESS_DEFINITION_BY_ID_NOTES")
+ @ApiOperation(value = "queryProcessDefinitionByCode", notes = "QUERY_PROCESS_DEFINITION_BY_CODE_NOTES")
@ApiImplicitParams({
@ApiImplicitParam(name = "code", value = "PROCESS_DEFINITION_CODE", required = true, dataType = "Long", example = "123456789")
})
@@ -649,7 +649,7 @@ public class ProcessDefinitionController extends BaseController {
* @param projectCode project code
* @return process definition list
*/
- @ApiOperation(value = "queryAllByProjectCode", notes = "QUERY_PROCESS_DEFINITION_All_BY_PROJECT_ID_NOTES")
+ @ApiOperation(value = "queryAllByProjectCode", notes = "QUERY_PROCESS_DEFINITION_All_BY_PROJECT_CODE_NOTES")
@GetMapping(value = "/queryAllByProjectCode")
@ResponseStatus(HttpStatus.OK)
@ApiException(QUERY_PROCESS_DEFINITION_LIST)
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
index 658eb39..8b0c83a 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
@@ -393,9 +393,8 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
if (processDefinition == null) {
putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, processDefinitionName);
} else {
- ProcessData processData = processService.genProcessData(processDefinition);
- processDefinition.setProcessDefinitionJson(JSONUtils.toJsonString(processData));
- result.put(Constants.DATA_LIST, processDefinition);
+ DagData dagData = processService.genDagData(processDefinition);
+ result.put(Constants.DATA_LIST, dagData);
putMsg(result, Status.SUCCESS);
}
return result;
@@ -1256,12 +1255,9 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
if (result.get(Constants.STATUS) != Status.SUCCESS) {
return result;
}
- List<ProcessDefinition> resourceList = processDefinitionMapper.queryAllDefinitionList(projectCode);
- resourceList.forEach(processDefinition -> {
- ProcessData processData = processService.genProcessData(processDefinition);
- processDefinition.setProcessDefinitionJson(JSONUtils.toJsonString(processData));
- });
- result.put(Constants.DATA_LIST, resourceList);
+ List<ProcessDefinition> processDefinitions = processDefinitionMapper.queryAllDefinitionList(projectCode);
+ List<DagData> dagDataList = processDefinitions.stream().map(processService::genDagData).collect(Collectors.toList());
+ result.put(Constants.DATA_LIST, dagDataList);
putMsg(result, Status.SUCCESS);
return result;
}