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

fix:文件操作统计不到项目下的文件

Browse Source
This commit is contained in:
zhuxinru
2026-04-01 14:15:06 +08:00
parent 63771ca960
commit 12c0498a19
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
View File

@@ -817,7 +817,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
}
// 记录删除日志
saveTaskFileLog("删除了文件" + deleteFileMetadataInfo.getOriginalName(), OperateTypeConstants.DELETE, deleteFileMetadataInfo.getTaskId(), deleteFileMetadataInfo.getId());
saveTaskFileLog("删除了文件" + deleteFileMetadataInfo.getOriginalName(), OperateTypeConstants.DELETE, deleteFileMetadataInfo.getTaskId(), deleteFileMetadataInfo.getTag1(), deleteFileMetadataInfo.getId());
// 所属文件夹（用于判断是否知识库）
FileMetadataInfo dirMetadataInfo = fileMetadataInfoService.lambdaQuery()
@@ -2148,7 +2148,11 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
logDTO.setModule(ModuleConstants.TASK);
logDTO.setOperateType(OperateTypeConstants.UPLOAD);
if (tagReq != null) {
logDTO.setBusinessId(tagReq.getTaskId());
if (StringUtil.isNotEmpty(tagReq.getTaskId())) {
logDTO.setBusinessId(tagReq.getTaskId());
} else {
logDTO.setBusinessId(tagReq.getTag1());
}
}
logDTO.setCreateBy(String.valueOf(ThreadLocalContext.getUserId()));
logDTO.setTenantId(ThreadLocalContext.getTenantId());
@@ -2158,12 +2162,16 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
sysLogFeignClient.batchSaveLog(logDTOList);
}
private void saveTaskFileLog(String title, String operateType , String taskId, Long fileId) {
private void saveTaskFileLog(String title, String operateType , String taskId, String projectId, Long fileId) {
SysLogDTO logDTO = new SysLogDTO();
logDTO.setTitle(title);
logDTO.setModule(ModuleConstants.TASK);
logDTO.setOperateType(operateType);
logDTO.setBusinessId(taskId);
if (StringUtil.isNotEmpty(taskId)) {
logDTO.setBusinessId(taskId);
} else {
logDTO.setBusinessId(projectId);
}
logDTO.setFileId(fileId);
logDTO.setCreateBy(String.valueOf(ThreadLocalContext.getUserId()));
logDTO.setTenantId(ThreadLocalContext.getTenantId());
@@ -2340,7 +2348,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
triggerKnowledgeApproveIfNeeded(req, fileInfo, dirMetadataInfo);
finalizeFileGroup(fileInfo);
// 记录日志
saveTaskFileLog("上传了文件" + fileInfo.getOriginalName(), OperateTypeConstants.PREVIEW, fileInfo.getTaskId(), fileInfo.getId());
saveTaskFileLog("上传了文件" + fileInfo.getOriginalName(), OperateTypeConstants.PREVIEW, fileInfo.getTaskId(), fileInfo.getTag1(), fileInfo.getId());
return buildUploadSuccess(fileInfo);
} catch (Exception e) {
@@ -3559,7 +3567,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
// kkFileView已经二次开发，需要拼接 &lastModified=2025-10-13%2016:12:12
// 记录预览日志
saveTaskFileLog("预览了" + fileMetadataInfo.getOriginalName(), OperateTypeConstants.PREVIEW, fileMetadataInfo.getTaskId(), fileId);
saveTaskFileLog("预览了" + fileMetadataInfo.getOriginalName(), OperateTypeConstants.PREVIEW, fileMetadataInfo.getTaskId(), fileMetadataInfo.getTag1(), fileId);
return SdmResponse.success(kkFileViewURLFromMinioResp);
}
@@ -3599,7 +3607,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
return SdmResponse.failed("获取下载链接失败");
}
// 记录下载日志
saveTaskFileLog("下载了" + fileMetadataInfo.getOriginalName(), OperateTypeConstants.DOWNLOAD, fileMetadataInfo.getTaskId(), fileId);
saveTaskFileLog("下载了" + fileMetadataInfo.getOriginalName(), OperateTypeConstants.DOWNLOAD, fileMetadataInfo.getTaskId(), fileMetadataInfo.getTag1(), fileId);
MinioDownloadUrlResp resp = new MinioDownloadUrlResp(minioDownloadUrl, fileName);
return SdmResponse.success(resp);
}

1
system/src/main/java/com/sdm/system/service/impl/ISysLogServiceImpl.java
View File

@@ -350,6 +350,7 @@ public class ISysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> implem
SdmResponse<List<String>> uuidsResponse = simulationTaskFeignClient.getUuidsByTag1s(tag1);
if (uuidsResponse.isSuccess() && CollectionUtils.isNotEmpty(uuidsResponse.getData())) {
taskUuids = uuidsResponse.getData();
taskUuids.addAll(Arrays.asList(tag1.split(",")));
wrapper.in(SysLog::getBusinessId, taskUuids);
} else {
// 如果没有找到对应的任务，返回空统计结果