From c7cef19248eb9bb6a5420a48d1b26167ff7db858 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 27 六月 2024 17:58:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java
index 243dbe7..09addb7 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java
@@ -1,5 +1,6 @@
package com.vci.web.service.impl;
+import com.vci.corba.common.PLException;
import com.vci.corba.volume.VolumeServicePrx;
import com.vci.file.constant.VciFileDefaultValueConstant;
import com.vci.file.constant.VciFileLangCodeConstant;
@@ -145,8 +146,6 @@
*/
@Override
public BaseResult uploadFile(MultipartFile multipartFile, VciFileObjectDTO fileObjectDTO) throws VciBaseException {
- VciBaseUtil.alertNotNull(fileObjectDTO.getFileDocClassify(), "鏂囨。绫诲瀷缂栧彿");
-
String sourceFileName = multipartFile.getOriginalFilename();
String fileExtension = getFileExtension(sourceFileName);
String fileNameNoExtension = getFileNameNoExtension(sourceFileName);
@@ -206,6 +205,9 @@
if(vciFileObjectDO.getSecretGrade() == null) {
vciFileObjectDO.setSecretGrade(DataSecretEnum.NONE.getValue());
}
+ //todo 鐧诲綍杩樻湭寮勫ソ闇�瑕佷慨鏀�
+ vciFileObjectDO.setCreator("1");
+ vciFileObjectDO.setLastModifier("1");
revisionModelUtil.wrapperForAdd(vciFileObjectDO);
//闅忔満璺緞
String randomPath = VciBaseUtil.getPk();
@@ -254,15 +256,15 @@
}
InputStream in = null;
if("filePathField".equalsIgnoreCase(vciFileObjectDO.getFileDocClassify())){
- vciFileObjectDO.setFilePath(vciFileVolumeDO.getId().toLowerCase() + ":/" + vciFileObjectDO.getFilePath() + "." + vciFileObjectDO.getFileExtension());
+ vciFileObjectDO.setFilePath(vciFileVolumeDO.getId() + ":/" + vciFileObjectDO.getFilePath() + "." + vciFileObjectDO.getFileExtension());
}else {
- vciFileObjectDO.setFilePath(vciFileVolumeDO.getId().toLowerCase() + ":/" + vciFileObjectDO.getFilePath());
+ vciFileObjectDO.setFilePath(vciFileVolumeDO.getId() + ":/" + vciFileObjectDO.getFilePath());
}
try{
long currentTime = volumnCorbaService.getCurrrentTimeMillions();
in = multipartFile.getInputStream();
long fileSize = multipartFile.getSize();
- int blockSize = (int)webProperties.getBlockLength()*1024;
+ int blockSize = webProperties.getBlockLength()*1024;
byte[] buffer = new byte[blockSize];
long temp =0L;
for(temp = 0L; temp < fileSize - (long)blockSize; temp += (long)blockSize) {
@@ -303,6 +305,18 @@
sourceFileObject.setFileSize(vciFileObjectDO.getFileSize());
vciFileObjectMapper.updateByPrimaryKey(sourceFileObject);
//娌″姙娉曞垹闄や箣鍓嶇殑鏂囦欢锛�
+
+ String volumeName = vciFileVolumeDO.getName();
+ VolumeServicePrx volumnCorbaService = platformClientUtil.getVolumeService(volumeName);
+ if(volumnCorbaService == null){
+ throw new VciBaseException("娌℃湁鑾峰彇鍒板嵎鏈嶅姟");
+ }
+ try {
+ volumnCorbaService.deleteFile(sourceFileObject.getFilePath());
+ } catch (PLException e) {
+ e.printStackTrace();
+ System.out.println("鍒犻櫎浠撳簱涓殑鏂囦欢澶辫触锛�"+e.getMessage());
+ }
}else {
vciFileObjectMapper.insert(vciFileObjectDO);
}
--
Gitblit v1.9.3