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 a3f541ffe2..0fafcf7dcb 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 @@ -1,3 +1,4 @@ + /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -149,7 +150,7 @@ public interface ProcessInstanceService { Map viewGantt(Integer processInstanceId) throws Exception; /** - * query process instance by processDefinitionId and stateArray + * query process instance by processDefinitionCode and stateArray * * @param processDefinitionCode processDefinitionCode * @param states states array @@ -166,4 +167,4 @@ public interface ProcessInstanceService { */ List queryByProcessDefineCode(Long processDefinitionCode,int size); -} +} \ No newline at end of file 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 582d75178d..374abb6fca 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 @@ -1762,4 +1762,4 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro return result; } -} +} \ No newline at end of file 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 a17d2019e7..121c832f33 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 @@ -130,11 +130,24 @@ public class ProcessInstanceServiceTest { "192.168.xx.xx", 1, 10); Assert.assertEquals(Status.PROJECT_NOT_FOUNT, proejctAuthFailRes.get(Constants.STATUS)); + Date start = DateUtils.getScheduleDate("2020-01-01 00:00:00"); + Date end = DateUtils.getScheduleDate("2020-01-02 00:00:00"); + ProcessInstance processInstance = getProcessInstance(); + List processInstanceList = new ArrayList<>(); + Page pageReturn = new Page<>(1, 10); + processInstanceList.add(processInstance); + pageReturn.setRecords(processInstanceList); + // data parameter check putMsg(result, Status.SUCCESS, projectName); Project project = getProject(projectName); when(projectMapper.queryByName(projectName)).thenReturn(project); when(projectService.checkProjectAndAuth(loginUser, project, projectName)).thenReturn(result); + when(processDefineMapper.selectById(Mockito.anyInt())).thenReturn(getProcessDefinition()); + when(processInstanceMapper.queryProcessInstanceListPaging(Mockito.any(Page.class) + , Mockito.any(), Mockito.any(), Mockito.any(),Mockito.any(), Mockito.any(), + eq("192.168.xx.xx"), Mockito.any(), Mockito.any())).thenReturn(pageReturn); + Map dataParameterRes = processInstanceService.queryProcessInstanceList(loginUser, projectName, 1, "20200101 00:00:00", "20200102 00:00:00", "", loginUser.getUserName(), ExecutionStatus.SUBMITTED_SUCCESS, "192.168.xx.xx", 1, 10); @@ -142,13 +155,7 @@ public class ProcessInstanceServiceTest { //project auth success putMsg(result, Status.SUCCESS, projectName); - Date start = DateUtils.getScheduleDate("2020-01-01 00:00:00"); - Date end = DateUtils.getScheduleDate("2020-01-02 00:00:00"); - ProcessInstance processInstance = getProcessInstance(); - List processInstanceList = new ArrayList<>(); - Page pageReturn = new Page<>(1, 10); - processInstanceList.add(processInstance); - pageReturn.setRecords(processInstanceList); + when(projectMapper.queryByName(projectName)).thenReturn(project); when(projectService.checkProjectAndAuth(loginUser, project, projectName)).thenReturn(result); when(usersService.queryUser(loginUser.getId())).thenReturn(loginUser); @@ -532,6 +539,7 @@ public class ProcessInstanceServiceTest { */ private Project getProject(String projectName) { Project project = new Project(); + project.setCode(1L); project.setId(1); project.setName(projectName); project.setUserId(1); diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java index c08b83b0f9..2cc69f7ba4 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java @@ -52,6 +52,7 @@ public class ProcessInstance { * process definition id * TODO delete */ + @TableField(exist = false) private int processDefinitionId; /** @@ -160,6 +161,7 @@ public class ProcessInstance { * process instance json * TODO delete */ + @TableField(exist = false) private String processInstanceJson; /** @@ -193,11 +195,13 @@ public class ProcessInstance { /** * task locations for web */ + @TableField(exist = false) private String locations; /** * task connects for web */ + @TableField(exist = false) private String connects; /** @@ -208,6 +212,7 @@ public class ProcessInstance { /** * depend processes schedule time */ + @TableField(exist = false) private String dependenceScheduleTimes; /** diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml index cb2304ec06..2e5a4fea13 100644 --- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml @@ -21,8 +21,8 @@ id, name, process_definition_version, process_definition_code, state, recovery, start_time, end_time, run_times,host, command_type, command_param, task_depend_type, max_try_times, failure_strategy, warning_type, - warning_group_id, schedule_time, command_start_time, global_params, flag, update_time, is_sub_process, executor_id, - locations, connects, history_cmd, dependence_schedule_times, + warning_group_id, schedule_time, command_start_time, global_params, flag, + update_time, is_sub_process, executor_id, history_cmd, process_instance_priority, worker_group, timeout, tenant_id, var_pool