From a471b20fe8075a663f32b3a2ee0cd70c1c63baf7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 十一月 2024 21:59:42 +0800
Subject: [PATCH] 业务类型查询：树查询修改，数据列表查询接口修改（处理模板套模板情况下freemarker表达式的替换处理）。
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java | 48 +++++++++++++++++++++++++++++-------------------
1 files changed, 29 insertions(+), 19 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..42235c3 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,13 +1,14 @@
package com.vci.web.service.impl;
+import com.vci.constant.VciFileDefaultValueConstant;
+import com.vci.constant.VciFileLangCodeConstant;
+import com.vci.corba.common.PLException;
import com.vci.corba.volume.VolumeServicePrx;
-import com.vci.file.constant.VciFileDefaultValueConstant;
-import com.vci.file.constant.VciFileLangCodeConstant;
-import com.vci.file.dto.VciFileObjectDTO;
-import com.vci.file.enumpck.VciFileTransProtocolEnum;
-import com.vci.file.lcstatuspck.FileLCStatus;
-import com.vci.file.pagemodel.VciFileObjectVO;
-import com.vci.frameworkcore.constant.FrameWorkLangCodeConstant;
+import com.vci.dto.VciFileObjectDTO;
+import com.vci.enumpck.VciFileTransProtocolEnum;
+import com.vci.lcstatuspck.FileLCStatus;
+import com.vci.constant.FrameWorkLangCodeConstant;
+import com.vci.pagemodel.VciFileObjectVO;
import com.vci.starter.revision.service.RevisionModelUtil;
import com.vci.starter.web.annotation.bus.VciChangeDocument;
import com.vci.starter.web.enumpck.DataSecretEnum;
@@ -18,13 +19,13 @@
import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.constant.WebLangCodeConstant;
+import com.vci.constant.WebLangCodeConstant;
import com.vci.web.dao.VciFileDocClassifyDaoI;
import com.vci.web.dao.VciFileObjectDaoI;
import com.vci.web.dao.VciFileVolumeDaoI;
-import com.vci.web.model.VciFileDocClassifyDO;
-import com.vci.web.model.VciFileObjectDO;
-import com.vci.web.model.VciFileVolumeDO;
+import com.vci.model.VciFileDocClassifyDO;
+import com.vci.model.VciFileObjectDO;
+import com.vci.model.VciFileVolumeDO;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.VciFileUploadServiceI;
import com.vci.web.service.VciFileVolumeServiceI;
@@ -44,9 +45,8 @@
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
-import static com.vci.file.constant.VciFileLangCodeConstant.*;
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.UPLOAD_FAIL;
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.UPLOAD_SUCCESS;
+import static com.vci.constant.VciFileLangCodeConstant.*;
+import static com.vci.constant.FrameWorkLangCodeConstant.*;
@Service
@VciChangeDocument(btmType = "fileUpload")
@@ -145,8 +145,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);
@@ -254,15 +252,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 +301,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