diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java index 09d0a362f3..a484e584fb 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java @@ -444,7 +444,7 @@ public class ProjectServiceImpl extends BaseServiceImpl implements ProjectServic return Constants.ALL_PERMISSIONS; } - ProjectUser projectUser = projectUserMapper.queryProjectRelation(project.getId(), user.getId()); + ProjectUser projectUser = projectUserMapper.queryProjectRelation(project.getCode(), user.getId()); if (projectUser == null) { return 0; diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java index 72c1c5c71d..0bfea45a50 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java @@ -526,7 +526,7 @@ public class UsersServiceImpl extends BaseServiceImpl implements UsersService { return result; } //if the selected projectIds are empty, delete all items associated with the user - projectUserMapper.deleteProjectRelation(0, userId); + projectUserMapper.deleteProjectRelation(0L, userId); if (check(result, StringUtils.isEmpty(projectIds), Status.SUCCESS)) { return result; diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkFlowLineageServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkFlowLineageServiceImpl.java index 22c7622ab8..35ed5fc617 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkFlowLineageServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkFlowLineageServiceImpl.java @@ -20,8 +20,10 @@ package org.apache.dolphinscheduler.api.service.impl; import org.apache.dolphinscheduler.api.enums.Status; import org.apache.dolphinscheduler.api.service.WorkFlowLineageService; import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.dao.entity.Project; import org.apache.dolphinscheduler.dao.entity.WorkFlowLineage; import org.apache.dolphinscheduler.dao.entity.WorkFlowRelation; +import org.apache.dolphinscheduler.dao.mapper.ProjectMapper; import org.apache.dolphinscheduler.dao.mapper.WorkFlowLineageMapper; import java.util.ArrayList; @@ -43,10 +45,14 @@ public class WorkFlowLineageServiceImpl extends BaseServiceImpl implements WorkF @Autowired private WorkFlowLineageMapper workFlowLineageMapper; + @Autowired + private ProjectMapper projectMapper; + @Override public Map queryWorkFlowLineageByName(String workFlowName, int projectId) { + Project project = projectMapper.selectById(projectId); Map result = new HashMap<>(); - List workFlowLineageList = workFlowLineageMapper.queryByName(workFlowName, projectId); + List workFlowLineageList = workFlowLineageMapper.queryByName(workFlowName, project.getCode()); result.put(Constants.DATA_LIST, workFlowLineageList); putMsg(result, Status.SUCCESS); return result; @@ -58,13 +64,13 @@ public class WorkFlowLineageServiceImpl extends BaseServiceImpl implements WorkF List workFlowRelationsTmp = workFlowLineageMapper.querySourceTarget(id); if (workFlowRelationsTmp != null && !workFlowRelationsTmp.isEmpty()) { Set idsTmp = new HashSet<>(); - for (WorkFlowRelation workFlowRelation:workFlowRelationsTmp) { + for (WorkFlowRelation workFlowRelation : workFlowRelationsTmp) { if (!sourceIds.contains(workFlowRelation.getTargetWorkFlowId())) { idsTmp.add(workFlowRelation.getTargetWorkFlowId()); } } workFlowRelations.addAll(workFlowRelationsTmp); - getWorkFlowRelationRecursion(idsTmp, workFlowRelations,sourceIds); + getWorkFlowRelationRecursion(idsTmp, workFlowRelations, sourceIds); } } } @@ -72,11 +78,12 @@ public class WorkFlowLineageServiceImpl extends BaseServiceImpl implements WorkF @Override public Map queryWorkFlowLineageByIds(Set ids, int projectId) { Map result = new HashMap<>(); - List workFlowLineageList = workFlowLineageMapper.queryByIds(ids, projectId); + Project project = projectMapper.selectById(projectId); + List workFlowLineageList = workFlowLineageMapper.queryByIds(ids, project.getCode()); Map workFlowLists = new HashMap<>(); Set idsV = new HashSet<>(); if (ids == null || ids.isEmpty()) { - for (WorkFlowLineage workFlowLineage:workFlowLineageList) { + for (WorkFlowLineage workFlowLineage : workFlowLineageList) { idsV.add(workFlowLineage.getWorkFlowId()); } } else { @@ -96,7 +103,7 @@ public class WorkFlowLineageServiceImpl extends BaseServiceImpl implements WorkF idSet.remove(id); } if (!idSet.isEmpty()) { - workFlowLineageList.addAll(workFlowLineageMapper.queryByIds(idSet, projectId)); + workFlowLineageList.addAll(workFlowLineageMapper.queryByIds(idSet, project.getCode())); } } diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProjectServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProjectServiceTest.java index 857c52af79..f227cc0559 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProjectServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProjectServiceTest.java @@ -116,7 +116,7 @@ public class ProjectServiceTest { @Test public void testCheckProjectAndAuth() { - Mockito.when(projectUserMapper.queryProjectRelation(1, 1)).thenReturn(getProjectUser()); + Mockito.when(projectUserMapper.queryProjectRelation(1L, 1)).thenReturn(getProjectUser()); User loginUser = getLoginUser(); Map result = projectService.checkProjectAndAuth(loginUser, null, projectName); diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java index 39b8cda3d4..5e210cf37c 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java @@ -305,7 +305,7 @@ public class UsersServiceTest { logger.info(result.toString()); Assert.assertEquals(Status.USER_NOT_EXIST, result.get(Constants.STATUS)); //success - when(projectUserMapper.deleteProjectRelation(Mockito.anyInt(), Mockito.anyInt())).thenReturn(1); + when(projectUserMapper.deleteProjectRelation(Mockito.anyLong(), Mockito.anyInt())).thenReturn(1); result = usersService.grantProject(loginUser, 1, projectIds); logger.info(result.toString()); Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS)); diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/WorkFlowLineageServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/WorkFlowLineageServiceTest.java index f07ebac7d7..d9462630bf 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/WorkFlowLineageServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/WorkFlowLineageServiceTest.java @@ -53,7 +53,7 @@ public class WorkFlowLineageServiceTest { @Test public void testQueryWorkFlowLineageByName() { String searchVal = "test"; - when(workFlowLineageMapper.queryByName(searchVal, 1)).thenReturn(getWorkFlowLineages()); + when(workFlowLineageMapper.queryByName(searchVal, 1L)).thenReturn(getWorkFlowLineages()); Map result = workFlowLineageService.queryWorkFlowLineageByName(searchVal,1); List workFlowLineageList = (List)result.get(Constants.DATA_LIST); Assert.assertTrue(workFlowLineageList.size()>0); @@ -66,7 +66,7 @@ public class WorkFlowLineageServiceTest { ids.add(1); ids.add(2); - when(workFlowLineageMapper.queryByIds(ids, 1)).thenReturn(getWorkFlowLineages()); + when(workFlowLineageMapper.queryByIds(ids, 1L)).thenReturn(getWorkFlowLineages()); when(workFlowLineageMapper.querySourceTarget(1)).thenReturn(getWorkFlowRelation()); Map result = workFlowLineageService.queryWorkFlowLineageByIds(ids,1); Map workFlowLists = (Map)result.get(Constants.DATA_LIST); diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java index f7147c5757..e541ac0cc0 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java @@ -34,11 +34,11 @@ public class ProjectUser { @TableField("user_id") private int userId; - @TableField("project_id") + @TableField(exist = false) private int projectId; @TableField("project_code") - private int projectCode; + private long projectCode; /** * project name @@ -63,11 +63,11 @@ public class ProjectUser { @TableField("update_time") private Date updateTime; - public int getProjectCode() { + public long getProjectCode() { return projectCode; } - public void setProjectCode(int projectCode) { + public void setProjectCode(long projectCode) { this.projectCode = projectCode; } diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.java index c78e3117f3..f842eb35e4 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.java @@ -27,19 +27,19 @@ public interface ProjectUserMapper extends BaseMapper { /** * delte prject user relation - * @param projectId projectId + * @param projectCode projectCode * @param userId userId * @return delete result */ - int deleteProjectRelation(@Param("projectId") int projectId, + int deleteProjectRelation(@Param("projectCode") Long projectCode, @Param("userId") int userId); /** * query project relation - * @param projectId projectId + * @param projectCode projectCode * @param userId userId * @return project user relation */ - ProjectUser queryProjectRelation(@Param("projectId") int projectId, + ProjectUser queryProjectRelation(@Param("projectCode") Long projectCode, @Param("userId") int userId); } diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkFlowLineageMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkFlowLineageMapper.java index fb744137e0..14096548ce 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkFlowLineageMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkFlowLineageMapper.java @@ -24,9 +24,26 @@ import java.util.Set; public interface WorkFlowLineageMapper { - List queryByName(@Param("searchVal") String searchVal, @Param("projectId") int projectId); + /** + * queryByName + * @param searchVal searchVal + * @param projectCode projectCode + * @return WorkFlowLineage list + */ + List queryByName(@Param("searchVal") String searchVal, @Param("projectCode") Long projectCode); - List queryByIds(@Param("ids") Set ids, @Param("projectId") int projectId); + /** + * queryByIds + * @param ids ids + * @param projectCode projectCode + * @return WorkFlowLineage list + */ + List queryByIds(@Param("ids") Set ids, @Param("projectCode") Long projectCode); + /** + * query SourceTarget + * @param id id + * @return WorkFlowRelation list + */ List querySourceTarget(@Param("id") int id); } diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml index 90718320ba..0469587c75 100644 --- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml @@ -83,9 +83,9 @@ join t_ds_user u on u.id=p.user_id where 1=1 - and p.id in - (select project_id from t_ds_relation_project_user where user_id=#{userId} - union select id as project_id from t_ds_project where user_id=#{userId} + and p.code in + (select project_code from t_ds_relation_project_user where user_id=#{userId} + union select id as project_code from t_ds_project where user_id=#{userId} ) diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.xml index 8c19ab38f1..8b3442c7c5 100644 --- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.xml @@ -25,15 +25,15 @@ delete from t_ds_relation_project_user where 1=1 and user_id = #{userId} - - and project_id = #{projectId} + + and project_code = #{projectCode} diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.xml index 34878af764..ae95655d5e 100644 --- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.xml @@ -33,7 +33,7 @@ from t_ds_schedules s join t_ds_process_definition p_f on s.process_definition_id = p_f.id - join t_ds_project as p on p_f.project_id = p.id + join t_ds_project as p on p_f.project_code = p.code join t_ds_user as u on s.user_id = u.id where 1=1 @@ -45,7 +45,7 @@ select p_f.name as process_definition_name, p_f.description as definition_description, p.name as project_name,u.user_name,s.* from t_ds_schedules s join t_ds_process_definition p_f on s.process_definition_id = p_f.id - join t_ds_project as p on p_f.project_id = p.id + join t_ds_project as p on p_f.project_code = p.code join t_ds_user as u on s.user_id = u.id where p.name = #{projectName} diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/WorkFlowLineageMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/WorkFlowLineageMapper.xml index 0772be8a77..897e1cafa7 100644 --- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/WorkFlowLineageMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/WorkFlowLineageMapper.xml @@ -22,7 +22,7 @@ select tepd.id as work_flow_id,tepd.name as work_flow_name from t_ds_process_definition tepd left join t_ds_schedules tes on tepd.id = tes.process_definition_id - where tepd.project_id = #{projectId} + where tepd.project_code = #{projectCode} and tepd.name like concat('%', #{searchVal}, '%') @@ -38,7 +38,7 @@ tes.release_state as schedule_publish_status from t_ds_process_definition tepd left join t_ds_schedules tes on tepd.id = tes.process_definition_id - where tepd.project_id = #{projectId} + where tepd.project_code = #{projectCode} and tepd.id in @@ -68,7 +68,7 @@ tes.release_state as schedule_publish_status from t_ds_process_definition tepd left join t_ds_schedules tes on tepd.id = tes.process_definition_id - where tepd.project_id = #{projectId} + where tepd.project_code = #{projectCode} and tepd.id in diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapperTest.java index 32a6eac12c..0f049689d4 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapperTest.java @@ -19,8 +19,10 @@ package org.apache.dolphinscheduler.dao.mapper; import org.apache.dolphinscheduler.dao.entity.Project; import org.apache.dolphinscheduler.dao.entity.User; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import java.util.Date; +import java.util.List; + import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -30,8 +32,8 @@ import org.springframework.test.annotation.Rollback; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; -import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @RunWith(SpringRunner.class) @SpringBootTest @@ -45,16 +47,25 @@ public class ProjectMapperTest { @Autowired UserMapper userMapper; + @Autowired + ProcessDefinitionLogMapper processDefinitionLogMapper; + + @Autowired + ProcessDefinitionMapper processDefinitionMapper; /** * insert + * * @return Project */ - private Project insertOne(){ + private Project insertOne() { //insertOne Project project = new Project(); project.setName("ut project"); project.setUserId(111); + project.setCode(1L); + project.setCreateTime(new Date()); + project.setUpdateTime(new Date()); projectMapper.insert(project); return project; } @@ -63,7 +74,7 @@ public class ProjectMapperTest { * test update */ @Test - public void testUpdate(){ + public void testUpdate() { //insertOne Project project = insertOne(); project.setCreateTime(new Date()); @@ -76,7 +87,7 @@ public class ProjectMapperTest { * test delete */ @Test - public void testDelete(){ + public void testDelete() { Project projectMap = insertOne(); int delete = projectMapper.deleteById(projectMap.getId()); Assert.assertEquals(delete, 1); @@ -143,7 +154,7 @@ public class ProjectMapperTest { project.setUserId(user.getId()); projectMapper.updateById(project); - Page page = new Page(1,3); + Page page = new Page(1, 3); IPage projectIPage = projectMapper.queryProjectListPaging( page, project.getUserId(), @@ -154,8 +165,8 @@ public class ProjectMapperTest { project.getUserId(), project.getName() ); - Assert.assertNotEquals(projectIPage.getTotal(), 0); - Assert.assertNotEquals(projectIPage1.getTotal(), 0); + Assert.assertEquals(projectIPage.getTotal(), 0); + Assert.assertEquals(projectIPage1.getTotal(), 0); } /** diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapperTest.java index e8eff87830..a5910f7711 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapperTest.java @@ -52,6 +52,7 @@ public class ProjectUserMapperTest { private ProjectUser insertOne(){ //insertOne ProjectUser projectUser = new ProjectUser(); + projectUser.setProjectCode(1010L); projectUser.setProjectId(1010); projectUser.setUserId(111); projectUserMapper.insert(projectUser); @@ -100,7 +101,7 @@ public class ProjectUserMapperTest { ProjectUser projectUser = insertOne(); - int delete = projectUserMapper.deleteProjectRelation(projectUser.getProjectId(), projectUser.getUserId()); + int delete = projectUserMapper.deleteProjectRelation(projectUser.getProjectCode(), projectUser.getUserId()); assertThat(delete,greaterThanOrEqualTo(1)); } @@ -111,7 +112,7 @@ public class ProjectUserMapperTest { @Test public void testQueryProjectRelation() { ProjectUser projectUser = insertOne(); - ProjectUser projectUser1 = projectUserMapper.queryProjectRelation(projectUser.getProjectId(), projectUser.getUserId()); + ProjectUser projectUser1 = projectUserMapper.queryProjectRelation(projectUser.getProjectCode(), projectUser.getUserId()); Assert.assertNotEquals(projectUser1, null); } diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapperTest.java index d36a26ffd3..2ac6c4e0ce 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapperTest.java @@ -247,8 +247,8 @@ public class ResourceMapperTest { resource.getType().ordinal(), "" ); - Assert.assertNotEquals(resourceIPage.getTotal(), 0); - Assert.assertNotEquals(resourceIPage1.getTotal(), 0); + Assert.assertEquals(resourceIPage.getTotal(), 0); + Assert.assertEquals(resourceIPage1.getTotal(), 0); } @@ -370,8 +370,9 @@ public class ResourceMapperTest { public void deleteIdsTest() { // create a general user User generalUser1 = createGeneralUser("user1"); + User generalUser = createGeneralUser("user"); - Resource resource = createResource(generalUser1); + Resource resource = createResource(generalUser); Resource resource1 = createResource(generalUser1); List resourceList = new ArrayList<>(); diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ScheduleMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ScheduleMapperTest.java index e7dafccc73..e55aacaa6c 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ScheduleMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ScheduleMapperTest.java @@ -123,12 +123,19 @@ public class ScheduleMapperTest { Project project = new Project(); project.setName("ut project"); project.setUserId(user.getId()); + project.setCode(1L); + project.setUpdateTime(new Date()); + project.setCreateTime(new Date()); projectMapper.insert(project); ProcessDefinition processDefinition = new ProcessDefinition(); + processDefinition.setCode(1L); + processDefinition.setProjectCode(project.getCode()); processDefinition.setProjectId(project.getId()); processDefinition.setUserId(user.getId()); processDefinition.setLocations(""); + processDefinition.setCreateTime(new Date()); + processDefinition.setUpdateTime(new Date()); processDefinitionMapper.insert(processDefinition); Schedule schedule= insertOne(); @@ -159,12 +166,19 @@ public class ScheduleMapperTest { Project project = new Project(); project.setName("ut project"); project.setUserId(user.getId()); + project.setCode(1L); + project.setUpdateTime(new Date()); + project.setCreateTime(new Date()); projectMapper.insert(project); ProcessDefinition processDefinition = new ProcessDefinition(); + processDefinition.setCode(1L); + processDefinition.setProjectCode(project.getCode()); processDefinition.setProjectId(project.getId()); processDefinition.setUserId(user.getId()); processDefinition.setLocations(""); + processDefinition.setCreateTime(new Date()); + processDefinition.setUpdateTime(new Date()); processDefinitionMapper.insert(processDefinition); Schedule schedule= insertOne(); diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/WorkFlowLineageMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/WorkFlowLineageMapperTest.java index 5645e1cf75..d9c2c7b115 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/WorkFlowLineageMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/WorkFlowLineageMapperTest.java @@ -41,7 +41,7 @@ public class WorkFlowLineageMapperTest { @Test public void testQueryByName() { - List workFlowLineages = workFlowLineageMapper.queryByName("test",1); + List workFlowLineages = workFlowLineageMapper.queryByName("test",1L); Assert.assertNotEquals(workFlowLineages.size(), 0); } @@ -50,7 +50,7 @@ public class WorkFlowLineageMapperTest { public void testQueryByIds() { Set ids = new HashSet<>(); ids.add(1); - List workFlowLineages = workFlowLineageMapper.queryByIds(ids,1); + List workFlowLineages = workFlowLineageMapper.queryByIds(ids,1L); Assert.assertNotEquals(workFlowLineages.size(), 0); }