add workspaceId when add project and select tree

Adamyuanyuan · Adamyuanyuan · commit d54733934f78 · 2020-07-03T18:34:13.000+08:00
diff --git a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DSSProject.java b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DSSProject.java
@@ -48,6 +48,7 @@ public class DSSProject implements Project {
     private String product;
     private Integer applicationArea;
     private String business;
+    private Long workspaceId;
 
     private DSSProjectVersion latestVersion;
     private Boolean isNotPublish;
@@ -282,4 +283,12 @@ public String getBusiness() {
     public void setBusiness(String business) {
         this.business = business;
     }
+
+    public Long getWorkspaceId() {
+        return workspaceId;
+    }
+
+    public void setWorkspaceId(Long workspaceId) {
+        this.workspaceId = workspaceId;
+    }
 }
diff --git a/dss-flow-execution-entrance/src/main/assembly/distribution.xml b/dss-flow-execution-entrance/src/main/assembly/distribution.xml
@@ -59,16 +59,16 @@
                 <exclude>aopalliance:aopalliance:jar</exclude>
                 <exclude>asm:asm:jar</exclude>
                 <exclude>cglib:cglib:jar</exclude>
-                <exclude>com.amazonaws:aws-java-sdk-autoscaling:jar</exclude>
-                <exclude>com.amazonaws:aws-java-sdk-core:jar</exclude>
-                <exclude>com.amazonaws:aws-java-sdk-ec2:jar</exclude>
-                <exclude>com.amazonaws:aws-java-sdk-route53:jar</exclude>
-                <exclude>com.amazonaws:aws-java-sdk-sts:jar</exclude>
-                <exclude>com.amazonaws:jmespath-java:jar</exclude>
+<!--                <exclude>com.amazonaws:aws-java-sdk-autoscaling:jar</exclude>-->
+<!--                <exclude>com.amazonaws:aws-java-sdk-core:jar</exclude>-->
+<!--                <exclude>com.amazonaws:aws-java-sdk-ec2:jar</exclude>-->
+<!--                <exclude>com.amazonaws:aws-java-sdk-route53:jar</exclude>-->
+<!--                <exclude>com.amazonaws:aws-java-sdk-sts:jar</exclude>-->
+<!--                <exclude>com.amazonaws:jmespath-java:jar</exclude>-->
                 <exclude>com.fasterxml.jackson.core:jackson-annotations:jar</exclude>
                 <exclude>com.fasterxml.jackson.core:jackson-core:jar</exclude>
                 <exclude>com.fasterxml.jackson.core:jackson-databind:jar</exclude>
-                <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar</exclude>
+<!--                <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar</exclude>-->
                 <exclude>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar</exclude>
                 <exclude>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar</exclude>
                 <exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar</exclude>
@@ -264,7 +264,7 @@
                 <exclude>org.springframework:spring-web:jar</exclude>
                 <exclude>org.springframework:spring-webmvc:jar</exclude>
                 <exclude>org.yaml:snakeyaml:jar</exclude>
-                <exclude>software.amazon.ion:ion-java:jar</exclude>
+<!--                <exclude>software.amazon.ion:ion-java:jar</exclude>-->
                 <exclude>xmlpull:xmlpull:jar</exclude>
                 <exclude>xpp3:xpp3_min:jar</exclude>
             </excludes>
diff --git a/dss-server/src/main/assembly/distribution.xml b/dss-server/src/main/assembly/distribution.xml
@@ -41,16 +41,16 @@
                 <exclude>aopalliance:aopalliance:jar</exclude>
                 <exclude>asm:asm:jar</exclude>
                 <exclude>cglib:cglib:jar</exclude>
-                <exclude>com.amazonaws:aws-java-sdk-autoscaling:jar</exclude>
-                <exclude>com.amazonaws:aws-java-sdk-core:jar</exclude>
-                <exclude>com.amazonaws:aws-java-sdk-ec2:jar</exclude>
-                <exclude>com.amazonaws:aws-java-sdk-route53:jar</exclude>
-                <exclude>com.amazonaws:aws-java-sdk-sts:jar</exclude>
-                <exclude>com.amazonaws:jmespath-java:jar</exclude>
+<!--                <exclude>com.amazonaws:aws-java-sdk-autoscaling:jar</exclude>-->
+<!--                <exclude>com.amazonaws:aws-java-sdk-core:jar</exclude>-->
+<!--                <exclude>com.amazonaws:aws-java-sdk-ec2:jar</exclude>-->
+<!--                <exclude>com.amazonaws:aws-java-sdk-route53:jar</exclude>-->
+<!--                <exclude>com.amazonaws:aws-java-sdk-sts:jar</exclude>-->
+<!--                <exclude>com.amazonaws:jmespath-java:jar</exclude>-->
                 <exclude>com.fasterxml.jackson.core:jackson-annotations:jar</exclude>
                 <exclude>com.fasterxml.jackson.core:jackson-core:jar</exclude>
                 <exclude>com.fasterxml.jackson.core:jackson-databind:jar</exclude>
-                <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar</exclude>
+<!--                <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar</exclude>-->
                 <exclude>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar</exclude>
                 <exclude>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar</exclude>
                 <exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar</exclude>
@@ -284,7 +284,7 @@
                 <exclude>org.springframework:spring-webmvc:jar</exclude>
                 <exclude>org.tukaani:xz:jar</exclude>
                 <exclude>org.yaml:snakeyaml:jar</exclude>
-                <exclude>software.amazon.ion:ion-java:jar</exclude>
+<!--                <exclude>software.amazon.ion:ion-java:jar</exclude>-->
                 <exclude>xerces:xercesImpl:jar</exclude>
                 <exclude>xmlenc:xmlenc:jar</exclude>
                 <exclude>xmlpull:xmlpull:jar</exclude>
diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/projectMapper.xml b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/projectMapper.xml
@@ -22,7 +22,7 @@
 <mapper namespace="com.webank.wedatasphere.dss.server.dao.ProjectMapper">
 
     <sql id="project_main">
-        id,`name`,`source`,`description`,`org_id`,`visibility`,`is_transfer`,`initial_org_id`,`user_id`,`create_time`,`create_by`,`product`,`application_area`,`business`
+        id,`name`,`source`,`description`,`org_id`,`visibility`,`is_transfer`,`initial_org_id`,`user_id`,`create_time`,`create_by`,`product`,`application_area`,`business`,`workspace_id`
     </sql>
 
     <sql id="project_version">
@@ -61,7 +61,7 @@
     <insert id="addProject" useGeneratedKeys="true" keyProperty="id"  parameterType="com.webank.wedatasphere.dss.common.entity.project.DSSProject">
         INSERT INTO dss_project (<include refid = "project_main" />)
         VALUES
-        (#{id},#{name},#{source},#{description},#{orgID},#{visibility},#{isTransfer},#{initialOrgID},#{userID},#{createTime},#{createBy},#{product},#{applicationArea},#{business})
+        (#{id},#{name},#{source},#{description},#{orgID},#{visibility},#{isTransfer},#{initialOrgID},#{userID},#{createTime},#{createBy},#{product},#{applicationArea},#{business},#{workspaceId})
     </insert>
 
     <insert id="addProjectVersion" useGeneratedKeys="true" keyProperty="id" parameterType="com.webank.wedatasphere.dss.common.entity.project.DSSProjectVersion" >
diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/ProjectRestfulApi.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/ProjectRestfulApi.java
@@ -101,8 +101,9 @@ public Response addProject(@Context HttpServletRequest req, JsonNode json) throw
         String product = json.get("product").getTextValue();
         Integer applicationArea = json.get("applicationArea").getIntValue();
         String business = json.get("business").getTextValue();
+        Long workspaceId = json.get("workspaceId") == null ? 1 : json.get("workspaceId").getLongValue();
         // TODO: 2019/5/16 空值校验，重复名校验
-        projectService.addProject(userName, name, description, taxonomyID,product,applicationArea,business);
+        projectService.addProject(userName, name, description, taxonomyID,product,applicationArea,business, workspaceId);
         return Message.messageToResponse(Message.ok());
     }
 
diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/TreeRestfulApi.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/TreeRestfulApi.java
@@ -26,13 +26,11 @@
 import com.webank.wedatasphere.linkis.server.security.SecurityFilter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestParam;
 import scala.Enumeration;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
+import javax.ws.rs.*;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSProjectService.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSProjectService.java
@@ -32,7 +32,7 @@ public interface DSSProjectService {
 
     DSSProject getProjectByID(Long id);
 
-    Long addProject(String userName, String name, String description, Long taxonomyID,String product,Integer applicationArea,String business) throws DSSErrorException, AppJointErrorException;
+    Long addProject(String userName, String name, String description, Long taxonomyID,String product,Integer applicationArea,String business, Long workspaceId) throws DSSErrorException, AppJointErrorException;
 
     void updateProject(long projectID, String name, String description, String userName , String product ,Integer applicationArea ,String business) throws AppJointErrorException;
 
diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSProjectTaxonomyService.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSProjectTaxonomyService.java
@@ -30,7 +30,7 @@ public interface DSSProjectTaxonomyService {
     List<DSSProjectTaxonomy> listProjectTaxonomyByUser(String userName);
 
     //----------------------
-    List<DSSProjectTaxonomy> listAllProjectTaxonomy(String userName);
+    List<DSSProjectTaxonomy> listAllProjectTaxonomy(String userName, Long workspaceId);
 
     List<DSSProjectTaxonomy> listProjectTaxonomy(Long taxonomyID, String userName);
 
diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSProjectServiceImpl.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSProjectServiceImpl.java
@@ -99,7 +99,7 @@ public DSSProject getProjectByID(Long id) {
 
     @Transactional(rollbackFor = {DSSErrorException.class,AppJointErrorException.class})
     @Override
-    public Long addProject(String userName, String name, String description, Long taxonomyID,String product,Integer applicationArea,String business) throws DSSErrorException, AppJointErrorException {
+    public Long addProject(String userName, String name, String description, Long taxonomyID,String product,Integer applicationArea,String business, Long workspaceId) throws DSSErrorException, AppJointErrorException {
         DSSProject dssProject = new DSSProject();
         dssProject.setUserName(userName);
         dssProject.setName(name);
@@ -112,7 +112,7 @@ public Long addProject(String userName, String name, String description, Long ta
         Map<Long,Long> appjointProjectIDAndAppID = createAppjointProject(dssProject);
         Long userID = dssUserMapper.getUserID(userName);
         //创建dss自己的project
-        Pair<Long, Long> pair = addDSSProject(userID, name, description,product,applicationArea,business);
+        Pair<Long, Long> pair = addDSSProject(userID, name, description,product,applicationArea,business, workspaceId);
         //添加关联
         projectTaxonomyMapper.addProjectTaxonomyRelation(pair.getFirst(), taxonomyID, userID);
         if(!appjointProjectIDAndAppID.isEmpty())projectMapper.addAccessProjectRelation(appjointProjectIDAndAppID,pair.getFirst());
@@ -132,7 +132,7 @@ private Map<Long,Long> createAppjointProject(DSSProject project) throws DSSError
         return applicationProjectIDs;
     }
 
-    private Pair<Long,Long> addDSSProject(Long userID, String name, String description,String product,Integer applicationArea,String business) {
+    private Pair<Long,Long> addDSSProject(Long userID, String name, String description, String product, Integer applicationArea, String business, Long workspaceId) {
         DSSProject dssProject = new DSSProject();
         dssProject.setUserID(userID);
         dssProject.setName(name);
@@ -143,6 +143,7 @@ private Pair<Long,Long> addDSSProject(Long userID, String name, String descripti
         dssProject.setProduct(product);
         dssProject.setApplicationArea(applicationArea);
         dssProject.setBusiness(business);
+        dssProject.setWorkspaceId(workspaceId);
         projectMapper.addProject(dssProject);
         DSSProjectVersion dssProjectVersion = new DSSProjectVersion();
         dssProjectVersion.setComment(DSSServerConstant.DSS_PROJECT_FIRST_VERSION_COMMENT);
diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSProjectTaxonomyServiceImpl.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSProjectTaxonomyServiceImpl.java
@@ -62,18 +62,21 @@ private List<Long> listProjectIDByTaxonomyID(Long taxonomyID, String userName) {
 
 
     @Override
-    public List<DSSProjectTaxonomy> listAllProjectTaxonomy(String userName) {
-        List<DSSProjectTaxonomy> dwsProjectTaxonomies = listProjectTaxonomyByUser(userName);
-        for (DSSProjectTaxonomy dssProjectTaxonomy : dwsProjectTaxonomies) {
+    public List<DSSProjectTaxonomy> listAllProjectTaxonomy(String userName, Long workspaceId) {
+        List<DSSProjectTaxonomy> dssProjectTaxonomies = listProjectTaxonomyByUser(userName);
+        for (DSSProjectTaxonomy dssProjectTaxonomy : dssProjectTaxonomies) {
             List<Long> projectIDs = listProjectIDByTaxonomyID(dssProjectTaxonomy.getId(), userName);
             ArrayList<DSSProject> dssProjectList = new ArrayList<>();
             for (Long projectID : projectIDs) {
                 DSSProject dssProject = projectService.getLatestVersionProject(projectID);
-                dssProjectList.add(dssProject);
+                // 只选择返回属于这个workspace的project，(某些用户拥有多个workspace的不同project)
+                if(workspaceId.equals(dssProject.getWorkspaceId())) {
+                    dssProjectList.add(dssProject);
+                }
             }
             dssProjectTaxonomy.setDssProjectList(dssProjectList);
         }
-        return dwsProjectTaxonomies;
+        return dssProjectTaxonomies;
     }
 
     @Override
diff --git a/dss-server/src/main/scala/com/webank/wedatasphere/dss/server/crumb/CrumbFactory.scala b/dss-server/src/main/scala/com/webank/wedatasphere/dss/server/crumb/CrumbFactory.scala
@@ -104,16 +104,16 @@ class CrumbFactory {
 
   def createCrumbData(crumbType: CrumbType, params: java.util.Map[String, String],userName:String): Any = {
     crumbType match {
-      case CrumbType.All =>createAllData(userName)
+      case CrumbType.All =>createAllData(userName, params.get("workspaceId").toLong)
       case CrumbType.SortProject =>createSortProjectData(params.get("projectTaxonomyID").toLong,userName)
       case CrumbType.Project =>createProjectData(params.get("projectVersionID").toLong,params.get("isRootFlow").toBoolean)
       case CrumbType.SortFlow =>createSortFlowData(params.get("projectVersionID").toLong,params.get("flowTaxonomyID").toLong,params.get("isRootFlow").toBoolean)
       case CrumbType.Flow =>null
     }
   }
 
-  private def createAllData(userName:String):java.util.List[DSSProjectTaxonomy] ={
-    projectTaxonomyService.listAllProjectTaxonomy(userName)
+  private def createAllData(userName:String, workspaceId: Long):java.util.List[DSSProjectTaxonomy] ={
+    projectTaxonomyService.listAllProjectTaxonomy(userName, workspaceId)
   }
 
   private def createSortProjectData(projectTaxonomyID:Long,userName:String):java.util.List[DSSProjectTaxonomy] ={
diff --git a/dss-server/src/main/scala/com/webank/wedatasphere/dss/server/crumb/QuerParamsParser.scala b/dss-server/src/main/scala/com/webank/wedatasphere/dss/server/crumb/QuerParamsParser.scala
@@ -27,10 +27,11 @@ object QuerParamsParser {
 
   def getCrumbType(queryParams: String): CrumbType = {
     queryParams.split("&").size match {
-      case 1 => if ("".equals(queryParams)) CrumbType.All else CrumbType.SortProject
-      case 3 => CrumbType.Project
-      case 4 => CrumbType.SortFlow
-      case 5 => CrumbType.Flow
+      case 1 => CrumbType.All
+      case 2 => CrumbType.SortProject
+      case 4 => CrumbType.Project
+      case 5 => CrumbType.SortFlow
+      case 6 => CrumbType.Flow
     }
   }
 
