This is an automated email from the ASF dual-hosted git repository. leonbao pushed a commit to branch json_split in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 0914699fc5216d49d4662ae25b15bda8e5a2c99f Merge: f05ba84 cd19507 Author: lenboo <[email protected]> AuthorDate: Fri Mar 26 00:06:26 2021 +0800 Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into spilit .../api/service/impl/DataAnalysisServiceImpl.java | 38 ++--- .../service/impl/ProcessDefinitionServiceImpl.java | 28 +++- .../service/impl/ProcessInstanceServiceImpl.java | 6 +- .../api/service/impl/ProjectServiceImpl.java | 2 +- .../service/impl/TaskDefinitionServiceImpl.java | 22 +-- .../api/service/impl/UsersServiceImpl.java | 4 +- .../api/service/ProjectServiceTest.java | 2 +- .../api/service/UsersServiceTest.java | 2 +- .../common/model/PreviousTaskNode.java | 4 + .../dolphinscheduler/common/model/TaskNode.java | 15 -- .../dolphinscheduler/common/utils/StringUtils.java | 30 ++++ .../dolphinscheduler/dao/entity/ProjectUser.java | 14 +- .../dao/mapper/ProcessDefinitionLogMapper.java | 5 + .../dolphinscheduler/dao/mapper/ProjectMapper.java | 7 + .../dao/mapper/ProjectUserMapper.java | 14 +- .../dolphinscheduler/dao/utils/DagHelper.java | 66 ++++---- .../dao/mapper/ErrorCommandMapper.xml | 2 +- .../dao/mapper/ProcessDefinitionLogMapper.xml | 8 + .../dolphinscheduler/dao/mapper/ProjectMapper.xml | 29 +++- .../dao/mapper/ProjectUserMapper.xml | 8 +- .../dao/mapper/ProcessDefinitionLogMapperTest.java | 23 ++- .../dao/mapper/ProjectUserMapperTest.java | 5 +- .../service/process/ProcessService.java | 15 +- .../service/process/ProcessServiceTest.java | 179 ++++++++++++++++++++- .../home/pages/dag/_source/formModel/formModel.vue | 18 +-- .../projects/pages/instance/pages/gantt/index.vue | 2 +- .../pages/resource/pages/file/pages/edit/index.vue | 2 +- sql/dolphinscheduler_mysql.sql | 2 +- 28 files changed, 391 insertions(+), 161 deletions(-) diff --cc dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java index 54d07f7,e2f4320..266528f --- 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 @@@ -259,13 -259,11 +259,13 @@@ public class ProcessInstanceServiceImp ProcessDefinition processDefinition = processDefineMapper.queryByDefineId(processDefineId); - IPage<ProcessInstance> processInstanceList = - processInstanceMapper.queryProcessInstanceListPaging(page, - project.getCode(), processDefinition.getCode(), searchVal, executorId, statusArray, host, start, end); + IPage<ProcessInstance> processInstanceList = processInstanceMapper.queryProcessInstanceListPaging(page, + project.getCode(), processDefinition == null ? 0L : processDefinition.getCode(), searchVal, + executorId, statusArray, host, start, end); List<ProcessInstance> processInstances = processInstanceList.getRecords(); + List<Integer> userIds = CollectionUtils.transformToList(processInstances, ProcessInstance::getExecutorId); + Map<Integer, User> idToUserMap = CollectionUtils.collectionToMap(usersService.queryUser(userIds), User::getId); for (ProcessInstance processInstance : processInstances) { processInstance.setDuration(DateUtils.format2Duration(processInstance.getStartTime(), processInstance.getEndTime()));
