From 90b343acf8e2b4393de0addc999025d750455178 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期二, 04 六月 2024 11:48:34 +0800
Subject: [PATCH] 1、pom文件改动上传。 2、文件上传代码改动。
---
Bin/lib/client/plt-clientbase.jar | 0
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/VciFileVolumeServiceImpl.java | 29 +++++++-------
Source/platformProject/vci-platform-web/pom.xml | 30 ---------------
Bin/lib/common/plt-common.jar | 0
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/VciFileUploadController.java | 1
Source/platformProject/vci-platform-starter/pom.xml | 25 ++++++++++++
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java | 19 +++++----
7 files changed, 51 insertions(+), 53 deletions(-)
diff --git a/Bin/lib/client/plt-clientbase.jar b/Bin/lib/client/plt-clientbase.jar
index 88b1396..8938f82 100644
--- a/Bin/lib/client/plt-clientbase.jar
+++ b/Bin/lib/client/plt-clientbase.jar
Binary files differ
diff --git a/Bin/lib/common/plt-common.jar b/Bin/lib/common/plt-common.jar
index ec5d9d9..30b3217 100644
--- a/Bin/lib/common/plt-common.jar
+++ b/Bin/lib/common/plt-common.jar
Binary files differ
diff --git a/Source/platformProject/vci-platform-starter/pom.xml b/Source/platformProject/vci-platform-starter/pom.xml
index 7785717..b16f8fe 100644
--- a/Source/platformProject/vci-platform-starter/pom.xml
+++ b/Source/platformProject/vci-platform-starter/pom.xml
@@ -252,5 +252,30 @@
<artifactId>commons-compress</artifactId>
<version>1.9</version>
</dependency>
+ <dependency>
+ <groupId>com.vci.client</groupId>
+ <artifactId>plt-clientbase</artifactId>
+ <version>1.0.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>com.zeroc</groupId>
+ <artifactId>icegridgui</artifactId>
+ <version>1.0.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vci.common</groupId>
+ <artifactId>plt-common</artifactId>
+ <version>1.0.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vci.client</groupId>
+ <artifactId>plt-client</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vci.corba</groupId>
+ <artifactId>plt-slice</artifactId>
+ <version>1.0.RELEASE</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/Source/platformProject/vci-platform-web/pom.xml b/Source/platformProject/vci-platform-web/pom.xml
index bf18b06..c5b27f9 100644
--- a/Source/platformProject/vci-platform-web/pom.xml
+++ b/Source/platformProject/vci-platform-web/pom.xml
@@ -18,12 +18,6 @@
<version>1.0-SNAPSHOT</version>
<type>pom</type>
</dependency>
-<!-- ddd-->
- <dependency>
- <groupId>com.vci.corba</groupId>
- <artifactId>plt-slice</artifactId>
- <version>1.0.RELEASE</version>
- </dependency>
<dependency>
<groupId>com.vci</groupId>
@@ -157,34 +151,10 @@
<artifactId>ddlTool-common</artifactId>
<version>${vciplt.version}</version>
</dependency>
-<!-- ddd-->
- <dependency>
- <groupId>com.vci.client</groupId>
- <artifactId>plt-clientbase</artifactId>
- <version>1.0.RELEASE</version>
- </dependency>
-<!-- ddd-->
- <dependency>
- <groupId>com.zeroc</groupId>
- <artifactId>icegridgui</artifactId>
- <version>1.0.RELEASE</version>
- </dependency>
-<!-- dd-->
- <dependency>
- <groupId>com.vci.common</groupId>
- <artifactId>plt-common</artifactId>
- <version>1.0.RELEASE</version>
- </dependency>
<dependency>
<groupId>com.vci</groupId>
<artifactId>vci-platform-starter</artifactId>
<version>2022.1-SNAPSHOT</version>
- </dependency>
-<!-- ddd-->
- <dependency>
- <groupId>com.vci.client</groupId>
- <artifactId>plt-client</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/VciFileUploadController.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/VciFileUploadController.java
index deacc41..bec3877 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/VciFileUploadController.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/VciFileUploadController.java
@@ -48,6 +48,7 @@
* @return 鏂囦欢淇℃伅鏄剧ず瀵硅薄
*/
@PostMapping("/uploadFile")
+ @VciUnCheckRight
public BaseResult<VciFileObjectVO> uploadFile(MultipartFile file, VciFileObjectDTO fileObjectDTO){
try {
if (file != null ) {
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..56c5f39 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,7 +1,9 @@
package com.vci.web.service.impl;
+import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.VCIError;
import com.vci.corba.framework.data.PvolumeInfo;
+import com.vci.corba.volume.VolumeServicePrx;
import com.vci.corba.volumn.method.VolumnManagement;
import com.vci.file.constant.VciFileDefaultValueConstant;
import com.vci.file.constant.VciFileLangCodeConstant;
@@ -207,7 +209,10 @@
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();
//鐩爣鏂囦欢
@@ -249,12 +254,10 @@
}
}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 = null;
+ // volumnCorbaService = platformClientUtil.getVolumeService(vciFileVolumeDO.getServiceUrl(),volumeName).getVolumnService();
+ volumnCorbaService = ServiceProvider.getVolumeService(volumeName);
+// volumnCorbaService = volumeService;
InputStream in = null;
if("filePathField".equalsIgnoreCase(vciFileObjectDO.getFileDocClassify())){
vciFileObjectDO.setFilePath(volumeName + ":/" + vciFileObjectDO.getFilePath() + "." + vciFileObjectDO.getFileExtension());
@@ -278,8 +281,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 {
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/VciFileVolumeServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/VciFileVolumeServiceImpl.java
index 1f312ea..7301ce9 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/VciFileVolumeServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/VciFileVolumeServiceImpl.java
@@ -1,5 +1,7 @@
package com.vci.web.service.impl;
+import com.vci.client.common.providers.ServiceProvider;
+import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.corba.framework.data.PvolumeInfo;
import com.vci.file.dto.VciFileVolumeDTO;
@@ -385,20 +387,19 @@
*/
@Override
public VciFileVolumeDO getUploadVolume(){
-// try {
-// PvolumeInfo volumeInfo = platformClientUtil.getLogonFactoryService().getFrameworkService().getIsvalidVolumeName();
-// VciFileVolumeDO fileVolumeDO = new VciFileVolumeDO();
-// fileVolumeDO.setOid(volumeInfo.id);
-// fileVolumeDO.setId(volumeInfo.name);
-// fileVolumeDO.setName(volumeInfo.service);
-// fileVolumeDO.setServiceUrl(volumeInfo.host);
-// fileVolumeDO.setVolumePath(volumeInfo.path);
-// fileVolumeDO.setServiceOsType(volumeInfo.type+"");
-// return fileVolumeDO;
- return null;
-// } catch (VCIError vciError) {
-// throw WebUtil.getVciBaseException(vciError);
-// }
+ try {
+ PvolumeInfo volumeInfo = ServiceProvider.getFrameService().getDefaultVolume();
+ VciFileVolumeDO fileVolumeDO = new VciFileVolumeDO();
+ fileVolumeDO.setOid(volumeInfo.id);
+ fileVolumeDO.setId(volumeInfo.name);
+ fileVolumeDO.setName(volumeInfo.service);
+ fileVolumeDO.setServiceUrl(volumeInfo.host);
+ fileVolumeDO.setVolumePath(volumeInfo.path);
+ fileVolumeDO.setServiceOsType(volumeInfo.type+"");
+ return fileVolumeDO;
+ } catch (PLException e) {
+ throw new RuntimeException(e);
+ }
}
--
Gitblit v1.9.3