From e146bc181625aee75624f8364654721cfd886254 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 30 六月 2023 17:39:53 +0800
Subject: [PATCH] 修改部分空指针报错
---
Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/service/impl/FileServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/service/impl/FileServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/service/impl/FileServiceImpl.java
index bdec3fd..6787222 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/service/impl/FileServiceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/service/impl/FileServiceImpl.java
@@ -17,6 +17,8 @@
import com.vci.ubcs.resource.utils.ZipUtil;
import com.vci.ubcs.resource.vo.FileObjectVO;
import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
+import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.starter.web.enumpck.BaseEnum;
import com.vci.ubcs.starter.web.enumpck.UserSecretEnum;
import com.vci.ubcs.starter.web.util.BeanUtil;
@@ -173,7 +175,7 @@
* @return 鎵ц缁撴灉
*/
@Override
- @Transactional()
+ @Transactional(rollbackFor = Exception.class)
public void deleteFiles(Collection<String> oids) {
VciBaseUtil.alertNotNull(oids,"鏂囦欢鐨勪富閿泦鍚�");
if(log.isDebugEnabled()){
@@ -182,16 +184,15 @@
Collection<FileObject> fileObjects = listByIds(oids);
if(!CollectionUtils.isEmpty(fileObjects)){
VciBaseUtil.switchCollectionForOracleIn(fileObjects).stream().forEach(fileDOs->{
- fileObjectMapper.deleteBatchIds(fileDOs.stream().map(FileObject::getId).collect(Collectors.toList()));
+ fileObjectMapper.deleteBatchIds(fileDOs.stream().map(FileObject::getOid).collect(Collectors.toList()));
});
- //鍒犻櫎minio閲岀殑鏂囦欢
- fileObjects.parallelStream().forEach(fileObject -> {
+ //鍒犻櫎minio閲岀殑鏂囦欢,杩欏効澶氭潯璁板綍鍒犻櫎浣跨敤parallelStream澶氱嚎绋嬫椂鍙兘浼氬嚭鐜皌ennantId鏃犳硶鎷兼帴涓婄殑闂锛屾墍浠ヨ繕鏄敤Stream
+ fileObjects.stream().forEach(fileObject -> {
ossTemplate.removeFile(fileObject.getBucketName(),fileObject.getObjectName());
});
+
}
}
-
-
/**
* 涓婁紶鏂囦欢
@@ -277,6 +278,8 @@
fileObject.setBucketName(bucketName);
fileObject.setObjectName(bladeFile.getName());
fileObject.setFileLink(bladeFile.getLink());
+ // 娣诲姞涔嬪墠璧嬮粯璁ゅ��
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(fileObject, MdmBtmTypeConstant.FILE_OBJECT);
fileObjectMapper.insert(fileObject);
if(log.isDebugEnabled()){
log.debug("鏂板鏂囦欢",fileObject.toString());
@@ -284,8 +287,6 @@
FileObjectVO fileObjectVO = do2Vo(fileObject);
return fileObjectVO;
}
-
-
/**
* 鏁版嵁瀵硅薄杞樉绀哄璞�
@@ -403,7 +404,6 @@
});
return R.data(do2Vos(fileObjectMap.values()));
}
-
/**
* 鏂囦欢鍒楄〃鏌ヨ
--
Gitblit v1.9.3