sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

附属属性相关接口修改

Browse Source
This commit is contained in:
huguanghan 2024-12-26 09:24:52 +08:00
parent 0d8c35afc1
commit 72573c30c0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
View File

@ -444,7 +444,9 @@ public class SysEquipmentServiceImpl implements SysEquipmentService {
List<SysEquipmentDocs> collectDelete = sysEquipmentDocs.stream().filter(item -> !collect.contains(item.getId())).collect(Collectors.toList()); List<SysEquipmentDocs> collectDelete = sysEquipmentDocs.stream().filter(item -> !collect.contains(item.getId())).collect(Collectors.toList());
//删除minio文件和数据库记录 //删除minio文件和数据库记录
for (SysEquipmentDocs item : collectDelete){ for (SysEquipmentDocs item : collectDelete){
sysEquipmentDocsMapper.deleteById(item.getId());
deleteFile(item); deleteFile(item);
} }
} }
@ -543,7 +545,6 @@ public class SysEquipmentServiceImpl implements SysEquipmentService {
@Override @Override
public void readFileToSteam(String path, OutputStream stream) { public void readFileToSteam(String path, OutputStream stream) {
path = minioAutoProperties.getPublicBucket()+ FileConstants.FILE_SEPARATOR+ path;
minioViewsServcie.readFileToStream(path, stream); minioViewsServcie.readFileToStream(path, stream);
} }

2
das/src/main/java/com/das/modules/fdr/service/MinioViewsServcie.java
View File

@ -200,7 +200,7 @@ public class MinioViewsServcie {
public void readFileToStream(String path, OutputStream stream) { public void readFileToStream(String path, OutputStream stream) {
try (GetObjectResponse res = minioClient.getObject( try (GetObjectResponse res = minioClient.getObject(
GetObjectArgs.builder().bucket(minioProperties.getBucket()).object(path).build())) { GetObjectArgs.builder().bucket(minioProperties.getPublicBucket()).object(path).build())) {
res.transferTo(stream); res.transferTo(stream);
} catch (Exception e) { } catch (Exception e) {
log.error("minio读取文件失败", e); log.error("minio读取文件失败", e);