数据查询（文件）返回所属项目、所属阶段信息

common/src/main/java/com/sdm/common/entity/resp/data/SimulationTaskResultCurveResp.java

@@ -38,4 +38,22 @@ public class SimulationTaskResultCurveResp {
     //格式化后的文件大小
     @Schema(description = "格式化后的文件大小")
     private String formatFileSize;
+
+    @Schema(description = "所属项目")
+    private String projectName;
+
+    @Schema(description = "所属项目id")
+    private String projectId;
+
+    @Schema(description = "所属阶段")
+    private String phaseName;
+
+    @Schema(description = "所属阶段id")
+    private String phaseId;
+
+    @Schema(description = "所属学科")
+    private String disciplineName;
+
+    @Schema(description = "所属学科id")
+    private String disciplineId;
 }

common/src/main/java/com/sdm/common/feign/inter/system/ISysTenantFeignClient.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
-@FeignClient(name = "tenant",contextId = "sysTenantFeignClient")
+@FeignClient(name = "system",contextId = "sysTenantFeignClient")
 public interface ISysTenantFeignClient {
     @PostMapping("/tenant/list")
     SdmResponse<PageDataResp<List<TenantResp>>> listTenant(@RequestBody TenantListReq tenant);

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.sdm.common.common.SdmResponse;
 import com.sdm.common.common.ThreadLocalContext;
+import com.sdm.common.entity.enums.NodeTypeEnum;
 import com.sdm.common.entity.resp.PageDataResp;
 import com.sdm.common.utils.FileSizeUtils;
 import com.sdm.common.utils.PageUtils;
@@ -49,14 +50,17 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
         BeanUtils.copyProperties(getSimulationTaskFileReq, queryBigFileReq);
         queryBigFileReq.setFileBizType(List.of(getSimulationTaskFileReq.getFileBizType()));
 
-        FileMetadataInfo fileMetadataInfo = fileMetadataInfoService.lambdaQuery()
-                .eq(FileMetadataInfo::getRelatedResourceUuid, getSimulationTaskFileReq.getUuid())
-                .eq(FileMetadataInfo::getTenantId, ThreadLocalContext.getTenantId())
-                .one();
-        if(ObjectUtils.isNotEmpty(fileMetadataInfo)) {
-            queryBigFileReq.setDirId(fileMetadataInfo.getId());
+        if(ObjectUtils.isNotEmpty(getSimulationTaskFileReq.getUuid())){
+            FileMetadataInfo fileMetadataInfo = fileMetadataInfoService.lambdaQuery()
+                    .eq(FileMetadataInfo::getRelatedResourceUuid, getSimulationTaskFileReq.getUuid())
+                    .eq(FileMetadataInfo::getTenantId, ThreadLocalContext.getTenantId())
+                    .one();
+            if(ObjectUtils.isNotEmpty(fileMetadataInfo)) {
+                queryBigFileReq.setDirId(fileMetadataInfo.getId());
+            }
         }
 
+
         SdmResponse<PageDataResp<List<FileStorage>>> searchResult = dataStorageAnalysis.listBigFile(queryBigFileReq);
         PageDataResp<List<FileStorage>> pageDataResp = searchResult.getData();
         List<FileStorage> data = pageDataResp.getData();
@@ -86,6 +90,29 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
             SimulationTaskResultCurveResp taskResultCurveResp = new SimulationTaskResultCurveResp();
             BeanUtils.copyProperties(simulationTaskFile, taskResultCurveResp);
             taskResultCurveResp.setFormatFileSize(FileSizeUtils.formatFileSize(BigDecimal.valueOf(simulationTaskFile.getFileSize())));
+
+            Long parentId = simulationTaskFile.getParentId();
+            while (ObjectUtils.isNotEmpty(parentId)){
+                FileMetadataInfo parDir = fileMetadataInfoService.lambdaQuery()
+                        .eq(FileMetadataInfo::getId, parentId).one();
+                if(ObjectUtils.isNotEmpty(parDir)){
+                    if(NodeTypeEnum.PROJECT.getValue().equals(parDir.getRelatedResourceUuidOwnType())){
+                        taskResultCurveResp.setProjectName(parDir.getOriginalName());
+                        taskResultCurveResp.setProjectId(parDir.getRelatedResourceUuid());
+                    }
+
+                    if(NodeTypeEnum.PHASE.getValue().equals(parDir.getRelatedResourceUuidOwnType())){
+                        taskResultCurveResp.setPhaseName(parDir.getOriginalName());
+                        taskResultCurveResp.setPhaseId(parDir.getRelatedResourceUuid());
+                    }
+
+                    if(NodeTypeEnum.DISCIPLINE.getValue().equals(parDir.getRelatedResourceUuidOwnType())){
+                        taskResultCurveResp.setDisciplineName(parDir.getOriginalName());
+                        taskResultCurveResp.setDisciplineId(parDir.getRelatedResourceUuid());
+                    }
+                    parentId = parDir.getParentId();
+                }
+            }
             return taskResultCurveResp;
         }).toList();
         return PageUtils.getJsonObjectSdmResponse(taskResultCurveResps,pageInfo);

data/src/main/resources/mapper/FileMetadataInfoMapper.xml

@@ -45,7 +45,7 @@
                 LEFT JOIN file_storage ON file_metadata_info.id = file_storage.dirId
             </if>
             WHERE
-            tenantId = #{tenantId}
+            file_metadata_info.tenantId = #{tenantId}
             and
             file_metadata_info.id IN (
             <foreach collection="fileIds" item="fileId" separator=",">
@@ -60,6 +60,6 @@
         </if>
 
         <!-- 排序：无论是否联合，都对最终结果排序 -->
-        ORDER BY originalName
+        ORDER BY file_metadata_info.originalName
     </select>
 </mapper>

system/src/main/resources/application-dev.yml

@@ -178,4 +178,5 @@ security:
     paths:
       - /systemApprove/approveStatusNotice
       - /user/getUserToken
-      - /systemMsg/sendMessage
+      - /systemMsg/sendMessage
+      - /tenant/list

system/src/main/resources/application-local.yml

@@ -179,6 +179,7 @@ security:
       - /systemApprove/approveStatusNotice
       - /user/getUserToken
       - /systemMsg/sendMessage
+      - /tenant/list
 
 # 0单机处理，可以指向本地，1负载均衡轮询
 serverType: 0

system/src/main/resources/application-lyric.yml

@@ -177,4 +177,5 @@ security:
     paths:
       - /systemApprove/approveStatusNotice
       - /user/getUserToken
-      - /systemMsg/sendMessage
+      - /systemMsg/sendMessage
+      - /tenant/list

system/src/main/resources/application-prod.yml

@@ -178,4 +178,5 @@ security:
     paths:
       - /systemApprove/approveStatusNotice
       - /user/getUserToken
-      - /systemMsg/sendMessage
+      - /systemMsg/sendMessage
+      - /tenant/list