From f29ad099c6dc5c55d6cb94fb190d06743777ec6d Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期三, 05 六月 2024 10:56:48 +0800
Subject: [PATCH] 项目引用调整
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java
index a5de749..99dcf0e 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java
@@ -1,8 +1,6 @@
package com.vci.web.service.impl;
-import com.vci.corba.common.VCIError;
-import com.vci.corba.framework.data.PvolumeInfo;
-import com.vci.corba.volumn.method.VolumnManagement;
+import com.vci.corba.volume.VolumeServicePrx;
import com.vci.file.constant.VciFileDefaultValueConstant;
import com.vci.file.constant.VciFileLangCodeConstant;
import com.vci.file.dto.VciFileObjectDTO;
@@ -33,15 +31,16 @@
import com.vci.web.service.WebBoServiceI;
import com.vci.web.service.WebSecretServiceI;
import com.vci.web.util.PlatformClientUtil;
-import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
-import plm.bs.bom.clientobject.ClientBusinessObject;
import javax.annotation.Resource;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.RandomAccessFile;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -207,11 +206,16 @@
if(vciFileObjectDO.getSecretGrade() == null) {
vciFileObjectDO.setSecretGrade(DataSecretEnum.NONE.getValue());
}
- revisionModelUtil.wrapperForAdd(vciFileObjectDO);
+ //todo 鍏堝啓鍥哄畾
+ vciFileObjectDO.setCreator("admin");
+ vciFileObjectDO.setLastModifier("admin");
+// revisionModelUtil.wrapperForAdd(vciFileObjectDO);
//闅忔満璺緞
- String randomPath = VciBaseUtil.getPk();
+// String randomPath = VciBaseUtil.getPk();
+ String randomPath = "rrt";
//鐩爣鏂囦欢
- String targetFileName = vciFileObjectDO.getOid();
+// String targetFileName = vciFileObjectDO.getOid();
+ String targetFileName = VciBaseUtil.getPk();
String filePath = randomPath+File.separator+targetFileName;
@@ -249,11 +253,9 @@
}
}else if(VciFileTransProtocolEnum.CORBA.getValue().equalsIgnoreCase(vciFileVolumeDO.getTransProtocol())){
String volumeName = vciFileVolumeDO.getName();
- VolumnManagement volumnCorbaService = null;
- try {
- volumnCorbaService = platformClientUtil.getVolumeService(vciFileVolumeDO.getServiceUrl(),volumeName).getVolumnService();
- } catch (VCIError vciError) {
- throw new VciBaseException("娌℃湁鑾峰彇鍒皗}鐨勫嵎鏈嶅姟",new String[]{volumeName},vciError);
+ VolumeServicePrx volumnCorbaService = platformClientUtil.getVolumeService(volumeName);
+ if(volumnCorbaService == null){
+ throw new VciBaseException("娌℃湁鑾峰彇鍒板嵎鏈嶅姟");
}
InputStream in = null;
if("filePathField".equalsIgnoreCase(vciFileObjectDO.getFileDocClassify())){
@@ -278,8 +280,6 @@
volumnCorbaService.receiveFile(vciFileObjectDO.getFilePath(), buffer, temp, currentTime, fileSize);
}catch(IOException e){
throw new VciBaseException("璇诲彇鏂囦欢[" + vciFileObjectDO.getName() + "]鍑虹幇浜嗛敊璇紝" + e.getMessage() ,new String[0],e);
- }catch (VCIError e){
- throw new VciBaseException("浼犺緭鏂囦欢[" + vciFileObjectDO.getName() + "]鍑虹幇浜嗛敊璇紝" + e.getMessage() ,new String[0],e);
}catch(Exception e){
throw new VciBaseException("澶勭悊涓婁紶鏂囦欢[" + vciFileObjectDO.getName() + "]鍑虹幇浜嗛敊璇紝" + e.getMessage() ,new String[0],e);
}finally {
--
Gitblit v1.9.3