[incubator-dolphinscheduler] branch dev updated: [Improvement][API] Improvement query all project list (#5169) (#5192)

[kirs]

This is an automated email from the ASF dual-hosted git repository.

kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new f20bb54  [Improvement][API] Improvement query all project list (#5169) 
(#5192)
f20bb54 is described below

commit f20bb54896a9ac7b65c20b0cc7b0a744d1741155
Author: wenjun <861923...@qq.com>
AuthorDate: Thu Apr 1 20:34:49 2021 +0800

    [Improvement][API] Improvement query all project list (#5169) (#5192)
---
 .../dolphinscheduler/api/service/impl/ProjectServiceImpl.java    | 9 ++-------
 .../apache/dolphinscheduler/api/service/ProjectServiceTest.java  | 3 +--
 .../org/apache/dolphinscheduler/dao/mapper/ProjectMapper.java    | 6 ++++++
 .../org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml     | 4 ++++
 4 files changed, 13 insertions(+), 9 deletions(-)

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 c2e85cf..6b25993 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
@@ -447,19 +447,14 @@ public class ProjectServiceImpl extends BaseServiceImpl 
implements ProjectServic
     }
 
     /**
-     * query all project list that have one or more process definitions.
+     * query all project list
      *
      * @return project list
      */
     @Override
     public Map<String, Object> queryAllProjectList() {
         Map<String, Object> result = new HashMap<>();
-        List<Project> projects = new ArrayList<>();
-
-        List<Integer> projectIds = processDefinitionMapper.listProjectIds();
-        if (CollectionUtils.isNotEmpty(projectIds)) {
-            projects = projectMapper.selectBatchIds(projectIds);
-        }
+        List<Project> projects = projectMapper.queryAllProject();
 
         result.put(Constants.DATA_LIST, projects);
         putMsg(result, Status.SUCCESS);
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 3cdf714..7b70206 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
@@ -322,8 +322,7 @@ public class ProjectServiceTest {
 
     @Test
     public void testQueryAllProjectList() {
-        
Mockito.when(processDefinitionMapper.listProjectIds()).thenReturn(getProjectIds());
-        
Mockito.when(projectMapper.selectBatchIds(getProjectIds())).thenReturn(getList());
+        Mockito.when(projectMapper.queryAllProject()).thenReturn(getList());
 
         Map<String, Object> result = projectService.queryAllProjectList();
         logger.info(result.toString());
diff --git 
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.java
 
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.java
index 872d53f..b84272c 100644
--- 
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.java
+++ 
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.java
@@ -92,4 +92,10 @@ public interface ProjectMapper extends BaseMapper<Project> {
      */
     ProjectUser 
queryProjectWithUserByProcessInstanceId(@Param("processInstanceId") int 
processInstanceId);
 
+    /**
+     * query all project
+     * @return projectList
+     */
+    List<Project> queryAllProject();
+
 }
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 a6d72d0..74844d4 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
@@ -109,4 +109,8 @@
         join t_ds_user u on dp.user_id = u.id
         where di.id = #{processInstanceId};
     </select>
+
+    <select id="queryAllProject" 
resultType="org.apache.dolphinscheduler.dao.entity.Project">
+        select * from t_ds_project
+    </select>
 </mapper>