toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

数据存储的项目统计优化租户查询

Browse Source
This commit is contained in:
gulongcheng
2026-01-21 09:23:50 +08:00
parent d324129b05
commit 6ea88fce72
6 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/src/main/java/com/sdm/data/controller/DataStorageAnalysisController.java
View File

@@ -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());
}
// 直接调用批量查询接口

2
data/src/main/java/com/sdm/data/dao/FileStorageMapper.java
View File

@@ -18,7 +18,7 @@ import java.util.List;
* @since 2025-11-04
*/
public interface FileStorageMapper extends BaseMapper<FileStorage> {
List<String> getdefaultNodeNameByNodeSize(@Param("queryNodeType") String queryNodeType, @Param("limitNum") Integer limitNum);
List<String> getdefaultNodeNameByNodeSize(@Param("queryNodeType") String queryNodeType, @Param("limitNum") Integer limitNum,@Param("tenantId") Long tenantId);
List<NodeSizeDTO> selectNodeSizeByNodeType(@Param("directoryIds") List<Long> directoryIds, @Param("intervalMonths") Integer intervalMonths, @Param("tenantId") Long tenantId);

2
data/src/main/java/com/sdm/data/service/IFileStorageService.java
View File

@@ -18,7 +18,7 @@ import java.util.List;
* @since 2025-11-04
*/
public interface IFileStorageService extends IService<FileStorage> {
List<String> getdefaultNodeSizeUUID(String queryNodeType, Integer limitNum);
List<String> getdefaultNodeSizeUUID(String queryNodeType, Integer limitNum,Long tenantId);
List<NodeSizeDTO> selectNodeSizeByNodeType(List<Long> directoryIds, Integer intervalMonths, Long tenantId);
List<NodeSizeDTO> statDirStorageByTargetYm(List<Long> dirIds, String targetYm, Long tenantId);

4
data/src/main/java/com/sdm/data/service/impl/FileStorageServiceImpl.java
View File

@@ -22,8 +22,8 @@ import java.util.List;
@Service
public class FileStorageServiceImpl extends ServiceImpl<FileStorageMapper, FileStorage> implements IFileStorageService {
@Override
public List<String> getdefaultNodeSizeUUID(String queryNodeType, Integer limitNum) {
return baseMapper.getdefaultNodeNameByNodeSize(queryNodeType,limitNum);
public List<String> getdefaultNodeSizeUUID(String queryNodeType, Integer limitNum,Long tenantId) {
return baseMapper.getdefaultNodeNameByNodeSize(queryNodeType,limitNum,tenantId);
}
@Override

3
data/src/main/resources/mapper/FileStorageMapper.xml
View File

@@ -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

2
data/src/test/java/com/sdm/data/dao/PostgreSQLCompatibilityTest.java
View File

@@ -128,7 +128,7 @@ public class PostgreSQLCompatibilityTest {
void testLimitQuery() {
List<String> result = fileStorageMapper.getdefaultNodeNameByNodeSize(
"node",
5 // LIMIT 5
5 ,1L // LIMIT 5
);
assertNotNull(result);