[Feature-10495][Resource Center] Resource Center Refactor

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/ResourceComponent.java

@@ -35,7 +35,7 @@
 @JsonPropertyOrder({"id", "pid", "name", "fullName", "description", "isDirctory", "children", "type"})
 public abstract class ResourceComponent {
 
-    public ResourceComponent(int id, int pid, String name, String fullName, String description, boolean isDirctory) {
+    public ResourceComponent(int id, String pid, String name, String fullName, String description, boolean isDirctory) {
         this.id = id;
         this.pid = pid;
         this.name = name;
@@ -53,7 +53,7 @@ public ResourceComponent(int id, int pid, String name, String fullName, String d
     /**
      * parent id
      */
-    protected int pid;
+    protected String pid;
     /**
      * name
      */

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/visitor/ResourceTreeVisitor.java

@@ -20,10 +20,14 @@
 import org.apache.dolphinscheduler.api.dto.resources.Directory;
 import org.apache.dolphinscheduler.api.dto.resources.FileLeaf;
 import org.apache.dolphinscheduler.api.dto.resources.ResourceComponent;
+import org.apache.dolphinscheduler.common.storage.StorageEntity;
 import org.apache.dolphinscheduler.dao.entity.Resource;
+import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.spi.utils.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * resource tree visitor
@@ -33,7 +37,7 @@ public class ResourceTreeVisitor implements Visitor{
     /**
      * resource list
      */
-    private List<Resource> resourceList;
+    private List<StorageEntity> resourceList;
 
     public ResourceTreeVisitor() {
     }
@@ -42,7 +46,7 @@ public ResourceTreeVisitor() {
      * constructor
      * @param resourceList resource list
      */
-    public ResourceTreeVisitor(List<Resource> resourceList) {
+    public ResourceTreeVisitor(List<StorageEntity> resourceList) {
         this.resourceList = resourceList;
     }
 
@@ -51,35 +55,37 @@ public ResourceTreeVisitor(List<Resource> resourceList) {
      * @return resoruce component
      */
     @Override
-    public ResourceComponent visit() {
+    public ResourceComponent visit(String rootPath) {
         ResourceComponent rootDirectory = new Directory();
-        for (Resource resource : resourceList) {
+        for (StorageEntity resource : resourceList) {
             // judge whether is root node
-            if (rootNode(resource)){
+            if (rootNode(resource, rootPath)){
+                // if it is a root node.
                 ResourceComponent tempResourceComponent = getResourceComponent(resource);
                 rootDirectory.add(tempResourceComponent);
-                tempResourceComponent.setChildren(setChildren(tempResourceComponent.getId(),resourceList));
+                tempResourceComponent.setChildren(setChildren(tempResourceComponent.getFullName(),resourceList));
             }
         }
         return rootDirectory;
     }
 
     /**
      * set children
-     * @param id    id
+     * @param fullName   unique path
      * @param list  resource list
      * @return resource component list
      */
-    public static List<ResourceComponent> setChildren(int id, List<Resource> list ){
+    public static List<ResourceComponent> setChildren(String fullName, List<StorageEntity> list ){
+        // id is the unique value,
         List<ResourceComponent> childList = new ArrayList<>();
-        for (Resource resource : list) {
-            if (id == resource.getPid()){
+        for (StorageEntity resource : list) {
+            if (Objects.equals(fullName, resource.getPfullName())){
                 ResourceComponent tempResourceComponent = getResourceComponent(resource);
                 childList.add(tempResourceComponent);
             }
         }
         for (ResourceComponent resourceComponent : childList) {
-            resourceComponent.setChildren(setChildren(resourceComponent.getId(),list));
+            resourceComponent.setChildren(setChildren(resourceComponent.getFullName(),list));
         }
         if (childList.size()==0){
             return new ArrayList<>();
@@ -92,17 +98,18 @@ public static List<ResourceComponent> setChildren(int id, List<Resource> list ){
      * @param resource resource
      * @return true if it is the root node
      */
-    public boolean rootNode(Resource resource) {
+    public boolean rootNode(StorageEntity resource, String rootPath) {
 
         boolean isRootNode = true;
-        if(resource.getPid() != -1 ){
-            for (Resource parent : resourceList) {
-                if (resource.getPid() == parent.getId()) {
+        if(!Objects.equals(resource.getPfullName(), rootPath)){
+            for (StorageEntity parent : resourceList) {
+                if ( Objects.equals(resource.getPfullName(), parent.getFullName())) {
                     isRootNode = false;
                     break;
                 }
             }
         }
+
         return isRootNode;
     }
 
@@ -111,7 +118,7 @@ public boolean rootNode(Resource resource) {
      * @param resource resource
      * @return resource component
      */
-    private static ResourceComponent getResourceComponent(Resource resource) {
+    private static ResourceComponent getResourceComponent(StorageEntity resource) {
         ResourceComponent tempResourceComponent;
         if(resource.isDirectory()){
             tempResourceComponent = new Directory();
@@ -120,9 +127,10 @@ private static ResourceComponent getResourceComponent(Resource resource) {
         }
 
         tempResourceComponent.setName(resource.getAlias());
-        tempResourceComponent.setFullName(resource.getFullName().replaceFirst("/",""));
+//        tempResourceComponent.setFullName(resource.getFullName().replaceFirst("/",""));
+        tempResourceComponent.setFullName(resource.getFullName());
         tempResourceComponent.setId(resource.getId());
-        tempResourceComponent.setPid(resource.getPid());
+        tempResourceComponent.setPid(resource.getPfullName());
         tempResourceComponent.setIdValue(resource.getId(),resource.isDirectory());
         tempResourceComponent.setDescription(resource.getDescription());
         tempResourceComponent.setType(resource.getType());

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/visitor/Visitor.java

@@ -18,6 +18,7 @@
 package org.apache.dolphinscheduler.api.dto.resources.visitor;
 
 import org.apache.dolphinscheduler.api.dto.resources.ResourceComponent;
+import org.apache.dolphinscheduler.dao.entity.User;
 
 /**
  * Visitor
@@ -27,5 +28,5 @@ public interface Visitor {
      * visit
      * @return resource component
      */
-    ResourceComponent visit();
+    ResourceComponent visit(String rootPath);
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckService.java

@@ -16,13 +16,13 @@
  */
 package org.apache.dolphinscheduler.api.permission;
 
-import org.apache.dolphinscheduler.common.enums.AuthorizationType;
-import org.slf4j.Logger;
-
 import java.util.List;
 import java.util.Set;
 
-public interface ResourcePermissionCheckService<T>{
+import org.slf4j.Logger;
+
+public interface ResourcePermissionCheckService<T> {
+
     /**
      * resourcePermissionCheck
      * @param authorizationType
@@ -38,7 +38,6 @@ public interface ResourcePermissionCheckService<T>{
      * @param authorizationType
      * @param userId
      * @param logger
-     * @param <T>
      * @return
      */
     Set<T> userOwnedResourceIdsAcquisition(Object authorizationType, Integer userId, Logger logger);
@@ -51,7 +50,8 @@ public interface ResourcePermissionCheckService<T>{
      * @param logger
      * @return
      */
-    boolean operationPermissionCheck(Object authorizationType, Object[] projectIds, Integer userId, String permissionKey, Logger logger);
+    boolean operationPermissionCheck(Object authorizationType, Object[] projectIds, Integer userId,
+                                     String permissionKey, Logger logger);
 
     /**
      * functionDisabled

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java

@@ -83,6 +83,8 @@ Result<Object> createResource(User loginUser,
      */
     Result<Object> updateResource(User loginUser,
                                   int resourceId,
+                                  String fullName,
+                                  String tenantCode,
                                   String name,
                                   String desc,
                                   ResourceType type,
@@ -98,7 +100,8 @@ Result<Object> updateResource(User loginUser,
      * @param pageSize page size
      * @return resource list page
      */
-    Result queryResourceListPaging(User loginUser, int directoryId, ResourceType type, String searchVal, Integer pageNo, Integer pageSize);
+    Result queryResourceListPaging(User loginUser, int directoryId, String fullName, String resTenantCode,
+                                   ResourceType type, String searchVal, Integer pageNo, Integer pageSize);
 
     /**
      * query resource list
@@ -107,7 +110,7 @@ Result<Object> updateResource(User loginUser,
      * @param type resource type
      * @return resource list
      */
-    Map<String, Object> queryResourceList(User loginUser, ResourceType type);
+    Map<String, Object> queryResourceList(User loginUser, ResourceType type, String fullName);
 
     /**
      * query resource list by program type
@@ -126,7 +129,7 @@ Result<Object> updateResource(User loginUser,
      * @return delete result code
      * @throws IOException exception
      */
-    Result<Object> delete(User loginUser, int resourceId) throws IOException;
+    Result<Object> delete(User loginUser, int resourceId, String fullName, String tenantCode) throws IOException;
 
     /**
      * verify resource by name and type
@@ -135,7 +138,7 @@ Result<Object> updateResource(User loginUser,
      * @param type      resource type
      * @return true if the resource name not exists, otherwise return false
      */
-    Result<Object> verifyResourceName(String fullName, ResourceType type,User loginUser);
+    Result<Object> verifyResourceName(String fullName, ResourceType type, User loginUser);
 
     /**
      * verify resource by full name or pid and type
@@ -144,17 +147,18 @@ Result<Object> updateResource(User loginUser,
      * @param type      resource type
      * @return true if the resource full name or pid not exists, otherwise return false
      */
-    Result<Object> queryResource(User loginUser,String fullName,Integer id,ResourceType type);
+    Result<Object> queryResource(User loginUser, String fullName, Integer id, ResourceType type, String resTenantCode);
 
     /**
      * view resource file online
      *
      * @param resourceId resource id
      * @param skipLineNum skip line number
      * @param limit limit
+     * @param fullName fullName
      * @return resource content
      */
-    Result<Object> readResource(User loginUser,int resourceId, int skipLineNum, int limit);
+    Result<Object> readResource(User loginUser, String resourceId, String fullName, String tenantCode, int skipLineNum, int limit);
 
     /**
      * create resource file online
@@ -167,7 +171,8 @@ Result<Object> updateResource(User loginUser,
      * @param content content
      * @return create result code
      */
-    Result<Object> onlineCreateResource(User loginUser, ResourceType type, String fileName, String fileSuffix, String desc, String content,int pid,String currentDirectory);
+    Result<Object> onlineCreateResource(User loginUser, ResourceType type, String fileName, String fileSuffix,
+                                        String desc, String content, int pid, String currentDirectory);
 
     /**
      * create or update resource.
@@ -179,7 +184,8 @@ Result<Object> updateResource(User loginUser,
      * @param content content of resource
      * @return create result code
      */
-    Result<Object> onlineCreateOrUpdateResourceWithDir(User loginUser, String fileFullName, String desc, String content);
+    Result<Object> onlineCreateOrUpdateResourceWithDir(User loginUser, String fileFullName, String desc,
+                                                       String content);
 
     /**
      * create or update resource.
@@ -200,7 +206,8 @@ Result<Object> updateResource(User loginUser,
      * @param content content
      * @return update result cod
      */
-    Result<Object> updateResourceContent(User loginUser,int resourceId, String content);
+    Result<Object> updateResourceContent(User loginUser, int resourceId, String fullName, String tenantCode,
+                                         String content);
 
     /**
      * download file
@@ -209,7 +216,8 @@ Result<Object> updateResource(User loginUser,
      * @return resource content
      * @throws IOException exception
      */
-    org.springframework.core.io.Resource downloadResource(User loginUser, int resourceId) throws IOException;
+    org.springframework.core.io.Resource downloadResource(User loginUser, int resourceId,
+                                                          String fullName) throws IOException;
 
     /**
      * list all file
@@ -270,6 +278,7 @@ Result<Object> updateResource(User loginUser,
      * @param resourceId resource id
      * @return resource
      */
-    Result<Object> queryResourceById(User loginUser, Integer resourceId);
+    Result<Object> queryResourceById(User loginUser, Integer resourceId, String fullName, String tenantCode,
+                                     ResourceType type) throws IOException;
 
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UdfFuncService.java

@@ -44,6 +44,7 @@ public interface UdfFuncService {
     Result<Object> createUdfFunction(User loginUser,
                                      String funcName,
                                      String className,
+                                     String fullName,
                                      String argTypes,
                                      String database,
                                      String desc,
@@ -68,6 +69,7 @@ Result<Object> createUdfFunction(User loginUser,
      * @param database data base
      * @param desc description
      * @param resourceId resource id
+     * @param fullName resource full name
      * @param className class name
      * @return update result code
      */
@@ -79,7 +81,8 @@ Result<Object> updateUdfFunc(User loginUser,
                                       String database,
                                       String desc,
                                       UdfType type,
-                                      int resourceId);
+                                      int resourceId,
+                                      String fullName);
 
     /**
      * query udf function list paging