query by projectDao

Author: 苏义超

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/ProjectDao.java

@@ -18,6 +18,7 @@
 package org.apache.dolphinscheduler.dao.repository;
 
 import org.apache.dolphinscheduler.dao.entity.Project;
+import org.apache.dolphinscheduler.dao.entity.ProjectUser;
 
 import java.util.Collection;
 import java.util.List;
@@ -28,4 +29,5 @@ public interface ProjectDao extends IDao<Project> {
 
     Project queryByCode(Long projectCode);
 
+    ProjectUser queryProjectWithUserByWorkflowInstanceId(int workflowInstanceId);
 }

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl/ProjectDaoImpl.java

@@ -18,6 +18,7 @@
 package org.apache.dolphinscheduler.dao.repository.impl;
 
 import org.apache.dolphinscheduler.dao.entity.Project;
+import org.apache.dolphinscheduler.dao.entity.ProjectUser;
 import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
 import org.apache.dolphinscheduler.dao.repository.BaseDao;
 import org.apache.dolphinscheduler.dao.repository.ProjectDao;
@@ -45,4 +46,9 @@ public List<Project> queryByCodes(Collection<Long> projectCodes) {
     public Project queryByCode(Long projectCode) {
         return mybatisMapper.queryByCode(projectCode);
     }
+
+    @Override
+    public ProjectUser queryProjectWithUserByWorkflowInstanceId(int workflowInstanceId) {
+        return mybatisMapper.queryProjectWithUserByWorkflowInstanceId(workflowInstanceId);
+    }
 }

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/alert/WorkflowAlertManager.java

@@ -31,7 +31,6 @@
 import org.apache.dolphinscheduler.dao.entity.WorkflowAlertContent;
 import org.apache.dolphinscheduler.dao.entity.WorkflowDefinitionLog;
 import org.apache.dolphinscheduler.dao.entity.WorkflowInstance;
-import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
 import org.apache.dolphinscheduler.dao.repository.ProjectDao;
 import org.apache.dolphinscheduler.dao.repository.UserDao;
 import org.apache.dolphinscheduler.dao.repository.WorkflowDefinitionLogDao;
@@ -61,9 +60,6 @@ public class WorkflowAlertManager {
     @Autowired
     private ProjectDao projectDao;
 
-    @Autowired
-    private ProjectMapper projectMapper;
-
     /**
      * convert command type to human-readable name
      *
@@ -265,7 +261,7 @@ public boolean isNeedToSendWarning(WorkflowInstance workflowInstance) {
 
     public void sendTaskTimeoutAlert(WorkflowInstance workflowInstance,
                                      TaskInstance taskInstance) {
-        ProjectUser projectUser = projectMapper.queryProjectWithUserByWorkflowInstanceId(workflowInstance.getId());
+        ProjectUser projectUser = projectDao.queryProjectWithUserByWorkflowInstanceId(workflowInstance.getId());
         alertDao.sendTaskTimeoutAlert(workflowInstance, taskInstance, projectUser);
     }
 }