From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 04 十二月 2024 10:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/VciFileUploadServiceImpl.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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-permission/src/main/java/com/vci/web/dao/impl/VciFileUploadServiceImpl.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java
rename to Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/VciFileUploadServiceImpl.java
index 42235c3..3cfa3db 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-permission/src/main/java/com/vci/web/dao/impl/VciFileUploadServiceImpl.java
@@ -1,13 +1,17 @@
-package com.vci.web.service.impl;
+package com.vci.web.dao.impl;
+import com.vci.constant.FrameWorkLangCodeConstant;
import com.vci.constant.VciFileDefaultValueConstant;
import com.vci.constant.VciFileLangCodeConstant;
+import com.vci.constant.WebLangCodeConstant;
import com.vci.corba.common.PLException;
import com.vci.corba.volume.VolumeServicePrx;
import com.vci.dto.VciFileObjectDTO;
-import com.vci.enumpck.VciFileTransProtocolEnum;
+import com.vci.enumpck.UI.VciFileTransProtocolEnum;
import com.vci.lcstatuspck.FileLCStatus;
-import com.vci.constant.FrameWorkLangCodeConstant;
+import com.vci.model.VciFileDocClassifyDO;
+import com.vci.model.VciFileObjectDO;
+import com.vci.model.VciFileVolumeDO;
import com.vci.pagemodel.VciFileObjectVO;
import com.vci.starter.revision.service.RevisionModelUtil;
import com.vci.starter.web.annotation.bus.VciChangeDocument;
@@ -15,17 +19,13 @@
import com.vci.starter.web.enumpck.UserSecretEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.util.BeanUtil;
+import com.vci.starter.web.util.BeanUtilForVCI;
import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-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.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;
@@ -45,8 +45,9 @@
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
+import static com.vci.constant.FrameWorkLangCodeConstant.UPLOAD_FAIL;
+import static com.vci.constant.FrameWorkLangCodeConstant.UPLOAD_SUCCESS;
import static com.vci.constant.VciFileLangCodeConstant.*;
-import static com.vci.constant.FrameWorkLangCodeConstant.*;
@Service
@VciChangeDocument(btmType = "fileUpload")
@@ -321,7 +322,7 @@
baseResult.setMsg(FrameWorkLangCodeConstant.UPLOAD_SUCCESS);
VciFileObjectVO vciFileObjectVO = new VciFileObjectVO();
- BeanUtil.convert(vciFileObjectDO, vciFileObjectVO);
+ BeanUtilForVCI.convert(vciFileObjectDO, vciFileObjectVO);
vciFileObjectVO.setFileDocClassifyName("22222");
baseResult.setObj(vciFileObjectVO);
@@ -403,7 +404,7 @@
List<VciFileObjectVO> voList = new ArrayList<VciFileObjectVO>();
for(VciFileObjectDO vciFileObjectDO : resultList){
VciFileObjectVO vciFileObjectVO = new VciFileObjectVO();
- BeanUtil.convert(vciFileObjectDO,vciFileObjectVO);
+ BeanUtilForVCI.convert(vciFileObjectDO,vciFileObjectVO);
voList.add(vciFileObjectVO);
}
@@ -431,7 +432,7 @@
for(VciFileObjectDO sourceDO : sourceFileObjectList){
VciFileObjectDO targetDO = new VciFileObjectDO();
- BeanUtil.convert(sourceDO, targetDO);
+ BeanUtilForVCI.convert(sourceDO, targetDO);
targetDO.setOid(VciBaseUtil.getPk());
targetDO.setCreator(currentUserId);
targetDO.setCreateTime(currentDate);
@@ -673,7 +674,7 @@
}
VciFileObjectVO vciFileObjectVO = new VciFileObjectVO();
- BeanUtil.convert(vciFileObjectDO,vciFileObjectVO);
+ BeanUtilForVCI.convert(vciFileObjectDO,vciFileObjectVO);
baseResult.setObj(vciFileObjectVO);
threadFileObjectMap.remove(fileOid);
@@ -724,7 +725,7 @@
List<VciFileObjectVO> vciFileObjectVOS = new ArrayList<VciFileObjectVO>();
for(VciFileObjectDTO vciFileObjectDTO : vciFileObjectDTOS){
VciFileObjectDO vciFileObjectDO = new VciFileObjectDO();
- BeanUtil.convert(vciFileObjectDTO, vciFileObjectDO);
+ BeanUtilForVCI.convert(vciFileObjectDTO, vciFileObjectDO);
vciFileObjectDO.setPkFileVolume(vciFileVolumeDO.getOid());
if(StringUtils.isBlank(vciFileObjectDO.getId())){
vciFileObjectDO.setName(vciFileObjectDO.getId());
@@ -741,7 +742,7 @@
vciFileObjectDOS.add(vciFileObjectDO);
VciFileObjectVO vciFileObjectVO = new VciFileObjectVO();
- BeanUtil.convert(vciFileObjectDO, vciFileObjectVO);
+ BeanUtilForVCI.convert(vciFileObjectDO, vciFileObjectVO);
vciFileObjectVOS.add(vciFileObjectVO);
threadFileObjectMap.put(vciFileObjectDO.getOid(),vciFileObjectDTO);
--
Gitblit v1.9.3