diff --git a/data/src/main/java/com/sdm/data/controller/DataStorageAnalysisController.java b/data/src/main/java/com/sdm/data/controller/DataStorageAnalysisController.java index 062aa6b6..6e6c68f0 100644 --- a/data/src/main/java/com/sdm/data/controller/DataStorageAnalysisController.java +++ b/data/src/main/java/com/sdm/data/controller/DataStorageAnalysisController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.sdm.common.common.SdmResponse; +import com.sdm.common.common.ThreadLocalContext; import com.sdm.common.entity.req.project.GetAllTasksByDisciplineReq; import com.sdm.common.entity.resp.PageDataResp; import com.sdm.common.feign.inter.project.ISimulationTaskFeignClient; @@ -66,7 +67,7 @@ public class DataStorageAnalysisController { // 如果未指定节点名称,获取默认的top10 if (CollectionUtils.isEmpty(queryNodeNames)) { - queryNodeNames = fileStorageService.getdefaultNodeSizeUUID(queryNodeType, 10); + queryNodeNames = fileStorageService.getdefaultNodeSizeUUID(queryNodeType, 10, ThreadLocalContext.getTenantId()); } // 直接调用批量查询接口 diff --git a/data/src/main/java/com/sdm/data/dao/FileStorageMapper.java b/data/src/main/java/com/sdm/data/dao/FileStorageMapper.java index d37d459b..79041233 100644 --- a/data/src/main/java/com/sdm/data/dao/FileStorageMapper.java +++ b/data/src/main/java/com/sdm/data/dao/FileStorageMapper.java @@ -18,7 +18,7 @@ import java.util.List; * @since 2025-11-04 */ public interface FileStorageMapper extends BaseMapper { - List getdefaultNodeNameByNodeSize(@Param("queryNodeType") String queryNodeType, @Param("limitNum") Integer limitNum); + List getdefaultNodeNameByNodeSize(@Param("queryNodeType") String queryNodeType, @Param("limitNum") Integer limitNum,@Param("tenantId") Long tenantId); List selectNodeSizeByNodeType(@Param("directoryIds") List directoryIds, @Param("intervalMonths") Integer intervalMonths, @Param("tenantId") Long tenantId); diff --git a/data/src/main/java/com/sdm/data/service/IFileStorageService.java b/data/src/main/java/com/sdm/data/service/IFileStorageService.java index c648ed5b..14bed30f 100644 --- a/data/src/main/java/com/sdm/data/service/IFileStorageService.java +++ b/data/src/main/java/com/sdm/data/service/IFileStorageService.java @@ -18,7 +18,7 @@ import java.util.List; * @since 2025-11-04 */ public interface IFileStorageService extends IService { - List getdefaultNodeSizeUUID(String queryNodeType, Integer limitNum); + List getdefaultNodeSizeUUID(String queryNodeType, Integer limitNum,Long tenantId); List selectNodeSizeByNodeType(List directoryIds, Integer intervalMonths, Long tenantId); List statDirStorageByTargetYm(List dirIds, String targetYm, Long tenantId); diff --git a/data/src/main/java/com/sdm/data/service/impl/FileStorageServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/FileStorageServiceImpl.java index 974dfc57..df0d433e 100644 --- a/data/src/main/java/com/sdm/data/service/impl/FileStorageServiceImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/FileStorageServiceImpl.java @@ -22,8 +22,8 @@ import java.util.List; @Service public class FileStorageServiceImpl extends ServiceImpl implements IFileStorageService { @Override - public List getdefaultNodeSizeUUID(String queryNodeType, Integer limitNum) { - return baseMapper.getdefaultNodeNameByNodeSize(queryNodeType,limitNum); + public List getdefaultNodeSizeUUID(String queryNodeType, Integer limitNum,Long tenantId) { + return baseMapper.getdefaultNodeNameByNodeSize(queryNodeType,limitNum,tenantId); } @Override diff --git a/data/src/main/resources/mapper/FileStorageMapper.xml b/data/src/main/resources/mapper/FileStorageMapper.xml index 47acf6bb..10236457 100644 --- a/data/src/main/resources/mapper/FileStorageMapper.xml +++ b/data/src/main/resources/mapper/FileStorageMapper.xml @@ -18,11 +18,12 @@ file_storage fs where fs.dirId - in(select id from file_metadata_info fmi where fmi.relatedResourceUuidOwnType = #{queryNodeType}) + in(select id from file_metadata_info fmi where fmi.relatedResourceUuidOwnType = #{queryNodeType}) and fmi.tenantId = #{tenantId} group by fs.dirId) dirSize left join file_metadata_info ON dirSize.dirId = file_metadata_info.id + where file_metadata_info.tenantId = #{tenantId} group by file_metadata_info.originalName order by diff --git a/data/src/test/java/com/sdm/data/dao/PostgreSQLCompatibilityTest.java b/data/src/test/java/com/sdm/data/dao/PostgreSQLCompatibilityTest.java index de29e5d5..5827dc42 100644 --- a/data/src/test/java/com/sdm/data/dao/PostgreSQLCompatibilityTest.java +++ b/data/src/test/java/com/sdm/data/dao/PostgreSQLCompatibilityTest.java @@ -128,7 +128,7 @@ public class PostgreSQLCompatibilityTest { void testLimitQuery() { List result = fileStorageMapper.getdefaultNodeNameByNodeSize( "node", - 5 // LIMIT 5 + 5 ,1L // LIMIT 5 ); assertNotNull(result);