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/VciFileDownloadServiceImpl.java | 41 ++++++++++++++++++-----------------------
1 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/VciFileDownloadServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/VciFileDownloadServiceImpl.java
index ce5b3fe..5e9a2a4 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/VciFileDownloadServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/VciFileDownloadServiceImpl.java
@@ -1,7 +1,7 @@
package com.vci.web.service.impl;
-import com.vci.corba.common.VCIError;
-import com.vci.corba.volumn.method.VolumnManagement;
+import com.vci.corba.common.PLException;
+import com.vci.corba.volume.VolumeServicePrx;
import com.vci.file.clientutil.VciFileServerClientUtil;
import com.vci.file.enumpck.VciFileTransProtocolEnum;
import com.vci.file.pagemodel.VciFileObjectVO;
@@ -32,7 +32,8 @@
import java.util.List;
import java.util.Map;
-import static com.vci.file.constant.VciFileLangCodeConstant.*;
+import static com.vci.file.constant.VciFileLangCodeConstant.FILE_NOT_FOUND;
+import static com.vci.file.constant.VciFileLangCodeConstant.FILE_READ_FAIL;
import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
/**
@@ -148,18 +149,16 @@
}
}else if(VciFileTransProtocolEnum.CORBA.getValue().equalsIgnoreCase(vciFileVolumeVO.getTransProtocol())){
String volumeName = vciFileVolumeVO.getName();
- VolumnManagement volumnCorbaService = null;
- try {
- volumnCorbaService = platformClientUtil.getVolumeService(vciFileVolumeVO.getServiceUrl(),volumeName).getVolumnService();
- } catch (VCIError vciError) {
- throw new VciBaseException("娌℃湁鑾峰彇鍒皗}鐨勫嵎鏈嶅姟",new String[]{volumeName},vciError);
+ VolumeServicePrx volumnCorbaService = platformClientUtil.getVolumeService(volumeName);
+ if(volumnCorbaService == null){
+ throw new VciBaseException("娌℃湁鑾峰彇鍒板嵎鏈嶅姟");
}
//骞冲彴2020鐗堟湰姝ゅ淇敼浜嗭紝鍗风殑鏂囦欢澶规槸鐢卞嵎鏈嶅姟鏉ユ帶鍒�
String serverPath = vciFileObjectVO.getFilePath();
long fileSize = 0;
try {
fileSize = volumnCorbaService.getFileSize(serverPath);
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw new VciBaseException("娌℃湁鍦ㄥ嵎鏈嶅姟{}閲岃幏鍙栧埌鏂囦欢{}鐨勫ぇ灏�",new String[]{volumeName,fileName},vciError);
}
try {
@@ -180,7 +179,7 @@
throw new VciBaseException("瑕佸啓鍏ョ殑鏂囦欢娌℃湁鎵惧埌",new String[]{tempFilePath},e);
} catch (IOException e) {
throw new VciBaseException("鍐欏叆鏂囦欢鍑洪敊" + e.getMessage(),new String[]{tempFilePath},e);
- } catch (VCIError e){
+ } catch (PLException e){
// throw new VciBaseException("鍗锋湇鍔′紶杈撴枃浠舵椂鍑虹幇浜嗛敊璇�" + e.error_code,e.error_message,e);
}catch (Exception e){
throw new VciBaseException("鍗锋湇鍔′紶杈撴枃浠舵椂鍑虹幇浜嗛敊璇�" + e.getMessage(),new String[0],e);
@@ -365,17 +364,15 @@
}
}else if(VciFileTransProtocolEnum.CORBA.getValue().equalsIgnoreCase(vciFileVolumeVO.getTransProtocol())){
String volumeName = vciFileVolumeVO.getName();
- VolumnManagement volumnCorbaService = null;
- try {
- volumnCorbaService = platformClientUtil.getVolumeService(vciFileVolumeVO.getServiceUrl(),volumeName).getVolumnService();
- } catch (VCIError vciError) {
- throw new VciBaseException("娌℃湁鑾峰彇鍒皗}鐨勫嵎鏈嶅姟",new String[]{volumeName},vciError);
+ VolumeServicePrx volumnCorbaService = platformClientUtil.getVolumeService(volumeName);
+ if(volumnCorbaService == null){
+ throw new VciBaseException("娌℃湁鑾峰彇鍒板嵎鏈嶅姟");
}
String serverPath = vciFileVolumeVO.getVolumePath() + File.separator + vciFileObjectVO.getFilePath().replace(volumeName+":","");
long fileSize = 0;
try {
fileSize = volumnCorbaService.getFileSize(serverPath);
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw new VciBaseException("娌℃湁鍦ㄥ嵎鏈嶅姟{}閲岃幏鍙栧埌鏂囦欢{}鐨勫ぇ灏�",new String[]{volumeName,fileName},vciError);
}
try {
@@ -491,18 +488,16 @@
}
}else if(VciFileTransProtocolEnum.CORBA.getValue().equalsIgnoreCase(vciFileVolumeVO.getTransProtocol())){
String volumeName = vciFileVolumeVO.getName();
- VolumnManagement volumnCorbaService = null;
- try {
- volumnCorbaService = platformClientUtil.getVolumeService(vciFileVolumeVO.getServiceUrl(),volumeName).getVolumnService();
- } catch (VCIError vciError) {
- throw new VciBaseException("娌℃湁鑾峰彇鍒皗}鐨勫嵎鏈嶅姟",new String[]{volumeName},vciError);
+ VolumeServicePrx volumnCorbaService = platformClientUtil.getVolumeService(volumeName);
+ if(volumnCorbaService == null){
+ throw new VciBaseException("娌℃湁鑾峰彇鍒板嵎鏈嶅姟");
}
//骞冲彴2020鐗堟湰姝ゅ淇敼浜嗭紝鍗风殑鏂囦欢澶规槸鐢卞嵎鏈嶅姟鏉ユ帶鍒�
String serverPath = volumeId+":" + filePath;
long fileSize = 0;
try {
fileSize = volumnCorbaService.getFileSize(serverPath);
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw new VciBaseException("娌℃湁鍦ㄥ嵎鏈嶅姟{}閲岃幏鍙栧埌鏂囦欢{}鐨勫ぇ灏�",new String[]{volumeName,fileName},vciError);
}
try {
@@ -523,7 +518,7 @@
throw new VciBaseException("瑕佸啓鍏ョ殑鏂囦欢娌℃湁鎵惧埌",new String[]{tempFilePath},e);
} catch (IOException e) {
throw new VciBaseException("鍐欏叆鏂囦欢鍑洪敊" + e.getMessage(),new String[]{tempFilePath},e);
- } catch (VCIError e){
+ } catch (PLException e){
// throw new VciBaseException("鍗锋湇鍔′紶杈撴枃浠舵椂鍑虹幇浜嗛敊璇�" + e.error_code,e.error_message,e);
}catch (Exception e){
throw new VciBaseException("鍗锋湇鍔′紶杈撴枃浠舵椂鍑虹幇浜嗛敊璇�" + e.getMessage(),new String[0],e);
--
Gitblit v1.9.3