Bin/lib/client/plt-clientbase.jarBinary files differ
Bin/lib/common/plt-common.jarBinary files differ
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> 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> 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 ) { 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 { 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); } }
