From e973fb747f0d1a382fb9e4cdb20383a0a546ef67 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期二, 03 十二月 2024 15:01:43 +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/VciFileVolumeServiceImpl.java | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileVolumeServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/VciFileVolumeServiceImpl.java similarity index 97% rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileVolumeServiceImpl.java rename to Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/VciFileVolumeServiceImpl.java index 423715d..99f19b3 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileVolumeServiceImpl.java +++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/VciFileVolumeServiceImpl.java @@ -1,23 +1,23 @@ -package com.vci.web.service.impl; +package com.vci.web.dao.impl; +import com.vci.constant.FrameWorkLangCodeConstant; import com.vci.corba.common.PLException; import com.vci.corba.framework.data.PvolumeInfo; import com.vci.dto.VciFileVolumeDTO; -import com.vci.enumpck.VciFileServiceOsTypeEnum; -import com.vci.enumpck.VciFileTransProtocolEnum; +import com.vci.enumpck.UI.VciFileServiceOsTypeEnum; +import com.vci.enumpck.UI.VciFileTransProtocolEnum; +import com.vci.model.VciFileVolumeDO; import com.vci.pagemodel.VciFileVolumeVO; -import com.vci.constant.FrameWorkLangCodeConstant; import com.vci.starter.web.annotation.bus.VciChangeDocument; import com.vci.starter.web.enumpck.VciChangeDocumentTypeEnum; import com.vci.starter.web.exception.VciBaseException; import com.vci.starter.web.pagemodel.BaseResult; import com.vci.starter.web.pagemodel.DataGrid; import com.vci.starter.web.pagemodel.PageHelper; -import com.vci.starter.web.util.BeanUtil; +import com.vci.starter.web.util.BeanUtilForVCI; import com.vci.starter.web.util.VciBaseUtil; import com.vci.starter.web.wrapper.VciQueryWrapperForDO; import com.vci.web.dao.VciFileVolumeDaoI; -import com.vci.model.VciFileVolumeDO; import com.vci.web.service.VciFileVolumeServiceI; import com.vci.web.util.PlatformClientUtil; import org.apache.commons.lang3.StringUtils; @@ -113,7 +113,7 @@ public VciFileVolumeVO vciFileVolumeDO2VO(VciFileVolumeDO vciFileVolumeDO) throws VciBaseException { VciFileVolumeVO vo = new VciFileVolumeVO(); if(vciFileVolumeDO != null){ - BeanUtil.convert(vciFileVolumeDO,vo); + BeanUtilForVCI.convert(vciFileVolumeDO,vo); //杩橀渶瑕佸鐞嗘灇涓剧瓑鍏朵粬鐨勫唴瀹� vo.setServiceOsTypeText(VciFileServiceOsTypeEnum.getTextByValue(vo.getServiceOsType())); @@ -134,7 +134,7 @@ VciBaseUtil.alertNotNull(vciFileVolumeDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄"); //灏咲TO杞崲涓篋O VciFileVolumeDO vciFileVolumeDO = new VciFileVolumeDO(); - BeanUtil.convert(vciFileVolumeDTO,vciFileVolumeDO); + BeanUtilForVCI.convert(vciFileVolumeDTO,vciFileVolumeDO); vciFileVolumeDO.setCurrentVolume("0"); int insert = vciFileVolumeMapper.insert(vciFileVolumeDO); if(insert>0){ @@ -156,7 +156,7 @@ VciBaseUtil.alertNotNull(vciFileVolumeDTO,"鏁版嵁瀵硅薄",vciFileVolumeDTO.getOid(),"鏂囦粨绠$悊涓婚敭"); //灏咲TO杞崲涓篋O VciFileVolumeDO vciFileVolumeDO = selectByOid(vciFileVolumeDTO.getOid()); - BeanUtil.convert(vciFileVolumeDTO,vciFileVolumeDO); + BeanUtilForVCI.convert(vciFileVolumeDTO,vciFileVolumeDO); int update = vciFileVolumeMapper.updateByPrimaryKey(vciFileVolumeDO); if(update>0){ return vciFileVolumeDO2VO(vciFileVolumeDO); -- Gitblit v1.9.3