bug fix

Author: SunPengWan

dss-framework/dss-framework-orchestrator-server/pom.xml

@@ -245,15 +245,6 @@
             </exclusions>
         </dependency>
 
-
-        <dependency>
-            <groupId>com.webank.wedatasphere.dss</groupId>
-            <artifactId>dss-framework-project-server</artifactId>
-            <version>${dss.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-
     </dependencies>
 
     <build>

dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java

@@ -30,8 +30,6 @@
 import com.webank.wedatasphere.dss.common.utils.AuditLogUtils;
 import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils;
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
-import com.webank.wedatasphere.dss.framework.project.entity.DSSProjectDO;
-import com.webank.wedatasphere.dss.framework.project.service.DSSProjectService;
 import com.webank.wedatasphere.dss.framework.workspace.bean.itsm.ItsmRequest;
 import com.webank.wedatasphere.dss.framework.workspace.bean.itsm.ItsmResponse;
 import com.webank.wedatasphere.dss.framework.workspace.service.DSSWorkspaceRoleService;
@@ -125,10 +123,6 @@ public class DSSFrameworkOrchestratorRestful {
 
     @Autowired
     private ProjectOrchestratorWhiteService projectOrchestratorWhiteService;
-    @Autowired
-    private DSSProjectService dssProjectService;
-
-
 
     private final  String encryptCopyWorkflowSuffix = "copy_cib";
 
@@ -952,10 +946,9 @@ public ItsmResponse addProjectAndOrchestratorWhite(@RequestBody ItsmRequest itsm
 
             try {
 
+                DSSProject dssProject = orchestratorFrameworkService.getProjectByName(projectName);
 
-               DSSProjectDO dbProject = dssProjectService.getProjectByName(projectName);
-
-               if (dbProject == null) {
+               if (dssProject == null) {
                    String msg = String.format("project %s does not exist.", projectName);
                    LOGGER.error(msg);
                    return ItsmResponse.error().retDetail(msg);
@@ -965,7 +958,7 @@ public ItsmResponse addProjectAndOrchestratorWhite(@RequestBody ItsmRequest itsm
 
                if(!"*".equalsIgnoreCase(orchestratorName.trim())){
 
-                   List<DSSOrchestratorInfo> orchestratorInfoList = orchestratorMapper.getByNameAndProjectId(dbProject.getId(),orchestratorName);
+                   List<DSSOrchestratorInfo> orchestratorInfoList = orchestratorMapper.getByNameAndProjectId(dssProject.getId(),orchestratorName);
 
                    if(CollectionUtils.isEmpty(orchestratorInfoList)){
                        String msg = String.format("flow %s does not exist.", orchestratorName);
@@ -981,7 +974,7 @@ public ItsmResponse addProjectAndOrchestratorWhite(@RequestBody ItsmRequest itsm
                projectOrchestratorWhite.setOrchestratorId(orchestratorId);
                projectOrchestratorWhite.setOrchestratorName(orchestratorName);
                projectOrchestratorWhite.setProjectName(projectName);
-               projectOrchestratorWhite.setProjectId(dbProject.getId());
+               projectOrchestratorWhite.setProjectId(dssProject.getId());
                projectOrchestratorWhite.setCreateBy(createUser);
 
                projectOrchestratorWhiteService.addProjectOrchestratorWhite(projectOrchestratorWhite);

dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java

@@ -16,6 +16,7 @@
 
 package com.webank.wedatasphere.dss.orchestrator.server.service;
 
+import com.webank.wedatasphere.dss.common.entity.project.DSSProject;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.label.LabelRouteVO;
 import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
@@ -68,4 +69,7 @@ public interface OrchestratorFrameworkService {
 
     DSSEncryptOrchestratorCopyInfo getDSSEncryptOrchestratorCopyInfo(String copyInfoId);
 
+
+    DSSProject getProjectByName(String projectName);
+
 }

dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java

@@ -1158,4 +1158,17 @@ public DSSEncryptOrchestratorCopyInfo getDSSEncryptOrchestratorCopyInfo(String c
     }
 
 
+
+    @Override
+    public DSSProject getProjectByName(String projectName){
+
+        List<String> projects = Collections.singletonList(projectName);
+        ProjectInfoListRequest request = new ProjectInfoListRequest();
+        request.setProjectNames(projects);
+
+        ProjectInfoListResponse response = RpcAskUtils.processAskException(DSSSenderServiceFactory.getOrCreateServiceInstance()
+                .getProjectServerSender().ask(request), ProjectInfoListResponse.class, ProjectInfoListRequest.class);
+
+        return  CollectionUtils.isEmpty(response.getDssProjects()) ? null : response.getDssProjects().get(0);
+    }
 }