数据总览优化

优化文件检索

data/src/main/java/com/sdm/data/dao/FileMetadataInfoMapper.java

@@ -1,12 +1,7 @@
 package com.sdm.data.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sdm.data.model.dto.NodeSizeDTO;
-import com.sdm.data.model.dto.UserTotalFileSizeDTO;
 import com.sdm.data.model.entity.FileMetadataInfo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>

data/src/main/java/com/sdm/data/model/entity/FileMetadataInfo.java

@@ -36,7 +36,7 @@ public class FileMetadataInfo implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "simulation_node关联的节点id")
-    @TableField("nodeId")
+    @TableField("relatedResourceUuid")
     private String relatedResourceUuid;
 
     @ApiModelProperty(value = "关联对象类型（node,task,run,performance）")

data/src/main/java/com/sdm/data/service/IDataFileService.java

@@ -36,7 +36,7 @@ public interface IDataFileService {
     SdmResponse delDir(DelDirReq req);
 
     /**
-     * 查询文件夹下文件信息
+     * 只查询当前文件夹下文件和文件夹信息
      * 1、知识库根据filedid查询
      * 2、项目文件根据nodeId查询
      * @param req 查询目录请求参数
@@ -45,7 +45,7 @@ public interface IDataFileService {
     SdmResponse queryDir(QueryDirReq req);
 
     /**
-     * 下一层级目录树查询
+     * 当前目录下的下一层级目录树查询
      *
      * @param dirType
      * @param parentDirId 父目录ID

data/src/main/java/com/sdm/data/service/impl/DimensionTemplateServiceImpl.java

@@ -2,6 +2,7 @@ package com.sdm.data.service.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.sdm.common.common.SdmResponse;
 import com.sdm.common.entity.resp.AllNodeByProjectIdAndTypeResp;
 import com.sdm.common.feign.impl.project.SimulationNodeFeignClientImpl;
@@ -144,7 +145,7 @@ public class DimensionTemplateServiceImpl extends ServiceImpl<DimensionTemplateM
 
         String chooseUuid = req.getChooseUuid();
         String chooseNodeType = req.getChooseNodeType();
-        if(chooseUuid==null){
+        if(ObjectUtils.isEmpty(chooseUuid)){
             // 选中维度了，没有选节点，按照模版，展示模版的第一层节点数据
             String rootNodeType = dimensionNodeTyepOrderList.get(0);
             SdmResponse<List<AllNodeByProjectIdAndTypeResp>> allNodeByNodeTypeResponse = simuluationNodeFeignClient.getAllNodeByNodeType(null,rootNodeType);

data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java

@@ -515,7 +515,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
             }
             parentId = nodeMetadataInfo.getId();
         } else {
-            return SdmResponse.failed("参数错误,缺少fileId或nodeId参数");
+            return SdmResponse.success();
         }
         List<FileMetadataInfo> list = fileMetadataInfoService.lambdaQuery().eq(FileMetadataInfo::getParentId, parentId)
                 .eq(ObjectUtils.isNotNull(req.getUploadUserId()), FileMetadataInfo::getCreatorId, req.getUploadUserId())

project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java

@@ -633,6 +633,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
         simulationNodeList.forEach(simulationNode -> {
             AllNodeByProjectIdAndTypeResp allNodeByProjectIdAndTypeResp = new AllNodeByProjectIdAndTypeResp();
             BeanUtils.copyProperties(simulationNode, allNodeByProjectIdAndTypeResp);
+            allNodeByProjectIdAndTypeResp.setId(simulationNode.getId().longValue());
             allNodeByProjectIdAndTypeRespList.add(allNodeByProjectIdAndTypeResp);
         });