[Improvement][API] ProjectService queryAllProjectList API optimization (#4539)

* [Improvement][API] ProjectService queryAllProjectList API optimization

* ✏️ checkStyle typo

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java

@@ -24,6 +24,7 @@ import org.apache.dolphinscheduler.api.service.ProjectService;
 import org.apache.dolphinscheduler.api.utils.PageInfo;
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.UserType;
+import org.apache.dolphinscheduler.common.utils.CollectionUtils;
 import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
 import org.apache.dolphinscheduler.dao.entity.Project;
 import org.apache.dolphinscheduler.dao.entity.ProjectUser;
@@ -442,21 +443,13 @@ public class ProjectServiceImpl extends BaseService implements ProjectService {
      */
     public Map<String, Object> queryAllProjectList() {
         Map<String, Object> result = new HashMap<>();
-        List<Project> projects = projectMapper.selectList(null);
+        List<Project> projects = new ArrayList<>();
-        List<ProcessDefinition> processDefinitions = processDefinitionMapper.selectList(null);
+
-        if (projects != null) {
+        List<Integer> projectIds = processDefinitionMapper.listProjectIds();
-            Set<Integer> set = new HashSet<>();
+        if (CollectionUtils.isNotEmpty(projectIds)) {
-            for (ProcessDefinition processDefinition : processDefinitions) {
+            projects = projectMapper.selectBatchIds(projectIds);
-                set.add(processDefinition.getProjectId());
-            }
-            List<Project> tempDeletelist = new ArrayList<>();
-            for (Project project : projects) {
-                if (!set.contains(project.getId())) {
-                    tempDeletelist.add(project);
-                }
-            }
-            projects.removeAll(tempDeletelist);
         }
+
         result.put(Constants.DATA_LIST, projects);
         putMsg(result, Status.SUCCESS);
         return result;

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProjectServiceTest.java

@@ -32,6 +32,7 @@ import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
 import org.apache.dolphinscheduler.dao.mapper.ProjectUserMapper;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -319,9 +320,8 @@ public class ProjectServiceTest {
 
     @Test
     public void testQueryAllProjectList() {
-
+        Mockito.when(processDefinitionMapper.listProjectIds()).thenReturn(getProjectIds());
-        Mockito.when(projectMapper.selectList(null)).thenReturn(getList());
+        Mockito.when(projectMapper.selectBatchIds(getProjectIds())).thenReturn(getList());
-        Mockito.when(processDefinitionMapper.selectList(null)).thenReturn(getProcessDefinitions());
 
         Map<String, Object> result = projectService.queryAllProjectList();
         logger.info(result.toString());
@@ -387,6 +387,11 @@ public class ProjectServiceTest {
         return list;
     }
 
+    private List<Integer> getProjectIds() {
+        return Collections.singletonList(1);
+    }
+
+
     private String getDesc() {
         return "projectUserMapper.deleteProjectRelation(projectId,userId)projectUserMappe"
                 + ".deleteProjectRelation(projectId,userId)projectUserMappe"

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.java

@@ -138,4 +138,10 @@ public interface ProcessDefinitionMapper extends BaseMapper<ProcessDefinition> {
      * @param version version
      */
     void updateVersionByProcessDefinitionId(@Param("processDefinitionId") int processDefinitionId, @Param("version") long version);
+
+    /**
+     * list all project ids
+     * @return project ids list
+     */
+    List<Integer> listProjectIds();
 }

dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml

@@ -128,6 +128,12 @@
         WHERE user_id = #{userId} and release_state = 1 and resource_ids is not null and resource_ids != ''
     </select>
 
+    <select id="listProjectIds" resultType="java.lang.Integer">
+        SELECT DISTINCT(project_id) as project_id
+        FROM t_ds_process_definition
+    </select>
+
+
     <update id="updateVersionByProcessDefinitionId">
         update  t_ds_process_definition
         set version = #{version}

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapperTest.java

@@ -366,4 +366,12 @@ public class ProcessDefinitionMapperTest {
         ProcessDefinition processDefinition1 = processDefinitionMapper.selectById(processDefinition.getId());
         Assert.assertEquals(expectedVersion, processDefinition1.getVersion());
     }
+
+    @Test
+    public void listProjectIds() {
+        ProcessDefinition processDefinition = insertOne();
+        List<Integer> projectIds = processDefinitionMapper.listProjectIds();
+        Assert.assertNotNull(projectIds);
+    }
+
 }