From dcd238531d8154633b9c1e2188b81e519760a17e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 16 七月 2024 16:09:45 +0800
Subject: [PATCH] 调整项目结构，统一DTO、VO、PO、BO等对象到plt-web-api模块下，拷贝vci-file-integration、plt-web-api、vci-framework-api、vci-file-api等依赖下的对象到plt-web-api模块下，并取消对这些jar的引用（为了解决同路径同名独享导致打包运行时对象加载出错问题）。
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/lifeCycle/FileObjectLCStatus.java | 6
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/VciFileTransProtocolEnum.java | 89 +
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FileTypeConstants.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmSessionForLoginImpl.java | 3
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeDateValueTypeEnum.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeGenSchemaDaoImpl.java | 4
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsAttributeDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeDTO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIEngineServiceI.java | 3
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileObjectDTO.java | 211 ++
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileObjectServiceI.java | 6
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java | 316 ++-
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/EnumIdConstant.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessTaskVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/VciFileVolumeVO.java | 144 +
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java | 19
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeRuleElementDO.java | 6
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WFWorkflowNodeFavItemServiceI.java | 6
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmOperationServiceI.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebProcessDefineServiceI.java | 6
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/VciFileDocClassifyDaoI.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebActionServiceImpl.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/VciFileVolumeDaoI.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/SmUserVO.java | 3
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/BtmIdConstant.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsCodeRuleElementVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BdSelectInputCharDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsAttributeVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/plugins/dto/AuditTaskDTO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeRuleElementDaoI.java | 2
Source/plt-web/plt-web-ui/vue.config.js | 1
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebLogServiceI.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIFieldSortVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java | 18
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/WFVariablesKeyConstant.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/LinkTypeInfoVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmRoleQueryServiceI.java | 5
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java | 16
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsCodeResultVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/BdSelectInputCharServiceImpl.java | 12
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeBreakCodeDaoImpl.java | 7
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsCodeRuleVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/SmPasswordStrategyDTO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebProcessCommandServiceI.java | 4
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsLinkTypeDO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/OsCodeGenQueryBO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/WebLangCodeConstant.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/WFProcessClassifyDO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessOutcomeVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java | 34
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebDataRightController.java | 5
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/KeyValue.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/BdSelectInputCharServiceI.java | 15
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITableFieldVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java | 12
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsCodeRuleDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/lcstatuspck/FileLCStatus.java | 92 +
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsLifeCycleDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UILayoutVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmUserDO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsStatusDO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIButtonDefineVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsAttributeDO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmFavFunctionDO.java | 4
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLinkTypeController.java | 4
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/BaseLinkModel.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessUserVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java | 19
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/plugins/controller/ImageViewerController.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/BdSelectInputCharDaoI.java | 4
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIActionVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java | 9
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITreeDefineVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/lcstatuspck/FrameworkDataLCStatus.java | 3
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/SmFunctionVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/WFWorkflowNodeFavItemDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ReferConfigVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java | 10
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebCodeGenSchemaController.java | 4
Source/plt-web/plt-web-parent/plt-web/src/main/resources/codeTemplate/Mapper.impl.java.vm | 4
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsERNodePropertyVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFavFunctionServiceImpl.java | 6
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/OsAttrOtherInfoBO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeFillTypeEnum.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/file/clientutil/VciFileDocClassifyClientUtil.java | 115 +
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciFileUploadController.java | 6
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileDownloadServiceI.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java | 5
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLifeCycleLineBoundVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java | 9
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/WebProcessDaoI.java | 10
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsLinkTypeServiceI.java | 6
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/SmRoleDTO.java | 22
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/SmOperationVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/VciFileObjectDaoI.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmPwdStrategyQueryServiceI.java | 4
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeProductTypeEnum.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileQueryProvider.java | 43
Source/plt-web/plt-web-parent/plt-web/pom.xml | 27
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmFavFunctionController.java | 3
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeBreakCodeDaoI.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/ProcessStartConfigDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsStatusVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeAttributeVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIController.java | 6
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/WFWorkflowNodeFavVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/VciFileObjectDaoImpl.java | 4
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/BtmOrLinkProcessAttributeInfo.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileDocClassifyDTO.java | 45
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java | 27
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsRevisionRuleDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLifeCycleVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsUsedAttributeVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsERVO.java | 3
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileShareHasClassifyDTO.java | 37
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/WFWorkflowNodeFavItemVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java | 14
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OrgDeptPO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java | 10
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileObjectDO.java | 8
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsRevisionRuleVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeSerialNumberDaoI.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeBreakCodeDO.java | 4
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITreeTableDefineVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java | 3
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileUploadProvider.java | 50
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeGenSchemaDaoI.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsCodeGenSchemaDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsERRelationVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileVolumeServiceImpl.java | 16
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIFormDefineVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDepartmentQueryController.java | 12
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/enumpck/DataObjectEnum.java | 6
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLinkTypeAttributeVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/SmRolePO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/WFWorkflowNodeFavDaoImpl.java | 6
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLinkTypeVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/pom.xml | 40
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeEnumDO.java | 4
Source/plt-web/plt-web-parent/plt-web/src/main/resources/codeTemplate/Service.java.vm | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/properties/VciFileTransProperties.java | 50
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HomeTaskController.java | 4
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileDocClassifyDO.java | 4
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/WFWorkflowNodeFavDaoI.java | 4
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/VciLogObjectBO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/VciFileServiceOsTypeEnum.java | 83 +
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/ProcessInstance.java | 2
Source/plt-web/plt-web-parent/pom.xml | 1
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIFormDataVO.java | 4
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/other/FlowNoticeExample.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileVolumeDTO.java | 144 +
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/SmUserDTO.java | 3
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OrgDepartmentVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java | 5
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIFormReferVO.java | 3
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/WFProcessTemplateDO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmRoleQueryController.java | 8
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/lcstatuspck/ReleaseDataLCStatus.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebSecretServiceI.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebBtmIOServiceI.java | 3
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/OsCodeGenAttributeBO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileVolumeDO.java | 11
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FieldConstant.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsCodeRuleProduceDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsStatusDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/BatchCBO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileUploadServiceI.java | 4
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/FlowNoticeInfo.java | 6
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLifeCycleLineEventVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITablePageVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/other/BdSelectInputCharAspect.java | 3
Source/plt-web/plt-web-parent/plt-web/src/main/resources/codeTemplate/Mapper.java.vm | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsLifeCycleDO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/ISmFunctionQueryService.java | 6
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileDocClassifyServiceI.java | 8
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmOperationServiceImpl.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/LoginServiceI.java | 11
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsCodeRuleServiceI.java | 14
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseModelDTOList.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/WebUtil.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FrameWorkLangCodeConstant.java | 319 +++
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteLinkDataDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsCodeGenSchemaVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WFWorkflowNodeFavServiceI.java | 8
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebHomeTaskServiceImpl.java | 10
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/LoginUserDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmPasswordStrategyForPlatform1.java | 4
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/BdSelectInputCharDaoImpl.java | 7
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsEnumVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebBtmTypeController.java | 11
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/WFWorkflowNodeFavDO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileShareDTO.java | 63
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/VciFileLangCodeConstant.java | 27
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeEnumDaoI.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciFileQueryController.java | 4
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsCodeGenSchemaServiceI.java | 6
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java | 17
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java | 13
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDutyQueryController.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FrameWorkBtmTypeConstant.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/file/VciZipUtil.java | 167 ++
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormDataDTO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java | 4
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OrgDepartmentDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeExportDTO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java | 19
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseModelDTO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebActionServiceI.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/CorbaKeyConstant.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/WebHomeTaskActionVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/WFWorkflowNodeFavItemDaoImpl.java | 6
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/VciFilePreviewConfigVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeRuleDO.java | 6
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmOperationController.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/VciFileBtmTypeConstant.java | 16
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/BdSelectInputCharDO.java | 5
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavServiceImpl.java | 14
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java | 4
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsCodeEnumVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormLinkDataDTOList.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java | 5
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/TreeSettingVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileDownloadServiceImpl.java | 20
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/SmPasswordStrategyVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FrameWorkDefaultValueConstant.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/OrgDutyQueryServiceI.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OrgDeptForPlatform1.java | 5
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/file/clientutil/VciFileServerClientUtil.java | 817 ++++++++++
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessCommandController.java | 8
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LoginController.java | 38
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/LinkTypeIdConstant.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/OsCodeGenButtonBO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WFWorkflowNodeFavController.java | 6
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeGenSchemaDO.java | 7
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeRuleServiceImpl.java | 28
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormLinkDataDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIComponentVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLifeCycleLineVO.java | 3
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/SmUserPO.java | 4
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseLinkModelDTO.java | 4
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsCodeRuleElementDTO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciOsStatusController.java | 7
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java | 3
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/WebHomeTaskActionDO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleElementDaoImpl.java | 6
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmPwdStrategyQueryController.java | 4
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/CacheNameConstant.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/ProcessTemplateVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java | 7
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/UserTypeEnum.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebHomeTaskServiceI.java | 4
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java | 12
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeSerialNumberDO.java | 4
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/VciFileVolumeDaoImpl.java | 6
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/SmRoleVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavItemServiceImpl.java | 10
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/other/WorkFlowEndedNotice.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/ProcessNodeUseDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITableDefineVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessHistoryVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileDocClassifyProvider.java | 44
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileDocClassifyServiceImpl.java | 11
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBtmServiceI.java | 6
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessNodeVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsERNodeVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/OrgDeptQueryServiceI.java | 4
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeGenJsPanelTypeEnum.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeSerialNumberDaoImpl.java | 6
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java | 4
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/BdSelectInputCharController.java | 11
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FrameWorkBusLangCodeConstant.java | 7
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormDataDTOList.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmRoleForPlatform1.java | 4
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OrgDutyVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileDownloadProvider.java | 24
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/VciFileShareResultVO.java | 43
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessInstanceVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsLifeCycleLineEventDTO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmFavFunctionServiceI.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/VciFileLifeConstant.java | 12
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDutyQueryServiceImpl.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmFunctionController.java | 6
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FrameWorkEnumConstant.java | 114 +
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmPasswordStrategyDO.java | 5
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/WebHomeTaskActionDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteDataDTO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsEnumServiceI.java | 7
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileObjectServiceImpl.java | 17
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciOsCodeRuleController.java | 10
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebEnumController.java | 9
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsLinkTypeDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/BdSelectInputCharVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeRuleDaoI.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsCodeEnumDTO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/resources/codeTemplate/Service.impl.java.vm | 6
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/WFWorkflowNodeFavDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/ProcessTask.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/VciFileEnumConstant.java | 13
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeLinkAttributesDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/OsCodeSerialBuildBO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java | 11
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsLifeCycleServiceI.java | 8
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/VciFileDefaultValueConstant.java | 19
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeEnumDaoImpl.java | 7
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsEnumItemVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIContentVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/WFWorkflowNodeFavItemDaoI.java | 4
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessClassifyVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITableCustomDefineVO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/LoginResultBO.java | 3
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/VciFileObjectVO.java | 136 +
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIFormItemVO.java | 3
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsLifeCycleLineDTO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileVolumeServiceI.java | 6
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebBoServiceI.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/VciFileDocClassifyVO.java | 45
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIDataServiceI.java | 10
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsEnumDTO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java | 7
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLifeCycleController.java | 4
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java | 6
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmFunctionForPlatform1.java | 5
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileDocClassifyDTOList.java | 28
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebLogServiceImpl.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeElementTypeEnum.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/OsScanAnnotationTool.java | 9
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileQueryServiceI.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseLinkModelDTOList.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/VciFileDocClassifyDaoImpl.java | 5
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/WFWorkflowNodeFavItemDO.java | 3
336 files changed, 3,966 insertions(+), 822 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/pom.xml b/Source/plt-web/plt-web-parent/plt-web-api/pom.xml
new file mode 100644
index 0000000..db24f31
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>plt-web-parent</artifactId>
+ <groupId>com.vci</groupId>
+ <version>2024.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>plt-web-api</artifactId>
+
+ <properties>
+ <maven.compiler.source>8</maven.compiler.source>
+ <maven.compiler.target>8</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.vci</groupId>
+ <artifactId>plt-web-base</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.vci</groupId>
+ <artifactId>plt-poi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.8.2</version>
+ </dependency>
+ <dependency>
+ <groupId>net.lingala.zip4j</groupId>
+ <artifactId>zip4j</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/BtmOrLinkProcessAttributeInfo.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/BtmOrLinkProcessAttributeInfo.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/BtmOrLinkProcessAttributeInfo.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/BtmOrLinkProcessAttributeInfo.java
index 2e0b384..e1c6f7e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/BtmOrLinkProcessAttributeInfo.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/BtmOrLinkProcessAttributeInfo.java
@@ -1,4 +1,4 @@
-package com.vci.web.bo;
+package com.vci.bo;
/**
* 涓氬姟绫诲瀷鎴栬�呴摼鎺ョ被鍨嬫壂鎻忓睘鎬х殑鏃跺�欎娇鐢ㄧ殑浼犺緭瀵硅薄
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/FlowNoticeInfo.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/FlowNoticeInfo.java
similarity index 95%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/FlowNoticeInfo.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/FlowNoticeInfo.java
index e0f2408..a778b73 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/FlowNoticeInfo.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/FlowNoticeInfo.java
@@ -1,7 +1,7 @@
-package com.vci.web.bo;
+package com.vci.bo;
-import com.vci.web.dto.ProcessStartConfigDTO;
-import com.vci.web.pageModel.ProcessTemplateVO;
+import com.vci.dto.ProcessStartConfigDTO;
+import com.vci.dto.ProcessTemplateVO;
import java.util.List;
import java.util.Map;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/LoginResultBO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/LoginResultBO.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/LoginResultBO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/LoginResultBO.java
index 7898b38..e44f5d1 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/LoginResultBO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/LoginResultBO.java
@@ -1,6 +1,5 @@
-package com.vci.web.bo;
+package com.vci.bo;
-import com.vci.starter.web.pagemodel.SessionInfo;
import com.vci.starter.web.pagemodel.TokenVO;
import java.util.Arrays;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/OsAttrOtherInfoBO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/OsAttrOtherInfoBO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/OsAttrOtherInfoBO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/OsAttrOtherInfoBO.java
index 221829e..a1f9103 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/OsAttrOtherInfoBO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/OsAttrOtherInfoBO.java
@@ -1,4 +1,4 @@
-package com.vci.web.bo;
+package com.vci.bo;
/**
* 鑰佸钩鍙颁腑灞炴�х殑鍏朵粬淇℃伅
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/OsCodeGenAttributeBO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/OsCodeGenAttributeBO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/OsCodeGenAttributeBO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/OsCodeGenAttributeBO.java
index 719f11e..4dbe500 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/OsCodeGenAttributeBO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/OsCodeGenAttributeBO.java
@@ -1,4 +1,4 @@
-package com.vci.web.bo;
+package com.vci.bo;
/**
* 浠ｇ爜鐢熸垚鏃剁殑灞炴�у璞�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/OsCodeGenButtonBO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/OsCodeGenButtonBO.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/OsCodeGenButtonBO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/OsCodeGenButtonBO.java
index d4aec5a..55aceec 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/OsCodeGenButtonBO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/OsCodeGenButtonBO.java
@@ -1,4 +1,4 @@
-package com.vci.web.bo;
+package com.vci.bo;
/**
* 浠ｇ爜鐢熸垚鐨勬椂鍊欑殑鎸夐挳
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/OsCodeGenQueryBO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/OsCodeGenQueryBO.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/OsCodeGenQueryBO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/OsCodeGenQueryBO.java
index 9ec5c8c..12a6a92 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/OsCodeGenQueryBO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/OsCodeGenQueryBO.java
@@ -1,4 +1,4 @@
-package com.vci.web.bo;
+package com.vci.bo;
/**
* 浠ｇ爜鐢熸垚鐨勬椂鍊欑殑鏌ヨ鍖哄煙
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/OsCodeSerialBuildBO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/OsCodeSerialBuildBO.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/OsCodeSerialBuildBO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/OsCodeSerialBuildBO.java
index d823226..2a9a113 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/OsCodeSerialBuildBO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/OsCodeSerialBuildBO.java
@@ -1,4 +1,4 @@
-package com.vci.web.bo;
+package com.vci.bo;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/VciLogObjectBO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/VciLogObjectBO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/VciLogObjectBO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/VciLogObjectBO.java
index 6f9ddc9..4b22dc9 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/bo/VciLogObjectBO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/bo/VciLogObjectBO.java
@@ -1,4 +1,4 @@
-package com.vci.web.bo;
+package com.vci.bo;
/**
* 鏃ュ織鐨勪笟鍔″璞�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/BtmIdConstant.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/BtmIdConstant.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/BtmIdConstant.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/BtmIdConstant.java
index d41164d..8a691ab 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/BtmIdConstant.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/BtmIdConstant.java
@@ -1,4 +1,4 @@
-package com.vci.web.constant;
+package com.vci.constant;
/**
* 涓氬姟绫诲瀷鐨勫畾涔�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/CacheNameConstant.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/CacheNameConstant.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/CacheNameConstant.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/CacheNameConstant.java
index 29676cc..cd05c85 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/CacheNameConstant.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/CacheNameConstant.java
@@ -1,4 +1,4 @@
-package com.vci.web.constant;
+package com.vci.constant;
/**
* 缂撳瓨鐨勫悕绉�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/CorbaKeyConstant.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/CorbaKeyConstant.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/CorbaKeyConstant.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/CorbaKeyConstant.java
index c243a5d..7f86e79 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/CorbaKeyConstant.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/CorbaKeyConstant.java
@@ -1,4 +1,4 @@
-package com.vci.web.constant;
+package com.vci.constant;
/**
* @Description
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/EnumIdConstant.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/EnumIdConstant.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/EnumIdConstant.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/EnumIdConstant.java
index 2e893e5..68fd94e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/EnumIdConstant.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/EnumIdConstant.java
@@ -1,4 +1,4 @@
-package com.vci.web.constant;
+package com.vci.constant;
/**
* 鏋氫妇鐨勪笟鍔＄被鍨�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/FieldConstant.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FieldConstant.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/FieldConstant.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FieldConstant.java
index a4402c1..22f609a 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/FieldConstant.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FieldConstant.java
@@ -1,4 +1,4 @@
-package com.vci.web.constant;
+package com.vci.constant;
import java.util.HashMap;
import java.util.Map;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/FileTypeConstants.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FileTypeConstants.java
similarity index 92%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/FileTypeConstants.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FileTypeConstants.java
index 2f366b3..c0994ff 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/FileTypeConstants.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FileTypeConstants.java
@@ -1,4 +1,4 @@
-package com.vci.web.constant;
+package com.vci.constant;
public class FileTypeConstants {
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/constant/FrameWorkBtmTypeConstant.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FrameWorkBtmTypeConstant.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/constant/FrameWorkBtmTypeConstant.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FrameWorkBtmTypeConstant.java
index 782ba1a..69d4ff6 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/constant/FrameWorkBtmTypeConstant.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FrameWorkBtmTypeConstant.java
@@ -1,4 +1,4 @@
-package com.vci.frameworkcore.constant;
+package com.vci.constant;
/**
* 骞冲彴妗嗘灦鐨勪笟鍔＄被鍨嬪悕绉�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/constant/FrameWorkBusLangCodeConstant.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FrameWorkBusLangCodeConstant.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/constant/FrameWorkBusLangCodeConstant.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FrameWorkBusLangCodeConstant.java
index 86c4488..e05f923 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/constant/FrameWorkBusLangCodeConstant.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FrameWorkBusLangCodeConstant.java
@@ -1,4 +1,4 @@
-package com.vci.frameworkcore.constant;
+package com.vci.constant;
/**
* 鍩虹妗嗘灦涓笟鍔￠儴鍒嗙殑澶氳瑷�浠ｇ爜
@@ -527,6 +527,11 @@
public static final String SYSTEM_ERROR = "systemError";
/**
+ * 鐢ㄦ埛娌℃湁鎵惧埌
+ */
+ public static final String UNKNOWN = "unknown";
+
+ /**
* 鐧诲綍鎴愬姛
*/
public static final String LOGIN_SUCCESS = "loginSuccess";
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/constant/FrameWorkDefaultValueConstant.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FrameWorkDefaultValueConstant.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/constant/FrameWorkDefaultValueConstant.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FrameWorkDefaultValueConstant.java
index 529ff12..98e882c 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/constant/FrameWorkDefaultValueConstant.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FrameWorkDefaultValueConstant.java
@@ -1,4 +1,4 @@
-package com.vci.frameworkcore.constant;
+package com.vci.constant;
/**
* 骞冲彴妗嗘灦鐨勪竴浜涢粯璁ゅ�硷紝鍦ㄤ竴浜涘鎴蜂笉闇�瑕佺鐞嗘煇浜涙。妗堟椂锛岄粯璁や竴涓��
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FrameWorkEnumConstant.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FrameWorkEnumConstant.java
new file mode 100644
index 0000000..55ada77
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FrameWorkEnumConstant.java
@@ -0,0 +1,114 @@
+package com.vci.constant;
+
+/**
+ * 鏋氫妇鍚嶇О
+ * @author weidy
+ * @date 2020/2/22
+ */
+public class FrameWorkEnumConstant {
+
+ /**
+ * 鐢ㄦ埛鐨勭被鍨�
+ */
+ public static final String USER_TYPE = "usertype";
+
+ /**
+ * 鐢ㄦ埛鐨勭姸鎬�
+ */
+ public static final String USER_STATUS = "userSTATUS";
+
+ /**
+ * 瀵嗙爜鎵�闇�瀛楃
+ */
+ public static final String PASSWORD_REQUIRE_CHAR = "passwordRequireChar";
+
+ /**
+ * 绯荤粺鍔熻兘鍒犻櫎鏃跺瓙鑺傜偣澶勭悊鏂瑰紡
+ */
+ public static final String FUNCTION_CHILD_DISPOSE = "functionChildDisposeEnum";
+
+ /**
+ * 鎬у埆
+ */
+ public static final String SEX = "sex";
+
+ /**
+ * 瀹夊叏瀛樺偍鐘舵��
+ */
+ public static final String SAFE_INV_STATUS = "safeInvStatus";
+
+ /**
+ * 瑙掕壊鎺у埗绫诲瀷
+ */
+ public static final String ROLE_CONTROL_AREA = "roleControlArea";
+
+ /**
+ * 瑙掕壊绫诲瀷
+ */
+ public static final String ROLE_CLASSIFY = "roleclassify";
+
+ /**
+ * 鍔熻兘鎺у埗绫诲瀷
+ */
+ public static final String RESOURCE_CONTROL_TYPE = "resourceControlType";
+
+ /**
+ * 濠氬Щ鐘跺喌
+ */
+ public static final String MARRIAGE = "marriage";
+
+ /**
+ * 澶氳瑷�缂栧彿
+ */
+ public static final String LANG_CODE = "langCode";
+
+ /**
+ * 搴撳瓨鐘舵��
+ */
+ public static final String INV_STATUS = "invStatus";
+
+ /**
+ * 搴撴埧瀛樺偍鐗╂枡绫诲瀷
+ */
+ public static final String INV_MATERIAL_TYPE = "invMaterialType";
+
+ /**
+ * 鐢ㄦ埛鏋氫妇
+ */
+ public static final String USER_SECRET = "usersecurityenum";
+
+ /**
+ * 鏁版嵁瀵嗙骇
+ */
+ public static final String DATA_SECRET = "Enumsecretgrade";
+
+ /**
+ * 渚涘簲鍟嗙被鍨�
+ */
+ public static final String SUPPLIER_TYPE = "supplierType";
+
+ /**
+ * 渚涘簲鏂瑰紡
+ */
+ public static final String SUPPLIER_MODE = "supplierMode";
+
+ /**
+ * 瀵垮懡璁＄畻鏂瑰紡
+ */
+ public static final String LIFE_COUNT_TYPE = "lifeCountType";
+
+ /**
+ * 鍦ㄨ〃鍗曠淮鎶ゆ椂鏄剧ず鐨勫瘑绾у悕绉�
+ */
+ public static final String FORM_DISPLAY_DATA_SECRET = "myDataSecret";
+
+ /**
+ * 閮ㄩ棬绾у埆
+ */
+ public static final String ORG_DEPARTMENT_LEVEL = "orgDepartmentLevel";
+
+ /**
+ * 鐢ㄦ埛鎿嶄綔
+ */
+ public static final String USER_OPERATION_TYPE = "userOperationType";
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FrameWorkLangCodeConstant.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FrameWorkLangCodeConstant.java
new file mode 100644
index 0000000..e479a5d
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/FrameWorkLangCodeConstant.java
@@ -0,0 +1,319 @@
+package com.vci.constant;
+
+/**
+ * 鍩虹妗嗘灦鐨勯�氱敤鐨勫璇█缂栫爜
+ * @author weidy
+ * @date 2020/4/25
+ */
+public class FrameWorkLangCodeConstant {
+
+ /**
+ * 娣诲姞鎴愬姛
+ */
+ public static final String ADD_SUCCESS ="addSuccess";
+
+ /**
+ * 娣诲姞澶辫触
+ */
+ public static final String ADD_FAIL = "addFailInDB";
+
+ /**
+ * 淇敼鎴愬姛
+ */
+ public static final String EDIT_SUCCESS = "editSuccess";
+
+ /**
+ * 淇敼澶辫触
+ */
+ public static final String EDIT_FAIL = "editFail";
+
+ /**
+ * 鍒犻櫎鎴愬姛
+ */
+ public static final String DELETE_SUCCESS = "deleteSuccess";
+
+ /**
+ * 绾ц仈鍒犻櫎鎴愬姛
+ */
+ public static final String DELETE_SUCCESS_CASCADE = "deleteSuccessCascade";
+
+ /**
+ * 鍒犻櫎澶辫触
+ */
+ public static final String DELETE_FAIL = "deleteFail";
+
+ /**
+ * 鍚敤鎴愬姛
+ */
+ public static final String ENABLE_SUCCESS ="enableSuccess";
+
+ /**
+ * 閿佸畾鎴愬姛
+ */
+ public static final String LOCK_SUCCESS = "lockSuccess";
+
+ /**
+ * 閿佸畾澶辫触
+ */
+ public static final String LOCK_FAIL = "lockFail";
+
+ /**
+ * 瑙ｉ攣鎴愬姛
+ */
+ public static final String UNLOCK_SUCCESS = "unlockSuccess";
+
+ /**
+ * 瑙ｉ攣澶辫触
+ */
+ public static final String UNLOCK_FAIL = "unlockFail";
+
+ /**
+ * 绾ц仈鍚敤鎴愬姛
+ */
+ public static final String ENABLE_SUCCESS_CASCADE = "enableSuccessCascade";
+
+ /**
+ * 鍚敤澶辫触
+ */
+ public static final String ENABLE_FAIL = "enableFail";
+
+ /**
+ * 鍋滅敤鎴愬姛
+ */
+ public static final String DISABLE_SUCCESS = "disableSuccess";
+
+ /**
+ * 绾ц仈鍋滅敤鎴愬姛
+ */
+ public static final String DISABLE_SUCCESS_CASCADE = "disableSuccessCascade";
+
+ /**
+ * 鍋滅敤澶辫触
+ */
+ public static final String DISABLE_FAIL = "disableFail";
+
+ /**
+ * 鍗囩増鏈彿鎴愬姛
+ */
+ public static final String UP_REVISION_SUCCESS = "dataUpRevisionSuccess";
+
+ /**
+ * 鍗囩増鏈彿澶辫触
+ */
+ public static final String UP_REVISION_FAIL = "dataUpRevisionFail";
+
+ /**
+ * 鍗囩増娆℃垚鍔�
+ */
+ public static final String UP_VERSION_SUCCESS = "dataUpVersionSuccess";
+
+ /**
+ * 鍗囩増娆″け璐�
+ */
+ public static final String UP_VERSION_FAIL = "dataUpVersionFail";
+
+ /**
+ * 鎻愪氦鎴愬姛
+ */
+ public static final String SUBMIT_SUCCESS= "submitSuccess";
+
+ /**
+ * 鎻愪氦澶辫触
+ */
+ public static final String SUBMIR_FAIL = "submitFail";
+
+ /**
+ * 鍙戝竷鎴愬姛
+ */
+ public static final String RELEASE_SUCCESS = "releaseSuccess";
+
+ /**
+ * 鍙戝竷澶辫触
+ */
+ public static final String RELEASE_FAIL = "releaseFail";
+
+ /**
+ * 鐗堟湰鍙烽噸澶�
+ */
+ public static final String REVISION_REPEAT = "revisionRepeat";
+
+ /**
+ * 鐗堟鍙烽噸澶�
+ */
+ public static final String VERSION_REPEAT= "versionRepeat";
+
+ /**
+ * 鏍规嵁涓婚敭鏌ヨ鏁版嵁涓嶅瓨鍦�
+ */
+ public static final String DATA_OID_NOT_EXIST = "dataOidNotExist";
+
+ /**
+ * 鏍规嵁涓婚敭鏌ヨ鐨勬暟鎹笉瀛樺湪
+ */
+ public static final String DATA_ID_NOT_EXIST = "dataIdNotExist";
+
+ /**
+ * 鏍规嵁鍚嶇О鏌ヨ鐨勬暟鎹笉瀛樺湪
+ */
+ public static final String DATA_NAME_NOT_EXIST = "dataNameNotExist";
+
+ /**
+ * 灞炴�у�奸噸澶�
+ */
+ public static final String DATA_ATTR_REPEAT = "dataRepeat";
+
+ /**
+ * 鑰佺増鏈殑鏁版嵁涓嶅瓨鍦�
+ */
+ public static final String OLD_REVISION_DATA_NOT_EXIST = "oldRevsionDataNotExist";
+
+ /**
+ * 涓婄骇涓婚敭瀹為檯鏄綋鍓嶈妭鐐圭殑涓嬬骇鑺傜偣锛屼細寮曡捣姝诲惊鐜�
+ */
+ public static final String PARENT_OID_IS_CHILD ="parentIsChild";
+
+ /**
+ * 鏁版嵁琚紩鐢紝涓嶅厑璁稿垹闄�
+ */
+ public static final String DATA_LINKED_NOT_DELETE = "dataLinkedNotDelete";
+
+ /**
+ * 鏁版嵁鐨勫瓙鑺傜偣涔熻寮曠敤锛屼笉鍏佽鍒犻櫎
+ */
+ public static final String DATA_CASCADE_LINKED_NOT_DELETE = "dataCascadeLinkedNotDelete";
+
+ /**
+ * 鏁版嵁琚紩鐢紝涓嶅厑璁镐慨鏀�
+ */
+ public static final String DATA_LINKED_NOT_EDIT ="dataLinkedNotEdit";
+
+ /**
+ * 鏁版嵁涓嶅紩鐢紝涓嶅厑璁镐慨鏀规煇涓睘鎬�
+ */
+ public static final String DATA_LINKED_NOT_EDIT_ATTR="dataLinkedNotEditAttr";
+
+ /**
+ * 涓婄骇妗ｆ涓嶅瓨鍦�
+ */
+ public static final String DATA_PARENT_NOT_EXIST = "parentNotExist";
+
+ /**
+ * 鍒嗙被鏁版嵁涓嶅瓨鍦�
+ */
+ public static final String DATA_CLASSIFY_NOT_EXIST = "classifyNotExist";
+
+ /**
+ * 褰撳墠鐘舵�佷笅涓嶅厑璁镐慨鏀规暟鎹�
+ */
+ public static final String LCSTATUS_CAN_NOT_EDIT = "lcStatusCannotEditData";
+
+ /**
+ * 褰撳墠鐘舵�佷笅涓嶅厑璁稿垹闄ゆ暟鎹�
+ */
+ public static final String LCSTATUS_CAN_NOT_DELETE = "lcStatusCannotDeleteData";
+
+ /**
+ * 瀵煎叆鎴愬姛
+ */
+ public static final String IMPORT_SUCCESS = "importSuccess";
+
+ /**
+ * 瀵煎叆澶辫触
+ */
+ public static final String IMPORT_FAIL = "importFail";
+
+ /**
+ * 瀵煎叆鐨勬ā鏉挎枃浠朵笉瀛樺湪
+ */
+ public static final String IMPORT_TEMPLATE_FILE_NOT_FOUND = "importTemplateFileNotFound";
+
+ /**
+ * 瀵煎嚭鎴愬姛
+ */
+ public static final String EXPORT_SUCCESS = "exportSuccess";
+
+ /**
+ * 瀵煎嚭澶辫触
+ */
+ public static final String EXPORT_FAIL = "exportFail";
+
+ /**
+ * 涓婁紶鎴愬姛
+ */
+ public static final String UPLOAD_SUCCESS = "uploadSuccess";
+
+ /**
+ * 涓婁紶澶辫触
+ */
+ public static final String UPLOAD_FAIL = "uploadFail";
+
+ /**
+ * 涓嬭浇鎴愬姛
+ */
+ public static final String DOWNLOAD_SUCCESS = "downloadSuccess";
+
+ /**
+ * 涓嬭浇澶辫触
+ */
+ public static final String DOWNLOAD_FAIL = "downloadFail";
+
+ /**
+ * 鏂囦欢涓嶅瓨鍦�
+ */
+ public static final String FILE_NOT_EXIST = "fileNotExist";
+
+ /**
+ * 瀹℃壒鎴愬姛
+ */
+ public static final String AUDIT_SUCCESS = "auditSuccess";
+
+ /**
+ * 瀹℃壒澶辫触
+ */
+ public static final String AUDIT_FAIL = "auditFail";
+
+ /**
+ * 涓嬪彂鎴愬姛
+ */
+ public static final String ISSUED_SUCCESS = "issuedSuccess";
+
+ /**
+ * 涓嬪彂澶辫触
+ */
+ public static final String ISSUED_FAIL = "issuedFail";
+
+ /**
+ * 鎺ユ敹鎴愬姛
+ */
+ public static final String RECEIVE_SUCCESS = "receiveSuccess";
+
+ /**
+ * 鎺ユ敹澶辫触
+ */
+ public static final String RECEIVE_FAIL = "receiveFail";
+
+ /**
+ * 璁″垝鐨勫埗閫犱緷鎹笉瀛樺湪
+ */
+ public static final String PLAN_SOURCE_NOT_EXIST = "planSourceNotExist";
+
+ /**
+ * 璁″垝鐨勫埗閫犵洰鏍囦笉瀛樺湪
+ */
+ public static final String PLAN_TARGET_NOT_EXIST = "planTargetNotExist";
+
+ /**
+ * 娲惧彂鎴愬姛
+ */
+ public static final String DISPATCH_SUCCESS = "dispatchSuccess";
+
+ /**
+ * 娲惧彂澶辫触
+ */
+ public static final String DISPATCH_FAIL = "dispatchFail";
+
+ /**
+ * 璇ヨ鍒掍笅涓嶅瓨鍦ㄦ淳鍙戣繃鐨勪换鍔�
+ */
+ public static final String DISPATCH_TASK_NOT_EXIST_BY_PLAN = "dispatchTaskNotExistByPlan";
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/LinkTypeIdConstant.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/LinkTypeIdConstant.java
similarity index 86%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/LinkTypeIdConstant.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/LinkTypeIdConstant.java
index 8090229..7c3ecea 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/LinkTypeIdConstant.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/LinkTypeIdConstant.java
@@ -1,4 +1,4 @@
-package com.vci.web.constant;
+package com.vci.constant;
/**
* 閾炬帴绫诲瀷鐨勫畾涔�
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/VciFileBtmTypeConstant.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/VciFileBtmTypeConstant.java
new file mode 100644
index 0000000..5530977
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/VciFileBtmTypeConstant.java
@@ -0,0 +1,16 @@
+package com.vci.constant;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 12:48
+ */
+public class VciFileBtmTypeConstant {
+ public static final String FILE_VOLUME = "fileVolume";
+ public static final String FILE_OBJECT = "fileObject";
+ public static final String FILE_DOWNLOAD_RECORD = "fileDownloadRecord";
+ public static final String FILE_DOWNLOAD_TOTAL = "fileDownloadTotal";
+ public static final String FILE_DOC_CLASSIFY = "fileDocClassify";
+
+ public VciFileBtmTypeConstant() {
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/VciFileDefaultValueConstant.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/VciFileDefaultValueConstant.java
new file mode 100644
index 0000000..6e3fdc2
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/VciFileDefaultValueConstant.java
@@ -0,0 +1,19 @@
+package com.vci.constant;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 12:51
+ */
+public class VciFileDefaultValueConstant {
+ public static final String FILE_LC_STATUS_INIT = "FileInit";
+ public static final String FILE_LC_STATUS_TRANS = "FileTransing";
+ public static final String FILE_LC_STATUS_TRANS_FINISH = "FileTransFinish";
+ public static final String FILE_LC_STATUS_RELEASE = "FileRelease";
+ public static final String FILE_LC_STATUS_LINED = "FileLinked";
+ public static final String TABLE_FILE_CLASSIFY_DVF = "DVF_DVF";
+ public static final String TABLE_FILE_CLASSIFY_XML = "DVF_XML";
+ public static final String TABLE_FILE_CLASSIFY_PDF = "DVF_PDF";
+
+ public VciFileDefaultValueConstant() {
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/VciFileEnumConstant.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/VciFileEnumConstant.java
new file mode 100644
index 0000000..8204974
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/VciFileEnumConstant.java
@@ -0,0 +1,13 @@
+package com.vci.constant;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 12:52
+ */
+public class VciFileEnumConstant {
+ public static final String FILE_TRANS_PROTOCOL = "fileTransProtocol";
+ public static final String FILE_SERVICE_OS_TYPE = "fileServiceOsType";
+
+ public VciFileEnumConstant() {
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/VciFileLangCodeConstant.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/VciFileLangCodeConstant.java
new file mode 100644
index 0000000..f7860a9
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/VciFileLangCodeConstant.java
@@ -0,0 +1,27 @@
+package com.vci.constant;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 14:24
+ */
+public class VciFileLangCodeConstant {
+ public static final String FILE_NOT_FOUND = "fileNotFound";
+ public static final String ZIP_FILE_ERROR = "zipFileError";
+ public static final String ZIP_FILE_NAME_NULL = "zipFileNameNull";
+ public static final String FILES_NULL = "fileNull";
+ public static final String FILE_VOLUME_NOT_EXIST = "fileVolumeNotExist";
+ public static final String FILE_DOC_CLASSIFY_NOT_EXIST = "fileDocClassifyNotExist";
+ public static final String FILE_RELEASED = "fileReleased";
+ public static final String FILE_INFO_NOT_EXIST = "fileInfoNotExist";
+ public static final String FILE_INFO_INIT_FAIL = "fileInfoInitFail";
+ public static final String FILE_INFO_INIT_SUCCESS = "fileInfoInitSuccess";
+ public static final String FILE_READ_FAIL = "fileReadFail";
+ public static final String FOLDER_NOT_EXIST = "folderNotExist";
+ public static final String IS_NOT_FOLDER = "isNotFolder";
+ public static final String ZIP_FILE_READ_ERROR = "zipFileReadError";
+ public static final String FILE_NOT_EXIST_CANNOT_SHARED = "fileNotExistCannotShared";
+ public static final String FILE_SHARED_FAIL = "fileSharedFail";
+
+ public VciFileLangCodeConstant() {
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/VciFileLifeConstant.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/VciFileLifeConstant.java
new file mode 100644
index 0000000..231e170
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/VciFileLifeConstant.java
@@ -0,0 +1,12 @@
+package com.vci.constant;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 12:50
+ */
+public class VciFileLifeConstant {
+ public static final String FILE_LC = "FileObjectLC";
+
+ public VciFileLifeConstant() {
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/WFVariablesKeyConstant.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/WFVariablesKeyConstant.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/WFVariablesKeyConstant.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/WFVariablesKeyConstant.java
index a3a332a..f00354f 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/WFVariablesKeyConstant.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/WFVariablesKeyConstant.java
@@ -1,4 +1,4 @@
-package com.vci.web.constant;
+package com.vci.constant;
/**
* 甯哥敤鐨勫彉閲忓悕绉�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/WebLangCodeConstant.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/WebLangCodeConstant.java
similarity index 95%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/WebLangCodeConstant.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/WebLangCodeConstant.java
index 2a5fbc0..4c567f3 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/constant/WebLangCodeConstant.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/WebLangCodeConstant.java
@@ -1,4 +1,4 @@
-package com.vci.web.constant;
+package com.vci.constant;
/**
* web鐨勫璇紪鐮�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/BaseLinkModelDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseLinkModelDTO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/BaseLinkModelDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseLinkModelDTO.java
index e4b9e4e..5b25d70 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/BaseLinkModelDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseLinkModelDTO.java
@@ -1,9 +1,9 @@
-package com.vci.web.dto;
+package com.vci.dto;
import com.alibaba.fastjson.annotation.JSONField;
+import com.vci.model.BaseLinkModel;
import com.vci.starter.web.annotation.Column;
-import com.vci.web.model.BaseLinkModel;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/BaseLinkModelDTOList.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseLinkModelDTOList.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/BaseLinkModelDTOList.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseLinkModelDTOList.java
index 9367c89..6c5e21c 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/BaseLinkModelDTOList.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseLinkModelDTOList.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import com.vci.starter.web.model.BaseLinkModel;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/BaseModelDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseModelDTO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/BaseModelDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseModelDTO.java
index a977c02..24bdc02 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/BaseModelDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseModelDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import com.vci.starter.web.model.BaseModel;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/BaseModelDTOList.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseModelDTOList.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/BaseModelDTOList.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseModelDTOList.java
index f56c4c2..90baa7a 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/BaseModelDTOList.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseModelDTOList.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/BdSelectInputCharDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BdSelectInputCharDTO.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/BdSelectInputCharDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BdSelectInputCharDTO.java
index 74072ef..3d7fcce 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/BdSelectInputCharDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BdSelectInputCharDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import java.util.Date;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/DeleteDataDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteDataDTO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/DeleteDataDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteDataDTO.java
index 5da7c81..2b6515f 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/DeleteDataDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteDataDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/DeleteLinkDataDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteLinkDataDTO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/DeleteLinkDataDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteLinkDataDTO.java
index 6558dd1..9c2bce1 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/DeleteLinkDataDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteLinkDataDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/FormDataDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormDataDTO.java
similarity index 95%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/FormDataDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormDataDTO.java
index 8e70d85..da64e67 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/FormDataDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormDataDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
/**
* 琛ㄥ崟鏂板鍜屼慨鏀规暟鎹�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/FormDataDTOList.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormDataDTOList.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/FormDataDTOList.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormDataDTOList.java
index 06886d7..e3d8e3d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/FormDataDTOList.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormDataDTOList.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/FormLinkDataDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormLinkDataDTO.java
similarity index 95%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/FormLinkDataDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormLinkDataDTO.java
index 5e84392..0c8ef87 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/FormLinkDataDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormLinkDataDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/FormLinkDataDTOList.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormLinkDataDTOList.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/FormLinkDataDTOList.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormLinkDataDTOList.java
index 8d78417..e13df32 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/FormLinkDataDTOList.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormLinkDataDTOList.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/LoginUserDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/LoginUserDTO.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/LoginUserDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/LoginUserDTO.java
index 9bfadab..3947427 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/LoginUserDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/LoginUserDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
/**
* 鐢ㄤ簬鑾峰彇鐧诲綍鐨勬椂鍊欑殑璇锋眰淇℃伅鐨勭敤鎴�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/dto/OrgDepartmentDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OrgDepartmentDTO.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/dto/OrgDepartmentDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OrgDepartmentDTO.java
index 74b52cf..b7b72d5 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/dto/OrgDepartmentDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OrgDepartmentDTO.java
@@ -1,4 +1,4 @@
-package com.vci.frameworkcore.model.dto;
+package com.vci.dto;
import com.vci.starter.web.pagemodel.BaseModelVO;
import lombok.AllArgsConstructor;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsAttributeDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsAttributeDTO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsAttributeDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsAttributeDTO.java
index 3636851..9f8a1ce 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsAttributeDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsAttributeDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import java.util.Date;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsBtmTypeDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeDTO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsBtmTypeDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeDTO.java
index 9e42d07..442752d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsBtmTypeDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import java.util.Date;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsBtmTypeExportDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeExportDTO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsBtmTypeExportDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeExportDTO.java
index 41106ca..c972f46 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsBtmTypeExportDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeExportDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import java.util.Collection;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsBtmTypeLinkAttributesDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeLinkAttributesDTO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsBtmTypeLinkAttributesDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeLinkAttributesDTO.java
index 04d5064..9e1eeb1 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsBtmTypeLinkAttributesDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeLinkAttributesDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
/**
* 寰�涓氬姟绫诲瀷涓坊鍔�/绉婚櫎灞炴�х殑鏁版嵁浼犺緭瀵硅薄
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsCodeEnumDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsCodeEnumDTO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsCodeEnumDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsCodeEnumDTO.java
index 4bfcda9..6e444ac 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsCodeEnumDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsCodeEnumDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsCodeGenSchemaDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsCodeGenSchemaDTO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsCodeGenSchemaDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsCodeGenSchemaDTO.java
index 232aa30..3818374 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsCodeGenSchemaDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsCodeGenSchemaDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsCodeRuleDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsCodeRuleDTO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsCodeRuleDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsCodeRuleDTO.java
index 39e4030..1a96fce 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsCodeRuleDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsCodeRuleDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsCodeRuleElementDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsCodeRuleElementDTO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsCodeRuleElementDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsCodeRuleElementDTO.java
index ba48969..f4a4bc3 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsCodeRuleElementDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsCodeRuleElementDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import com.vci.starter.web.pagemodel.BaseModelVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsCodeRuleProduceDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsCodeRuleProduceDTO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsCodeRuleProduceDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsCodeRuleProduceDTO.java
index 5dc318d..fa8d721 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsCodeRuleProduceDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsCodeRuleProduceDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import java.util.Map;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsEnumDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsEnumDTO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsEnumDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsEnumDTO.java
index e925d2d..4597459 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsEnumDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsEnumDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import java.util.Date;
import java.util.Map;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsLifeCycleDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsLifeCycleDTO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsLifeCycleDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsLifeCycleDTO.java
index 2e7f36d..ca7ef13 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsLifeCycleDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsLifeCycleDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import java.util.Date;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsLifeCycleLineDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsLifeCycleLineDTO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsLifeCycleLineDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsLifeCycleLineDTO.java
index b721146..bac8362 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsLifeCycleLineDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsLifeCycleLineDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import java.util.Date;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsLifeCycleLineEventDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsLifeCycleLineEventDTO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsLifeCycleLineEventDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsLifeCycleLineEventDTO.java
index 01d3c59..092f3db 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsLifeCycleLineEventDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsLifeCycleLineEventDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import java.util.Date;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsLinkTypeDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsLinkTypeDTO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsLinkTypeDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsLinkTypeDTO.java
index b7426e4..e00dda3 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsLinkTypeDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsLinkTypeDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import java.util.Date;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsRevisionRuleDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsRevisionRuleDTO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsRevisionRuleDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsRevisionRuleDTO.java
index d94a052..7fe59b4 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsRevisionRuleDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsRevisionRuleDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import java.util.Date;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsStatusDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsStatusDTO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsStatusDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsStatusDTO.java
index 1e57871..9c1890b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/OsStatusDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsStatusDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import java.util.Date;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/ProcessNodeUseDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/ProcessNodeUseDTO.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/ProcessNodeUseDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/ProcessNodeUseDTO.java
index d3af0f6..fd1731c 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/ProcessNodeUseDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/ProcessNodeUseDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import java.util.HashMap;
import java.util.Map;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/ProcessStartConfigDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/ProcessStartConfigDTO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/ProcessStartConfigDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/ProcessStartConfigDTO.java
index c0b4608..ea2b97e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/ProcessStartConfigDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/ProcessStartConfigDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
/**
* 娴佺▼鍚姩鐩稿叧鐨勯厤缃�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessTemplateVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/ProcessTemplateVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessTemplateVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/ProcessTemplateVO.java
index 9d83f68..9212d17 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessTemplateVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/ProcessTemplateVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.dto;
/**
* 娴佺▼妯℃澘瀵硅薄
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/dto/SmPasswordStrategyDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/SmPasswordStrategyDTO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/dto/SmPasswordStrategyDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/SmPasswordStrategyDTO.java
index 80ea4ea..4eaf6e9 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/dto/SmPasswordStrategyDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/SmPasswordStrategyDTO.java
@@ -1,4 +1,4 @@
-package com.vci.frameworkcore.model.dto;
+package com.vci.dto;
import com.vci.starter.web.pagemodel.BaseModelVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmRoleVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/SmRoleDTO.java
similarity index 83%
copy from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmRoleVO.java
copy to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/SmRoleDTO.java
index f934f9e..7ac75a9 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmRoleVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/SmRoleDTO.java
@@ -1,18 +1,18 @@
-package com.vci.frameworkcore.pagemodel;
-
+package com.vci.dto;
import com.vci.starter.web.pagemodel.BaseModelVO;
/**
- * 瑙掕壊鏄剧ず瀵硅薄
- * @author weidy
- * @date 2020/2/2
- */
-public class SmRoleVO extends BaseModelVO {
+ * 瑙掕壊鏁版嵁浼犺緭瀵硅薄
+ * @author Renky
+ * @date 2020/6/15
+ **/
+public class SmRoleDTO extends BaseModelVO {
+
/**
* 绂佹淇敼杩欎釜鍊�
*/
- private static final long serialVersionUID = 8387796743619665258L;
+ private static final long serialVersionUID = 4819234508660282679L;
/**
* 瑙掕壊缂栧彿
@@ -98,15 +98,13 @@
@Override
public String toString() {
- return "SmRoleVO{" +
- "oid='" + getOid() + '\'' +
- ",id='" + id + '\'' +
+ return "SmRoleDTO{" +
+ "id='" + id + '\'' +
", name='" + name + '\'' +
", roleClassify='" + roleClassify + '\'' +
", roleClassifyText='" + roleClassifyText + '\'' +
", roleControlArea='" + roleControlArea + '\'' +
", roleControlAreaText='" + roleControlAreaText + '\'' +
- ",description='" + getDescription() + '\'' +
'}';
}
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/dto/SmUserDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/SmUserDTO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/dto/SmUserDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/SmUserDTO.java
index f7863b1..7a80669 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/dto/SmUserDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/SmUserDTO.java
@@ -1,6 +1,5 @@
-package com.vci.frameworkcore.model.dto;
+package com.vci.dto;
-import com.vci.starter.web.model.BaseModel;
import com.vci.starter.web.pagemodel.BaseModelVO;
import java.util.Date;
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileDocClassifyDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileDocClassifyDTO.java
new file mode 100644
index 0000000..885daa7
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileDocClassifyDTO.java
@@ -0,0 +1,45 @@
+package com.vci.dto;
+
+import com.vci.starter.web.pagemodel.BaseModelVO;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 14:16
+ */
+public class VciFileDocClassifyDTO extends BaseModelVO {
+ private static final long serialVersionUID = -8734458292613818262L;
+ private String id;
+ private String name;
+ private String description;
+
+ public VciFileDocClassifyDTO() {
+ }
+
+ public String getId() {
+ return this.id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return this.description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String toString() {
+ return "VciFileDocClassifyDTO{id='" + this.id + '\'' + ", name='" + this.name + '\'' + ", description='" + this.description + '\'' + "} " + super.toString();
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileDocClassifyDTOList.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileDocClassifyDTOList.java
new file mode 100644
index 0000000..266f9d0
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileDocClassifyDTOList.java
@@ -0,0 +1,28 @@
+package com.vci.dto;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 14:18
+ */
+public class VciFileDocClassifyDTOList implements Serializable {
+ private static final long serialVersionUID = -4972216166383334378L;
+ private List<VciFileDocClassifyDTO> docClassifyDTOList;
+
+ public VciFileDocClassifyDTOList() {
+ }
+
+ public List<VciFileDocClassifyDTO> getDocClassifyDTOList() {
+ return this.docClassifyDTOList;
+ }
+
+ public void setDocClassifyDTOList(List<VciFileDocClassifyDTO> docClassifyDTOList) {
+ this.docClassifyDTOList = docClassifyDTOList;
+ }
+
+ public String toString() {
+ return "VciFileDocClassifyDTOList{docClassifyDTOList=" + this.docClassifyDTOList + '}';
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileObjectDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileObjectDTO.java
new file mode 100644
index 0000000..4a946a0
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileObjectDTO.java
@@ -0,0 +1,211 @@
+package com.vci.dto;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鏂囦欢鏁版嵁浼犺緭瀵硅薄
+ * @author ludc
+ * @date 2024/7/16 14:14
+ */
+public class VciFileObjectDTO implements Serializable {
+ private static final long serialVersionUID = 5916046307355781994L;
+ private String oid;
+ private Date ts;
+ private String id;
+ private String name;
+ private String fileDocClassify;
+ private String fileDocClassifyName;
+ private String keyInfos;
+ private String ownbizOid;
+ private String ownBtmname;
+ private Integer secretGrade;
+ private boolean updateFileFlag = false;
+ private String fileOid;
+ private String filePath;
+ private String dirPath;
+ private String fileExtension;
+ private long fileSize;
+ private boolean effect = true;
+ private String sourceFilePath;
+ private List<VciFileObjectDTO> vciFileObjectDTOList;
+ private Collection<VciFileObjectDTO> vciFileObjectDTOS;
+ private boolean checkSameFile = true;
+
+ public VciFileObjectDTO() {
+ }
+
+ public String getKeyInfos() {
+ return this.keyInfos;
+ }
+
+ public void setKeyInfos(String keyInfos) {
+ this.keyInfos = keyInfos;
+ }
+
+ public String getOwnbizOid() {
+ return this.ownbizOid;
+ }
+
+ public void setOwnbizOid(String ownbizOid) {
+ this.ownbizOid = ownbizOid;
+ }
+
+ public String getOwnBtmname() {
+ return this.ownBtmname;
+ }
+
+ public void setOwnBtmname(String ownBtmname) {
+ this.ownBtmname = ownBtmname;
+ }
+
+ public boolean isUpdateFileFlag() {
+ return this.updateFileFlag;
+ }
+
+ public void setUpdateFileFlag(boolean updateFileFlag) {
+ this.updateFileFlag = updateFileFlag;
+ }
+
+ public String getFileOid() {
+ return this.fileOid;
+ }
+
+ public void setFileOid(String fileOid) {
+ this.fileOid = fileOid;
+ }
+
+ public String getId() {
+ return this.id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getFileDocClassify() {
+ return this.fileDocClassify;
+ }
+
+ public void setFileDocClassify(String fileDocClassify) {
+ this.fileDocClassify = fileDocClassify;
+ }
+
+ public Integer getSecretGrade() {
+ return this.secretGrade;
+ }
+
+ public void setSecretGrade(Integer secretGrade) {
+ this.secretGrade = secretGrade;
+ }
+
+ public String getOid() {
+ return this.oid;
+ }
+
+ public void setOid(String oid) {
+ this.oid = oid;
+ }
+
+ public Date getTs() {
+ return this.ts;
+ }
+
+ public void setTs(Date ts) {
+ this.ts = ts;
+ }
+
+ public String getFilePath() {
+ return this.filePath;
+ }
+
+ public void setFilePath(String filePath) {
+ this.filePath = filePath;
+ }
+
+ public String getFileExtension() {
+ return this.fileExtension;
+ }
+
+ public void setFileExtension(String fileExtension) {
+ this.fileExtension = fileExtension;
+ }
+
+ public long getFileSize() {
+ return this.fileSize;
+ }
+
+ public void setFileSize(long fileSize) {
+ this.fileSize = fileSize;
+ }
+
+ public String getDirPath() {
+ return this.dirPath;
+ }
+
+ public void setDirPath(String dirPath) {
+ this.dirPath = dirPath;
+ }
+
+ public String getFileDocClassifyName() {
+ return this.fileDocClassifyName;
+ }
+
+ public void setFileDocClassifyName(String fileDocClassifyName) {
+ this.fileDocClassifyName = fileDocClassifyName;
+ }
+
+ public boolean isEffect() {
+ return this.effect;
+ }
+
+ public void setEffect(boolean effect) {
+ this.effect = effect;
+ }
+
+ public String getSourceFilePath() {
+ return this.sourceFilePath;
+ }
+
+ public void setSourceFilePath(String sourceFilePath) {
+ this.sourceFilePath = sourceFilePath;
+ }
+
+ public Collection<VciFileObjectDTO> getVciFileObjectDTOS() {
+ return this.vciFileObjectDTOS;
+ }
+
+ public void setVciFileObjectDTOS(Collection<VciFileObjectDTO> vciFileObjectDTOS) {
+ this.vciFileObjectDTOS = vciFileObjectDTOS;
+ }
+
+ public List<VciFileObjectDTO> getVciFileObjectDTOList() {
+ return this.vciFileObjectDTOList;
+ }
+
+ public void setVciFileObjectDTOList(List<VciFileObjectDTO> vciFileObjectDTOList) {
+ this.vciFileObjectDTOList = vciFileObjectDTOList;
+ }
+
+ public boolean isCheckSameFile() {
+ return this.checkSameFile;
+ }
+
+ public void setCheckSameFile(boolean checkSameFile) {
+ this.checkSameFile = checkSameFile;
+ }
+
+ public String toString() {
+ return "VciFileObjectDTO{oid='" + this.oid + '\'' + ", ts=" + this.ts + ", id='" + this.id + '\'' + ", name='" + this.name + '\'' + ", fileDocClassify='" + this.fileDocClassify + '\'' + ", fileDocClassifyName='" + this.fileDocClassifyName + '\'' + ", keyInfos='" + this.keyInfos + '\'' + ", ownbizOid='" + this.ownbizOid + '\'' + ", ownBtmname='" + this.ownBtmname + '\'' + ", secretGrade=" + this.secretGrade + ", updateFileFlag=" + this.updateFileFlag + ", fileOid='" + this.fileOid + '\'' + ", filePath='" + this.filePath + '\'' + ", dirPath='" + this.dirPath + '\'' + ", fileExtension='" + this.fileExtension + '\'' + ", fileSize=" + this.fileSize + ", effect=" + this.effect + ", sourceFilePath='" + this.sourceFilePath + '\'' + ", vciFileObjectDTOList=" + this.vciFileObjectDTOList + ", vciFileObjectDTOS=" + this.vciFileObjectDTOS + ", checkSameFile=" + this.checkSameFile + '}';
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileShareDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileShareDTO.java
new file mode 100644
index 0000000..7d18af2
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileShareDTO.java
@@ -0,0 +1,63 @@
+package com.vci.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 14:48
+ */
+public class VciFileShareDTO implements Serializable {
+ private static final long serialVersionUID = -8315393072984685004L;
+ private String sourceFileOid;
+ private String sourceOwnbizOid;
+ private String sourceBtmName;
+ private String targetOwnbizOid;
+ private String targetBtmName;
+
+ public VciFileShareDTO() {
+ }
+
+ public String getSourceFileOid() {
+ return this.sourceFileOid;
+ }
+
+ public void setSourceFileOid(String sourceFileOid) {
+ this.sourceFileOid = sourceFileOid;
+ }
+
+ public String getSourceOwnbizOid() {
+ return this.sourceOwnbizOid;
+ }
+
+ public void setSourceOwnbizOid(String sourceOwnbizOid) {
+ this.sourceOwnbizOid = sourceOwnbizOid;
+ }
+
+ public String getSourceBtmName() {
+ return this.sourceBtmName;
+ }
+
+ public void setSourceBtmName(String sourceBtmName) {
+ this.sourceBtmName = sourceBtmName;
+ }
+
+ public String getTargetOwnbizOid() {
+ return this.targetOwnbizOid;
+ }
+
+ public void setTargetOwnbizOid(String targetOwnbizOid) {
+ this.targetOwnbizOid = targetOwnbizOid;
+ }
+
+ public String getTargetBtmName() {
+ return this.targetBtmName;
+ }
+
+ public void setTargetBtmName(String targetBtmName) {
+ this.targetBtmName = targetBtmName;
+ }
+
+ public String toString() {
+ return "VciFileShareDTO{sourceFileOid='" + this.sourceFileOid + '\'' + ", sourceOwnbizOid='" + this.sourceOwnbizOid + '\'' + ", sourceBtmName='" + this.sourceBtmName + '\'' + ", targetOwnbizOid='" + this.targetOwnbizOid + '\'' + ", targetBtmName='" + this.targetBtmName + '\'' + '}';
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileShareHasClassifyDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileShareHasClassifyDTO.java
new file mode 100644
index 0000000..be4332c
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileShareHasClassifyDTO.java
@@ -0,0 +1,37 @@
+package com.vci.dto;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 14:47
+ */
+public class VciFileShareHasClassifyDTO implements Serializable {
+ private static final long serialVersionUID = -1573454091438305008L;
+ private String docClassifyId;
+ private List<VciFileShareDTO> shareDTOList;
+
+ public VciFileShareHasClassifyDTO() {
+ }
+
+ public String getDocClassifyId() {
+ return this.docClassifyId;
+ }
+
+ public void setDocClassifyId(String docClassifyId) {
+ this.docClassifyId = docClassifyId;
+ }
+
+ public List<VciFileShareDTO> getShareDTOList() {
+ return this.shareDTOList;
+ }
+
+ public void setShareDTOList(List<VciFileShareDTO> shareDTOList) {
+ this.shareDTOList = shareDTOList;
+ }
+
+ public String toString() {
+ return "VciFileShareHasClassifyDTO{docClassifyId='" + this.docClassifyId + '\'' + ", shareDTOList=" + this.shareDTOList + '}';
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileVolumeDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileVolumeDTO.java
new file mode 100644
index 0000000..4e82821
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/VciFileVolumeDTO.java
@@ -0,0 +1,144 @@
+package com.vci.dto;
+
+import com.vci.starter.web.pagemodel.BaseModelVO;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 14:21
+ */
+public class VciFileVolumeDTO extends BaseModelVO {
+ private static final long serialVersionUID = 2958869483453400582L;
+ private String id;
+ private String name;
+ private String description;
+ private String volumePath;
+ private String serviceOsType;
+ private String serviceOsTypeText;
+ private String transProtocol;
+ private String transProtocolText;
+ private String serviceUrl;
+ private String transUser;
+ private String transUserPwd;
+ private String maxVolume;
+ private String currentVolume;
+ private String lastSyncTimeLong;
+
+ public VciFileVolumeDTO() {
+ }
+
+ public String getId() {
+ return this.id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return this.description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getVolumePath() {
+ return this.volumePath;
+ }
+
+ public void setVolumePath(String volumePath) {
+ this.volumePath = volumePath;
+ }
+
+ public String getServiceOsType() {
+ return this.serviceOsType;
+ }
+
+ public void setServiceOsType(String serviceOsType) {
+ this.serviceOsType = serviceOsType;
+ }
+
+ public String getTransProtocol() {
+ return this.transProtocol;
+ }
+
+ public void setTransProtocol(String transProtocol) {
+ this.transProtocol = transProtocol;
+ }
+
+ public String getTransProtocolText() {
+ return this.transProtocolText;
+ }
+
+ public void setTransProtocolText(String transProtocolText) {
+ this.transProtocolText = transProtocolText;
+ }
+
+ public String getServiceUrl() {
+ return this.serviceUrl;
+ }
+
+ public void setServiceUrl(String serviceUrl) {
+ this.serviceUrl = serviceUrl;
+ }
+
+ public String getTransUser() {
+ return this.transUser;
+ }
+
+ public void setTransUser(String transUser) {
+ this.transUser = transUser;
+ }
+
+ public String getTransUserPwd() {
+ return this.transUserPwd;
+ }
+
+ public void setTransUserPwd(String transUserPwd) {
+ this.transUserPwd = transUserPwd;
+ }
+
+ public String getMaxVolume() {
+ return this.maxVolume;
+ }
+
+ public void setMaxVolume(String maxVolume) {
+ this.maxVolume = maxVolume;
+ }
+
+ public String getCurrentVolume() {
+ return this.currentVolume;
+ }
+
+ public void setCurrentVolume(String currentVolume) {
+ this.currentVolume = currentVolume;
+ }
+
+ public String getLastSyncTimeLong() {
+ return this.lastSyncTimeLong;
+ }
+
+ public void setLastSyncTimeLong(String lastSyncTimeLong) {
+ this.lastSyncTimeLong = lastSyncTimeLong;
+ }
+
+ public String getServiceOsTypeText() {
+ return this.serviceOsTypeText;
+ }
+
+ public void setServiceOsTypeText(String serviceOsTypeText) {
+ this.serviceOsTypeText = serviceOsTypeText;
+ }
+
+ public String toString() {
+ return "VciFileVolumeDTO{id='" + this.id + '\'' + ", name='" + this.name + '\'' + ", description='" + this.description + '\'' + ", volumePath='" + this.volumePath + '\'' + ", serviceOsType='" + this.serviceOsType + '\'' + ", serviceOsTypeText='" + this.serviceOsTypeText + '\'' + ", transProtocol='" + this.transProtocol + '\'' + ", transProtocolText='" + this.transProtocolText + '\'' + ", serviceUrl='" + this.serviceUrl + '\'' + ", transUser='" + this.transUser + '\'' + ", transUserPwd='" + this.transUserPwd + '\'' + ", maxVolume='" + this.maxVolume + '\'' + ", currentVolume='" + this.currentVolume + '\'' + ", lastSyncTimeLong='" + this.lastSyncTimeLong + '\'' + "} " + super.toString();
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/WFWorkflowNodeFavDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/WFWorkflowNodeFavDTO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/WFWorkflowNodeFavDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/WFWorkflowNodeFavDTO.java
index 24b4d56..ec7d0d6 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/WFWorkflowNodeFavDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/WFWorkflowNodeFavDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import com.vci.starter.web.pagemodel.BaseModelVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/WFWorkflowNodeFavItemDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/WFWorkflowNodeFavItemDTO.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/WFWorkflowNodeFavItemDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/WFWorkflowNodeFavItemDTO.java
index df72528..cd97fc3 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/WFWorkflowNodeFavItemDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/WFWorkflowNodeFavItemDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import com.vci.starter.web.pagemodel.BaseModelVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/WebHomeTaskActionDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/WebHomeTaskActionDTO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/WebHomeTaskActionDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/WebHomeTaskActionDTO.java
index bf4921f..1411559 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dto/WebHomeTaskActionDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/WebHomeTaskActionDTO.java
@@ -1,4 +1,4 @@
-package com.vci.web.dto;
+package com.vci.dto;
import com.vci.starter.web.model.BaseModel;
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/VciFileServiceOsTypeEnum.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/VciFileServiceOsTypeEnum.java
new file mode 100644
index 0000000..d34c699
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/VciFileServiceOsTypeEnum.java
@@ -0,0 +1,83 @@
+package com.vci.enumpck;
+
+import com.vci.starter.web.annotation.VciEnum;
+import com.vci.starter.web.enumpck.BaseEnum;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 14:35
+ */
+@VciEnum(
+ name = "fileServiceOsType",
+ text = "鏂囦粨鎿嶄綔绯荤粺鐨勭被鍨�"
+)
+public enum VciFileServiceOsTypeEnum implements BaseEnum {
+ WINDOWS("windows", "寰蒋windows"),
+ UNIX("unix", "unix/linux/macos绛�");
+
+ private String value;
+ private String text;
+
+ public String getValue() {
+ return this.value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public String getText() {
+ return this.text;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ private VciFileServiceOsTypeEnum(String value, String text) {
+ this.value = value;
+ this.text = text;
+ }
+
+ public static String getValueByText(String text) {
+ VciFileServiceOsTypeEnum[] var1 = values();
+ int var2 = var1.length;
+
+ for(int var3 = 0; var3 < var2; ++var3) {
+ VciFileServiceOsTypeEnum wenum = var1[var3];
+ if (wenum.getText().equalsIgnoreCase(text)) {
+ return wenum.getValue();
+ }
+ }
+
+ return "";
+ }
+
+ public static String getTextByValue(String value) {
+ VciFileServiceOsTypeEnum[] var1 = values();
+ int var2 = var1.length;
+
+ for(int var3 = 0; var3 < var2; ++var3) {
+ VciFileServiceOsTypeEnum wenum = var1[var3];
+ if (wenum.getValue().equalsIgnoreCase(value)) {
+ return wenum.getText();
+ }
+ }
+
+ return "";
+ }
+
+ public static VciFileServiceOsTypeEnum forValue(String value) {
+ VciFileServiceOsTypeEnum[] var1 = values();
+ int var2 = var1.length;
+
+ for(int var3 = 0; var3 < var2; ++var3) {
+ VciFileServiceOsTypeEnum wenum = var1[var3];
+ if (wenum.getValue().equalsIgnoreCase(value)) {
+ return wenum;
+ }
+ }
+
+ return null;
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/VciFileTransProtocolEnum.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/VciFileTransProtocolEnum.java
new file mode 100644
index 0000000..8f7cdc9
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/VciFileTransProtocolEnum.java
@@ -0,0 +1,89 @@
+package com.vci.enumpck;
+
+import com.vci.starter.web.annotation.VciEnum;
+import com.vci.starter.web.enumpck.BaseEnum;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 14:30
+ */
+@VciEnum(
+ name = "fileTransProtocol",
+ text = "鏂囦欢浼犺緭鐨勫崗璁�"
+)
+public enum VciFileTransProtocolEnum implements BaseEnum {
+ CORBA("corba", "骞冲彴鍘熸湁鐨凜ORBA鏈嶅姟"),
+ MINIO("minio", "杞婚噺鍖栨枃浠舵湇鍔�"),
+ MONGO("mongo", "mongoDB鍒嗗竷寮忔枃浠舵湇鍔�"),
+ FTP("ftp", "瀛樺偍鍒癋TP鏈嶅姟涓�"),
+ LOCAL("local", "鏈湴瀛樺偍"),
+ HTTP("http", "浠呬娇鐢℉TTP鏌ョ湅"),
+ NAS("nas", "NAS鏈嶅姟涓婂瓨鍌�"),
+ THRIFT("thrift", "Thrift杩滅▼璋冪敤");
+
+ private String value;
+ private String text;
+
+ public String getValue() {
+ return this.value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public String getText() {
+ return this.text;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ private VciFileTransProtocolEnum(String value, String text) {
+ this.value = value;
+ this.text = text;
+ }
+
+ public static String getValueByText(String text) {
+ VciFileTransProtocolEnum[] var1 = values();
+ int var2 = var1.length;
+
+ for(int var3 = 0; var3 < var2; ++var3) {
+ VciFileTransProtocolEnum wenum = var1[var3];
+ if (wenum.getText().equalsIgnoreCase(text)) {
+ return wenum.getValue();
+ }
+ }
+
+ return "";
+ }
+
+ public static String getTextByValue(String value) {
+ VciFileTransProtocolEnum[] var1 = values();
+ int var2 = var1.length;
+
+ for(int var3 = 0; var3 < var2; ++var3) {
+ VciFileTransProtocolEnum wenum = var1[var3];
+ if (wenum.getValue().equalsIgnoreCase(value)) {
+ return wenum.getText();
+ }
+ }
+
+ return "";
+ }
+
+ public static VciFileTransProtocolEnum forValue(String value) {
+ VciFileTransProtocolEnum[] var1 = values();
+ int var2 = var1.length;
+
+ for(int var3 = 0; var3 < var2; ++var3) {
+ VciFileTransProtocolEnum wenum = var1[var3];
+ if (wenum.getValue().equalsIgnoreCase(value)) {
+ return wenum;
+ }
+ }
+
+ return null;
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/lcstatuspck/FileLCStatus.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/lcstatuspck/FileLCStatus.java
new file mode 100644
index 0000000..b2e9eed
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/lcstatuspck/FileLCStatus.java
@@ -0,0 +1,92 @@
+package com.vci.lcstatuspck;
+
+import com.vci.starter.web.annotation.VciLifeCycle;
+import com.vci.starter.web.annotation.VciLifeCycleTrans;
+import com.vci.starter.web.enumpck.BaseEnum;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 14:31
+ */
+
+@VciLifeCycle(
+ name = "FileObjectLC",
+ text = "鏂囦欢鐢熷懡鍛ㄦ湡",
+ startStatus = "FileInit",
+ translations = {@VciLifeCycleTrans(
+ source = "FileInit",
+ target = "FileTransing",
+ name = "寮�濮嬩笂浼�"
+ ), @VciLifeCycleTrans(
+ source = "FileTransing",
+ target = "FileTransFinish",
+ name = "涓婁紶瀹屾垚"
+ ), @VciLifeCycleTrans(
+ source = "FileTransing",
+ target = "FileRelease",
+ name = "涓婁紶瀹屾垚鍚庣洿鎺ュ彂甯�"
+ ), @VciLifeCycleTrans(
+ source = "FileTransFinish",
+ target = "FileRelease",
+ name = "涓婁紶瀹屾垚鍚庤浆鍙戝竷"
+ )}
+)
+public enum FileLCStatus implements BaseEnum {
+ INIT("FileInit", "鍒濆鍖�"),
+ TRANSING("FileTransing", "涓婁紶涓�"),
+ TRANS_FINISH("FileTransFinish", "涓婁紶瀹屾垚"),
+ FILE_RELEASE("FileRelease", "宸茬敓鏁�"),
+ LINKED("FileLinked", "鍏宠仈鐨勬枃浠�");
+
+ private String value;
+ private String text;
+
+ public String getValue() {
+ return this.value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public String getText() {
+ return this.text;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ private FileLCStatus(String value, String text) {
+ this.value = value;
+ this.text = text;
+ }
+
+ public static String getTextByValue(String value) {
+ FileLCStatus[] var1 = values();
+ int var2 = var1.length;
+
+ for(int var3 = 0; var3 < var2; ++var3) {
+ FileLCStatus eu = var1[var3];
+ if (eu.value.equalsIgnoreCase(value)) {
+ return eu.text;
+ }
+ }
+
+ return "";
+ }
+
+ public static String getValueByText(String text) {
+ FileLCStatus[] var1 = values();
+ int var2 = var1.length;
+
+ for(int var3 = 0; var3 < var2; ++var3) {
+ FileLCStatus eu = var1[var3];
+ if (eu.text.equalsIgnoreCase(text)) {
+ return eu.value;
+ }
+ }
+
+ return "";
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/BaseLinkModel.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/BaseLinkModel.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/BaseLinkModel.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/BaseLinkModel.java
index ccedbba..44fe7f3 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/BaseLinkModel.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/BaseLinkModel.java
@@ -1,4 +1,4 @@
-package com.vci.web.model;
+package com.vci.model;
import com.vci.starter.web.annotation.Column;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/BdSelectInputCharDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/BdSelectInputCharDO.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/BdSelectInputCharDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/BdSelectInputCharDO.java
index f7751c1..b6ea395 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/BdSelectInputCharDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/BdSelectInputCharDO.java
@@ -1,10 +1,11 @@
-package com.vci.web.model;
+package com.vci.model;
+import com.vci.constant.BtmIdConstant;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.annotation.VciBtmType;
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
import com.vci.starter.web.model.BaseModel;
-import com.vci.web.constant.BtmIdConstant;
+
/**
* 鍙緭鍙�夊唴瀹�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/OrgDeptForPlatform1.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OrgDeptForPlatform1.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/OrgDeptForPlatform1.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OrgDeptForPlatform1.java
index 1dbdfbf..8f303cd 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/OrgDeptForPlatform1.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OrgDeptForPlatform1.java
@@ -1,11 +1,10 @@
-package com.vci.frameworkcore.model;
+package com.vci.model;
-import com.vci.frameworkcore.constant.FrameWorkBtmTypeConstant;
+import com.vci.constant.FrameWorkBtmTypeConstant;
import com.vci.starter.web.annotation.Id;
import com.vci.starter.web.annotation.VciBtmType;
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import java.util.Date;
/**
* 鍘熷钩鍙扮殑閮ㄩ棬
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsAttributeDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsAttributeDO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsAttributeDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsAttributeDO.java
index 42d1365..27d1f3e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsAttributeDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsAttributeDO.java
@@ -1,4 +1,4 @@
-package com.vci.web.model;
+package com.vci.model;
import com.vci.starter.web.annotation.*;
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsCodeBreakCodeDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeBreakCodeDO.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsCodeBreakCodeDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeBreakCodeDO.java
index 14e748c..4d3d1cc 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsCodeBreakCodeDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeBreakCodeDO.java
@@ -1,12 +1,12 @@
-package com.vci.web.model;
+package com.vci.model;
+import com.vci.constant.BtmIdConstant;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.annotation.VciBtmType;
import com.vci.starter.web.annotation.VciUseRefer;
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
import com.vci.starter.web.model.BaseModel;
-import com.vci.web.constant.BtmIdConstant;
/**
* 鏂爜鐨勫唴瀹�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsCodeEnumDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeEnumDO.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsCodeEnumDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeEnumDO.java
index c947b9f..e492f36 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsCodeEnumDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeEnumDO.java
@@ -1,10 +1,10 @@
-package com.vci.web.model;
+package com.vci.model;
+import com.vci.constant.BtmIdConstant;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.annotation.VciBtmType;
import com.vci.starter.web.annotation.VciUseRefer;
import com.vci.starter.web.model.BaseModel;
-import com.vci.web.constant.BtmIdConstant;
/**
* 缂栫爜鐨勬灇涓炬槧灏�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsCodeGenSchemaDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeGenSchemaDO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsCodeGenSchemaDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeGenSchemaDO.java
index 1a167e4..6fc2499 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsCodeGenSchemaDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeGenSchemaDO.java
@@ -1,13 +1,12 @@
-package com.vci.web.model;
+package com.vci.model;
+import com.vci.constant.BtmIdConstant;
+import com.vci.constant.EnumIdConstant;
import com.vci.starter.web.annotation.*;
import com.vci.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.starter.web.model.BaseModel;
-import com.vci.web.constant.BtmIdConstant;
-import com.vci.web.constant.EnumIdConstant;
import java.util.Date;
-
/**
* 浠ｇ爜鐢熸垚鏂规
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsCodeRuleDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeRuleDO.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsCodeRuleDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeRuleDO.java
index 2401980..2903707 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsCodeRuleDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeRuleDO.java
@@ -1,6 +1,8 @@
-package com.vci.web.model;
+package com.vci.model;
+import com.vci.constant.BtmIdConstant;
+import com.vci.constant.EnumIdConstant;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.annotation.VciBtmType;
import com.vci.starter.web.annotation.VciFieldType;
@@ -8,8 +10,6 @@
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
import com.vci.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.starter.web.model.BaseModel;
-import com.vci.web.constant.BtmIdConstant;
-import com.vci.web.constant.EnumIdConstant;
/**
* 涓氬姟琛ㄥ崟缂栫爜瑙勫垯
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsCodeRuleElementDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeRuleElementDO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsCodeRuleElementDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeRuleElementDO.java
index a19e25c..3087f50 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsCodeRuleElementDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeRuleElementDO.java
@@ -1,12 +1,12 @@
-package com.vci.web.model;
+package com.vci.model;
+import com.vci.constant.BtmIdConstant;
+import com.vci.constant.EnumIdConstant;
import com.vci.starter.web.annotation.*;
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
import com.vci.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.starter.web.model.BaseModel;
-import com.vci.web.constant.BtmIdConstant;
-import com.vci.web.constant.EnumIdConstant;
/**
* 缂栫爜瑙勫垯鐨勫厓绱�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsCodeSerialNumberDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeSerialNumberDO.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsCodeSerialNumberDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeSerialNumberDO.java
index ca58c78..e5dacca 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsCodeSerialNumberDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsCodeSerialNumberDO.java
@@ -1,12 +1,12 @@
-package com.vci.web.model;
+package com.vci.model;
+import com.vci.constant.BtmIdConstant;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.annotation.VciBtmType;
import com.vci.starter.web.annotation.VciUseRefer;
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
import com.vci.starter.web.model.BaseModel;
-import com.vci.web.constant.BtmIdConstant;
/**
* 缂栫爜娴佹按鍙风鐞�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsLifeCycleDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsLifeCycleDO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsLifeCycleDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsLifeCycleDO.java
index 49a83d5..1ed23e6 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsLifeCycleDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsLifeCycleDO.java
@@ -1,4 +1,4 @@
-package com.vci.web.model;
+package com.vci.model;
import com.vci.starter.web.annotation.*;
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsLinkTypeDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsLinkTypeDO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsLinkTypeDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsLinkTypeDO.java
index 6dce040..f81701b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsLinkTypeDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsLinkTypeDO.java
@@ -1,4 +1,4 @@
-package com.vci.web.model;
+package com.vci.model;
import com.vci.starter.web.annotation.*;
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsStatusDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsStatusDO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsStatusDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsStatusDO.java
index bd25fa0..aaf2423 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/OsStatusDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/OsStatusDO.java
@@ -1,4 +1,4 @@
-package com.vci.web.model;
+package com.vci.model;
import com.vci.starter.web.annotation.*;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/ProcessInstance.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/ProcessInstance.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/ProcessInstance.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/ProcessInstance.java
index aa7bb2f..3229678 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/ProcessInstance.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/ProcessInstance.java
@@ -1,4 +1,4 @@
-package com.vci.web.model;
+package com.vci.model;
import com.vci.starter.web.annotation.Transient;
import com.vci.starter.web.annotation.VciBtmType;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/ProcessTask.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/ProcessTask.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/ProcessTask.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/ProcessTask.java
index 725eeb4..0d25182 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/ProcessTask.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/ProcessTask.java
@@ -1,4 +1,4 @@
-package com.vci.web.model;
+package com.vci.model;
import com.vci.starter.web.annotation.Transient;
import com.vci.starter.web.annotation.VciBtmType;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/SmFavFunctionDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmFavFunctionDO.java
similarity index 93%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/SmFavFunctionDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmFavFunctionDO.java
index 75e5fdc..f8762a6 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/SmFavFunctionDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmFavFunctionDO.java
@@ -1,6 +1,6 @@
-package com.vci.web.model;
+package com.vci.model;
-import com.vci.frameworkcore.constant.FrameWorkBtmTypeConstant;
+import com.vci.constant.FrameWorkBtmTypeConstant;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.annotation.VciBtmType;
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmFunctionForPlatform1.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmFunctionForPlatform1.java
similarity index 95%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmFunctionForPlatform1.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmFunctionForPlatform1.java
index b0934fe..ee29c80 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmFunctionForPlatform1.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmFunctionForPlatform1.java
@@ -1,5 +1,6 @@
-package com.vci.frameworkcore.model;
+package com.vci.model;
+import com.vci.constant.FrameWorkBtmTypeConstant;
import com.vci.starter.web.annotation.VciBtmType;
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
@@ -8,7 +9,7 @@
* @author weidy
* @date 2020/2/27
*/
-@VciBtmType(name = "function",text = "绯荤粺鍔熻兘鑿滃崟",tableName = "PLFUNCTION",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
+@VciBtmType(name = FrameWorkBtmTypeConstant.SM_FUNCTION_BTM_TYPE,text = "绯荤粺鍔熻兘鑿滃崟",tableName = "PLFUNCTION",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
public class SmFunctionForPlatform1 implements java.io.Serializable{
/**
* 绂佹淇敼杩欎釜鍊�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmPasswordStrategyDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmPasswordStrategyDO.java
similarity index 95%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmPasswordStrategyDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmPasswordStrategyDO.java
index 9997330..e2ab0c1 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmPasswordStrategyDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmPasswordStrategyDO.java
@@ -1,5 +1,6 @@
-package com.vci.frameworkcore.model;
+package com.vci.model;
+import com.vci.constant.FrameWorkBtmTypeConstant;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.annotation.Transient;
import com.vci.starter.web.annotation.VciBtmType;
@@ -14,7 +15,7 @@
* @author weidy
* @date 2020/1/29
*/
-@VciBtmType(name = "passwordstrategy",text = "瀵嗙爜瀹夊叏绛栫暐",tableName = "PLPASSWORDSTRATEGY",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
+@VciBtmType(name = FrameWorkBtmTypeConstant.SM_PASSWORD_STRATEGY,text = "瀵嗙爜瀹夊叏绛栫暐",tableName = "PLPASSWORDSTRATEGY",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
@Transient
public class SmPasswordStrategyDO implements java.io.Serializable {
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmPasswordStrategyForPlatform1.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmPasswordStrategyForPlatform1.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmPasswordStrategyForPlatform1.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmPasswordStrategyForPlatform1.java
index 9c54ed9..c904f05 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmPasswordStrategyForPlatform1.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmPasswordStrategyForPlatform1.java
@@ -1,6 +1,6 @@
-package com.vci.frameworkcore.model;
+package com.vci.model;
-import com.vci.frameworkcore.constant.FrameWorkBtmTypeConstant;
+import com.vci.constant.FrameWorkBtmTypeConstant;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.annotation.VciBtmType;
import com.vci.starter.web.annotation.VciFieldType;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmRoleForPlatform1.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmRoleForPlatform1.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmRoleForPlatform1.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmRoleForPlatform1.java
index 6af3bdc..efde442 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmRoleForPlatform1.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmRoleForPlatform1.java
@@ -1,6 +1,6 @@
-package com.vci.frameworkcore.model;
+package com.vci.model;
-import com.vci.frameworkcore.constant.FrameWorkBtmTypeConstant;
+import com.vci.constant.FrameWorkBtmTypeConstant;
import com.vci.starter.web.annotation.VciBtmType;
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmUserDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmUserDO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmUserDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmUserDO.java
index 9eb31ee..a0d087d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmUserDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/SmUserDO.java
@@ -1,4 +1,4 @@
-package com.vci.frameworkcore.model;
+package com.vci.model;
import com.vci.starter.web.annotation.*;
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/VciFileDocClassifyDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileDocClassifyDO.java
similarity index 95%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/VciFileDocClassifyDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileDocClassifyDO.java
index c43ea66..23e6c61 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/VciFileDocClassifyDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileDocClassifyDO.java
@@ -1,6 +1,6 @@
-package com.vci.web.model;
+package com.vci.model;
-import com.vci.file.constant.VciFileBtmTypeConstant;
+import com.vci.constant.VciFileBtmTypeConstant;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.annotation.Transient;
import com.vci.starter.web.annotation.VciBtmType;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/VciFileObjectDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileObjectDO.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/VciFileObjectDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileObjectDO.java
index 336b8b6..a3bfe98 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/VciFileObjectDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileObjectDO.java
@@ -1,8 +1,8 @@
-package com.vci.web.model;
+package com.vci.model;
-import com.vci.file.constant.VciFileBtmTypeConstant;
-import com.vci.file.constant.VciFileDefaultValueConstant;
-import com.vci.file.constant.VciFileLifeConstant;
+import com.vci.constant.VciFileBtmTypeConstant;
+import com.vci.constant.VciFileDefaultValueConstant;
+import com.vci.constant.VciFileLifeConstant;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.annotation.Transient;
import com.vci.starter.web.annotation.VciBtmType;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/VciFileVolumeDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileVolumeDO.java
similarity index 94%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/VciFileVolumeDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileVolumeDO.java
index eb3521a..f9154cc 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/VciFileVolumeDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileVolumeDO.java
@@ -1,15 +1,14 @@
-package com.vci.web.model;
+package com.vci.model;
-import com.vci.file.constant.VciFileBtmTypeConstant;
-import com.vci.file.constant.VciFileEnumConstant;
+import com.vci.constant.FrameWorkDefaultValueConstant;
+import com.vci.constant.VciFileBtmTypeConstant;
+import com.vci.constant.VciFileEnumConstant;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.annotation.Transient;
import com.vci.starter.web.annotation.VciBtmType;
import com.vci.starter.web.annotation.VciUseEnum;
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import static com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant.FRAMEWORK_DATA_ENABLED;
/**
* 鏂囦粨鍗�
@@ -17,7 +16,7 @@
* @date 2020/3/12
*/
@VciBtmType(name = VciFileBtmTypeConstant.FILE_VOLUME,tableName = "plvolume",text = "鏂囦粨绠＄悊",lifeCycle =
- FrameWorkLcStatusConstant.FRAME_WORK_LIFE_CYCLE_NAME,startStatus = FRAMEWORK_DATA_ENABLED)
+ FrameWorkLcStatusConstant.FRAME_WORK_LIFE_CYCLE_NAME,startStatus = FrameWorkDefaultValueConstant.FRAMEWORK_DATA_ENABLED)
@Transient
public class VciFileVolumeDO implements java.io.Serializable{
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/WFProcessClassifyDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/WFProcessClassifyDO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/WFProcessClassifyDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/WFProcessClassifyDO.java
index 201c59a..9b685e4 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/WFProcessClassifyDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/WFProcessClassifyDO.java
@@ -1,4 +1,4 @@
-package com.vci.web.model;
+package com.vci.model;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.annotation.Transient;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/WFProcessTemplateDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/WFProcessTemplateDO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/WFProcessTemplateDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/WFProcessTemplateDO.java
index 82b6b88..fb0c74a 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/WFProcessTemplateDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/WFProcessTemplateDO.java
@@ -1,4 +1,4 @@
-package com.vci.web.model;
+package com.vci.model;
import com.vci.starter.web.annotation.Column;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/WFWorkflowNodeFavDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/WFWorkflowNodeFavDO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/WFWorkflowNodeFavDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/WFWorkflowNodeFavDO.java
index b97fd3d..77ebcbd 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/WFWorkflowNodeFavDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/WFWorkflowNodeFavDO.java
@@ -1,4 +1,4 @@
-package com.vci.web.model;
+package com.vci.model;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.annotation.VciBtmType;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/WFWorkflowNodeFavItemDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/WFWorkflowNodeFavItemDO.java
similarity index 95%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/WFWorkflowNodeFavItemDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/WFWorkflowNodeFavItemDO.java
index dcb6ca6..b577b7d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/WFWorkflowNodeFavItemDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/WFWorkflowNodeFavItemDO.java
@@ -1,6 +1,5 @@
-package com.vci.web.model;
+package com.vci.model;
-import com.vci.frameworkcore.constant.FrameWorkBtmTypeConstant;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.annotation.VciBtmType;
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/WebHomeTaskActionDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/WebHomeTaskActionDO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/WebHomeTaskActionDO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/WebHomeTaskActionDO.java
index 54e0ffb..4cb1ccc 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/WebHomeTaskActionDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/WebHomeTaskActionDO.java
@@ -1,4 +1,4 @@
-package com.vci.web.model;
+package com.vci.model;
import com.vci.starter.web.annotation.Column;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/BatchCBO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/BatchCBO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/BatchCBO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/BatchCBO.java
index cd8b141..1ea92d9 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/BatchCBO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/BatchCBO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import com.vci.corba.omd.data.BusinessObject;
import com.vci.corba.omd.data.LinkObject;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/BdSelectInputCharVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/BdSelectInputCharVO.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/BdSelectInputCharVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/BdSelectInputCharVO.java
index 38d6257..eba38e5 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/BdSelectInputCharVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/BdSelectInputCharVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.lang.*;
import java.util.Date;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/KeyValue.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/KeyValue.java
similarity index 95%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/KeyValue.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/KeyValue.java
index 90a4946..1c404a9 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/KeyValue.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/KeyValue.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.HashMap;
import java.util.Map;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/LinkTypeInfoVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/LinkTypeInfoVO.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/LinkTypeInfoVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/LinkTypeInfoVO.java
index c8abc1e..822c7b4 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/LinkTypeInfoVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/LinkTypeInfoVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
/**
* 閾炬帴绫诲瀷鐨勪俊鎭�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/MenuVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/MenuVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java
index 275262d..48769fb 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/MenuVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java
@@ -1,5 +1,5 @@
-package com.vci.frameworkcore.pagemodel;
+package com.vci.pagemodel;
import java.util.HashMap;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/OrgDepartmentVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OrgDepartmentVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/OrgDepartmentVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OrgDepartmentVO.java
index 20344e8..6040f84 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/OrgDepartmentVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OrgDepartmentVO.java
@@ -1,4 +1,4 @@
-package com.vci.frameworkcore.pagemodel;
+package com.vci.pagemodel;
import com.vci.starter.web.pagemodel.BaseModelVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/OrgDutyVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OrgDutyVO.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/OrgDutyVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OrgDutyVO.java
index 9a37401..81ce801 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/OrgDutyVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OrgDutyVO.java
@@ -1,4 +1,4 @@
-package com.vci.frameworkcore.pagemodel;
+package com.vci.pagemodel;
import com.vci.starter.web.pagemodel.BaseModelVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsAttributeVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsAttributeVO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsAttributeVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsAttributeVO.java
index 96db0fc..fcaacaa 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsAttributeVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsAttributeVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.Date;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsBtmTypeAttributeVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeAttributeVO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsBtmTypeAttributeVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeAttributeVO.java
index ad5d080..b03a021 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsBtmTypeAttributeVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeAttributeVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.Date;
import java.util.Map;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsBtmTypeVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsBtmTypeVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java
index 605e212..5283769 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsBtmTypeVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.Date;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsCodeEnumVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsCodeEnumVO.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsCodeEnumVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsCodeEnumVO.java
index e7ed23b..fdbee09 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsCodeEnumVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsCodeEnumVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
/**
* 缂栫爜瑙勫垯涓灇涓剧殑鏄犲皠淇℃伅
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsCodeGenSchemaVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsCodeGenSchemaVO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsCodeGenSchemaVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsCodeGenSchemaVO.java
index 6e2a194..a407e09 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsCodeGenSchemaVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsCodeGenSchemaVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import com.vci.starter.web.pagemodel.BaseModelVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsCodeResultVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsCodeResultVO.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsCodeResultVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsCodeResultVO.java
index 67793b1..6ee50e5 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsCodeResultVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsCodeResultVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
/**
* 缂栫爜鐢熸垚鐨勭粨鏋滃璞�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsCodeRuleElementVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsCodeRuleElementVO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsCodeRuleElementVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsCodeRuleElementVO.java
index 0d7b68a..7a6525c 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsCodeRuleElementVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsCodeRuleElementVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import com.vci.starter.web.pagemodel.BaseModelVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsCodeRuleVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsCodeRuleVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsCodeRuleVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsCodeRuleVO.java
index 380e591..a8e91bd 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsCodeRuleVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsCodeRuleVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import com.vci.starter.web.pagemodel.BaseModelVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsERNodePropertyVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsERNodePropertyVO.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsERNodePropertyVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsERNodePropertyVO.java
index 2b54139..d34fd59 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsERNodePropertyVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsERNodePropertyVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
/**
* E-R鍥剧殑鑺傜偣灞炴��
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsERNodeVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsERNodeVO.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsERNodeVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsERNodeVO.java
index acf5ccc..7dd848a 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsERNodeVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsERNodeVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsERRelationVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsERRelationVO.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsERRelationVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsERRelationVO.java
index 40d855c..10e4a81 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsERRelationVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsERRelationVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
/**
* ER鍥剧殑浜嗛摼鎺ュ叧绯�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsERVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsERVO.java
similarity index 94%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsERVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsERVO.java
index fb9ebd4..9ac7725 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsERVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsERVO.java
@@ -1,7 +1,6 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.List;
-import java.util.Map;
/**
* E-R鍥剧殑鏄剧ず鍐呭
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsEnumItemVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsEnumItemVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsEnumItemVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsEnumItemVO.java
index 12e051c..cf5b330 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsEnumItemVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsEnumItemVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.Date;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsEnumVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsEnumVO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsEnumVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsEnumVO.java
index 1e82fd8..74f81e8 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsEnumVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsEnumVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.Date;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsLifeCycleLineBoundVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLifeCycleLineBoundVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsLifeCycleLineBoundVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLifeCycleLineBoundVO.java
index f685b8e..715f62a 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsLifeCycleLineBoundVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLifeCycleLineBoundVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
/**
* 鐢熷懡鍛ㄦ湡鐨勮繛鎺ョ嚎
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsLifeCycleLineEventVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLifeCycleLineEventVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsLifeCycleLineEventVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLifeCycleLineEventVO.java
index ed039f1..65179e1 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsLifeCycleLineEventVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLifeCycleLineEventVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.Date;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsLifeCycleLineVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLifeCycleLineVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsLifeCycleLineVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLifeCycleLineVO.java
index 286bd25..927f5de 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsLifeCycleLineVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLifeCycleLineVO.java
@@ -1,7 +1,6 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.Date;
-import java.util.List;
/**
* 鐢熷懡鍛ㄦ湡杩炴帴绾�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsLifeCycleVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLifeCycleVO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsLifeCycleVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLifeCycleVO.java
index c6d0f5b..e657789 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsLifeCycleVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLifeCycleVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.Arrays;
import java.util.Date;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsLinkTypeAttributeVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLinkTypeAttributeVO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsLinkTypeAttributeVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLinkTypeAttributeVO.java
index 1e8d74f..e5b4345 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsLinkTypeAttributeVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLinkTypeAttributeVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.Date;
import java.util.Map;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsLinkTypeVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLinkTypeVO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsLinkTypeVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLinkTypeVO.java
index caa5416..493f095 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsLinkTypeVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsLinkTypeVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.Date;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsRevisionRuleVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsRevisionRuleVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsRevisionRuleVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsRevisionRuleVO.java
index ac36ee3..1144d97 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsRevisionRuleVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsRevisionRuleVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.Date;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsStatusVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsStatusVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsStatusVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsStatusVO.java
index 3847112..ce790e9 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsStatusVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsStatusVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.Date;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsUsedAttributeVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsUsedAttributeVO.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsUsedAttributeVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsUsedAttributeVO.java
index ad3dc90..220d9af 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/OsUsedAttributeVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsUsedAttributeVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
/**
* 寮曠敤灞炴�х殑涓氬姟绫诲瀷鎴栬�呴摼鎺ョ被鍨�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessClassifyVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessClassifyVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessClassifyVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessClassifyVO.java
index 958a158..ec727a9 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessClassifyVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessClassifyVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.Date;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessHistoryVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessHistoryVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessHistoryVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessHistoryVO.java
index 367f295..26f0209 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessHistoryVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessHistoryVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
/**
* 娴佺▼鍘嗗彶淇℃伅
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessInstanceVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessInstanceVO.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessInstanceVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessInstanceVO.java
index da02172..8500b32 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessInstanceVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessInstanceVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import com.vci.starter.web.pagemodel.BaseModelVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessNodeVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessNodeVO.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessNodeVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessNodeVO.java
index 4420b31..670caf0 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessNodeVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessNodeVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.ArrayList;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessOutcomeVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessOutcomeVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessOutcomeVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessOutcomeVO.java
index c660744..0d9df59 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessOutcomeVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessOutcomeVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.*;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessTaskVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessTaskVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessTaskVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessTaskVO.java
index 83db027..e9b7867 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessTaskVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessTaskVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.Date;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessUserVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessUserVO.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessUserVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessUserVO.java
index 7b27a5e..168ea64 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ProcessUserVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ProcessUserVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.ArrayList;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ReferConfigVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ReferConfigVO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ReferConfigVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ReferConfigVO.java
index c7d27ee..490cef8 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/ReferConfigVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ReferConfigVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.HashMap;
import java.util.Map;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmFunctionVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/SmFunctionVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmFunctionVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/SmFunctionVO.java
index a7048f4..3110724 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmFunctionVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/SmFunctionVO.java
@@ -1,4 +1,4 @@
-package com.vci.frameworkcore.pagemodel;
+package com.vci.pagemodel;
import com.vci.starter.web.pagemodel.BaseModelVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/SmOperationVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/SmOperationVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/SmOperationVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/SmOperationVO.java
index e851479..0cb2c4a 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/SmOperationVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/SmOperationVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
/**
* 鑿滃崟鐨勬寜閽璞�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmPasswordStrategyVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/SmPasswordStrategyVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmPasswordStrategyVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/SmPasswordStrategyVO.java
index 2598d78..1bffa16 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmPasswordStrategyVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/SmPasswordStrategyVO.java
@@ -1,4 +1,4 @@
-package com.vci.frameworkcore.pagemodel;
+package com.vci.pagemodel;
import com.vci.starter.web.pagemodel.BaseModelVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmRoleVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/SmRoleVO.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmRoleVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/SmRoleVO.java
index f934f9e..a16b587 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmRoleVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/SmRoleVO.java
@@ -1,4 +1,4 @@
-package com.vci.frameworkcore.pagemodel;
+package com.vci.pagemodel;
import com.vci.starter.web.pagemodel.BaseModelVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmUserVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/SmUserVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmUserVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/SmUserVO.java
index 909f184..5c30bde 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmUserVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/SmUserVO.java
@@ -1,5 +1,4 @@
-package com.vci.frameworkcore.pagemodel;
-import com.vci.common.annotaion.CustomAnnotaion;
+package com.vci.pagemodel;
import com.vci.starter.web.pagemodel.BaseModelVO;
import java.util.Date;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/TreeSettingVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/TreeSettingVO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/TreeSettingVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/TreeSettingVO.java
index c99774b..4db8787 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/TreeSettingVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/TreeSettingVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.HashMap;
import java.util.Map;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIActionVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIActionVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIActionVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIActionVO.java
index cb2ea06..c570c12 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIActionVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIActionVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.Date;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIButtonDefineVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIButtonDefineVO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIButtonDefineVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIButtonDefineVO.java
index dbe1917..1f466c6 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIButtonDefineVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIButtonDefineVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.Date;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIComponentVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIComponentVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIComponentVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIComponentVO.java
index 8491d06..653208f 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIComponentVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIComponentVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import com.vci.starter.web.pagemodel.BaseModelVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIContentVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIContentVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIContentVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIContentVO.java
index da70827..c803002 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIContentVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIContentVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import com.vci.starter.web.pagemodel.BaseModelVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIFieldSortVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIFieldSortVO.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIFieldSortVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIFieldSortVO.java
index 0628976..f961224 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIFieldSortVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIFieldSortVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
/**
* 瀛楁鐨勬帓搴�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIFormDataVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIFormDataVO.java
similarity index 94%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIFormDataVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIFormDataVO.java
index c2414a2..85d2dc6 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIFormDataVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIFormDataVO.java
@@ -1,6 +1,4 @@
-package com.vci.web.pageModel;
-
-import com.vci.file.pagemodel.VciFileObjectVO;
+package com.vci.pagemodel;
import java.util.List;
import java.util.Map;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIFormDefineVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIFormDefineVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIFormDefineVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIFormDefineVO.java
index 8d56687..844ec4d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIFormDefineVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIFormDefineVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.ArrayList;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIFormItemVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIFormItemVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIFormItemVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIFormItemVO.java
index 59771c3..5c335a7 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIFormItemVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIFormItemVO.java
@@ -1,6 +1,5 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIFormReferVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIFormReferVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIFormReferVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIFormReferVO.java
index 08c0967..efef848 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UIFormReferVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UIFormReferVO.java
@@ -1,6 +1,5 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
-import java.util.List;
import java.util.Map;
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UILayoutVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UILayoutVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UILayoutVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UILayoutVO.java
index 4e888d0..ea9f20e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UILayoutVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UILayoutVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import com.vci.starter.web.pagemodel.BaseModelVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UITableCustomDefineVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITableCustomDefineVO.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UITableCustomDefineVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITableCustomDefineVO.java
index 615258f..a024242 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UITableCustomDefineVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITableCustomDefineVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UITableDefineVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITableDefineVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UITableDefineVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITableDefineVO.java
index f438bf0..f26c66c 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UITableDefineVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITableDefineVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.ArrayList;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UITableFieldVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITableFieldVO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UITableFieldVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITableFieldVO.java
index e797ef0..f65b9f6 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UITableFieldVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITableFieldVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import java.util.ArrayList;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UITablePageVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITablePageVO.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UITablePageVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITablePageVO.java
index d129e59..2aef469 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UITablePageVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITablePageVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
/**
* 琛ㄦ牸鐨勫垎椤靛璞�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UITreeDefineVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITreeDefineVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UITreeDefineVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITreeDefineVO.java
index c259c95..f779f10 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UITreeDefineVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITreeDefineVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
/**
* 鏍戠殑閰嶇疆
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UITreeTableDefineVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITreeTableDefineVO.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UITreeTableDefineVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITreeTableDefineVO.java
index c128db1..9ad671e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/UITreeTableDefineVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITreeTableDefineVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
/**
* 鏍戣〃瀹氫箟
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/VciFileDocClassifyVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/VciFileDocClassifyVO.java
new file mode 100644
index 0000000..2af324d
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/VciFileDocClassifyVO.java
@@ -0,0 +1,45 @@
+package com.vci.pagemodel;
+
+import com.vci.starter.web.pagemodel.BaseModelVO;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 14:19
+ */
+public class VciFileDocClassifyVO extends BaseModelVO {
+ private static final long serialVersionUID = 1445799225556572873L;
+ private String id;
+ private String name;
+ private String description;
+
+ public VciFileDocClassifyVO() {
+ }
+
+ public String getId() {
+ return this.id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return this.description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String toString() {
+ return "VciFileDocClassifyVO{id='" + this.id + '\'' + ", name='" + this.name + '\'' + ", description='" + this.description + '\'' + "} " + super.toString();
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/VciFileObjectVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/VciFileObjectVO.java
new file mode 100644
index 0000000..b1ae9fa
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/VciFileObjectVO.java
@@ -0,0 +1,136 @@
+package com.vci.pagemodel;
+
+import com.vci.starter.web.pagemodel.BaseModelVO;
+
+/**
+ * 鏂囦欢VO瀵硅薄
+ * @author ludc
+ * @date 2024/7/16 11:37
+ */
+public class VciFileObjectVO extends BaseModelVO {
+ private static final long serialVersionUID = 8631070862210420279L;
+ private String id;
+ private String name;
+ private String fileExtension;
+ private String fileDocClassify;
+ private String fileDocClassifyName;
+ private long fileSize;
+ private String keyInfos;
+ private String ownbizOid;
+ private String ownBtmname;
+ private Integer downloadCount;
+ private String pkFileVolume;
+ private String filePath;
+ private String sourceFilePath;
+
+ public VciFileObjectVO() {
+ }
+
+ public String getId() {
+ return this.id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getFileExtension() {
+ return this.fileExtension;
+ }
+
+ public void setFileExtension(String fileExtension) {
+ this.fileExtension = fileExtension;
+ }
+
+ public long getFileSize() {
+ return this.fileSize;
+ }
+
+ public void setFileSize(long fileSize) {
+ this.fileSize = fileSize;
+ }
+
+ public String getKeyInfos() {
+ return this.keyInfos;
+ }
+
+ public void setKeyInfos(String keyInfos) {
+ this.keyInfos = keyInfos;
+ }
+
+ public String getOwnbizOid() {
+ return this.ownbizOid;
+ }
+
+ public void setOwnbizOid(String ownbizOid) {
+ this.ownbizOid = ownbizOid;
+ }
+
+ public String getOwnBtmname() {
+ return this.ownBtmname;
+ }
+
+ public void setOwnBtmname(String ownBtmname) {
+ this.ownBtmname = ownBtmname;
+ }
+
+ public Integer getDownloadCount() {
+ return this.downloadCount;
+ }
+
+ public void setDownloadCount(Integer downloadCount) {
+ this.downloadCount = downloadCount;
+ }
+
+ public String getFileDocClassify() {
+ return this.fileDocClassify;
+ }
+
+ public void setFileDocClassify(String fileDocClassify) {
+ this.fileDocClassify = fileDocClassify;
+ }
+
+ public String getFileDocClassifyName() {
+ return this.fileDocClassifyName;
+ }
+
+ public void setFileDocClassifyName(String fileDocClassifyName) {
+ this.fileDocClassifyName = fileDocClassifyName;
+ }
+
+ public String getPkFileVolume() {
+ return this.pkFileVolume;
+ }
+
+ public void setPkFileVolume(String pkFileVolume) {
+ this.pkFileVolume = pkFileVolume;
+ }
+
+ public String getFilePath() {
+ return this.filePath;
+ }
+
+ public void setFilePath(String filePath) {
+ this.filePath = filePath;
+ }
+
+ public String getSourceFilePath() {
+ return this.sourceFilePath;
+ }
+
+ public void setSourceFilePath(String sourceFilePath) {
+ this.sourceFilePath = sourceFilePath;
+ }
+
+ public String toString() {
+ return "VciFileObjectVO{id='" + this.id + '\'' + ", name='" + this.name + '\'' + ", fileExtension='" + this.fileExtension + '\'' + ", fileDocClassify='" + this.fileDocClassify + '\'' + ", fileDocClassifyName='" + this.fileDocClassifyName + '\'' + ", fileSize=" + this.fileSize + ", keyInfos='" + this.keyInfos + '\'' + ", ownbizOid='" + this.ownbizOid + '\'' + ", ownBtmname='" + this.ownBtmname + '\'' + ", downloadCount=" + this.downloadCount + ", pkFileVolume='" + this.pkFileVolume + '\'' + ", filePath='" + this.filePath + '\'' + ", sourceFilePath='" + this.sourceFilePath + '\'' + '}';
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/VciFilePreviewConfigVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/VciFilePreviewConfigVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/VciFilePreviewConfigVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/VciFilePreviewConfigVO.java
index 4aba605..73b0d0f 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/VciFilePreviewConfigVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/VciFilePreviewConfigVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
/**
* 鏂囦欢棰勮鐨勯厤缃樉绀哄璞�
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/VciFileShareResultVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/VciFileShareResultVO.java
new file mode 100644
index 0000000..a46fd9e
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/VciFileShareResultVO.java
@@ -0,0 +1,43 @@
+package com.vci.pagemodel;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 14:46
+ */
+public class VciFileShareResultVO extends VciFileObjectVO {
+ private static final long serialVersionUID = -4954618652801269876L;
+ private String sourceFileOid;
+ private String sourceOwnbizOid;
+ private String sourceBtmName;
+
+ public VciFileShareResultVO() {
+ }
+
+ public String getSourceFileOid() {
+ return this.sourceFileOid;
+ }
+
+ public void setSourceFileOid(String sourceFileOid) {
+ this.sourceFileOid = sourceFileOid;
+ }
+
+ public String getSourceOwnbizOid() {
+ return this.sourceOwnbizOid;
+ }
+
+ public void setSourceOwnbizOid(String sourceOwnbizOid) {
+ this.sourceOwnbizOid = sourceOwnbizOid;
+ }
+
+ public String getSourceBtmName() {
+ return this.sourceBtmName;
+ }
+
+ public void setSourceBtmName(String sourceBtmName) {
+ this.sourceBtmName = sourceBtmName;
+ }
+
+ public String toString() {
+ return "VciFileShareResultVO{sourceFileOid='" + this.sourceFileOid + '\'' + ", sourceOwnbizOid='" + this.sourceOwnbizOid + '\'' + ", sourceBtmName='" + this.sourceBtmName + '\'' + "} " + super.toString();
+ }
+}
\ No newline at end of file
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/VciFileVolumeVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/VciFileVolumeVO.java
new file mode 100644
index 0000000..69d2ee8
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/VciFileVolumeVO.java
@@ -0,0 +1,144 @@
+package com.vci.pagemodel;
+
+import com.vci.starter.web.pagemodel.BaseModelVO;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 14:22
+ */
+public class VciFileVolumeVO extends BaseModelVO {
+ private static final long serialVersionUID = -8705455753001336641L;
+ private String id;
+ private String name;
+ private String description;
+ private String volumePath;
+ private String serviceOsType;
+ private String serviceOsTypeText;
+ private String transProtocol;
+ private String transProtocolText;
+ private String serviceUrl;
+ private String transUser;
+ private String transUserPwd;
+ private String maxVolume;
+ private String currentVolume;
+ private String lastSyncTimeLong;
+
+ public VciFileVolumeVO() {
+ }
+
+ public String getId() {
+ return this.id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return this.description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getVolumePath() {
+ return this.volumePath;
+ }
+
+ public void setVolumePath(String volumePath) {
+ this.volumePath = volumePath;
+ }
+
+ public String getServiceOsType() {
+ return this.serviceOsType;
+ }
+
+ public void setServiceOsType(String serviceOsType) {
+ this.serviceOsType = serviceOsType;
+ }
+
+ public String getTransProtocol() {
+ return this.transProtocol;
+ }
+
+ public void setTransProtocol(String transProtocol) {
+ this.transProtocol = transProtocol;
+ }
+
+ public String getTransProtocolText() {
+ return this.transProtocolText;
+ }
+
+ public void setTransProtocolText(String transProtocolText) {
+ this.transProtocolText = transProtocolText;
+ }
+
+ public String getServiceUrl() {
+ return this.serviceUrl;
+ }
+
+ public void setServiceUrl(String serviceUrl) {
+ this.serviceUrl = serviceUrl;
+ }
+
+ public String getTransUser() {
+ return this.transUser;
+ }
+
+ public void setTransUser(String transUser) {
+ this.transUser = transUser;
+ }
+
+ public String getTransUserPwd() {
+ return this.transUserPwd;
+ }
+
+ public void setTransUserPwd(String transUserPwd) {
+ this.transUserPwd = transUserPwd;
+ }
+
+ public String getMaxVolume() {
+ return this.maxVolume;
+ }
+
+ public void setMaxVolume(String maxVolume) {
+ this.maxVolume = maxVolume;
+ }
+
+ public String getCurrentVolume() {
+ return this.currentVolume;
+ }
+
+ public void setCurrentVolume(String currentVolume) {
+ this.currentVolume = currentVolume;
+ }
+
+ public String getLastSyncTimeLong() {
+ return this.lastSyncTimeLong;
+ }
+
+ public void setLastSyncTimeLong(String lastSyncTimeLong) {
+ this.lastSyncTimeLong = lastSyncTimeLong;
+ }
+
+ public String getServiceOsTypeText() {
+ return this.serviceOsTypeText;
+ }
+
+ public void setServiceOsTypeText(String serviceOsTypeText) {
+ this.serviceOsTypeText = serviceOsTypeText;
+ }
+
+ public String toString() {
+ return "VciFileVolumeVO{id='" + this.id + '\'' + ", name='" + this.name + '\'' + ", description='" + this.description + '\'' + ", volumePath='" + this.volumePath + '\'' + ", serviceOsType='" + this.serviceOsType + '\'' + ", serviceOsTypeText='" + this.serviceOsTypeText + '\'' + ", transProtocol='" + this.transProtocol + '\'' + ", transProtocolText='" + this.transProtocolText + '\'' + ", serviceUrl='" + this.serviceUrl + '\'' + ", transUser='" + this.transUser + '\'' + ", transUserPwd='" + this.transUserPwd + '\'' + ", maxVolume='" + this.maxVolume + '\'' + ", currentVolume='" + this.currentVolume + '\'' + ", lastSyncTimeLong='" + this.lastSyncTimeLong + '\'' + "} " + super.toString();
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/WFWorkflowNodeFavItemVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/WFWorkflowNodeFavItemVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/WFWorkflowNodeFavItemVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/WFWorkflowNodeFavItemVO.java
index e6c2cce..79484fc 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/WFWorkflowNodeFavItemVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/WFWorkflowNodeFavItemVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import com.vci.starter.web.pagemodel.BaseModelVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/WFWorkflowNodeFavVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/WFWorkflowNodeFavVO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/WFWorkflowNodeFavVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/WFWorkflowNodeFavVO.java
index 2e8f524..cd7a122 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/WFWorkflowNodeFavVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/WFWorkflowNodeFavVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import com.vci.starter.web.pagemodel.BaseModelVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/WebHomeTaskActionVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/WebHomeTaskActionVO.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/WebHomeTaskActionVO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/WebHomeTaskActionVO.java
index 0e74305..0298397 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/pageModel/WebHomeTaskActionVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/WebHomeTaskActionVO.java
@@ -1,4 +1,4 @@
-package com.vci.web.pageModel;
+package com.vci.pagemodel;
import com.vci.starter.web.model.BaseModel;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/po/OrgDeptPO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OrgDeptPO.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/po/OrgDeptPO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OrgDeptPO.java
index 5929c19..7d16413 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/po/OrgDeptPO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OrgDeptPO.java
@@ -1,4 +1,4 @@
-package com.vci.frameworkcore.model.po;
+package com.vci.po;
import com.vci.starter.poi.annotation.ExcelColumn;
import com.vci.starter.web.pagemodel.BaseModelVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/po/SmRolePO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/SmRolePO.java
similarity index 94%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/po/SmRolePO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/SmRolePO.java
index bf2d53d..20f26ef 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/po/SmRolePO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/SmRolePO.java
@@ -1,4 +1,4 @@
-package com.vci.frameworkcore.model.po;
+package com.vci.po;
import com.vci.starter.poi.annotation.ExcelColumn;
import com.vci.starter.web.pagemodel.BaseModelVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/po/SmUserPO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/SmUserPO.java
similarity index 95%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/po/SmUserPO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/SmUserPO.java
index efaabd7..192eda0 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/po/SmUserPO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/SmUserPO.java
@@ -1,12 +1,10 @@
-package com.vci.frameworkcore.model.po;
+package com.vci.po;
import com.vci.starter.poi.annotation.ExcelColumn;
import com.vci.starter.web.pagemodel.BaseModelVO;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
-
-import java.util.Date;
/**
* 鐢ㄦ埛鐨勫鍏ュ鍑哄璞�
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/properties/VciFileTransProperties.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/properties/VciFileTransProperties.java
new file mode 100644
index 0000000..9710389
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/properties/VciFileTransProperties.java
@@ -0,0 +1,50 @@
+package com.vci.properties;
+
+import com.vci.enumpck.VciFileTransProtocolEnum;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 14:49
+ */
+@Configuration
+@ConfigurationProperties(
+ prefix = "vci.file"
+)
+public class VciFileTransProperties {
+ private VciFileTransProtocolEnum transProtocal;
+ private String checkTableExist;
+ private String zipCharset = "GBK";
+
+ public VciFileTransProperties() {
+ }
+
+ public VciFileTransProtocolEnum getTransProtocal() {
+ return this.transProtocal;
+ }
+
+ public void setTransProtocal(VciFileTransProtocolEnum transProtocal) {
+ this.transProtocal = transProtocal;
+ }
+
+ public String getCheckTableExist() {
+ return this.checkTableExist;
+ }
+
+ public void setCheckTableExist(String checkTableExist) {
+ this.checkTableExist = checkTableExist;
+ }
+
+ public String getZipCharset() {
+ return this.zipCharset;
+ }
+
+ public void setZipCharset(String zipCharset) {
+ this.zipCharset = zipCharset;
+ }
+
+ public String toString() {
+ return "VciFileTransProperties{transProtocal=" + this.transProtocal + ", checkTableExist='" + this.checkTableExist + '\'' + ", zipCharset='" + this.zipCharset + '\'' + '}';
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileDocClassifyProvider.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileDocClassifyProvider.java
new file mode 100644
index 0000000..4e10948
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileDocClassifyProvider.java
@@ -0,0 +1,44 @@
+package com.vci.provider;
+
+import com.vci.dto.VciFileDocClassifyDTO;
+import com.vci.dto.VciFileDocClassifyDTOList;
+import com.vci.pagemodel.VciFileDocClassifyVO;
+import com.vci.starter.web.pagemodel.BaseQueryObject;
+import com.vci.starter.web.pagemodel.BaseResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 14:40
+ */
+@FeignClient(
+ name = "vciFileDocClassifyProvider",
+ url = "${vciPlatform.fileServiceUrl:http://localhost:19000/fileService}",
+ path = "vciFileDocClassifyController"
+)
+public interface VciFileDocClassifyProvider {
+ @PostMapping({"/gridVciFileDocClassify"})
+ BaseResult<VciFileDocClassifyVO> gridVciFileDocClassify(@RequestBody BaseQueryObject var1);
+
+ @GetMapping({"/getFileDocClassifyById"})
+ BaseResult<VciFileDocClassifyVO> getFileDocClassifyById(@RequestParam("id") String var1);
+
+ @GetMapping({"/listFileDocClassifyByIds"})
+ BaseResult<VciFileDocClassifyVO> listFileDocClassifyByIds(@RequestParam("ids") String var1);
+
+ @GetMapping({"/checkClassifyIdExist"})
+ BaseResult checkClassifyIdExist(@RequestParam("id") String var1);
+
+ @GetMapping({"/checkClassifyIdsExist"})
+ BaseResult checkClassifyIdsExist(@RequestParam("ids") String var1);
+
+ @PostMapping({"/addSaveForFegin"})
+ BaseResult addFileDocClassify(@RequestBody VciFileDocClassifyDTO var1);
+
+ @PostMapping({"/batchAddSave"})
+ BaseResult batchAddClassify(@RequestBody VciFileDocClassifyDTOList var1);
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileDownloadProvider.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileDownloadProvider.java
new file mode 100644
index 0000000..6f27976
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileDownloadProvider.java
@@ -0,0 +1,24 @@
+package com.vci.provider;
+
+import com.vci.starter.web.pagemodel.BaseResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 14:44
+ */
+@FeignClient(
+ name = "VciFileDownloadProvider",
+ url = "${vciPlatform.fileServiceUrl:http://localhost:19000/fileService}",
+ path = "vciFileDownloadController"
+)
+public interface VciFileDownloadProvider {
+ @PostMapping({"/sectionDownloadByFileOid"})
+ BaseResult<byte[]> sectionDownloadByFileOid(@RequestParam("fileOid") String var1, @RequestParam("offSet") long var2);
+
+ @DeleteMapping({"/deleteFile"})
+ BaseResult deleteFile(@RequestParam("fileOids") String var1);
+}
\ No newline at end of file
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileQueryProvider.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileQueryProvider.java
new file mode 100644
index 0000000..417c0b3
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileQueryProvider.java
@@ -0,0 +1,43 @@
+package com.vci.provider;
+
+import com.vci.pagemodel.VciFileObjectVO;
+import com.vci.starter.web.pagemodel.BaseResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 14:45
+ */
+@FeignClient(
+ name = "vciFileQueryProvider",
+ url = "${vciPlatform.fileServiceUrl:http://localhost:19000/fileService}",
+ path = "vciFileQueryController"
+)
+public interface VciFileQueryProvider {
+ @GetMapping({"/listFilesByOwnbiz"})
+ BaseResult<VciFileObjectVO> listFilesByOwnbiz(@RequestParam("ownbizOid") String var1, @RequestParam("ownbizBtm") String var2);
+
+ @GetMapping({"/listFilesByOwnbizAndClassify"})
+ BaseResult<VciFileObjectVO> listFilesByOwnbizAndClassify(@RequestParam("ownbizOid") String var1, @RequestParam("ownbizBtm") String var2, @RequestParam("docClassifyId") String var3);
+
+ @GetMapping({"/batchListFilesByOwnbizAndClassify"})
+ BaseResult<VciFileObjectVO> batchListFilesByOwnbizAndClassify(@RequestParam("ownbizOids") String var1, @RequestParam("ownbizBtm") String var2, @RequestParam("docClassifyId") String var3);
+
+ @GetMapping({"/getFileObjectByOid"})
+ BaseResult<VciFileObjectVO> getFileObjectByOid(@RequestParam("oid") String var1);
+
+ @GetMapping({"/batchListFilesByOids"})
+ BaseResult<VciFileObjectVO> batchListFilesByOids(@RequestParam("oids") String var1);
+
+ @PutMapping({"/releasedFileByOid"})
+ BaseResult<VciFileObjectVO> releasedFile(@RequestParam("fileOids") String var1);
+
+ @GetMapping({"/listFileObjectByKeyInfo"})
+ BaseResult<VciFileObjectVO> listFileObjectByKeyInfo(@RequestParam("keyInfo") String var1, @RequestParam("docClassifyId") String var2);
+
+ @GetMapping({"/countByKeyInfo"})
+ BaseResult<Long> countByKeyInfo(@RequestParam("keyInfo") String var1, @RequestParam("docClassifyId") String var2);
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileUploadProvider.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileUploadProvider.java
new file mode 100644
index 0000000..fd05ff7
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileUploadProvider.java
@@ -0,0 +1,50 @@
+package com.vci.provider;
+
+import com.vci.dto.VciFileObjectDTO;
+import com.vci.dto.VciFileShareHasClassifyDTO;
+import com.vci.pagemodel.VciFileObjectVO;
+import com.vci.pagemodel.VciFileShareResultVO;
+import com.vci.starter.web.pagemodel.BaseResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Collection;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 14:45
+ */
+@FeignClient(
+ name = "vciFileUploadProvider",
+ url = "${vciPlatform.fileServiceUrl:http://localhost:19000/fileService}",
+ path = "vciFileUploadController"
+)
+public interface VciFileUploadProvider {
+ @PostMapping({"/initUploadFileInfo"})
+ BaseResult<VciFileObjectVO> initUploadFileInfo(@RequestBody VciFileObjectDTO var1);
+
+ @PostMapping(
+ value = {"/uploadFileForOtherService"},
+ consumes = {"multipart/form-data"}
+ )
+ BaseResult<VciFileObjectVO> uploadFileForOtherService(@RequestPart("file") MultipartFile var1, @RequestParam("offSet") long var2, @RequestParam("fileOid") String var4);
+
+ @PostMapping({"/shareFilesFromBO"})
+ BaseResult<VciFileObjectVO> shareFilesToBO(@RequestParam("sourceBtmName") String var1, @RequestParam("sourceBusinessOid") String var2, @RequestParam("btmName") String var3, @RequestParam("businessOid") String var4);
+
+ @PostMapping({"/shareFileFromFile"})
+ BaseResult<VciFileObjectVO> shareFilesToBO(@RequestParam("fileOids") String var1, @RequestParam("btmName") String var2, @RequestParam("businessOid") String var3);
+
+ @PostMapping({"/shareAnnexFilesToBO"})
+ BaseResult<VciFileObjectVO> shareAnnexFilesToBO(@RequestParam("sourceBtmName") String var1, @RequestParam("sourceBusinessOid") String var2, @RequestParam("btmName") String var3, @RequestParam("businessOid") String var4);
+
+ @PostMapping({"/batchShareFile"})
+ BaseResult<VciFileShareResultVO> batchShareFile(@RequestBody VciFileShareHasClassifyDTO var1);
+
+ @PostMapping({"/updateFileInfos"})
+ BaseResult updateFileInfos(@RequestBody Collection<VciFileObjectDTO> var1);
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web/pom.xml b/Source/plt-web/plt-web-parent/plt-web/pom.xml
index df1c4e0..039b4d9 100644
--- a/Source/plt-web/plt-web-parent/plt-web/pom.xml
+++ b/Source/plt-web/plt-web-parent/plt-web/pom.xml
@@ -30,29 +30,18 @@
</exclusion>
</exclusions>
</dependency>
- <dependency><!--鏂囦欢鐨勪俊鎭�-->
- <groupId>com.vci</groupId>
- <artifactId>vci-file-api</artifactId>
- <version>1.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-thymeleaf</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.vci</groupId>
- <artifactId>vci-file-integration</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>plt-web-api</artifactId>
+ <version>2024.1-SNAPSHOT</version>
<exclusions>
<exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-thymeleaf</artifactId>
+ <groupId>com.vci</groupId>
+ <artifactId>plt-web-base</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.vci</groupId>
+ <artifactId>plt-poi</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/ISmFunctionQueryService.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/ISmFunctionQueryService.java
index a52aed1..dcf7cc8 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/ISmFunctionQueryService.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/ISmFunctionQueryService.java
@@ -2,13 +2,13 @@
import com.vci.corba.common.PLException;
import com.vci.frameworkcore.enumpck.ResourceControlTypeEnum;
-import com.vci.frameworkcore.pagemodel.MenuVO;
-import com.vci.frameworkcore.pagemodel.SmFunctionVO;
+import com.vci.pagemodel.MenuVO;
+import com.vci.pagemodel.SmFunctionVO;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.pagemodel.Tree;
import com.vci.starter.web.pagemodel.TreeQueryObject;
-import com.vci.web.pageModel.UIContentVO;
+import com.vci.pagemodel.UIContentVO;
import com.vci.web.service.OsBaseServiceI;
import java.util.Collection;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/OrgDeptQueryServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/OrgDeptQueryServiceI.java
index bc79121..ae07c6b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/OrgDeptQueryServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/OrgDeptQueryServiceI.java
@@ -1,8 +1,8 @@
package com.vci.frameworkcore.compatibility;
+import com.vci.dto.OrgDepartmentDTO;
import com.vci.corba.common.PLException;
-import com.vci.frameworkcore.model.dto.OrgDepartmentDTO;
-import com.vci.frameworkcore.pagemodel.OrgDepartmentVO;
+import com.vci.pagemodel.OrgDepartmentVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/OrgDutyQueryServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/OrgDutyQueryServiceI.java
index 703a24d..13bfc41 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/OrgDutyQueryServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/OrgDutyQueryServiceI.java
@@ -1,6 +1,6 @@
package com.vci.frameworkcore.compatibility;
-import com.vci.frameworkcore.pagemodel.OrgDutyVO;
+import com.vci.pagemodel.OrgDutyVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmPwdStrategyQueryServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmPwdStrategyQueryServiceI.java
index fcb902c..1abb895 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmPwdStrategyQueryServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmPwdStrategyQueryServiceI.java
@@ -1,8 +1,8 @@
package com.vci.frameworkcore.compatibility;
+import com.vci.dto.SmPasswordStrategyDTO;
import com.vci.corba.common.PLException;
-import com.vci.frameworkcore.model.dto.SmPasswordStrategyDTO;
-import com.vci.frameworkcore.pagemodel.SmPasswordStrategyVO;
+import com.vci.pagemodel.SmPasswordStrategyVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmRoleQueryServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmRoleQueryServiceI.java
index 7f76fbc..c231b6f 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmRoleQueryServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmRoleQueryServiceI.java
@@ -1,8 +1,8 @@
package com.vci.frameworkcore.compatibility;
import com.vci.corba.common.PLException;
-import com.vci.frameworkcore.dto.SmRoleDTO;
-import com.vci.frameworkcore.pagemodel.SmRoleVO;
+import com.vci.dto.SmRoleDTO;
+import com.vci.pagemodel.SmRoleVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
@@ -10,7 +10,6 @@
import java.util.Collection;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.locks.Condition;
/**
* 瑙掕壊鐨勬煡璇㈡湇鍔★紝鍏煎鏉ュ钩鍙帮紝鎵�鏈夌殑鎺ュ彛閮借繑鍥炴柊鐨勮鑹叉樉绀哄璞�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java
index aa8bd9b..96dd533 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java
@@ -1,8 +1,8 @@
package com.vci.frameworkcore.compatibility;
+import com.vci.dto.SmUserDTO;
import com.vci.corba.common.PLException;
-import com.vci.frameworkcore.model.dto.SmUserDTO;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.pagemodel.SmUserVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
@@ -191,10 +191,11 @@
/**
* 淇敼瀵嗙爜
* @param userOid 鐢ㄦ埛涓婚敭
+ * @param oldPassword 鏃х殑瀵嗙爜
* @param password 鏂扮殑瀵嗙爜
* @param confirmPassword 纭瀵嗙爜
*/
- void changePassword(String userOid, String password, String confirmPassword) throws PLException;
+ boolean changePassword(String userOid,String oldPassword, String password, String confirmPassword) throws PLException;
/**
* 鏇存柊鐢ㄦ埛鐨勫瘑鐮侀敊璇鏁�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java
index c45b79e..edaa600 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java
@@ -1,19 +1,15 @@
package com.vci.frameworkcore.compatibility.impl;
+import com.vci.dto.OrgDepartmentDTO;
import com.vci.corba.common.PLException;
import com.vci.corba.common.data.UserEntityInfo;
import com.vci.corba.framework.data.DeptInfo;
import com.vci.corba.omd.data.BusinessObject;
import com.vci.frameworkcore.compatibility.OrgDeptQueryServiceI;
-import com.vci.frameworkcore.model.dto.OrgDepartmentDTO;
import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
-import com.vci.frameworkcore.model.OrgDeptForPlatform1;
-import com.vci.frameworkcore.model.dto.SmUserDTO;
-import com.vci.frameworkcore.model.po.OrgDeptPO;
-import com.vci.frameworkcore.model.po.SmUserPO;
-import com.vci.frameworkcore.pagemodel.OrgDepartmentVO;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
-import com.vci.frameworkcore.properties.ConfigReader;
+import com.vci.model.OrgDeptForPlatform1;
+import com.vci.po.OrgDeptPO;
+import com.vci.pagemodel.OrgDepartmentVO;
import com.vci.omd.utils.ObjectTool;
import com.vci.starter.poi.bo.ReadExcelOption;
import com.vci.starter.poi.bo.WriteExcelData;
@@ -23,7 +19,6 @@
import com.vci.starter.revision.bo.TreeWrapperOptions;
import com.vci.starter.revision.service.RevisionModelUtil;
import com.vci.starter.web.constant.QueryOptionConstant;
-import com.vci.starter.web.enumpck.UserSecretEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
import com.vci.starter.web.util.*;
@@ -40,12 +35,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.util.WebUtils;
import java.io.File;
-import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -99,7 +90,7 @@
}
Map<String, String> conditionMap = new HashMap<>();
conditionMap.put("pluid",deptOid);
- VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(conditionMap,OrgDeptForPlatform1.class);
+ VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(conditionMap, OrgDeptForPlatform1.class);
List<OrgDeptForPlatform1> deptForPlatform1s = boService.selectByQueryWrapper(queryWrapper, OrgDeptForPlatform1.class);
if(Func.isEmpty(deptForPlatform1s)){
return null;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDutyQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDutyQueryServiceImpl.java
index cb5b244..b0f1304 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDutyQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDutyQueryServiceImpl.java
@@ -1,7 +1,7 @@
package com.vci.frameworkcore.compatibility.impl;
import com.vci.frameworkcore.compatibility.OrgDutyQueryServiceI;
-import com.vci.frameworkcore.pagemodel.OrgDutyVO;
+import com.vci.pagemodel.OrgDutyVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
index 8ba719e..1414528 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
@@ -8,16 +8,17 @@
import com.vci.corba.portal.data.PLUILayout;
import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
import com.vci.frameworkcore.enumpck.ResourceControlTypeEnum;
-import com.vci.frameworkcore.model.SmFunctionForPlatform1;
-import com.vci.frameworkcore.model.SmRoleForPlatform1;
-import com.vci.frameworkcore.pagemodel.MenuVO;
-import com.vci.frameworkcore.pagemodel.SmFunctionVO;
+import com.vci.model.SmFunctionForPlatform1;
+import com.vci.model.SmRoleForPlatform1;
+import com.vci.pagemodel.MenuVO;
+import com.vci.pagemodel.SmFunctionVO;
import com.vci.omd.utils.ObjectTool;
+import com.vci.pagemodel.SmFunctionVO;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.pageModel.UIContentVO;
+import com.vci.pagemodel.UIContentVO;
import com.vci.web.service.UIEngineServiceI;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.util.PlatformClientUtil;
@@ -481,7 +482,7 @@
conditionMap.put(key,value);
});
conditionMap.put("ploid", notIn ? QueryOptionConstant.NOTIN : QueryOptionConstant.IN + "select plfuncoid from plroleright where plroleoid in (" + WebUtil.toInSql(roleOids.toArray(new String[0])) + ")");
- VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(conditionMap,SmRoleForPlatform1.class);
+ VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(conditionMap, SmRoleForPlatform1.class);
List<SmFunctionForPlatform1> functionForPlatform1s = boService.selectByQueryWrapper(queryWrapper, SmFunctionForPlatform1.class);
if(!CollectionUtils.isEmpty(functionForPlatform1s)){
functions.addAll(functionForPlatform1s);
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java
index 8770ca0..daf15f0 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java
@@ -1,17 +1,16 @@
package com.vci.frameworkcore.compatibility.impl;
+import com.vci.dto.SmPasswordStrategyDTO;
import com.vci.corba.common.PLException;
import com.vci.corba.common.data.UserEntityInfo;
import com.vci.corba.framework.data.PasswordStrategyInfo;
import com.vci.corba.omd.data.BusinessObject;
import com.vci.frameworkcore.compatibility.SmPwdStrategyQueryServiceI;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
-import com.vci.frameworkcore.model.OrgDeptForPlatform1;
-import com.vci.frameworkcore.model.dto.SmPasswordStrategyDTO;
import com.vci.frameworkcore.enumpck.CombinationEnum;
-import com.vci.frameworkcore.model.SmPasswordStrategyDO;
-import com.vci.frameworkcore.model.SmPasswordStrategyForPlatform1;
-import com.vci.frameworkcore.pagemodel.SmPasswordStrategyVO;
+import com.vci.model.SmPasswordStrategyDO;
+import com.vci.model.SmPasswordStrategyForPlatform1;
+import com.vci.pagemodel.SmPasswordStrategyVO;
import com.vci.omd.utils.ObjectTool;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.exception.VciBaseException;
@@ -34,7 +33,8 @@
import java.util.*;
import java.util.stream.Collectors;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
+
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
/**
* 瀵嗙爜绛栫暐鏌ヨ鏈嶅姟
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java
index be2eb81..2320280 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java
@@ -1,28 +1,23 @@
package com.vci.frameworkcore.compatibility.impl;
+import com.vci.constant.FrameWorkBtmTypeConstant;
import com.vci.corba.common.PLException;
import com.vci.corba.common.data.UserEntityInfo;
import com.vci.corba.framework.data.RoleInfo;
import com.vci.corba.omd.data.BusinessObject;
import com.vci.frameworkcore.compatibility.SmRoleQueryServiceI;
-import com.vci.frameworkcore.constant.FrameWorkBtmTypeConstant;
-import com.vci.frameworkcore.dto.SmRoleDTO;
+import com.vci.constant.FrameWorkBtmTypeConstant;
+import com.vci.dto.SmRoleDTO;
import com.vci.frameworkcore.enumpck.RoleClassifyEnum;
import com.vci.frameworkcore.enumpck.RoleControlAreaEnum;
-import com.vci.frameworkcore.model.SmRoleForPlatform1;
-import com.vci.frameworkcore.model.dto.SmUserDTO;
-import com.vci.frameworkcore.model.po.SmRolePO;
-import com.vci.frameworkcore.model.po.SmUserPO;
-import com.vci.frameworkcore.pagemodel.OrgDepartmentVO;
-import com.vci.frameworkcore.pagemodel.SmRoleVO;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
-import com.vci.frameworkcore.properties.ConfigReader;
+import com.vci.model.SmRoleForPlatform1;
+import com.vci.po.SmRolePO;
+import com.vci.pagemodel.SmRoleVO;
import com.vci.omd.utils.ObjectTool;
import com.vci.starter.poi.bo.ReadExcelOption;
import com.vci.starter.poi.constant.ExcelLangCodeConstant;
import com.vci.starter.poi.util.ExcelUtil;
import com.vci.starter.web.constant.QueryOptionConstant;
-import com.vci.starter.web.enumpck.UserSecretEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
import com.vci.starter.web.util.LangBaseUtil;
@@ -86,7 +81,7 @@
if(Func.isEmpty(conditionMap)){
return null;
}
- VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(conditionMap,SmRoleForPlatform1.class);
+ VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(conditionMap, SmRoleForPlatform1.class);
List<SmRoleForPlatform1> smRoleForPlatform1s = boService.selectByQueryWrapper(queryWrapper, SmRoleForPlatform1.class);
if(Func.isNotEmpty(smRoleForPlatform1s) && Func.isNotBlank(smRoleForPlatform1s.get(0).getPluid())){
//瑙掕壊鍚嶄笉鑳介噸澶嶆墍浠ョ洿鎺ュ彇绗竴涓厓绱�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmSessionForLoginImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmSessionForLoginImpl.java
index 1857244..8896f69 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmSessionForLoginImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmSessionForLoginImpl.java
@@ -11,13 +11,12 @@
import com.vci.starter.web.pagemodel.SessionInfo;
import com.vci.starter.web.pagemodel.TokenVO;
import com.vci.starter.web.util.*;
-import com.vci.web.constant.CacheNameConstant;
+import com.vci.constant.CacheNameConstant;
import com.vci.web.properties.WebProperties;
import com.vci.web.redis.RedisService;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
-import io.jsonwebtoken.Claims;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
index c38f4cc..80dd56a 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
@@ -1,5 +1,6 @@
package com.vci.frameworkcore.compatibility.impl;
+import com.vci.dto.SmUserDTO;
import com.vci.common.util.ThreeDES;
import com.vci.corba.common.PLException;
import com.vci.corba.common.data.UserEntityInfo;
@@ -9,13 +10,12 @@
import com.vci.frameworkcore.compatibility.SmPwdStrategyQueryServiceI;
import com.vci.frameworkcore.compatibility.SmRoleQueryServiceI;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
-import com.vci.frameworkcore.model.dto.SmUserDTO;
-import com.vci.frameworkcore.model.SmUserDO;
-import com.vci.frameworkcore.model.po.SmUserPO;
-import com.vci.frameworkcore.pagemodel.OrgDepartmentVO;
-import com.vci.frameworkcore.pagemodel.SmPasswordStrategyVO;
-import com.vci.frameworkcore.pagemodel.SmRoleVO;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.model.SmUserDO;
+import com.vci.pagemodel.SmUserVO;
+import com.vci.po.SmUserPO;
+import com.vci.pagemodel.OrgDepartmentVO;
+import com.vci.pagemodel.SmPasswordStrategyVO;
+import com.vci.pagemodel.SmRoleVO;
import com.vci.frameworkcore.properties.ConfigReader;
import com.vci.omd.utils.ObjectTool;
import com.vci.starter.poi.bo.ReadExcelOption;
@@ -183,7 +183,7 @@
* @return 鐢ㄦ埛鐨勪俊鎭�
* @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- private SmUserVO getUserByField(String queryField,String queryValue) throws VciBaseException{
+ private SmUserVO getUserByField(String queryField, String queryValue) throws VciBaseException{
VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(null, SmUserDO.class,null,true);
queryWrapper.eq(queryWrapper.getTableNick() + "." +queryField,queryValue);
queryWrapper.setDistinct(true);
@@ -1021,14 +1021,20 @@
/**
* 淇敼瀵嗙爜
* @param userOid 鐢ㄦ埛涓婚敭
+ * @param oldPassword 鏃х殑瀵嗙爜
* @param password 鏂扮殑瀵嗙爜
* @param confirmPassword 纭瀵嗙爜
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void changePassword(String userOid, String password,
+ public boolean changePassword(String userOid,String oldPassword, String password,
String confirmPassword) throws PLException {
- WebUtil.alertNotNull(userOid,"鐢ㄦ埛涓婚敭",password,"瀵嗙爜",confirmPassword,"纭瀵嗙爜");
+ WebUtil.alertNotNull(userOid,"鐢ㄦ埛涓婚敭",oldPassword,"鐧诲綍瀵嗙爜",password,"瀵嗙爜",confirmPassword,"纭瀵嗙爜");
+ //瀵规瘮鏃у瘑鐮�
+ boolean b = this.checkPasswordEqual(oldPassword, userOid);
+ if(!b){
+ throw new PLException("500", new String[] { "鎮ㄨ緭鍏ョ殑瀵嗙爜涓庣櫥褰曞瘑鐮佷笉涓�鑷�,璇烽噸鏂拌緭鍏�!"});
+ }
if(!password.equals(confirmPassword)){
throw new VciBaseException("瀵嗙爜鍜岀‘璁ゅ瘑鐮佷笉鐩哥瓑");
}
@@ -1039,16 +1045,16 @@
//TODO:鏍￠獙瀵嗙爜鏄惁绗﹀悎绛栫暐
String error = platformClientUtil.getFrameworkService().checkPasswordStrategyByUserId(smUserVO.getId(), password,null);
if (!StringUtils.isBlank(error)) {
- throw new VciBaseException("褰撳墠璁剧疆鐨勫瘑鐮侊紝瀵嗙爜绛栫暐鏍￠獙鏈�氳繃");
+ throw new VciBaseException("褰撳墠璁剧疆鐨勫瘑鐮侊紝瀵嗙爜绛栫暐鏍￠獙鏈�氳繃!");
}
ThreeDES des = new ThreeDES();// 瀹炰緥鍖栦竴涓锟�?
des.getKey("daliantan0v0");// 鐢熸垚瀵嗗寵
String encPassword = des.getEncString(password);
-
//淇敼瀵嗙爜鐨勫悓鏃堕渶瑕佸皢瀵嗙爜淇敼鏃堕棿涔熸洿鏂�
- String sql = "update pluser set plpassword = '" + encPassword + "' plpwdupdatetime = '"+ System.currentTimeMillis() +"' where pluid = '" + userOid.trim() + "'";
+ String sql = "update pluser set plpassword = '" + encPassword + "', plpwdupdatetime = TO_DATE('"
+ + Func.format(new Date(),"yyyy-MM-dd HH:mm:ss") +"','yyyy-MM-dd hh24:mi:ssxff') where pluid = '" + userOid.trim() + "'";
try {
- platformClientUtil.getBOFactoryService().executeUpdateSql(sql);
+ return platformClientUtil.getBOFactoryService().executeUpdateSql(sql);
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDepartmentQueryController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDepartmentQueryController.java
index 2b11de4..cec47dc 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDepartmentQueryController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDepartmentQueryController.java
@@ -1,13 +1,9 @@
package com.vci.frameworkcore.controller;
-import com.vci.corba.common.PLException;
-import com.vci.corba.common.data.UserEntityInfo;
-import com.vci.corba.framework.data.DeptInfo;
+import com.vci.dto.OrgDepartmentDTO;
import com.vci.frameworkcore.compatibility.OrgDeptQueryServiceI;
-import com.vci.frameworkcore.constant.FrameWorkLangCodeConstant;
-import com.vci.frameworkcore.model.dto.OrgDepartmentDTO;
-import com.vci.frameworkcore.pagemodel.OrgDepartmentVO;
-import com.vci.starter.web.annotation.controller.VciUnCheckRight;
+import com.vci.constant.FrameWorkLangCodeConstant;
+import com.vci.pagemodel.OrgDepartmentVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
import com.vci.starter.web.util.ControllerUtil;
@@ -15,8 +11,6 @@
import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.util.Func;
-import com.vci.web.util.PlatformClientUtil;
-import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDutyQueryController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDutyQueryController.java
index 6d9cc51..f0e5744 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDutyQueryController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDutyQueryController.java
@@ -1,7 +1,7 @@
package com.vci.frameworkcore.controller;
import com.vci.frameworkcore.compatibility.OrgDutyQueryServiceI;
-import com.vci.frameworkcore.pagemodel.OrgDutyVO;
+import com.vci.pagemodel.OrgDutyVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmPwdStrategyQueryController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmPwdStrategyQueryController.java
index afd0d76..eaf03f4 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmPwdStrategyQueryController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmPwdStrategyQueryController.java
@@ -1,8 +1,8 @@
package com.vci.frameworkcore.controller;
+import com.vci.dto.SmPasswordStrategyDTO;
import com.vci.frameworkcore.compatibility.SmPwdStrategyQueryServiceI;
-import com.vci.frameworkcore.model.dto.SmPasswordStrategyDTO;
-import com.vci.frameworkcore.pagemodel.SmPasswordStrategyVO;
+import com.vci.pagemodel.SmPasswordStrategyVO;
import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseQueryObject;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmRoleQueryController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmRoleQueryController.java
index 28c90bd..8cb409a 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmRoleQueryController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmRoleQueryController.java
@@ -1,17 +1,15 @@
package com.vci.frameworkcore.controller;
import com.vci.frameworkcore.compatibility.SmRoleQueryServiceI;
-import com.vci.frameworkcore.constant.FrameWorkLangCodeConstant;
-import com.vci.frameworkcore.dto.SmRoleDTO;
-import com.vci.frameworkcore.pagemodel.SmRoleVO;
-import com.vci.starter.web.annotation.controller.VciUnCheckRight;
+import com.vci.constant.FrameWorkLangCodeConstant;
+import com.vci.dto.SmRoleDTO;
+import com.vci.pagemodel.SmRoleVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.WebThreadLocalUtil;
import com.vci.web.enumpck.UserTypeEnum;
-import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java
index 9a38877..7dda639 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java
@@ -1,10 +1,10 @@
package com.vci.frameworkcore.controller;
+import com.vci.dto.SmUserDTO;
import com.vci.corba.common.PLException;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
-import com.vci.frameworkcore.constant.FrameWorkLangCodeConstant;
-import com.vci.frameworkcore.model.dto.SmUserDTO;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.constant.FrameWorkLangCodeConstant;
+import com.vci.pagemodel.SmUserVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
import com.vci.starter.web.util.ControllerUtil;
@@ -204,9 +204,15 @@
* @param confirmPassword 纭瀵嗙爜
*/
@RequestMapping(value = "/changePassword",method = RequestMethod.POST)
- public BaseResult changePassword(String userOid, String password, String confirmPassword) throws PLException {
- userQueryService.changePassword(userOid, password, confirmPassword);
- return BaseResult.success("淇敼瀵嗙爜鎴愬姛");
+ public BaseResult changePassword(String userOid,String oldPassword, String password, String confirmPassword) throws PLException {
+ try {
+ return BaseResult.success(userQueryService.changePassword(userOid, oldPassword, password, confirmPassword) ? "淇敼瀵嗙爜鎴愬姛锛�":"淇敼瀵嗙爜澶辫触锛�");
+ }catch (Exception e){
+ e.printStackTrace();
+ String exceptionMessage = "淇敼瀵嗙爜鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
}
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/enumpck/DataObjectEnum.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/enumpck/DataObjectEnum.java
index b9d65a4..8d748a9 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/enumpck/DataObjectEnum.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/enumpck/DataObjectEnum.java
@@ -4,9 +4,9 @@
import com.vci.client.common.objects.DeptObject;
import com.vci.client.common.objects.RoleObject;
import com.vci.client.common.objects.UserObject;
-import com.vci.frameworkcore.pagemodel.OrgDepartmentVO;
-import com.vci.frameworkcore.pagemodel.SmRoleVO;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.pagemodel.OrgDepartmentVO;
+import com.vci.pagemodel.SmRoleVO;
+import com.vci.pagemodel.SmUserVO;
import java.text.ParsePosition;
import java.text.SimpleDateFormat;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/lcstatuspck/FrameworkDataLCStatus.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/lcstatuspck/FrameworkDataLCStatus.java
index 0578a94..6491230 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/lcstatuspck/FrameworkDataLCStatus.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/lcstatuspck/FrameworkDataLCStatus.java
@@ -6,8 +6,7 @@
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
import com.vci.starter.web.enumpck.BaseEnum;
-import static com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant.FRAMEWORK_DATA_DISABLED;
-import static com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant.FRAMEWORK_DATA_ENABLED;
+import static com.vci.constant.FrameWorkDefaultValueConstant.*;
/**
* 鐢ㄦ埛锛岃鑹诧紝閮ㄩ棬锛岃亴鍔★紝宀椾綅锛岃亴绾�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/lcstatuspck/ReleaseDataLCStatus.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/lcstatuspck/ReleaseDataLCStatus.java
index ef00645..5bfca87 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/lcstatuspck/ReleaseDataLCStatus.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/lcstatuspck/ReleaseDataLCStatus.java
@@ -6,7 +6,7 @@
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
import com.vci.starter.web.enumpck.BaseEnum;
-import static com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant.*;
+import static com.vci.constant.FrameWorkDefaultValueConstant.*;
/**
* 鍙戝竷鐢熷懡鍛ㄦ湡
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/plugins/controller/ImageViewerController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/plugins/controller/ImageViewerController.java
index ed139ba..fef425f 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/plugins/controller/ImageViewerController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/plugins/controller/ImageViewerController.java
@@ -1,6 +1,6 @@
package com.vci.plugins.controller;
-import com.vci.file.constant.VciFileBtmTypeConstant;
+import com.vci.constant.VciFileBtmTypeConstant;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.util.ControllerUtil;
import com.vci.starter.web.util.VciBaseUtil;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/plugins/dto/AuditTaskDTO.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/plugins/dto/AuditTaskDTO.java
index 361bb34..295977e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/plugins/dto/AuditTaskDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/plugins/dto/AuditTaskDTO.java
@@ -1,6 +1,6 @@
package com.vci.plugins.dto;
-import com.vci.web.dto.BaseModelDTO;
+import com.vci.dto.BaseModelDTO;
import java.util.Date;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/BdSelectInputCharController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/BdSelectInputCharController.java
index 7150e4d..bc4ce6d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/BdSelectInputCharController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/BdSelectInputCharController.java
@@ -1,18 +1,15 @@
package com.vci.web.controller;
import java.util.Collection;
-import java.util.Map;
import java.util.List;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.web.pageModel.KeyValue;
+
+import com.vci.pagemodel.KeyValue;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.vci.starter.web.pagemodel.*;
-import com.vci.starter.web.annotation.*;
-import com.vci.web.pageModel.BdSelectInputCharVO;
-import com.vci.web.dto.BdSelectInputCharDTO;
+import com.vci.pagemodel.BdSelectInputCharVO;
+import com.vci.dto.BdSelectInputCharDTO;
import com.vci.web.service.BdSelectInputCharServiceI;
-import org.springframework.stereotype.Controller;
import com.vci.starter.web.util.*;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HomeTaskController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HomeTaskController.java
index 0d35be0..b18be75 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HomeTaskController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HomeTaskController.java
@@ -8,8 +8,8 @@
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.web.dto.WebHomeTaskActionDTO;
-import com.vci.web.pageModel.WebHomeTaskActionVO;
+import com.vci.dto.WebHomeTaskActionDTO;
+import com.vci.pagemodel.WebHomeTaskActionVO;
import com.vci.web.service.WebHomeTaskServiceI;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LoginController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LoginController.java
index 3cd9c93..9fbc3dc 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LoginController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LoginController.java
@@ -10,11 +10,13 @@
import com.vci.starter.web.util.MessageUtils;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.WebThreadLocalUtil;
-import com.vci.web.bo.LoginResultBO;
-import com.vci.web.dto.LoginUserDTO;
+import com.vci.bo.LoginResultBO;
+import com.vci.dto.LoginUserDTO;
import com.vci.web.service.LoginServiceI;
import eu.bitwalker.useragentutils.*;
import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping;
@@ -48,6 +50,11 @@
private LoginServiceI loginService;
/**
+ * 鏃ュ織
+ */
+ private Logger logger = LoggerFactory.getLogger(getClass());
+
+ /**
* 鐧诲綍锛岃繖涓湴鏂逛富瑕佹槸涓轰簡鐧诲綍鍚庡崟鐙殑涓氬姟
* @param userDTO 鐢ㄦ埛鐨勫璞�
* @param request 璇锋眰瀵硅薄
@@ -60,17 +67,24 @@
@VciUnCheckRight()
public BaseResult login(LoginUserDTO userDTO, HttpServletRequest request, RequestClientInfo clientInfo){
VciBaseUtil.alertNotNull(userDTO,"鐢ㄦ埛瀵硅薄",clientInfo,"璇锋眰瀹㈡埛绔俊鎭�");
- wrapperBrowserInfo(clientInfo,request);
- LoginResultBO loginResultBO = loginService.login(userDTO,clientInfo);
- if(loginResultBO.isSuccess()){
- return BaseResult.success(loginResultBO);
- }else{
- BaseResult result = BaseResult.fail(loginResultBO.getFailMsg());
- if(StringUtils.isBlank(loginResultBO.getFailMsg())){
- result.setMsg(MessageUtils.get(loginResultBO.getFailCode(),loginResultBO.getFailMsgArray()));
+ try {
+ wrapperBrowserInfo(clientInfo,request);
+ LoginResultBO loginResultBO = loginService.login(userDTO,clientInfo);
+ if(loginResultBO.isSuccess()){
+ return BaseResult.success(loginResultBO);
+ }else{
+ BaseResult result = BaseResult.fail(loginResultBO.getFailMsg());
+ if(StringUtils.isBlank(loginResultBO.getFailMsg())){
+ result.setMsg(MessageUtils.get(loginResultBO.getFailCode(),loginResultBO.getFailMsgArray()));
+ }
+ result.setObj(loginResultBO);
+ return result;
}
- result.setObj(loginResultBO);
- return result;
+ }catch (Exception e){
+ e.printStackTrace();
+ String msg = "璋冪敤鐧诲綍鏂规硶鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+VciBaseUtil.getExceptionMessage(e);
+ logger.error(msg);
+ return BaseResult.fail(msg);
}
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java
index 9900bb4..5a65bfe 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java
@@ -2,8 +2,7 @@
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.web.pageModel.OsAttributeVO;
-import com.vci.web.pageModel.OsStatusVO;
+import com.vci.pagemodel.OsAttributeVO;
import com.vci.web.service.OsAttributeServiceI;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLifeCycleController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLifeCycleController.java
index 323a196..175f7ff 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLifeCycleController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLifeCycleController.java
@@ -3,8 +3,8 @@
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.web.pageModel.OsERVO;
-import com.vci.web.pageModel.OsLifeCycleVO;
+import com.vci.pagemodel.OsERVO;
+import com.vci.pagemodel.OsLifeCycleVO;
import com.vci.web.service.OsLifeCycleServiceI;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLinkTypeController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLinkTypeController.java
index 3b6691a..9308325 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLinkTypeController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLinkTypeController.java
@@ -1,9 +1,11 @@
package com.vci.web.controller;
+import com.vci.pagemodel.OsBtmTypeAttributeVO;
+import com.vci.pagemodel.OsLinkTypeAttributeVO;
+import com.vci.pagemodel.OsLinkTypeVO;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.web.pageModel.*;
import com.vci.web.service.OsLinkTypeServiceI;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmFavFunctionController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmFavFunctionController.java
index 3f6ccde..2ada857 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmFavFunctionController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmFavFunctionController.java
@@ -1,7 +1,6 @@
package com.vci.web.controller;
-
-import com.vci.frameworkcore.pagemodel.SmFunctionVO;
+import com.vci.pagemodel.SmFunctionVO;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.web.service.SmFavFunctionServiceI;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmFunctionController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmFunctionController.java
index b264d82..87f6987 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmFunctionController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmFunctionController.java
@@ -3,11 +3,11 @@
import com.vci.corba.common.PLException;
import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
import com.vci.frameworkcore.enumpck.ResourceControlTypeEnum;
-import com.vci.frameworkcore.pagemodel.MenuVO;
-import com.vci.frameworkcore.pagemodel.SmFunctionVO;
+import com.vci.pagemodel.MenuVO;
+import com.vci.pagemodel.SmFunctionVO;
import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.pagemodel.*;
-import com.vci.web.pageModel.UIContentVO;
+import com.vci.pagemodel.UIContentVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmOperationController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmOperationController.java
index c3c8c7d..6112c20 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmOperationController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmOperationController.java
@@ -1,6 +1,6 @@
package com.vci.web.controller;
-import com.vci.web.pageModel.SmOperationVO;
+import com.vci.pagemodel.SmOperationVO;
import com.vci.web.service.SmOperationServiceI;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciFileQueryController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciFileQueryController.java
index d95e12b..2974519 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciFileQueryController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciFileQueryController.java
@@ -1,6 +1,6 @@
package com.vci.web.controller;
-import com.vci.file.pagemodel.VciFileObjectVO;
+import com.vci.pagemodel.VciFileObjectVO;
import com.vci.starter.web.autoconfigure.AppAutoConfigure;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseQueryObject;
@@ -9,7 +9,7 @@
import com.vci.starter.web.util.Md5;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.config.WebFilePreviewAutoConfig;
-import com.vci.web.pageModel.VciFilePreviewConfigVO;
+import com.vci.pagemodel.VciFilePreviewConfigVO;
import com.vci.web.service.VciFileObjectServiceI;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciFileUploadController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciFileUploadController.java
index 906cf78..1839bbc 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciFileUploadController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciFileUploadController.java
@@ -1,8 +1,8 @@
package com.vci.web.controller;
-import com.vci.file.dto.VciFileObjectDTO;
-import com.vci.file.pagemodel.VciFileObjectVO;
-import com.vci.frameworkcore.constant.FrameWorkLangCodeConstant;
+import com.vci.constant.FrameWorkLangCodeConstant;
+import com.vci.dto.VciFileObjectDTO;
+import com.vci.pagemodel.VciFileObjectVO;
import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciOsCodeRuleController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciOsCodeRuleController.java
index 26feb50..2d802bb 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciOsCodeRuleController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciOsCodeRuleController.java
@@ -4,11 +4,11 @@
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.web.dto.OsCodeRuleDTO;
-import com.vci.web.dto.OsCodeRuleProduceDTO;
-import com.vci.web.pageModel.OsCodeResultVO;
-import com.vci.web.pageModel.OsCodeRuleElementVO;
-import com.vci.web.pageModel.OsCodeRuleVO;
+import com.vci.dto.OsCodeRuleDTO;
+import com.vci.dto.OsCodeRuleProduceDTO;
+import com.vci.pagemodel.OsCodeResultVO;
+import com.vci.pagemodel.OsCodeRuleElementVO;
+import com.vci.pagemodel.OsCodeRuleVO;
import com.vci.web.service.OsCodeRuleServiceI;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciOsStatusController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciOsStatusController.java
index 36029e9..718362f 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciOsStatusController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciOsStatusController.java
@@ -1,13 +1,12 @@
package com.vci.web.controller;
import com.vci.starter.web.annotation.log.VciBusinessLog;
-import com.vci.starter.web.annotation.permission.VciPermission;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.web.dto.OsStatusDTO;
-import com.vci.web.pageModel.OsLifeCycleVO;
-import com.vci.web.pageModel.OsStatusVO;
+import com.vci.dto.OsStatusDTO;
+import com.vci.pagemodel.OsLifeCycleVO;
+import com.vci.pagemodel.OsStatusVO;
import com.vci.web.service.OsLifeCycleServiceI;
import com.vci.web.service.OsStatusServiceI;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WFWorkflowNodeFavController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WFWorkflowNodeFavController.java
index 1bfca0f..3f46d82 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WFWorkflowNodeFavController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WFWorkflowNodeFavController.java
@@ -5,9 +5,9 @@
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.dto.WFWorkflowNodeFavDTO;
-import com.vci.web.pageModel.WFWorkflowNodeFavItemVO;
-import com.vci.web.pageModel.WFWorkflowNodeFavVO;
+import com.vci.dto.WFWorkflowNodeFavDTO;
+import com.vci.pagemodel.WFWorkflowNodeFavItemVO;
+import com.vci.pagemodel.WFWorkflowNodeFavVO;
import com.vci.web.service.WFWorkflowNodeFavServiceI;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebBtmTypeController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebBtmTypeController.java
index 6801931..81d0ddd 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebBtmTypeController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebBtmTypeController.java
@@ -1,6 +1,5 @@
package com.vci.web.controller;
-import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.annotation.log.VciBusinessLog;
import com.vci.starter.web.enumpck.BooleanEnum;
import com.vci.starter.web.exception.VciBaseException;
@@ -11,17 +10,15 @@
import com.vci.starter.web.util.ControllerUtil;
import com.vci.starter.web.util.LangBaseUtil;
import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.pageModel.OsBtmTypeAttributeVO;
-import com.vci.web.pageModel.OsBtmTypeVO;
-import com.vci.web.pageModel.OsERVO;
+import com.vci.pagemodel.OsBtmTypeAttributeVO;
+import com.vci.pagemodel.OsBtmTypeVO;
+import com.vci.pagemodel.OsERVO;
import com.vci.web.service.OsAttributeServiceI;
import com.vci.web.service.OsBtmServiceI;
import com.vci.web.service.WebBtmIOServiceI;
-import com.vci.web.service.impl.OsAttributeServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
-import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -32,7 +29,7 @@
import java.util.List;
import java.util.stream.Collectors;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
/**
* 涓氬姟绫诲瀷鐨勬帶鍒跺櫒
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebCodeGenSchemaController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebCodeGenSchemaController.java
index 6e05fe5..ec1b0dd 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebCodeGenSchemaController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebCodeGenSchemaController.java
@@ -5,8 +5,8 @@
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.util.ControllerUtil;
import com.vci.starter.web.util.LangBaseUtil;
-import com.vci.web.dto.OsCodeGenSchemaDTO;
-import com.vci.web.pageModel.OsCodeGenSchemaVO;
+import com.vci.dto.OsCodeGenSchemaDTO;
+import com.vci.pagemodel.OsCodeGenSchemaVO;
import com.vci.web.service.OsCodeGenSchemaServiceI;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebDataRightController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebDataRightController.java
index bb7b4bc..0e2fc7a 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebDataRightController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebDataRightController.java
@@ -5,8 +5,8 @@
import com.vci.starter.web.enumpck.UserSecretEnum;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.SessionInfo;
-import com.vci.web.dto.BaseModelDTO;
-import com.vci.web.dto.BaseModelDTOList;
+import com.vci.dto.BaseModelDTO;
+import com.vci.dto.BaseModelDTOList;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.WebSecretServiceI;
import com.vci.web.util.WebUtil;
@@ -20,7 +20,6 @@
import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
/**
* 鏁版嵁鏉冮檺鎺у埗
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebEnumController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebEnumController.java
index 1933f33..14f0e92 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebEnumController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebEnumController.java
@@ -5,16 +5,13 @@
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.web.pageModel.KeyValue;
-import com.vci.web.pageModel.OsBtmTypeVO;
-import com.vci.web.pageModel.OsEnumItemVO;
-import com.vci.web.pageModel.OsEnumVO;
+import com.vci.pagemodel.KeyValue;
+import com.vci.pagemodel.OsEnumItemVO;
+import com.vci.pagemodel.OsEnumVO;
import com.vci.web.service.OsEnumServiceI;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessCommandController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessCommandController.java
index dbb235a..7df22dd 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessCommandController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessCommandController.java
@@ -1,13 +1,13 @@
package com.vci.web.controller;
import com.vci.corba.workflow.data.TasksAssignedInfo;
+import com.vci.pagemodel.ProcessUserVO;
import com.vci.starter.web.annotation.log.VciBusinessLog;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.web.dto.BaseModelDTO;
-import com.vci.web.dto.ProcessNodeUseDTO;
-import com.vci.web.dto.ProcessStartConfigDTO;
-import com.vci.web.pageModel.*;
+import com.vci.dto.BaseModelDTO;
+import com.vci.dto.ProcessNodeUseDTO;
+import com.vci.dto.ProcessStartConfigDTO;
import com.vci.web.service.WebProcessCommandServiceI;
import com.vci.web.util.WebUtil;
import org.slf4j.Logger;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java
index fac4192..792a964 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java
@@ -1,15 +1,14 @@
package com.vci.web.controller;
-import com.vci.file.pagemodel.VciFileObjectVO;
+import com.vci.dto.ProcessTemplateVO;
+import com.vci.pagemodel.*;
+import com.vci.pagemodel.KeyValue;
import com.vci.starter.web.annotation.bus.VciNoUseBaseResult;
import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.annotation.log.VciBusinessLog;
import com.vci.starter.web.annotation.permission.VciReferPermission;
-import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
import com.vci.starter.web.util.ControllerUtil;
-import com.vci.web.pageModel.*;
-import com.vci.web.pageModel.KeyValue;
import com.vci.web.service.WebProcessDefineServiceI;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIController.java
index f7e9ec6..eef47eb 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIController.java
@@ -3,9 +3,9 @@
import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.annotation.log.VciBusinessLog;
import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.web.pageModel.UIContentVO;
-import com.vci.web.pageModel.UIFormDefineVO;
-import com.vci.web.pageModel.UITableDefineVO;
+import com.vci.pagemodel.UIContentVO;
+import com.vci.pagemodel.UIFormDefineVO;
+import com.vci.pagemodel.UITableDefineVO;
import com.vci.web.service.UIEngineServiceI;
import com.vci.web.service.impl.WebInitServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java
index 6c19aeb..dba34fa 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java
@@ -1,13 +1,15 @@
package com.vci.web.controller;
import com.vci.corba.common.PLException;
-import com.vci.corba.omd.data.BusinessObject;
+import com.vci.dto.DeleteDataDTO;
+import com.vci.dto.DeleteLinkDataDTO;
+import com.vci.dto.FormDataDTO;
+import com.vci.dto.FormLinkDataDTO;
import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.annotation.log.VciBusinessLog;
import com.vci.starter.web.pagemodel.*;
-import com.vci.web.dto.*;
-import com.vci.web.pageModel.ReferConfigVO;
-import com.vci.web.pageModel.UIFormDataVO;
+import com.vci.pagemodel.ReferConfigVO;
+import com.vci.pagemodel.UIFormDataVO;
import com.vci.web.query.UIDataGridQuery;
import com.vci.web.query.UIFormQuery;
import com.vci.web.query.UITreeQuery;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/BdSelectInputCharDaoI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/BdSelectInputCharDaoI.java
index 17f2970..2f94b86 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/BdSelectInputCharDaoI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/BdSelectInputCharDaoI.java
@@ -1,10 +1,10 @@
package com.vci.web.dao;
-import com.vci.web.model.BdSelectInputCharDO;
+import com.vci.model.BdSelectInputCharDO;
import com.vci.starter.web.pagemodel.*;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.pageModel.BatchCBO;
+import com.vci.pagemodel.BatchCBO;
import java.util.Collection;
import java.util.*;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeBreakCodeDaoI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeBreakCodeDaoI.java
index 2757cd2..5faf7e5 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeBreakCodeDaoI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeBreakCodeDaoI.java
@@ -1,7 +1,7 @@
package com.vci.web.dao;
import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.web.model.OsCodeBreakCodeDO;
+import com.vci.model.OsCodeBreakCodeDO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeEnumDaoI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeEnumDaoI.java
index 9961da0..a0cc4a5 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeEnumDaoI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeEnumDaoI.java
@@ -1,6 +1,6 @@
package com.vci.web.dao;
import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.web.model.OsCodeEnumDO;
+import com.vci.model.OsCodeEnumDO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeGenSchemaDaoI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeGenSchemaDaoI.java
index cf99f21..9197067 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeGenSchemaDaoI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeGenSchemaDaoI.java
@@ -1,7 +1,7 @@
package com.vci.web.dao;
import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.web.model.OsCodeGenSchemaDO;
+import com.vci.model.OsCodeGenSchemaDO;
import java.util.List;
import java.util.Map;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeRuleDaoI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeRuleDaoI.java
index 45ebae6..f344b80 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeRuleDaoI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeRuleDaoI.java
@@ -2,7 +2,7 @@
import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.web.model.OsCodeRuleDO;
+import com.vci.model.OsCodeRuleDO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeRuleElementDaoI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeRuleElementDaoI.java
index e5d71cc..83f7cdd 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeRuleElementDaoI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeRuleElementDaoI.java
@@ -2,7 +2,7 @@
import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.web.model.OsCodeRuleElementDO;
+import com.vci.model.OsCodeRuleElementDO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeSerialNumberDaoI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeSerialNumberDaoI.java
index 760a2ed..42ff56b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeSerialNumberDaoI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/OsCodeSerialNumberDaoI.java
@@ -1,7 +1,7 @@
package com.vci.web.dao;
import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.web.model.OsCodeSerialNumberDO;
+import com.vci.model.OsCodeSerialNumberDO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/VciFileDocClassifyDaoI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/VciFileDocClassifyDaoI.java
index 7124048..bbfb0b7 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/VciFileDocClassifyDaoI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/VciFileDocClassifyDaoI.java
@@ -1,7 +1,7 @@
package com.vci.web.dao;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.model.VciFileDocClassifyDO;
+import com.vci.model.VciFileDocClassifyDO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/VciFileObjectDaoI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/VciFileObjectDaoI.java
index d5df621..88355ff 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/VciFileObjectDaoI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/VciFileObjectDaoI.java
@@ -1,7 +1,7 @@
package com.vci.web.dao;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.model.VciFileObjectDO;
+import com.vci.model.VciFileObjectDO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/VciFileVolumeDaoI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/VciFileVolumeDaoI.java
index 9defaee..58efef6 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/VciFileVolumeDaoI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/VciFileVolumeDaoI.java
@@ -1,7 +1,7 @@
package com.vci.web.dao;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.model.VciFileVolumeDO;
+import com.vci.model.VciFileVolumeDO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/WFWorkflowNodeFavDaoI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/WFWorkflowNodeFavDaoI.java
index 78068f2..cb4ed3f 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/WFWorkflowNodeFavDaoI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/WFWorkflowNodeFavDaoI.java
@@ -2,8 +2,8 @@
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.model.WFWorkflowNodeFavDO;
-import com.vci.web.pageModel.BatchCBO;
+import com.vci.model.WFWorkflowNodeFavDO;
+import com.vci.pagemodel.BatchCBO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/WFWorkflowNodeFavItemDaoI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/WFWorkflowNodeFavItemDaoI.java
index 39903ba..42814e9 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/WFWorkflowNodeFavItemDaoI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/WFWorkflowNodeFavItemDaoI.java
@@ -1,8 +1,8 @@
package com.vci.web.dao;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.model.WFWorkflowNodeFavItemDO;
-import com.vci.web.pageModel.BatchCBO;
+import com.vci.model.WFWorkflowNodeFavItemDO;
+import com.vci.pagemodel.BatchCBO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/WebProcessDaoI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/WebProcessDaoI.java
index 85e9101..0b6c337 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/WebProcessDaoI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/WebProcessDaoI.java
@@ -3,12 +3,14 @@
import com.vci.corba.omd.data.LinkObject;
import com.vci.corba.workflow.WorkflowServicePrx;
import com.vci.corba.workflow.data.TasksAssignedInfo;
+import com.vci.dto.ProcessTemplateVO;
+import com.vci.pagemodel.*;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.web.model.WFProcessClassifyDO;
-import com.vci.web.model.WFProcessTemplateDO;
-import com.vci.web.pageModel.*;
+import com.vci.model.WFProcessClassifyDO;
+import com.vci.model.WFProcessTemplateDO;
+
import java.util.Collection;
import java.util.Date;
import java.util.List;
@@ -24,7 +26,7 @@
* @return
* @throws VciBaseException
*/
- List<ProcessTemplateVO> getTemplatesByType(String type, String filterTemplate,boolean showAll) throws VciBaseException;
+ List<ProcessTemplateVO> getTemplatesByType(String type, String filterTemplate, boolean showAll) throws VciBaseException;
/**
* 鑾峰彇娴佺▼妯℃澘涓嬬殑浠诲姟鑺傜偣锛屼互鍙婁换鍔¤妭鐐逛笂閰嶇疆鐨勮矗浠讳汉
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/BdSelectInputCharDaoImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/BdSelectInputCharDaoImpl.java
index 39b01b2..f9c4982 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/BdSelectInputCharDaoImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/BdSelectInputCharDaoImpl.java
@@ -1,6 +1,6 @@
package com.vci.web.dao.impl;
-import com.vci.web.model.BdSelectInputCharDO;
+import com.vci.model.BdSelectInputCharDO;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import org.apache.commons.lang3.StringUtils;
@@ -10,7 +10,7 @@
import com.vci.starter.web.pagemodel.*;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.service.OsLifeCycleServiceI;
-import com.vci.web.pageModel.BatchCBO;
+import com.vci.pagemodel.BatchCBO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
@@ -18,8 +18,7 @@
import java.util.List;
import java.util.Map;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
-
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
/**
* 鍙緭鍙�夊唴瀹规暟鎹搷浣滃眰瀹炵幇绫�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeBreakCodeDaoImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeBreakCodeDaoImpl.java
index e0384b5..f81932a 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeBreakCodeDaoImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeBreakCodeDaoImpl.java
@@ -5,10 +5,9 @@
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.dao.OsCodeBreakCodeDaoI;
-import com.vci.web.model.OsCodeBreakCodeDO;
-import com.vci.web.pageModel.BatchCBO;
+import com.vci.model.OsCodeBreakCodeDO;
+import com.vci.pagemodel.BatchCBO;
import com.vci.web.service.WebBoServiceI;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +19,7 @@
import java.util.List;
import java.util.Map;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
/**
* Description:鏂爜鍐呭鏁版嵁鎿嶄綔灞傚疄鐜扮被
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeEnumDaoImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeEnumDaoImpl.java
index aeb2c4c..a622f8e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeEnumDaoImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeEnumDaoImpl.java
@@ -5,10 +5,9 @@
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.constant.BtmIdConstant;
import com.vci.web.dao.OsCodeEnumDaoI;
-import com.vci.web.model.OsCodeEnumDO;
-import com.vci.web.pageModel.BatchCBO;
+import com.vci.model.OsCodeEnumDO;
+import com.vci.pagemodel.BatchCBO;
import com.vci.web.service.WebBoServiceI;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +16,7 @@
import java.util.*;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
/**
* Description:缂栫爜涓殑鏋氫妇鏄犲皠鏁版嵁鎿嶄綔灞傚疄鐜扮被
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeGenSchemaDaoImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeGenSchemaDaoImpl.java
index 7a8e7f8..cf7157d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeGenSchemaDaoImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeGenSchemaDaoImpl.java
@@ -4,7 +4,7 @@
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.dao.OsCodeGenSchemaDaoI;
-import com.vci.web.model.OsCodeGenSchemaDO;
+import com.vci.model.OsCodeGenSchemaDO;
import com.vci.web.service.OsLinkTypeServiceI;
import com.vci.web.service.WebBoServiceI;
import org.apache.commons.lang3.StringUtils;
@@ -14,7 +14,7 @@
import java.util.List;
import java.util.Map;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java
index d27a34b..cc29913 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java
@@ -5,8 +5,8 @@
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.dao.OsCodeRuleDaoI;
-import com.vci.web.model.OsCodeRuleDO;
-import com.vci.web.pageModel.BatchCBO;
+import com.vci.model.OsCodeRuleDO;
+import com.vci.pagemodel.BatchCBO;
import com.vci.web.service.OsLifeCycleServiceI;
import com.vci.web.service.WebBoServiceI;
import org.apache.commons.lang3.StringUtils;
@@ -19,7 +19,7 @@
import java.util.List;
import java.util.Map;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleElementDaoImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleElementDaoImpl.java
index 9cb0c38..1d20b09 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleElementDaoImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleElementDaoImpl.java
@@ -4,8 +4,8 @@
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.dao.OsCodeRuleElementDaoI;
-import com.vci.web.model.OsCodeRuleElementDO;
-import com.vci.web.pageModel.BatchCBO;
+import com.vci.model.OsCodeRuleElementDO;
+import com.vci.pagemodel.BatchCBO;
import com.vci.web.service.WebBoServiceI;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +17,7 @@
import java.util.List;
import java.util.Map;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
/**
* Description:缂栫爜瑙勫垯鏄庣粏鏁版嵁鎿嶄綔灞傚疄鐜扮被
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeSerialNumberDaoImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeSerialNumberDaoImpl.java
index 24eeb18..ef5fb31 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeSerialNumberDaoImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeSerialNumberDaoImpl.java
@@ -4,8 +4,8 @@
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.dao.OsCodeSerialNumberDaoI;
-import com.vci.web.model.OsCodeSerialNumberDO;
-import com.vci.web.pageModel.BatchCBO;
+import com.vci.model.OsCodeSerialNumberDO;
+import com.vci.pagemodel.BatchCBO;
import com.vci.web.service.WebBoServiceI;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +17,7 @@
import java.util.List;
import java.util.Map;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
/**
* Description:缂栫爜娴佹按鍙锋暟鎹搷浣滃眰瀹炵幇绫�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/VciFileDocClassifyDaoImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/VciFileDocClassifyDaoImpl.java
index bdbd9f3..815871e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/VciFileDocClassifyDaoImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/VciFileDocClassifyDaoImpl.java
@@ -1,12 +1,11 @@
package com.vci.web.dao.impl;
-import com.vci.file.constant.VciFileBtmTypeConstant;
+import com.vci.constant.VciFileBtmTypeConstant;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.dao.VciFileDocClassifyDaoI;
-import com.vci.web.model.VciFileDocClassifyDO;
-import com.vci.web.model.VciFileObjectDO;
+import com.vci.model.VciFileDocClassifyDO;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/VciFileObjectDaoImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/VciFileObjectDaoImpl.java
index b73fdca..fcf3c6b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/VciFileObjectDaoImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/VciFileObjectDaoImpl.java
@@ -1,13 +1,13 @@
package com.vci.web.dao.impl;
+import com.vci.constant.VciFileBtmTypeConstant;
import com.vci.corba.omd.data.BusinessObject;
-import com.vci.file.constant.VciFileBtmTypeConstant;
import com.vci.omd.utils.ObjectTool;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.dao.VciFileObjectDaoI;
-import com.vci.web.model.VciFileObjectDO;
+import com.vci.model.VciFileObjectDO;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/VciFileVolumeDaoImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/VciFileVolumeDaoImpl.java
index 4bd99c0..608c55e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/VciFileVolumeDaoImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/VciFileVolumeDaoImpl.java
@@ -1,18 +1,16 @@
package com.vci.web.dao.impl;
-import com.vci.file.constant.VciFileBtmTypeConstant;
+import com.vci.constant.VciFileBtmTypeConstant;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.dao.VciFileVolumeDaoI;
-import com.vci.web.model.VciFileObjectDO;
-import com.vci.web.model.VciFileVolumeDO;
+import com.vci.model.VciFileVolumeDO;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
-import org.springframework.util.CollectionUtils;
import java.util.Collection;
import java.util.HashMap;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/WFWorkflowNodeFavDaoImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/WFWorkflowNodeFavDaoImpl.java
index a520234..0913b85 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/WFWorkflowNodeFavDaoImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/WFWorkflowNodeFavDaoImpl.java
@@ -1,12 +1,12 @@
package com.vci.web.dao.impl;
-import com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant;
+import com.vci.constant.FrameWorkBusLangCodeConstant;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.dao.WFWorkflowNodeFavDaoI;
-import com.vci.web.model.WFWorkflowNodeFavDO;
-import com.vci.web.pageModel.BatchCBO;
+import com.vci.model.WFWorkflowNodeFavDO;
+import com.vci.pagemodel.BatchCBO;
import com.vci.web.service.OsLifeCycleServiceI;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.util.PlatformClientUtil;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/WFWorkflowNodeFavItemDaoImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/WFWorkflowNodeFavItemDaoImpl.java
index b433fc5..e0114c4 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/WFWorkflowNodeFavItemDaoImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/WFWorkflowNodeFavItemDaoImpl.java
@@ -1,12 +1,12 @@
package com.vci.web.dao.impl;
-import com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant;
+import com.vci.constant.FrameWorkBusLangCodeConstant;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.dao.WFWorkflowNodeFavItemDaoI;
-import com.vci.web.model.WFWorkflowNodeFavItemDO;
-import com.vci.web.pageModel.BatchCBO;
+import com.vci.model.WFWorkflowNodeFavItemDO;
+import com.vci.pagemodel.BatchCBO;
import com.vci.web.service.OsLifeCycleServiceI;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.util.PlatformClientUtil;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java
index 13cf5eb..af20c8f 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java
@@ -7,8 +7,9 @@
import com.vci.corba.omd.data.LinkObject;
import com.vci.corba.workflow.WorkflowServicePrx;
import com.vci.corba.workflow.data.*;
+import com.vci.dto.ProcessTemplateVO;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.pagemodel.*;
import com.vci.omd.utils.ObjectTool;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.exception.VciBaseException;
@@ -18,13 +19,12 @@
import com.vci.starter.web.util.BeanUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
-import com.vci.web.constant.WFVariablesKeyConstant;
+import com.vci.constant.WFVariablesKeyConstant;
import com.vci.web.dao.WebProcessDaoI;
-import com.vci.web.model.ProcessInstance;
-import com.vci.web.model.ProcessTask;
-import com.vci.web.model.WFProcessClassifyDO;
-import com.vci.web.model.WFProcessTemplateDO;
-import com.vci.web.pageModel.*;
+import com.vci.model.ProcessInstance;
+import com.vci.model.ProcessTask;
+import com.vci.model.WFProcessClassifyDO;
+import com.vci.model.WFProcessTemplateDO;
import com.vci.web.service.OsLifeCycleServiceI;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.service.WebLoServiceI;
@@ -41,7 +41,8 @@
import java.util.*;
import java.util.stream.Collectors;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
+
/**
* 娴佺▼鐨勬暟鎹眰
@@ -129,7 +130,7 @@
* @throws
*/
@Override
- public List<ProcessTemplateVO> getTemplatesByType(String type, String filterTemplate,boolean showAll)
+ public List<ProcessTemplateVO> getTemplatesByType(String type, String filterTemplate, boolean showAll)
throws VciBaseException {
WebUtil.alertNotNull(type,"妯℃澘鍒嗙被");
ProcessDefinitionInfo[] allFlowInType = null;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeDateValueTypeEnum.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeDateValueTypeEnum.java
index 0eb4cd8..7003f87 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeDateValueTypeEnum.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeDateValueTypeEnum.java
@@ -2,7 +2,7 @@
import com.vci.starter.web.annotation.VciEnum;
import com.vci.starter.web.enumpck.BaseEnum;
-import com.vci.web.constant.EnumIdConstant;
+import com.vci.constant.EnumIdConstant;
/**
* 缂栫爜鐨勬椂闂村彇鍊肩被鍨�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeElementTypeEnum.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeElementTypeEnum.java
index 9621eb1..2e158a1 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeElementTypeEnum.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeElementTypeEnum.java
@@ -3,7 +3,7 @@
import com.vci.starter.web.annotation.VciEnum;
import com.vci.starter.web.enumpck.BaseEnum;
-import com.vci.web.constant.EnumIdConstant;
+import com.vci.constant.EnumIdConstant;
/**
* 缂栫爜鍏冪礌绫诲瀷
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeFillTypeEnum.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeFillTypeEnum.java
index 18841e0..77a2b08 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeFillTypeEnum.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeFillTypeEnum.java
@@ -3,7 +3,7 @@
import com.vci.starter.web.annotation.VciEnum;
import com.vci.starter.web.enumpck.BaseEnum;
-import com.vci.web.constant.EnumIdConstant;
+import com.vci.constant.EnumIdConstant;
/**
* 缂栫爜鐨勮ˉ浣嶆柟寮�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeGenJsPanelTypeEnum.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeGenJsPanelTypeEnum.java
index acb3952..17ad8f0 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeGenJsPanelTypeEnum.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeGenJsPanelTypeEnum.java
@@ -2,7 +2,7 @@
import com.vci.starter.web.annotation.VciEnum;
import com.vci.starter.web.enumpck.BaseEnum;
-import com.vci.web.constant.EnumIdConstant;
+import com.vci.constant.EnumIdConstant;
/**
* 椤甸潰鐨勭被鍨�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeProductTypeEnum.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeProductTypeEnum.java
index 4df67b4..e1c272e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeProductTypeEnum.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeProductTypeEnum.java
@@ -3,7 +3,7 @@
import com.vci.starter.web.annotation.VciEnum;
import com.vci.starter.web.enumpck.BaseEnum;
-import com.vci.web.constant.EnumIdConstant;
+import com.vci.constant.EnumIdConstant;
/**
* 缂栫爜鐢熸垚鏂瑰紡
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/UserTypeEnum.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/UserTypeEnum.java
index d8d8dc0..b2e7c71 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/UserTypeEnum.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/UserTypeEnum.java
@@ -2,7 +2,7 @@
import com.vci.starter.web.annotation.VciEnum;
import com.vci.starter.web.enumpck.BaseEnum;
-import com.vci.web.constant.EnumIdConstant;
+import com.vci.constant.EnumIdConstant;
/**
* @Description
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java
index e2b4b4f..8fbdc66 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java
@@ -3,10 +3,11 @@
import com.alibaba.fastjson.JSONObject;
import com.vci.client.mw.ClientContextVariable;
import com.vci.client.mw.LaunchModeEnum;
+import com.vci.constant.FrameWorkBtmTypeConstant;
import com.vci.corba.common.PLException;
import com.vci.corba.framework.FrameworkServicePrx;
import com.vci.corba.omd.data.AttributeValue;
-import com.vci.frameworkcore.constant.FrameWorkBtmTypeConstant;
+import com.vci.constant.FrameWorkBtmTypeConstant;
import com.vci.frameworkcore.properties.VciFramworkCompatibilityProperties;
import com.vci.starter.web.annotation.config.VciConfigField;
import com.vci.starter.web.annotation.config.VciConfigModule;
@@ -17,7 +18,7 @@
import com.vci.starter.web.util.ApplicationContextProvider;
import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.pageModel.OsAttributeVO;
+import com.vci.pagemodel.OsAttributeVO;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.OsAttributeServiceI;
import com.vci.web.service.VciMdServiceI;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/lifeCycle/FileObjectLCStatus.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/lifeCycle/FileObjectLCStatus.java
index 8c96bb3..66a2787 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/lifeCycle/FileObjectLCStatus.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/lifeCycle/FileObjectLCStatus.java
@@ -1,11 +1,11 @@
package com.vci.web.lifeCycle;
-import com.vci.file.constant.VciFileLifeConstant;
-import com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant;
+import com.vci.constant.FrameWorkDefaultValueConstant;
+import com.vci.constant.VciFileLifeConstant;
+import com.vci.constant.FrameWorkDefaultValueConstant;
import com.vci.starter.web.annotation.Transient;
import com.vci.starter.web.annotation.VciLifeCycle;
import com.vci.starter.web.annotation.VciLifeCycleTrans;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
import com.vci.starter.web.enumpck.BaseEnum;
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/other/BdSelectInputCharAspect.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/other/BdSelectInputCharAspect.java
index 16bff3c..c991c3f 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/other/BdSelectInputCharAspect.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/other/BdSelectInputCharAspect.java
@@ -2,11 +2,10 @@
import com.vci.web.annotation.BdSelectInput;
import com.vci.web.dao.BdSelectInputCharDaoI;
-import com.vci.web.model.BdSelectInputCharDO;
+import com.vci.model.BdSelectInputCharDO;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.After;
import org.aspectj.lang.annotation.AfterReturning;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/other/FlowNoticeExample.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/other/FlowNoticeExample.java
index e3b85bf..dcf69fe 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/other/FlowNoticeExample.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/other/FlowNoticeExample.java
@@ -3,7 +3,7 @@
import com.vci.web.annotation.FlowNotifyAfter;
import com.vci.web.annotation.FlowNotifyBefore;
import com.vci.web.annotation.FlowNotifyWeb;
-import com.vci.web.bo.FlowNoticeInfo;
+import com.vci.bo.FlowNoticeInfo;
/**
* 娴佺▼閫氱煡鐨勭ず渚�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/other/WorkFlowEndedNotice.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/other/WorkFlowEndedNotice.java
index 33f5ba3..b45b0f3 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/other/WorkFlowEndedNotice.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/other/WorkFlowEndedNotice.java
@@ -5,7 +5,7 @@
import com.vci.omd.utils.ObjectTool;
import com.vci.web.annotation.FlowNotifyBefore;
import com.vci.web.annotation.FlowNotifyWeb;
-import com.vci.web.bo.FlowNoticeInfo;
+import com.vci.bo.FlowNoticeInfo;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.util.PlatformClientUtil;
import org.apache.commons.lang3.StringUtils;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/BdSelectInputCharServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/BdSelectInputCharServiceI.java
index 3d515da..600b2fb 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/BdSelectInputCharServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/BdSelectInputCharServiceI.java
@@ -1,21 +1,16 @@
package com.vci.web.service;
-import com.vci.web.pageModel.BdSelectInputCharVO;
-import com.vci.web.dto.BdSelectInputCharDTO;
-import com.vci.web.model.BdSelectInputCharDO;
-import com.vci.web.dao.BdSelectInputCharDaoI;
-import com.vci.web.pageModel.KeyValue;
-import com.vci.web.service.BdSelectInputCharServiceI;
- import com.vci.starter.web.exception.VciBaseException;
+import com.vci.pagemodel.BdSelectInputCharVO;
+import com.vci.dto.BdSelectInputCharDTO;
+import com.vci.model.BdSelectInputCharDO;
+import com.vci.pagemodel.KeyValue;
+import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
-import com.vci.starter.web.util.*;
-import com.vci.starter.web.wrapper.*;
import java.util.*;
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
/**
* 鍙緭鍙�夊唴瀹规湇鍔℃帴鍙�
*
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/LoginServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/LoginServiceI.java
index deb8d8a..1093ba8 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/LoginServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/LoginServiceI.java
@@ -1,11 +1,10 @@
package com.vci.web.service;
+import com.vci.corba.common.PLException;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.RequestClientInfo;
-import com.vci.starter.web.pagemodel.SessionInfo;
-import com.vci.starter.web.pagemodel.TokenVO;
-import com.vci.web.bo.LoginResultBO;
-import com.vci.web.dto.LoginUserDTO;
+import com.vci.bo.LoginResultBO;
+import com.vci.dto.LoginUserDTO;
/**
* 鐧诲綍鍜岄��鍑烘湇鍔�
@@ -21,7 +20,7 @@
* @return 鐧诲綍鐨勭粨鏋滃璞�
* @throws VciBaseException 鐧诲綍澶辫触鐨勬椂鍊欐姏鍑哄紓甯�
*/
- LoginResultBO login(LoginUserDTO userDTO, RequestClientInfo clientInfo) throws VciBaseException;
+ LoginResultBO login(LoginUserDTO userDTO, RequestClientInfo clientInfo) throws PLException;
/**
* 鍗曠偣鐧诲綍
@@ -30,7 +29,7 @@
* @return 鐧诲綍鐨勭粨鏋滃璞�
* @throws VciBaseException 鐧诲綍澶辫触鐨勬椂鍊欐姏鍑哄紓甯�
*/
- LoginResultBO singleLogin(LoginUserDTO userDTO, RequestClientInfo clientInfo) throws VciBaseException;
+ LoginResultBO singleLogin(LoginUserDTO userDTO, RequestClientInfo clientInfo) throws PLException;
/**
* 閫�鍑虹郴缁�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java
index 76255d7..5326c44 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java
@@ -3,7 +3,7 @@
import com.vci.corba.omd.atm.AttributeDef;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.web.pageModel.OsAttributeVO;
+import com.vci.pagemodel.OsAttributeVO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBtmServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBtmServiceI.java
index 5639a9d..85b5146 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBtmServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBtmServiceI.java
@@ -1,9 +1,13 @@
package com.vci.web.service;
import com.vci.corba.omd.btm.BizType;
+import com.vci.pagemodel.OsBtmTypeAttributeVO;
+import com.vci.pagemodel.OsBtmTypeVO;
+import com.vci.pagemodel.OsERVO;
+import com.vci.pagemodel.OsUsedAttributeVO;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.web.pageModel.*;
+
import java.util.Collection;
import java.util.List;
import java.util.Map;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsCodeGenSchemaServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsCodeGenSchemaServiceI.java
index 89bab70..60b864d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsCodeGenSchemaServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsCodeGenSchemaServiceI.java
@@ -2,9 +2,9 @@
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.web.dto.OsCodeGenSchemaDTO;
-import com.vci.web.model.OsCodeGenSchemaDO;
-import com.vci.web.pageModel.OsCodeGenSchemaVO;
+import com.vci.dto.OsCodeGenSchemaDTO;
+import com.vci.model.OsCodeGenSchemaDO;
+import com.vci.pagemodel.OsCodeGenSchemaVO;
import java.util.List;
import java.util.Map;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsCodeRuleServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsCodeRuleServiceI.java
index b6d4944..62b1848 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsCodeRuleServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsCodeRuleServiceI.java
@@ -3,13 +3,13 @@
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.web.dto.OsCodeRuleDTO;
-import com.vci.web.dto.OsCodeRuleProduceDTO;
-import com.vci.web.model.OsCodeRuleDO;
-import com.vci.web.model.OsCodeRuleElementDO;
-import com.vci.web.pageModel.OsCodeResultVO;
-import com.vci.web.pageModel.OsCodeRuleElementVO;
-import com.vci.web.pageModel.OsCodeRuleVO;
+import com.vci.dto.OsCodeRuleDTO;
+import com.vci.dto.OsCodeRuleProduceDTO;
+import com.vci.model.OsCodeRuleDO;
+import com.vci.model.OsCodeRuleElementDO;
+import com.vci.pagemodel.OsCodeResultVO;
+import com.vci.pagemodel.OsCodeRuleElementVO;
+import com.vci.pagemodel.OsCodeRuleVO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsEnumServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsEnumServiceI.java
index 3643a8a..49dfc6f 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsEnumServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsEnumServiceI.java
@@ -3,10 +3,9 @@
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.web.pageModel.KeyValue;
-import com.vci.web.pageModel.OsEnumItemVO;
-import com.vci.web.pageModel.OsEnumVO;
-import com.vci.corba.omd.etm.EnumItem;
+import com.vci.pagemodel.KeyValue;
+import com.vci.pagemodel.OsEnumItemVO;
+import com.vci.pagemodel.OsEnumVO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsLifeCycleServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsLifeCycleServiceI.java
index e3e0992..c0be382 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsLifeCycleServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsLifeCycleServiceI.java
@@ -5,10 +5,10 @@
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.web.pageModel.OsERVO;
-import com.vci.web.pageModel.OsLifeCycleLineVO;
-import com.vci.web.pageModel.OsLifeCycleVO;
-import com.vci.web.pageModel.OsStatusVO;
+import com.vci.pagemodel.OsERVO;
+import com.vci.pagemodel.OsLifeCycleLineVO;
+import com.vci.pagemodel.OsLifeCycleVO;
+import com.vci.pagemodel.OsStatusVO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsLinkTypeServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsLinkTypeServiceI.java
index 4143af1..3c8d7ca 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsLinkTypeServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsLinkTypeServiceI.java
@@ -3,9 +3,9 @@
import com.vci.corba.omd.ltm.LinkType;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.web.pageModel.OsBtmTypeAttributeVO;
-import com.vci.web.pageModel.OsLinkTypeAttributeVO;
-import com.vci.web.pageModel.OsLinkTypeVO;
+import com.vci.pagemodel.OsBtmTypeAttributeVO;
+import com.vci.pagemodel.OsLinkTypeAttributeVO;
+import com.vci.pagemodel.OsLinkTypeVO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java
index 7a75561..b32a874 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java
@@ -1,7 +1,7 @@
package com.vci.web.service;
import com.vci.corba.omd.vrm.VersionRule;
-import com.vci.web.pageModel.OsRevisionRuleVO;
+import com.vci.pagemodel.OsRevisionRuleVO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java
index 2c122d6..f3b3835 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java
@@ -3,8 +3,8 @@
import com.vci.corba.omd.stm.StatePool;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.web.dto.OsStatusDTO;
-import com.vci.web.pageModel.OsStatusVO;
+import com.vci.dto.OsStatusDTO;
+import com.vci.pagemodel.OsStatusVO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmFavFunctionServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmFavFunctionServiceI.java
index 395621e..c2d207a 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmFavFunctionServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmFavFunctionServiceI.java
@@ -1,6 +1,6 @@
package com.vci.web.service;
-import com.vci.frameworkcore.pagemodel.SmFunctionVO;
+import com.vci.pagemodel.SmFunctionVO;
import com.vci.starter.web.exception.VciBaseException;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmOperationServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmOperationServiceI.java
index 6cb448c..ee25d63 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmOperationServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmOperationServiceI.java
@@ -1,6 +1,6 @@
package com.vci.web.service;
-import com.vci.web.pageModel.SmOperationVO;
+import com.vci.pagemodel.SmOperationVO;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIDataServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIDataServiceI.java
index dc2df3b..0bbdd9b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIDataServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIDataServiceI.java
@@ -5,14 +5,14 @@
import com.vci.corba.omd.data.LinkObject;
import com.vci.corba.omd.data.RevisionDataInfo;
import com.vci.corba.omd.data.VersionDataInfo;
+import com.vci.dto.*;
import com.vci.starter.web.enumpck.VciChangeDocumentTypeEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.model.BaseModel;
import com.vci.starter.web.pagemodel.*;
-import com.vci.web.dto.*;
-import com.vci.web.pageModel.OsBtmTypeVO;
-import com.vci.web.pageModel.ReferConfigVO;
-import com.vci.web.pageModel.UIFormDataVO;
+import com.vci.pagemodel.OsBtmTypeVO;
+import com.vci.pagemodel.ReferConfigVO;
+import com.vci.pagemodel.UIFormDataVO;
import com.vci.web.query.UIDataGridQuery;
import com.vci.web.query.UIFormQuery;
import com.vci.web.query.UITreeQuery;
@@ -61,7 +61,7 @@
* @return 鎵ц缁撴灉锛岃鍒ゆ柇success灞炴�ф槸鍚︿负true
* @throws VciBaseException 閰嶇疆鎴栬�呮槸璋冪敤涓嶆垚鍔熺殑鏃跺�欙紝浼氭姏鍑哄紓甯�
*/
- BaseResult callPreEvent(BaseModelDTOList baseModelDTOList, BaseLinkModelDTOList baseLinkModelDTOList,String preEvent, VciChangeDocumentTypeEnum businessType) throws VciBaseException;
+ BaseResult callPreEvent(BaseModelDTOList baseModelDTOList, BaseLinkModelDTOList baseLinkModelDTOList, String preEvent, VciChangeDocumentTypeEnum businessType) throws VciBaseException;
/**
* 鍚庣疆浜嬩欢
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIEngineServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIEngineServiceI.java
index 07010d9..4e768f8 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIEngineServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIEngineServiceI.java
@@ -4,7 +4,8 @@
import com.vci.corba.portal.data.PLUILayout;
import com.vci.corba.portal.data.PortalVI;
import com.vci.corba.portal.data.PLAction;
-import com.vci.web.pageModel.*;
+import com.vci.pagemodel.*;
+
import java.util.Collection;
import java.util.List;
import java.util.Map;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileDocClassifyServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileDocClassifyServiceI.java
index d155813..9715897 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileDocClassifyServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileDocClassifyServiceI.java
@@ -1,14 +1,14 @@
package com.vci.web.service;
-import com.vci.file.dto.VciFileDocClassifyDTO;
-import com.vci.file.dto.VciFileDocClassifyDTOList;
-import com.vci.file.pagemodel.VciFileDocClassifyVO;
+import com.vci.dto.VciFileDocClassifyDTO;
+import com.vci.dto.VciFileDocClassifyDTOList;
+import com.vci.pagemodel.VciFileDocClassifyVO;
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.KeyValue;
import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.web.model.VciFileDocClassifyDO;
+import com.vci.model.VciFileDocClassifyDO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileDownloadServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileDownloadServiceI.java
index a156053..0859384 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileDownloadServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileDownloadServiceI.java
@@ -1,6 +1,6 @@
package com.vci.web.service;
-import com.vci.file.pagemodel.VciFileObjectVO;
+import com.vci.pagemodel.VciFileObjectVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;
import net.lingala.zip4j.core.ZipFile;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileObjectServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileObjectServiceI.java
index a4329c0..b137723 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileObjectServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileObjectServiceI.java
@@ -1,12 +1,12 @@
package com.vci.web.service;
-import com.vci.file.dto.VciFileObjectDTO;
-import com.vci.file.pagemodel.VciFileObjectVO;
+import com.vci.dto.VciFileObjectDTO;
+import com.vci.pagemodel.VciFileObjectVO;
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.web.model.VciFileObjectDO;
+import com.vci.model.VciFileObjectDO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileQueryServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileQueryServiceI.java
index 51a20fb..9916038 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileQueryServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileQueryServiceI.java
@@ -1,6 +1,6 @@
package com.vci.web.service;
-import com.vci.file.pagemodel.VciFileObjectVO;
+import com.vci.pagemodel.VciFileObjectVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileUploadServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileUploadServiceI.java
index d4aa3a7..f977bad 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileUploadServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileUploadServiceI.java
@@ -1,7 +1,7 @@
package com.vci.web.service;
-import com.vci.file.dto.VciFileObjectDTO;
-import com.vci.file.pagemodel.VciFileObjectVO;
+import com.vci.dto.VciFileObjectDTO;
+import com.vci.pagemodel.VciFileObjectVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;
import org.springframework.web.multipart.MultipartFile;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileVolumeServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileVolumeServiceI.java
index 1c4e3c8..4275135 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileVolumeServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/VciFileVolumeServiceI.java
@@ -1,12 +1,12 @@
package com.vci.web.service;
-import com.vci.file.dto.VciFileVolumeDTO;
-import com.vci.file.pagemodel.VciFileVolumeVO;
+import com.vci.dto.VciFileVolumeDTO;
+import com.vci.pagemodel.VciFileVolumeVO;
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.web.model.VciFileVolumeDO;
+import com.vci.model.VciFileVolumeDO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WFWorkflowNodeFavItemServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WFWorkflowNodeFavItemServiceI.java
index 704cfb5..2a0d6f2 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WFWorkflowNodeFavItemServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WFWorkflowNodeFavItemServiceI.java
@@ -5,9 +5,9 @@
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.web.dto.WFWorkflowNodeFavItemDTO;
-import com.vci.web.model.WFWorkflowNodeFavItemDO;
-import com.vci.web.pageModel.WFWorkflowNodeFavItemVO;
+import com.vci.dto.WFWorkflowNodeFavItemDTO;
+import com.vci.model.WFWorkflowNodeFavItemDO;
+import com.vci.pagemodel.WFWorkflowNodeFavItemVO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WFWorkflowNodeFavServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WFWorkflowNodeFavServiceI.java
index 3d69a06..007c4a4 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WFWorkflowNodeFavServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WFWorkflowNodeFavServiceI.java
@@ -4,10 +4,10 @@
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.web.dto.WFWorkflowNodeFavDTO;
-import com.vci.web.model.WFWorkflowNodeFavDO;
-import com.vci.web.pageModel.WFWorkflowNodeFavItemVO;
-import com.vci.web.pageModel.WFWorkflowNodeFavVO;
+import com.vci.dto.WFWorkflowNodeFavDTO;
+import com.vci.model.WFWorkflowNodeFavDO;
+import com.vci.pagemodel.WFWorkflowNodeFavItemVO;
+import com.vci.pagemodel.WFWorkflowNodeFavVO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebActionServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebActionServiceI.java
index 8b8a995..dd7757e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebActionServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebActionServiceI.java
@@ -1,7 +1,7 @@
package com.vci.web.service;
import com.vci.starter.web.exception.VciBaseException;
-import com.vci.web.pageModel.UIActionVO;
+import com.vci.pagemodel.UIActionVO;
/**
* 骞冲彴鐨刟ction鏈嶅姟
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebBoServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebBoServiceI.java
index 88e3208..a0d0ac2 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebBoServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebBoServiceI.java
@@ -8,7 +8,7 @@
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.pageModel.BatchCBO;
+import com.vci.pagemodel.BatchCBO;
import java.util.Collection;
import java.util.List;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebBtmIOServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebBtmIOServiceI.java
index 2498bd4..556ce7e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebBtmIOServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebBtmIOServiceI.java
@@ -2,10 +2,9 @@
import com.vci.corba.omd.btm.BizType;
import com.vci.starter.web.exception.VciBaseException;
-import com.vci.web.dto.OsBtmTypeExportDTO;
+import com.vci.dto.OsBtmTypeExportDTO;
import java.util.Collection;
-import java.util.List;
/**
* 瀵硅薄寤烘ā鐩稿叧鐨勫鍏�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebHomeTaskServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebHomeTaskServiceI.java
index 69f9b06..a0c7821 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebHomeTaskServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebHomeTaskServiceI.java
@@ -4,8 +4,8 @@
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.web.dto.WebHomeTaskActionDTO;
-import com.vci.web.pageModel.WebHomeTaskActionVO;
+import com.vci.dto.WebHomeTaskActionDTO;
+import com.vci.pagemodel.WebHomeTaskActionVO;
import java.util.List;
import java.util.Map;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebLogServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebLogServiceI.java
index 42f4745..2222de8 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebLogServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebLogServiceI.java
@@ -1,6 +1,6 @@
package com.vci.web.service;
-import com.vci.web.bo.VciLogObjectBO;
+import com.vci.bo.VciLogObjectBO;
public interface WebLogServiceI {
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebProcessCommandServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebProcessCommandServiceI.java
index 75f57e0..731f509 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebProcessCommandServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebProcessCommandServiceI.java
@@ -2,8 +2,8 @@
import com.vci.corba.workflow.data.TasksAssignedInfo;
import com.vci.starter.web.exception.VciBaseException;
-import com.vci.web.dto.ProcessStartConfigDTO;
-import com.vci.web.pageModel.ProcessUserVO;
+import com.vci.dto.ProcessStartConfigDTO;
+import com.vci.pagemodel.ProcessUserVO;
import org.springframework.web.multipart.MultipartFile;
import java.util.Collection;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebProcessDefineServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebProcessDefineServiceI.java
index 4dfc55b..24b5962 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebProcessDefineServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebProcessDefineServiceI.java
@@ -1,12 +1,12 @@
package com.vci.web.service;
-import com.vci.file.pagemodel.VciFileObjectVO;
+import com.vci.dto.ProcessTemplateVO;
+import com.vci.pagemodel.*;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.pagemodel.Tree;
import com.vci.starter.web.pagemodel.TreeQueryObject;
-import com.vci.web.pageModel.*;
import java.util.List;
import java.util.Map;
@@ -25,7 +25,7 @@
* @return 鍙敤鐨勬祦绋嬫ā鐗�
* @throws VciBaseException
*/
- List<ProcessTemplateVO> getMyTemplates(String type, String filterTemplate,boolean showAll) throws VciBaseException;
+ List<ProcessTemplateVO> getMyTemplates(String type, String filterTemplate, boolean showAll) throws VciBaseException;
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebSecretServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebSecretServiceI.java
index e41448d..efc7a11 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebSecretServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/WebSecretServiceI.java
@@ -1,6 +1,6 @@
package com.vci.web.service;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.pagemodel.SmUserVO;
import com.vci.starter.web.exception.VciBaseException;
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/BdSelectInputCharServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/BdSelectInputCharServiceImpl.java
index 1d60c81..eb9046b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/BdSelectInputCharServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/BdSelectInputCharServiceImpl.java
@@ -9,11 +9,11 @@
import com.vci.starter.web.util.BeanUtilForVCI;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.dao.BdSelectInputCharDaoI;
-import com.vci.web.dto.BdSelectInputCharDTO;
-import com.vci.web.model.BdSelectInputCharDO;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.pageModel.BdSelectInputCharVO;
-import com.vci.web.pageModel.KeyValue;
+import com.vci.dto.BdSelectInputCharDTO;
+import com.vci.model.BdSelectInputCharDO;
+import com.vci.pagemodel.BatchCBO;
+import com.vci.pagemodel.BdSelectInputCharVO;
+import com.vci.pagemodel.KeyValue;
import com.vci.web.service.BdSelectInputCharServiceI;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.util.WebUtil;
@@ -28,7 +28,7 @@
import javax.annotation.Resource;
import java.util.*;
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
+import static com.vci.constant.FrameWorkLangCodeConstant.*;
/**
* 鍙緭鍙�夊唴瀹规湇鍔�
* @author weidy
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java
index aba5f04..e860eee 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java
@@ -1,8 +1,6 @@
package com.vci.web.service.impl;
-import com.vci.client.mw.ClientSessionUtility;
import com.vci.corba.common.PLException;
-import com.vci.corba.common.data.InvocationInfo;
import com.vci.corba.framework.data.DeptInfo;
import com.vci.corba.framework.data.LoginResult;
import com.vci.corba.framework.data.LoginState;
@@ -10,11 +8,13 @@
import com.vci.frameworkcore.ajaxTask.SmUserUnLockTask;
import com.vci.frameworkcore.ajaxTask.SmUserUnLockTaskManager;
import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
-import com.vci.frameworkcore.compatibility.SmRoleQueryServiceI;
+import com.vci.frameworkcore.compatibility.SmPwdStrategyQueryServiceI;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
import com.vci.frameworkcore.enumpck.ResourceControlTypeEnum;
-import com.vci.frameworkcore.pagemodel.SmFunctionVO;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
+import com.vci.pagemodel.SmFunctionVO;
+import com.vci.pagemodel.SmPasswordStrategyVO;
+import com.vci.pagemodel.SmUserVO;
import com.vci.frameworkcore.properties.VciSecurityManageProperties;
import com.vci.starter.web.annotation.bus.VciLoginAfter;
import com.vci.starter.web.annotation.bus.VciLogoutBefore;
@@ -25,27 +25,28 @@
import com.vci.starter.web.pagemodel.SessionInfo;
import com.vci.starter.web.pagemodel.TokenVO;
import com.vci.starter.web.util.*;
-import com.vci.web.bo.LoginResultBO;
-import com.vci.web.constant.CacheNameConstant;
-import com.vci.web.dto.LoginUserDTO;
+
+import com.vci.bo.LoginResultBO;
+import com.vci.constant.CacheNameConstant;
+import com.vci.dto.LoginUserDTO;
import com.vci.web.properties.WebProperties;
import com.vci.web.redis.RedisService;
import com.vci.web.service.LoginServiceI;
+import com.vci.web.util.Func;
import com.vci.web.util.PlatformClientUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.lang.reflect.Method;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.text.MessageFormat;
+import java.util.*;
+import java.util.stream.Collectors;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.*;
+import static com.vci.constant.FrameWorkBusLangCodeConstant.*;
/**
* 鐧诲綍鐨勬湇鍔�
@@ -85,16 +86,28 @@
private SmUserQueryServiceI userQueryService;
/**
- * 瑙掕壊鐨勬煡璇㈡湇鍔★紝鍙互鍏煎鑰佸钩鍙�
+ * 瀵嗙爜绛栫暐鏌ヨ鏈嶅姟
*/
@Resource
- private SmRoleQueryServiceI roleQueryService;
+ private SmPwdStrategyQueryServiceI pwdStrategyQueryService;
+
+ /**
+ * 鍔熻兘鑿滃崟鐨勬煡璇㈡湇鍔�
+ */
+ @Resource
+ private ISmFunctionQueryService functionQueryService;
+
+ /**
+ * 瑙掕壊鐨勬煡璇㈡湇鍔★紝鍙互鍏煎鑰佸钩鍙�
+ */
+ //@Resource
+ //private SmRoleQueryServiceI roleQueryService;
/**
* 鏉冮檺鐨勬煡璇㈡湇鍔★紝鍙互鍏煎鑰佸钩鍙�
*/
- @Resource
- private ISmFunctionQueryService functionQueryService;
+ //@Resource
+ //private ISmFunctionQueryService functionQueryService;
/**
* redis鏈嶅姟
@@ -121,7 +134,7 @@
* @throws VciBaseException 鐧诲綍鍙戠敓寮傚父鐨勬椂鍊欏嚭鐜颁簡閿欒
*/
@Override
- public LoginResultBO login(LoginUserDTO userDTO, RequestClientInfo clientInfo) throws VciBaseException {
+ public LoginResultBO login(LoginUserDTO userDTO, RequestClientInfo clientInfo) throws PLException {
return login(userDTO,clientInfo,true);
}
@@ -133,16 +146,16 @@
* @return 鎵ц缁撴灉
* @throws VciBaseException 鍙傛暟閿欒锛岀敤鎴蜂笉鑳界櫥褰曠瓑浼氭姏鍑哄紓甯�
*/
- private LoginResultBO login(LoginUserDTO userDTO, RequestClientInfo clientInfo, boolean checkPassword) throws VciBaseException {
+ private LoginResultBO login(LoginUserDTO userDTO, RequestClientInfo clientInfo, boolean checkPassword/*鍗曠偣鐧诲綍涓嶉渶瑕佹牎楠屽瘑鐮�*/) throws VciBaseException, PLException {
LoginResultBO loginResult = new LoginResultBO();
loginResult.setSuccess(false);
+
//1.鍒ゆ柇鐢ㄦ埛鐨勫熀鏈俊鎭�
VciBaseUtil.alertNotNull(userDTO, "鐧诲綍淇℃伅", userDTO.getUserId(), "鐢ㄦ埛璐﹀彿");
if (checkPassword) {
VciBaseUtil.alertNotNull(userDTO.getPassword(), "鐧诲綍瀵嗙爜");
}
-
- //闇�瑕佺湅鐪嬫槸鍚﹀凡缁忕櫥褰曚簡
+ //2銆佸垽鏂崟璁惧鐧诲綍,鏄惁宸茬粡鐧诲綍浜�
String userIdTokenKey = CacheNameConstant.cacheKey(CacheNameConstant.USERID_TOKEN_KEY, userDTO.getUserId().trim());
if(redisService.hasKey(userIdTokenKey) && !userDTO.isForceLogin() && securityManageProperties.isUserOneLogin()){
loginResult.setFailCode(USER_IS_LOGINED);
@@ -156,7 +169,151 @@
redisService.deleteObject(userIdTokenKey);
}
- //2.鑾峰彇鐢ㄦ埛鐨勫璞�.
+ //3.鑾峰彇鐢ㄦ埛鐨勫璞★紙瀵硅薄涓寘鍚鑹查儴闂ㄨ繕鏈夊瘑鐮佺瓥鐣ヤ俊鎭�(褰撳墠鐢ㄦ埛娌¤缃瘑鐮佺瓥鐣ュ氨鏄彇鐨勯粯璁ゅ瘑鐮佺瓥鐣�)锛�
+ SmUserVO user = getUserByUserId(userDTO.getUserId().trim());
+ if (user == null || StringUtils.isBlank(user.getOid())) {
+ loginResult.setFailCode(USER_NOT_FOUND);
+ loginResult.setFailMsgArray(new String[]{userDTO.getUserId()});
+ return loginResult;
+ }
+
+ //4銆佸垽鏂瘑鐮佹槸鍚︽纭紙骞冲彴鐨刢heckLogin鏂规硶濂藉儚鏈夊瀵嗙爜杩涜姣斿鐨勬柟娉曪級
+ /*if (checkPassword) {
+ boolean passwordIsEqual = userQueryService.checkPasswordEqual(userDTO.getPassword(), user.getOid());
+ if (!passwordIsEqual) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("{}瀵嗙爜涓嶆纭�", user.getId());
+ }
+ }
+ }*/
+
+ //5銆佽皟鐢ㄥ钩鍙扮櫥褰曟帴鍙ｏ紝杩涜鐧诲綍
+ MachineInfo machine = getMachieInfo(clientInfo);
+ machine.country = clientInfo.getCountry();
+ machine.language = clientInfo.getLanguage();
+ machine.osUser = clientInfo.getOsUser();
+ machine.machine = clientInfo.getMachine();
+ String token = null;
+ try {
+ /*ThreeDES des = new ThreeDES();// 瀹炰緥鍖栦竴涓锟�?
+ des.getKey("daliantan0v0");// 鐢熸垚瀵嗗寵
+ String encPassword = des.getDesString(userDTO.getPassword());*/
+ LoginResult chkRes = platformClientUtil.getFrameworkService().checkLogin(userDTO.getUserId(),userDTO.getPassword(), machine);
+ loginResult.setFailCode(getErrorCode(chkRes));
+ //loginResult.setFailMsgArray(new String[]{userDTO.getUserId(), String.valueOf(chkRes.auxInfo)});
+ loginResult.setFailMsgArray(new String[]{String.valueOf(chkRes.auxInfo)});
+ //鏍规嵁涓嶅悓鐘舵�佸鐞嗗钩鍙拌繑鍥炵殑淇℃伅
+ if(chkRes.state.equals(LoginState.Error) || chkRes.state.equals(LoginState.Locked) || chkRes.state.equals(LoginState.Freeze)){
+ return loginResult;
+ }
+ //鍏充簬瀵嗙爜绛栫暐鐩稿叧鐨勮繑鍥炰俊鎭鐞�
+ if(chkRes.state.equals(LoginState.InitialPW)){
+ loginResult.setMustChangePassword(true);
+ loginResult.setPasswordInfo("鎮ㄧ殑瀵嗙爜鏄鐞嗗憳鍒濆鐨勫瘑鐮侊紝闇�瑕佷慨鏀瑰瘑鐮佹墠鑳借繘琛屽叾瀹冩搷浣�!");
+ return loginResult;
+ }else if(chkRes.state.equals(LoginState.PWExpired)){
+ //闇�瑕佺珛鍗充慨鏀瑰瘑鐮�
+ loginResult.setMustChangePassword(true);
+ loginResult.setPasswordInfo("鎮ㄧ殑瀵嗙爜宸茬粡杩囨湡,璇疯繘琛屼慨鏀癸紒");
+ return loginResult;
+ }else if(chkRes.state.equals(LoginState.PWPolicyUpdated)){
+ //绛栫暐淇敼锛岀洿鎺ヨ繑鍥為檺鍒剁敤鎴峰悗缁搷浣�
+ loginResult.setMustChangePassword(true);
+ loginResult.setPasswordInfo("鎮ㄧ殑瀵嗙爜绛栫暐宸茬粡淇敼锛岄渶瑕佷慨鏀瑰瘑鐮佹墠鑳借繘琛屽叾瀹冩搷浣�!");
+ return loginResult;
+ }else if(chkRes.state.equals(LoginState.PWWillExpire)){
+ loginResult.setPasswordInfo(String.format("鎮ㄧ殑瀵嗙爜鏈夋晥鏈熻繕鏈�%s澶�,璇锋敞鎰忎慨鏀�!",chkRes.auxInfo));
+ }
+ token = chkRes.token;
+ } catch (Exception e) {
+ loginResult.setFailCode(SYSTEM_ERROR);
+ loginResult.setFailMsgArray(new String[]{userDTO.getUserId()});
+ return loginResult;
+ }
+ if(StringUtils.isBlank(token)){
+ loginResult.setFailMsg(TOKEN_EMPTY);
+ loginResult.setFailMsgArray(new String[]{userDTO.getUserId()});
+ return loginResult;
+ }
+ //6銆佺櫥褰曟垚鍔熶箣鍚庨渶瑕佸鐞嗙殑閫昏緫
+ user.setLastLoginTime(new Date());//鏈�鍚庣櫥褰曟椂闂�
+ user.setPwdWrongCount(0);//瀵嗙爜閿欒娆℃暟娓�0
+ //澶勭悊鐢ㄦ埛鐧诲綍鎴愬姛鐨剆ession
+ SessionInfo sessionInfo = new SessionInfo();
+ sessionInfo.setToken(token);
+ //鍒濆鍖栧钩鍙扮殑token
+ sessionForLogin.initInvocationInfo(sessionInfo);
+ //鎷疯礉鐢ㄦ埛鍒版柊鐨剆ession浼氳瘽涓�
+ copyUser2SessionInfo(user, sessionInfo, userDTO.getLangCode());
+ //鎷疯礉璇锋眰淇℃伅鍒皊ession浼氳瘽涓�
+ copyRequest2SessionInfo(clientInfo, sessionInfo);
+
+ //鏌ョ湅浜嗗钩鍙扮殑鐧诲綍鏂规硶鍏跺疄鏄湁澶勭悊閮ㄩ棬瑙掕壊绛夌浉鍏充俊鎭殑浣嗘槸涓嶇煡閬撲负浠�涔堟棤娉曡幏鍙栧埌
+ //閮ㄩ棬淇℃伅澶勭悊
+ sessionInfo.setDeptOid(user.getPkDepartment());
+ sessionInfo.setDeptName(user.getPkDepartmentName());
+ sessionInfo.setDeptNum(user.getPkDepartmentNum());
+ //瑙掕壊淇℃伅澶勭悊
+ String roleOids = user.getPkPerson();
+ String roleNames = user.getPkPersonName();
+ HashMap<String, String> roleOidNameMap = new HashMap<>();
+ if(Func.isNotBlank(roleOids) && Func.isNotBlank(roleOids)){
+ String[] oids = roleOids.split(",");
+ String[] names = roleNames.split(",");
+ for (int i = 0; i < oids.length; i++) {
+ roleOidNameMap.put(oids[i],names[i]);
+ }
+ }
+ sessionInfo.setRolesName(roleOidNameMap);
+
+ //鏌ヨ鎵�鏈夌殑鏉冮檺
+ List<SmFunctionVO> functionVOList = functionQueryService.listFunctionByUserOid(user.getOid(), null, ResourceControlTypeEnum.BS);
+ if (!CollectionUtils.isEmpty(functionVOList)) {
+ List<String> functionOidList = functionVOList.stream().map(s -> s.getOid()).collect(Collectors.toList());
+ sessionInfo.setFunctionOids(functionOidList);
+ } else {
+ sessionInfo.setFunctionOids(new ArrayList());
+ }
+
+ //娣诲姞鍒颁細璇濅俊鎭�
+ TokenVO tokenVO = saveSessionInfo(sessionInfo);
+ loginResult.setTokenVO(tokenVO);
+ loginResult.setSuccess(true);
+ return loginResult;
+ }
+
+ /**
+ * 鐧诲綍_搴熷純鏂规硶锛屼富瑕佺敤鏉ュ浠�
+ * @param userDTO 鐢ㄦ埛鐨勬暟鎹紶杈撳璞�
+ * @param clientInfo 瀹㈡埛绔殑淇℃伅
+ * @param checkPassword 鏄惁鏍￠獙瀵嗙爜
+ * @return 鎵ц缁撴灉
+ * @throws VciBaseException 鍙傛暟閿欒锛岀敤鎴蜂笉鑳界櫥褰曠瓑浼氭姏鍑哄紓甯�
+ */
+ private LoginResultBO login_old(LoginUserDTO userDTO, RequestClientInfo clientInfo, boolean checkPassword/*鍗曠偣鐧诲綍涓嶉渶瑕佹牎楠屽瘑鐮�*/) throws VciBaseException, PLException {
+ LoginResultBO loginResult = new LoginResultBO();
+ loginResult.setSuccess(false);
+
+ //1.鍒ゆ柇鐢ㄦ埛鐨勫熀鏈俊鎭�
+ VciBaseUtil.alertNotNull(userDTO, "鐧诲綍淇℃伅", userDTO.getUserId(), "鐢ㄦ埛璐﹀彿");
+ if (checkPassword) {
+ VciBaseUtil.alertNotNull(userDTO.getPassword(), "鐧诲綍瀵嗙爜");
+ }
+ //2銆佸垽鏂崟璁惧鐧诲綍,鏄惁宸茬粡鐧诲綍浜�
+ String userIdTokenKey = CacheNameConstant.cacheKey(CacheNameConstant.USERID_TOKEN_KEY, userDTO.getUserId().trim());
+ if(redisService.hasKey(userIdTokenKey) && !userDTO.isForceLogin() && securityManageProperties.isUserOneLogin()){
+ loginResult.setFailCode(USER_IS_LOGINED);
+ loginResult.setFailMsg("褰撳墠鐢ㄦ埛宸茬粡鍦ㄥ叾浠栧湴鏂圭櫥褰曪紒");
+ return loginResult;
+ }
+ //璇存槑宸茬粡鐧诲綍浜嗭紝閭ｅ簲璇ュ彇娑堝師鏉ョ殑鐧诲綍
+ if (redisService.hasKey(userIdTokenKey) && userDTO.isForceLogin() && securityManageProperties.isUserOneLogin()) {
+ String tokenKey = redisService.getCacheObject(userIdTokenKey);
+ redisService.deleteObject(tokenKey);
+ redisService.deleteObject(userIdTokenKey);
+ }
+
+ //3.鑾峰彇鐢ㄦ埛鐨勫璞★紙瀵硅薄涓寘鍚鑹查儴闂ㄨ繕鏈夊瘑鐮佺瓥鐣ヤ俊鎭級
SmUserVO user = getUserByUserId(userDTO.getUserId().trim());
if (user == null || StringUtils.isBlank(user.getOid())) {
loginResult.setFailCode(USER_NOT_FOUND);
@@ -180,7 +337,6 @@
machine.language = clientInfo.getLanguage();
machine.osUser = clientInfo.getOsUser();
machine.machine = clientInfo.getMachine();
-
String token = null;
try {
LoginResult chkRes = platformClientUtil.getFrameworkService().checkLogin(userDTO.getUserId(),userDTO.getPassword(), machine);
@@ -202,9 +358,7 @@
}
//濡傛灉鐢ㄦ埛宸茬粡琚仠鐢ㄥ拰閿佸畾锛屼笉鑳界櫥褰�
- //濡傛灉鐢ㄦ埛鐨勫け鏁堟棩鏈熷凡缁忚秴杩囦簡褰撳墠鏃堕棿锛屼笉鑳界櫥褰�
- //鍙湁鏂板钩鍙扮殑鐢ㄦ埛鎵嶅垽鏂け鏁�
- /**if (FrameworkDataLCStatus.DISABLED.getValue().equals(user.getLcStatus())) {
+ if (FrameworkDataLCStatus.DISABLED.getValue().equals(user.getLcStatus())) {
loginResult.setFailCode(USER_IS_DISABLED);
loginResult.setFailMsgArray(new String[]{userDTO.getUserId()});
return loginResult;
@@ -214,7 +368,10 @@
loginResult.setFailMsgArray(new String[]{userDTO.getUserId()});
return loginResult;
}
- if (user.getDisabledate() != null) {
+
+ //濡傛灉鐢ㄦ埛鐨勫け鏁堟棩鏈熷凡缁忚秴杩囦簡褰撳墠鏃堕棿锛屼笉鑳界櫥褰�
+ //鍙湁鏂板钩鍙扮殑鐢ㄦ埛鎵嶅垽鏂け鏁�
+ /*if (user.getDisabledate() != null) {
//2021鐗堟湰鎵嶆湁杩欎釜灞炴�х殑鍊硷紝褰撳墠杩欎釜娌℃湁杩欎釜鍊�
Date disableDate = VciDateUtil.addOrSubDate(user.getDisabledate(), Calendar.DATE, 1);
if (disableDate != null && disableDate.getTime() < System.currentTimeMillis()) {
@@ -222,45 +379,43 @@
loginResult.setFailMsgArray(new String[]{userDTO.getUserId()});
return loginResult;
}
- }
-
- SmPasswordStrategyVO passwordStrategyVO = userQueryService.getPasswordStrategyVOByUserOid(user.getOid());
+ }*/
+ //褰撳墠鐢ㄦ埛娌℃湁閰嶇疆灏辨煡璇㈤粯璁ょ殑瀵嗙爜绛栫暐
+ SmPasswordStrategyVO passwordStrategyVO = pwdStrategyQueryService.getPasswordStrategyVOByUserOid(user.getOid());
if (checkPassword) {
- boolean passwordIsEqual = userQueryService.checkPasswordEqual(userDTO.getPassword(), user.getOid());
- //3.鍒ゆ柇鐢ㄦ埛鐨勫瘑鐮佹槸鍚︽纭�
- if (!passwordIsEqual) {
- //鍓嶇闇�瑕佸厛md5涓�娆★紝鐒跺悗鍚庡彴鍐峂D5涓�娆★紝
- if (logger.isDebugEnabled()) {
- logger.debug("{}瀵嗙爜涓嶆纭�", user.getId());
- }
- if (passwordStrategyVO == null) {
- //鍙兘鏁版嵁闂娌℃湁璁剧疆瀵嗙爜绛栫暐
- passwordStrategyVO = new SmPasswordStrategyVO();
- passwordStrategyVO.setRetryTime(6);
- passwordStrategyVO.setLockTime(30);
- }
- if (passwordStrategyVO.getRetryTime() <= (user.getPwdWrongCount() + 1)) {
- user.setLockFlag(true);
- updateUserPwdWrongCount(user.getOid(), user.getPwdWrongCount() + 1);
- addUserToUnLock(userDTO.getUserId(), passwordStrategyVO.getLockTime());
- updateUserPwdWrongCount(user.getOid(), user.getPwdWrongCount() + 1);
- loginResult.setFailCode(USER_PWD_LOCK);
- loginResult.setFailMsgArray(new String[]{userDTO.getUserId(), passwordStrategyVO.getLockTime() + ""});
- return loginResult;
- } else {
- //杩樻病鏈夊埌閿佸畾鐨勬鏁�
- updateUserPwdWrongCount(user.getOid(), user.getPwdWrongCount() + 1);
- //5, 杩欐槸绗竴娆￠敊璇紝鍓╀笅鐨勬槸 5- 锛�0+1锛�
- loginResult.setFailCode(USER_PWD_NOT_EQUAL);
- loginResult.setFailMsgArray(new String[]{userDTO.getUserId(), (passwordStrategyVO.getRetryTime() - (user.getPwdWrongCount() + 1)) + ""});
- return loginResult;
- }
+ //鍓嶇闇�瑕佸厛md5涓�娆★紝鐒跺悗鍚庡彴鍐峂D5涓�娆★紝
+ if (logger.isDebugEnabled()) {
+ logger.debug("{}瀵嗙爜涓嶆纭�", user.getId());
+ }
+ //鍙鏁版嵁娌℃湁闂灏变笉瀛樺湪瀵嗙爜绛栫暐涓虹┖鐨勬儏鍐�
+ if (passwordStrategyVO == null) {
+ //鍙兘鏁版嵁闂娌℃湁璁剧疆瀵嗙爜绛栫暐
+ passwordStrategyVO = new SmPasswordStrategyVO();
+ passwordStrategyVO.setRetryTime(6);
+ passwordStrategyVO.setLockTime(30);
+ }
+ //鍒ゆ柇瀵嗙爜閿欒娆℃暟鏄惁杈惧埌涓婇檺
+ if (passwordStrategyVO.getRetryTime() <= (user.getPwdWrongCount() + 1)) {
+ user.setLockFlag(true);
+ updateUserPwdWrongCount(user.getOid(), user.getPwdWrongCount() + 1);
+ addUserToUnLock(userDTO.getUserId(), passwordStrategyVO.getLockTime());
+ //updateUserPwdWrongCount(user.getOid(), user.getPwdWrongCount() + 1);
+ loginResult.setFailCode(USER_PWD_LOCK);
+ loginResult.setFailMsgArray(new String[]{userDTO.getUserId(), passwordStrategyVO.getLockTime() + ""});
+ return loginResult;
+ } else {
+ //杩樻病鏈夊埌閿佸畾鐨勬鏁�
+ updateUserPwdWrongCount(user.getOid(), user.getPwdWrongCount() + 1);
+ //5, 杩欐槸绗竴娆￠敊璇紝鍓╀笅鐨勬槸 5- 锛�0+1锛�
+ loginResult.setFailCode(USER_PWD_NOT_EQUAL);
+ loginResult.setFailMsgArray(new String[]{userDTO.getUserId(), (passwordStrategyVO.getRetryTime() - (user.getPwdWrongCount() + 1)) + ""});
+ return loginResult;
}
}
//妫�鏌ユ槸鍚﹁淇敼瀵嗙爜
if (!clientInfo.isSso() && checkPassword) {
- //鏈�鍚庝慨鏀规椂闂�+ 澶辨晥鏃堕棿锛屽ぇ浜庣瓑浜庡綋鍓嶆棩鏈燂紝鍒欓渶瑕侀┈涓婁慨鏀瑰瘑鐮�
+ //鏈�鍚庝慨鏀规椂闂� + 澶辨晥鏃堕棿锛屽ぇ浜庣瓑浜庡綋鍓嶆棩鏈燂紝鍒欓渶瑕侀┈涓婁慨鏀瑰瘑鐮�
Date currentDay = null;
try {
currentDay = VciDateUtil.getNow(VciDateUtil.DateFormat);
@@ -272,7 +427,7 @@
if (currentDay != null && passwordStrategyVO != null && passwordStrategyVO.getValidDay() != null) {
Date inValidDay = null;
if (user.getLastModifyPasswordTime() == null) {
- //閲嶆潵娌℃湁鐧诲綍杩�
+ //浠庢潵娌℃湁鐧诲綍杩�
loginResult.setMustChangePassword(true);
} else {
inValidDay = VciDateUtil.addOrSubDate(user.getLastModifyPasswordTime(), Calendar.DATE, passwordStrategyVO.getValidDay());
@@ -289,7 +444,7 @@
}
}
}
- }*/
+ }
//璇存槑瀵嗙爜姝ｇ‘鐨�
if (logger.isDebugEnabled()) {
@@ -320,21 +475,21 @@
}
/** //鏌ヨ鎵�鏈夌殑瑙掕壊
- List<SmRoleVO> roleVOList = roleQueryService.listRoleByUserOid(user.getOid(), null);
- if (!CollectionUtils.isEmpty(roleVOList)) {
- Map<String, String> roleOidNameMap = roleVOList.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t.getName()));
- sessionInfo.setRolesName(roleOidNameMap);
- } else {
- sessionInfo.setRolesName(new HashMap());
- }
- //鏌ヨ鎵�鏈夌殑鏉冮檺
- List<SmFunctionVO> functionVOList = functionQueryService.listFunctionByUserOid(user.getOid(), null, ResourceControlTypeEnum.BS);
- if (!CollectionUtils.isEmpty(functionVOList)) {
- List<String> functionOidList = functionVOList.stream().map(s -> s.getOid()).collect(Collectors.toList());
- sessionInfo.setFunctionOids(functionOidList);
- } else {
- sessionInfo.setFunctionOids(new ArrayList());
- }*/
+ List<SmRoleVO> roleVOList = roleQueryService.listRoleByUserOid(user.getOid(), null);
+ if (!CollectionUtils.isEmpty(roleVOList)) {
+ Map<String, String> roleOidNameMap = roleVOList.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t.getName()));
+ sessionInfo.setRolesName(roleOidNameMap);
+ } else {
+ sessionInfo.setRolesName(new HashMap());
+ }
+ //鏌ヨ鎵�鏈夌殑鏉冮檺
+ List<SmFunctionVO> functionVOList = functionQueryService.listFunctionByUserOid(user.getOid(), null, ResourceControlTypeEnum.BS);
+ if (!CollectionUtils.isEmpty(functionVOList)) {
+ List<String> functionOidList = functionVOList.stream().map(s -> s.getOid()).collect(Collectors.toList());
+ sessionInfo.setFunctionOids(functionOidList);
+ } else {
+ sessionInfo.setFunctionOids(new ArrayList());
+ }*/
//娣诲姞鍒颁細璇濅俊鎭�
TokenVO tokenVO = saveSessionInfo(sessionInfo);
@@ -362,7 +517,6 @@
return userQueryService.getUserByUserId(userId);
}
-
/**
* 鍗曠偣鐧诲綍
*
@@ -372,7 +526,7 @@
* @throws VciBaseException 鐧诲綍澶辫触鐨勬椂鍊欐姏鍑哄紓甯�
*/
@Override
- public LoginResultBO singleLogin(LoginUserDTO userDTO, RequestClientInfo clientInfo) throws VciBaseException {
+ public LoginResultBO singleLogin(LoginUserDTO userDTO, RequestClientInfo clientInfo) throws PLException {
return login(userDTO,clientInfo,false);
}
@@ -426,8 +580,6 @@
});
}
}
-
-
/**
* 淇濆瓨浼氳瘽淇℃伅
@@ -533,7 +685,7 @@
switch(chkRes.state.value())
{
case 0:
- return "";
+ return UNKNOWN;
case 1:
return LOGIN_SUCCESS;
case 10:
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
index 97b69cc..6f33a37 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
@@ -8,8 +8,8 @@
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
-import com.vci.web.model.OsAttributeDO;
-import com.vci.web.pageModel.OsAttributeVO;
+import com.vci.model.OsAttributeDO;
+import com.vci.pagemodel.OsAttributeVO;
import com.vci.web.service.OsAttributeServiceI;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
index 0ef1e62..66cdd49 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
@@ -2,6 +2,7 @@
import com.vci.corba.common.PLException;
import com.vci.corba.omd.btm.BizType;
+import com.vci.pagemodel.*;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.enumpck.BooleanEnum;
import com.vci.starter.web.exception.VciBaseException;
@@ -10,7 +11,6 @@
import com.vci.starter.web.util.BeanUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
-import com.vci.web.pageModel.*;
import com.vci.web.service.*;
import com.vci.web.util.ConcurrentDateFormat;
import com.vci.web.util.Func;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java
index 4df0334..70e4ff8 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java
@@ -1,7 +1,6 @@
package com.vci.web.service.impl;
import com.alibaba.fastjson.JSONObject;
-import com.vci.file.util.VciZipUtil;
import com.vci.starter.revision.service.RevisionModelUtil;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
@@ -15,20 +14,21 @@
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.bo.OsCodeGenAttributeBO;
-import com.vci.web.bo.OsCodeGenButtonBO;
+import com.vci.bo.OsCodeGenAttributeBO;
+import com.vci.bo.OsCodeGenButtonBO;
import com.vci.web.dao.OsCodeGenSchemaDaoI;
-import com.vci.web.dto.OsCodeGenSchemaDTO;
+import com.vci.dto.OsCodeGenSchemaDTO;
import com.vci.web.enumpck.OsCodeGenJsPanelTypeEnum;
-import com.vci.web.model.OsCodeGenSchemaDO;
-import com.vci.web.pageModel.OsBtmTypeAttributeVO;
-import com.vci.web.pageModel.OsBtmTypeVO;
-import com.vci.web.pageModel.OsCodeGenSchemaVO;
+import com.vci.model.OsCodeGenSchemaDO;
+import com.vci.pagemodel.OsBtmTypeAttributeVO;
+import com.vci.pagemodel.OsBtmTypeVO;
+import com.vci.pagemodel.OsCodeGenSchemaVO;
import com.vci.web.service.OsAttributeServiceI;
import com.vci.web.service.OsBtmServiceI;
import com.vci.web.service.OsCodeGenSchemaServiceI;
import com.vci.web.service.WebBtmIOServiceI;
import com.vci.web.util.WebUtil;
+import com.vci.web.util.file.VciZipUtil;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.velocity.Template;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeRuleServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeRuleServiceImpl.java
index ba4a692..2184b86 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeRuleServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeRuleServiceImpl.java
@@ -1,7 +1,9 @@
package com.vci.web.service.impl;
-import com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant;
+import com.vci.constant.FrameWorkDefaultValueConstant;
+import com.vci.constant.FrameWorkDefaultValueConstant;
import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
+import com.vci.model.*;
import com.vci.starter.web.enumpck.BooleanEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
@@ -10,21 +12,20 @@
import com.vci.starter.web.util.LangBaseUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
-import com.vci.web.bo.OsCodeSerialBuildBO;
+import com.vci.bo.OsCodeSerialBuildBO;
import com.vci.web.dao.*;
-import com.vci.web.dto.OsCodeEnumDTO;
-import com.vci.web.dto.OsCodeRuleDTO;
-import com.vci.web.dto.OsCodeRuleElementDTO;
-import com.vci.web.dto.OsCodeRuleProduceDTO;
+import com.vci.dto.OsCodeEnumDTO;
+import com.vci.dto.OsCodeRuleDTO;
+import com.vci.dto.OsCodeRuleElementDTO;
+import com.vci.dto.OsCodeRuleProduceDTO;
import com.vci.web.enumpck.OsCodeDateValueTypeEnum;
import com.vci.web.enumpck.OsCodeElementTypeEnum;
import com.vci.web.enumpck.OsCodeFillTypeEnum;
import com.vci.web.enumpck.OsCodeProductTypeEnum;
-import com.vci.web.model.*;
-import com.vci.web.pageModel.OsCodeEnumVO;
-import com.vci.web.pageModel.OsCodeResultVO;
-import com.vci.web.pageModel.OsCodeRuleElementVO;
-import com.vci.web.pageModel.OsCodeRuleVO;
+import com.vci.pagemodel.OsCodeEnumVO;
+import com.vci.pagemodel.OsCodeResultVO;
+import com.vci.pagemodel.OsCodeRuleElementVO;
+import com.vci.pagemodel.OsCodeRuleVO;
import com.vci.web.service.OsCodeRuleServiceI;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
@@ -34,8 +35,9 @@
import javax.annotation.Resource;
import java.util.*;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_ID_NOT_EXIST;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_ID_NOT_EXIST;
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
+
/**
* 缂栫爜瑙勫垯鐨勬湇鍔�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
index d3fa3fa..c9cb8d8 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
@@ -12,11 +12,11 @@
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
-import com.vci.web.constant.EnumIdConstant;
-import com.vci.web.pageModel.KeyValue;
-import com.vci.web.pageModel.OsEnumItemVO;
-import com.vci.web.pageModel.OsEnumVO;
-import com.vci.web.pageModel.OsStatusVO;
+import com.vci.constant.EnumIdConstant;
+import com.vci.pagemodel.KeyValue;
+import com.vci.pagemodel.OsEnumItemVO;
+import com.vci.pagemodel.OsEnumVO;
+import com.vci.pagemodel.OsStatusVO;
import com.vci.web.service.OsEnumServiceI;
import com.vci.web.service.OsLifeCycleServiceI;
import com.vci.web.service.WebBoServiceI;
@@ -34,7 +34,7 @@
import java.util.*;
import java.util.stream.Collectors;
-import static com.vci.web.constant.EnumIdConstant.LC_STATUS_SUBFIX;
+import static com.vci.constant.EnumIdConstant.LC_STATUS_SUBFIX;
/**
* 鏋氫妇鏈嶅姟--宸茬粡璋冪敤骞冲彴搴曞眰浜嗭紝涓嶅啀鎻愪緵dao灞�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
index 64effb0..a1deb7c 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
@@ -5,13 +5,13 @@
import com.vci.corba.omd.lcm.Bound;
import com.vci.corba.omd.lcm.LifeCycle;
import com.vci.corba.omd.lcm.TransitionVO;
+import com.vci.pagemodel.*;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.util.VciDateUtil;
-import com.vci.web.model.OsLifeCycleDO;
-import com.vci.web.pageModel.*;
+import com.vci.model.OsLifeCycleDO;
import com.vci.web.service.OsLifeCycleServiceI;
import com.vci.web.service.OsStatusServiceI;
import com.vci.web.service.WebBoServiceI;
@@ -28,9 +28,9 @@
import java.util.*;
import java.util.stream.Collectors;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_ID_NOT_EXIST;
-import static com.vci.web.constant.WebLangCodeConstant.LIFE_CYCLE_ROUTER_NULL;
-import static com.vci.web.constant.WebLangCodeConstant.LIFE_CYCLE_TRANS_ERROR;
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_ID_NOT_EXIST;
+import static com.vci.constant.WebLangCodeConstant.LIFE_CYCLE_ROUTER_NULL;
+import static com.vci.constant.WebLangCodeConstant.LIFE_CYCLE_TRANS_ERROR;
/**
* 鐢熷懡鍛ㄦ湡鏈嶅姟
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java
index 58b792c..7065900 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java
@@ -4,6 +4,7 @@
import com.vci.corba.omd.data.BusinessObject;
import com.vci.corba.omd.ltm.LinkType;
import com.vci.omd.utils.ObjectTool;
+import com.vci.pagemodel.*;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.starter.web.pagemodel.BaseQueryObject;
@@ -11,8 +12,7 @@
import com.vci.starter.web.util.BeanUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
-import com.vci.web.model.OsLinkTypeDO;
-import com.vci.web.pageModel.*;
+import com.vci.model.OsLinkTypeDO;
import com.vci.web.service.*;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java
index dba1ef7..4adf929 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java
@@ -4,7 +4,7 @@
import com.vci.corba.omd.vrm.VersionRule;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.util.VciDateUtil;
-import com.vci.web.pageModel.OsRevisionRuleVO;
+import com.vci.pagemodel.OsRevisionRuleVO;
import com.vci.web.service.OsRevisionRuleServiceI;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
index 562ad05..9f3f54c 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
@@ -10,9 +10,9 @@
import com.vci.starter.web.util.LangBaseUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
-import com.vci.web.dto.OsStatusDTO;
-import com.vci.web.model.OsStatusDO;
-import com.vci.web.pageModel.OsStatusVO;
+import com.vci.dto.OsStatusDTO;
+import com.vci.model.OsStatusDO;
+import com.vci.pagemodel.OsStatusVO;
import com.vci.web.service.OsLifeCycleServiceI;
import com.vci.web.service.OsStatusServiceI;
import com.vci.web.service.WebBoServiceI;
@@ -29,7 +29,8 @@
import java.util.*;
import java.util.stream.Collectors;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
+
/**
* 鐘舵�佺殑鏈嶅姟
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFavFunctionServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFavFunctionServiceImpl.java
index fa7d1e4..c357587 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFavFunctionServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFavFunctionServiceImpl.java
@@ -1,12 +1,12 @@
package com.vci.web.service.impl;
+import com.vci.constant.FrameWorkBtmTypeConstant;
import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
-import com.vci.frameworkcore.constant.FrameWorkBtmTypeConstant;
-import com.vci.frameworkcore.pagemodel.SmFunctionVO;
+import com.vci.pagemodel.SmFunctionVO;
import com.vci.starter.revision.service.RevisionModelUtil;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.model.SmFavFunctionDO;
+import com.vci.model.SmFavFunctionDO;
import com.vci.web.service.SmFavFunctionServiceI;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.util.WebUtil;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmOperationServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmOperationServiceImpl.java
index 89cb783..b19055b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmOperationServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmOperationServiceImpl.java
@@ -3,7 +3,7 @@
import com.vci.corba.omd.data.BusinessObject;
import com.vci.omd.utils.ObjectTool;
import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.pageModel.SmOperationVO;
+import com.vci.pagemodel.SmOperationVO;
import com.vci.web.service.SmOperationServiceI;
import com.vci.web.service.WebBoServiceI;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
index 8f0443d..6ba98e7 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
@@ -1,14 +1,14 @@
package com.vci.web.service.impl;
-import com.vci.client.common.providers.ClientServiceProvider;
import com.vci.corba.common.PLException;
import com.vci.corba.framework.data.UserInfo;
import com.vci.corba.omd.data.*;
import com.vci.corba.omd.lcm.LifeCycle;
-import com.vci.file.pagemodel.VciFileObjectVO;
+import com.vci.dto.*;
import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
import com.vci.frameworkcore.lcstatuspck.ReleaseDataLCStatus;
import com.vci.omd.utils.ObjectTool;
+import com.vci.pagemodel.*;
import com.vci.starter.revision.bo.TreeWrapperOptions;
import com.vci.starter.web.annotation.bus.VciChangeDataAfter;
import com.vci.starter.web.annotation.bus.VciChangeDataBefore;
@@ -21,10 +21,8 @@
import com.vci.starter.web.pagemodel.*;
import com.vci.starter.web.util.*;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.dto.*;
import com.vci.web.enumpck.UIFieldTypeEnum;
import com.vci.web.enumpck.UITreeLoadTypeEnum;
-import com.vci.web.pageModel.*;
import com.vci.web.query.UIDataGridQuery;
import com.vci.web.query.UIFormQuery;
import com.vci.web.query.UILinkTypeDataQuery;
@@ -42,7 +40,8 @@
import java.util.*;
import java.util.stream.Collectors;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
+
/**
* UI涓婄殑鏁版嵁鏌ヨ
@@ -762,7 +761,7 @@
* @throws VciBaseException 閰嶇疆鎴栬�呮槸璋冪敤涓嶆垚鍔熺殑鏃跺�欙紝浼氭姏鍑哄紓甯�
*/
@Override
- public BaseResult callPreEvent(BaseModelDTOList baseModelDTOList,BaseLinkModelDTOList baseLinkModelDTOList, String preEvent, VciChangeDocumentTypeEnum businessType) throws VciBaseException{
+ public BaseResult callPreEvent(BaseModelDTOList baseModelDTOList, BaseLinkModelDTOList baseLinkModelDTOList, String preEvent, VciChangeDocumentTypeEnum businessType) throws VciBaseException{
if((baseModelDTOList == null || CollectionUtils.isEmpty(baseModelDTOList.getDataList())) && (baseLinkModelDTOList == null || CollectionUtils.isEmpty(baseLinkModelDTOList.getDataList()))){
return BaseResult.success();
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
index 6d760d5..558679f 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
@@ -7,16 +7,15 @@
import com.vci.corba.common.PLException;
import com.vci.corba.framework.data.RoleRightInfo;
import com.vci.corba.portal.data.*;
+import com.vci.pagemodel.*;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.SessionInfo;
import com.vci.starter.web.util.*;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.enumpck.UIComponentDisplayTypeEnum;
import com.vci.web.enumpck.UIComponentTypeEnum;
import com.vci.web.enumpck.UIFieldTypeEnum;
import com.vci.web.enumpck.UILayoutAreaTypeEnum;
-import com.vci.web.pageModel.*;
import com.vci.web.service.OsAttributeServiceI;
import com.vci.web.service.OsBtmServiceI;
import com.vci.web.service.UIEngineServiceI;
@@ -37,7 +36,7 @@
import java.util.*;
import java.util.stream.Collectors;
-import static com.vci.web.constant.EnumIdConstant.LC_STATUS_SUBFIX;
+import static com.vci.constant.EnumIdConstant.LC_STATUS_SUBFIX;
/**
* UI寮曟搸鏈嶅姟锛屼互鍓嶅钩鍙板皝瑁呭埌action閲岀殑锛�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileDocClassifyServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileDocClassifyServiceImpl.java
index 5177b4d..a744a35 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileDocClassifyServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileDocClassifyServiceImpl.java
@@ -1,8 +1,9 @@
package com.vci.web.service.impl;
-import com.vci.file.dto.VciFileDocClassifyDTO;
-import com.vci.file.dto.VciFileDocClassifyDTOList;
-import com.vci.file.pagemodel.VciFileDocClassifyVO;
+import com.vci.dto.VciFileDocClassifyDTO;
+import com.vci.dto.VciFileDocClassifyDTOList;
+import com.vci.pagemodel.VciFileDocClassifyVO;
+import com.vci.pagemodel.VciFileDocClassifyVO;
import com.vci.starter.revision.service.RevisionModelUtil;
import com.vci.starter.web.annotation.bus.VciChangeDocument;
import com.vci.starter.web.enumpck.VciChangeDocumentTypeEnum;
@@ -15,7 +16,7 @@
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.dao.VciFileDocClassifyDaoI;
-import com.vci.web.model.VciFileDocClassifyDO;
+import com.vci.model.VciFileDocClassifyDO;
import com.vci.web.service.VciFileDocClassifyServiceI;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -28,7 +29,7 @@
import java.util.*;
import java.util.stream.Collectors;
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
+import static com.vci.constant.FrameWorkLangCodeConstant.*;
/**
* 鏂囨。鐨勭被鍨嬫湇鍔�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileDownloadServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileDownloadServiceImpl.java
index 5e9a2a4..f432c1b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileDownloadServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileDownloadServiceImpl.java
@@ -2,24 +2,24 @@
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;
-import com.vci.file.pagemodel.VciFileVolumeVO;
-import com.vci.file.util.VciZipUtil;
+import com.vci.enumpck.VciFileTransProtocolEnum;
+import com.vci.pagemodel.VciFileVolumeVO;
+import com.vci.pagemodel.VciFileObjectVO;
import com.vci.starter.web.annotation.bus.VciChangeDocument;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
+import com.vci.web.util.file.clientutil.VciFileServerClientUtil;
import com.vci.web.dao.VciFileObjectDaoI;
-import com.vci.web.model.VciFileObjectDO;
+import com.vci.model.VciFileObjectDO;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.VciFileDownloadServiceI;
import com.vci.web.service.VciFileObjectServiceI;
import com.vci.web.service.VciFileVolumeServiceI;
import com.vci.web.util.PlatformClientUtil;
+import com.vci.web.util.file.VciZipUtil;
import net.lingala.zip4j.core.ZipFile;
import net.lingala.zip4j.io.ZipOutputStream;
import org.apache.commons.lang3.StringUtils;
@@ -32,9 +32,9 @@
import java.util.List;
import java.util.Map;
-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.*;
+import static com.vci.constant.VciFileLangCodeConstant.FILE_NOT_FOUND;
+import static com.vci.constant.VciFileLangCodeConstant.FILE_READ_FAIL;
+import static com.vci.constant.FrameWorkLangCodeConstant.*;
/**
* 鏂囦欢鐨勪笅杞芥湇鍔�
@@ -339,7 +339,7 @@
RandomAccessFile destfile = null;
try{
byte[] buffer ;
- if(offSet<(fileSize-VciFileServerClientUtil.BLOCKSIZE)){
+ if(offSet<(fileSize- VciFileServerClientUtil.BLOCKSIZE)){
buffer = new byte[VciFileServerClientUtil.BLOCKSIZE];
}else{
buffer = new byte[(int) (fileSize-offSet)];
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileObjectServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileObjectServiceImpl.java
index 59e6613..9a2867b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileObjectServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileObjectServiceImpl.java
@@ -2,9 +2,9 @@
import com.vci.corba.common.PLException;
import com.vci.corba.volume.VolumeServicePrx;
-import com.vci.file.dto.VciFileObjectDTO;
-import com.vci.file.lcstatuspck.FileLCStatus;
-import com.vci.file.pagemodel.VciFileObjectVO;
+import com.vci.dto.VciFileObjectDTO;
+import com.vci.lcstatuspck.FileLCStatus;
+import com.vci.pagemodel.VciFileObjectVO;
import com.vci.starter.revision.service.RevisionModelUtil;
import com.vci.starter.web.annotation.bus.VciChangeDocument;
import com.vci.starter.web.enumpck.VciChangeDocumentTypeEnum;
@@ -16,8 +16,8 @@
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.dao.VciFileObjectDaoI;
-import com.vci.web.model.VciFileObjectDO;
-import com.vci.web.model.VciFileVolumeDO;
+import com.vci.model.VciFileObjectDO;
+import com.vci.model.VciFileVolumeDO;
import com.vci.web.service.VciFileObjectServiceI;
import com.vci.web.service.VciFileVolumeServiceI;
import com.vci.web.util.PlatformClientUtil;
@@ -25,7 +25,6 @@
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -34,8 +33,8 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
-import static com.vci.file.constant.VciFileLangCodeConstant.FILE_RELEASED;
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
+import static com.vci.constant.VciFileLangCodeConstant.FILE_RELEASED;
+import static com.vci.constant.FrameWorkLangCodeConstant.*;
/**
* 鏂囦欢瀵硅薄鏈嶅姟
@@ -131,7 +130,7 @@
* @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
@Override
- public VciFileObjectVO vciFileObjectDO2VO(VciFileObjectDO vciFileObjectDO) throws VciBaseException {
+ public VciFileObjectVO vciFileObjectDO2VO(VciFileObjectDO vciFileObjectDO) throws VciBaseException {
VciFileObjectVO vo = new VciFileObjectVO();
if(vciFileObjectDO != null){
BeanUtil.convert(vciFileObjectDO,vo);
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/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java
index 55ac98a..42235c3 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/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java
@@ -1,14 +1,14 @@
package com.vci.web.service.impl;
+import com.vci.constant.VciFileDefaultValueConstant;
+import com.vci.constant.VciFileLangCodeConstant;
import com.vci.corba.common.PLException;
import com.vci.corba.volume.VolumeServicePrx;
-import com.vci.file.constant.VciFileDefaultValueConstant;
-import com.vci.file.constant.VciFileLangCodeConstant;
-import com.vci.file.dto.VciFileObjectDTO;
-import com.vci.file.enumpck.VciFileTransProtocolEnum;
-import com.vci.file.lcstatuspck.FileLCStatus;
-import com.vci.file.pagemodel.VciFileObjectVO;
-import com.vci.frameworkcore.constant.FrameWorkLangCodeConstant;
+import com.vci.dto.VciFileObjectDTO;
+import com.vci.enumpck.VciFileTransProtocolEnum;
+import com.vci.lcstatuspck.FileLCStatus;
+import com.vci.constant.FrameWorkLangCodeConstant;
+import com.vci.pagemodel.VciFileObjectVO;
import com.vci.starter.revision.service.RevisionModelUtil;
import com.vci.starter.web.annotation.bus.VciChangeDocument;
import com.vci.starter.web.enumpck.DataSecretEnum;
@@ -19,13 +19,13 @@
import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.constant.WebLangCodeConstant;
+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.web.model.VciFileDocClassifyDO;
-import com.vci.web.model.VciFileObjectDO;
-import com.vci.web.model.VciFileVolumeDO;
+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,9 +45,8 @@
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
-import static com.vci.file.constant.VciFileLangCodeConstant.*;
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.UPLOAD_FAIL;
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.UPLOAD_SUCCESS;
+import static com.vci.constant.VciFileLangCodeConstant.*;
+import static com.vci.constant.FrameWorkLangCodeConstant.*;
@Service
@VciChangeDocument(btmType = "fileUpload")
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/src/main/java/com/vci/web/service/impl/VciFileVolumeServiceImpl.java
index 879ee86..423715d 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/src/main/java/com/vci/web/service/impl/VciFileVolumeServiceImpl.java
@@ -2,11 +2,11 @@
import com.vci.corba.common.PLException;
import com.vci.corba.framework.data.PvolumeInfo;
-import com.vci.file.dto.VciFileVolumeDTO;
-import com.vci.file.enumpck.VciFileServiceOsTypeEnum;
-import com.vci.file.enumpck.VciFileTransProtocolEnum;
-import com.vci.file.pagemodel.VciFileVolumeVO;
-import com.vci.frameworkcore.constant.FrameWorkLangCodeConstant;
+import com.vci.dto.VciFileVolumeDTO;
+import com.vci.enumpck.VciFileServiceOsTypeEnum;
+import com.vci.enumpck.VciFileTransProtocolEnum;
+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;
@@ -17,7 +17,7 @@
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.dao.VciFileVolumeDaoI;
-import com.vci.web.model.VciFileVolumeDO;
+import com.vci.model.VciFileVolumeDO;
import com.vci.web.service.VciFileVolumeServiceI;
import com.vci.web.util.PlatformClientUtil;
import org.apache.commons.lang3.StringUtils;
@@ -30,8 +30,8 @@
import javax.annotation.Resource;
import java.util.*;
-import static com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant.FRAMEWORK_DATA_ENABLED;
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
+import static com.vci.constant.FrameWorkDefaultValueConstant.FRAMEWORK_DATA_ENABLED;
+import static com.vci.constant.FrameWorkLangCodeConstant.*;
/**
* 鏂囦粨绠＄悊鏈嶅姟
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavItemServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavItemServiceImpl.java
index 7778641..96652a4 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavItemServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavItemServiceImpl.java
@@ -11,10 +11,10 @@
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.dao.WFWorkflowNodeFavItemDaoI;
-import com.vci.web.dto.WFWorkflowNodeFavItemDTO;
-import com.vci.web.model.WFWorkflowNodeFavItemDO;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.pageModel.WFWorkflowNodeFavItemVO;
+import com.vci.dto.WFWorkflowNodeFavItemDTO;
+import com.vci.model.WFWorkflowNodeFavItemDO;
+import com.vci.pagemodel.BatchCBO;
+import com.vci.pagemodel.WFWorkflowNodeFavItemVO;
import com.vci.web.service.WFWorkflowNodeFavItemServiceI;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -27,7 +27,7 @@
import javax.annotation.Resource;
import java.util.*;
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
+import static com.vci.constant.FrameWorkLangCodeConstant.*;
/**
* 娴佺▼鏀惰棌鑺傜偣鏄庣粏鏈嶅姟
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavServiceImpl.java
index e9375d0..180de6b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavServiceImpl.java
@@ -12,12 +12,12 @@
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.dao.WFWorkflowNodeFavDaoI;
import com.vci.web.dao.WFWorkflowNodeFavItemDaoI;
-import com.vci.web.dto.WFWorkflowNodeFavDTO;
-import com.vci.web.model.WFWorkflowNodeFavDO;
-import com.vci.web.model.WFWorkflowNodeFavItemDO;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.pageModel.WFWorkflowNodeFavItemVO;
-import com.vci.web.pageModel.WFWorkflowNodeFavVO;
+import com.vci.dto.WFWorkflowNodeFavDTO;
+import com.vci.model.WFWorkflowNodeFavDO;
+import com.vci.model.WFWorkflowNodeFavItemDO;
+import com.vci.pagemodel.BatchCBO;
+import com.vci.pagemodel.WFWorkflowNodeFavItemVO;
+import com.vci.pagemodel.WFWorkflowNodeFavVO;
import com.vci.web.service.WFWorkflowNodeFavItemServiceI;
import com.vci.web.service.WFWorkflowNodeFavServiceI;
import org.apache.commons.lang3.StringUtils;
@@ -32,7 +32,7 @@
import java.util.*;
import java.util.stream.Collectors;
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
+import static com.vci.constant.FrameWorkLangCodeConstant.*;
/**
* 娴佺▼璐熻矗浜烘敹钘忔湇鍔�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebActionServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebActionServiceImpl.java
index 5732df5..7dcc7ee 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebActionServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebActionServiceImpl.java
@@ -4,7 +4,7 @@
import com.vci.corba.common.PLException;
import com.vci.corba.portal.data.PLAction;
import com.vci.starter.web.exception.VciBaseException;
-import com.vci.web.pageModel.UIActionVO;
+import com.vci.pagemodel.UIActionVO;
import com.vci.web.service.WebActionServiceI;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
index 9938b92..31f0204 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
@@ -1,7 +1,6 @@
package com.vci.web.service.impl;
import com.vci.client.common.oq.OQTool;
-import com.vci.client.common.providers.ClientServiceProvider;
import com.vci.common.qt.object.*;
import com.vci.common.utility.ObjectUtility;
import com.vci.corba.common.PLException;
@@ -15,6 +14,7 @@
import com.vci.corba.query.data.KV;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
import com.vci.omd.utils.ObjectTool;
+import com.vci.pagemodel.*;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.enumpck.BooleanEnum;
@@ -24,7 +24,6 @@
import com.vci.starter.web.util.BeanUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.pageModel.*;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.*;
import com.vci.web.util.PlatformClientUtil;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
index 74c8dd5..e5380cc 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
@@ -1,6 +1,5 @@
package com.vci.web.service.impl;
-import com.vci.client.common.providers.WebServiceProvider;
import com.vci.corba.common.PLException;
import com.vci.corba.omd.atm.AttributeDef;
import com.vci.corba.omd.btm.BTMServicePrx;
@@ -13,6 +12,8 @@
import com.vci.corba.omd.lcm.TransitionVOEvent;
import com.vci.corba.omd.ltm.LinkType;
import com.vci.corba.omd.stm.StatePool;
+import com.vci.dto.*;
+import com.vci.pagemodel.*;
import com.vci.starter.poi.bo.WriteExcelData;
import com.vci.starter.poi.bo.WriteExcelOption;
import com.vci.starter.poi.util.ExcelUtil;
@@ -26,8 +27,6 @@
import com.vci.starter.web.util.VciDateUtil;
import com.vci.starter.word.bo.WordMergeStartTableDataBO;
import com.vci.starter.word.util.WordUtil;
-import com.vci.web.dto.*;
-import com.vci.web.pageModel.*;
import com.vci.web.properties.OsDDLExportWordFieldProperties;
import com.vci.web.service.*;
import com.vci.web.util.Func;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebHomeTaskServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebHomeTaskServiceImpl.java
index e2f6da0..31ff447 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebHomeTaskServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebHomeTaskServiceImpl.java
@@ -5,26 +5,22 @@
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.pagemodel.SessionInfo;
-import com.vci.starter.web.util.ApplicationContextProvider;
import com.vci.starter.web.util.BeanUtil;
import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.dto.WebHomeTaskActionDTO;
-import com.vci.web.model.WebHomeTaskActionDO;
-import com.vci.web.pageModel.WebHomeTaskActionVO;
+import com.vci.dto.WebHomeTaskActionDTO;
+import com.vci.model.WebHomeTaskActionDO;
+import com.vci.pagemodel.WebHomeTaskActionVO;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.service.WebHomeTaskServiceI;
import com.vci.web.util.WebUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.*;
import java.util.stream.Collectors;
-
-import static com.vci.web.constant.CacheNameConstant.VCI_USER;
/**
* 棣栭〉寰呭姙浠诲姟鐨勬湇鍔�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebLogServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebLogServiceImpl.java
index 144b948..0023c06 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebLogServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebLogServiceImpl.java
@@ -3,7 +3,7 @@
import com.vci.corba.common.data.UserEntityInfo;
import com.vci.starter.web.pagemodel.SessionInfo;
import com.vci.starter.web.util.WebThreadLocalUtil;
-import com.vci.web.bo.VciLogObjectBO;
+import com.vci.bo.VciLogObjectBO;
import com.vci.web.service.WebLogServiceI;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java
index bc5f628..6e662f9 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java
@@ -7,8 +7,13 @@
import com.vci.corba.workflow.data.FlowInstanceInfo;
import com.vci.corba.workflow.data.MapTransfersInfo;
import com.vci.corba.workflow.data.TasksAssignedInfo;
-import com.vci.file.dto.VciFileObjectDTO;
+import com.vci.dto.ProcessTemplateVO;
+import com.vci.dto.VciFileObjectDTO;
import com.vci.omd.utils.ObjectTool;
+import com.vci.pagemodel.ProcessNodeVO;
+import com.vci.pagemodel.ProcessOutcomeVO;
+import com.vci.pagemodel.ProcessTaskVO;
+import com.vci.pagemodel.ProcessUserVO;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.enumpck.DataSecretEnum;
import com.vci.starter.web.exception.VciBaseException;
@@ -19,11 +24,10 @@
import com.vci.web.annotation.FlowNotifyAfter;
import com.vci.web.annotation.FlowNotifyBefore;
import com.vci.web.annotation.FlowNotifyWeb;
-import com.vci.web.bo.FlowNoticeInfo;
-import com.vci.web.constant.WFVariablesKeyConstant;
+import com.vci.bo.FlowNoticeInfo;
+import com.vci.constant.WFVariablesKeyConstant;
import com.vci.web.dao.WebProcessDaoI;
-import com.vci.web.dto.ProcessStartConfigDTO;
-import com.vci.web.pageModel.*;
+import com.vci.dto.ProcessStartConfigDTO;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.*;
import com.vci.web.util.BusAnnotationUtil;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java
index 18a6d75..ca79668 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java
@@ -1,13 +1,11 @@
package com.vci.web.service.impl;
import com.vci.corba.omd.data.LinkObject;
-import com.vci.file.pagemodel.VciFileObjectVO;
+import com.vci.dto.ProcessTemplateVO;
import com.vci.frameworkcore.compatibility.OrgDeptQueryServiceI;
import com.vci.frameworkcore.compatibility.SmRoleQueryServiceI;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
-import com.vci.frameworkcore.pagemodel.OrgDepartmentVO;
-import com.vci.frameworkcore.pagemodel.SmRoleVO;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.pagemodel.*;
import com.vci.starter.web.enumpck.DataSecretEnum;
import com.vci.starter.web.enumpck.UserSecretEnum;
import com.vci.starter.web.exception.VciBaseException;
@@ -15,11 +13,10 @@
import com.vci.starter.web.util.Md5;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.constant.FileTypeConstants;
-import com.vci.web.constant.WFVariablesKeyConstant;
+import com.vci.constant.FileTypeConstants;
+import com.vci.constant.WFVariablesKeyConstant;
import com.vci.web.dao.WebProcessDaoI;
-import com.vci.web.model.WFProcessClassifyDO;
-import com.vci.web.pageModel.*;
+import com.vci.model.WFProcessClassifyDO;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.*;
import com.vci.web.util.PlatformClientUtil;
@@ -106,8 +103,8 @@
* @param showAll 鏄惁鏄剧ず鎵�鏈夌殑鐗堟湰
*/
@Override
- public List<ProcessTemplateVO> getMyTemplates(String type,String filterTemplate,
- boolean showAll) throws VciBaseException {
+ public List<ProcessTemplateVO> getMyTemplates(String type, String filterTemplate,
+ boolean showAll) throws VciBaseException {
//鐜板湪娌℃湁娣诲姞鐢ㄦ埛鐨勮繃婊�
return processDao.getTemplatesByType(type,filterTemplate,showAll);
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java
index 7e3d5d5..e42e7e9 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java
@@ -2,14 +2,14 @@
import com.vci.corba.omd.data.BusinessObject;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.pagemodel.SmUserVO;
import com.vci.omd.utils.ObjectTool;
import com.vci.starter.web.enumpck.DataSecretEnum;
import com.vci.starter.web.enumpck.UserSecretEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.constant.EnumIdConstant;
-import com.vci.web.pageModel.KeyValue;
+import com.vci.constant.EnumIdConstant;
+import com.vci.pagemodel.KeyValue;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.OsEnumServiceI;
import com.vci.web.service.WebBoServiceI;
@@ -27,7 +27,8 @@
import java.util.Map;
import java.util.stream.Collectors;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_ID_NOT_EXIST;
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_ID_NOT_EXIST;
+
/**
* 瀵嗙骇鐨勬湇鍔�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/OsScanAnnotationTool.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/OsScanAnnotationTool.java
index 446f3b2..a623bd4 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/OsScanAnnotationTool.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/OsScanAnnotationTool.java
@@ -1,5 +1,6 @@
package com.vci.web.util;
+import com.vci.dto.*;
import com.vci.starter.web.annotation.*;
import com.vci.starter.web.enumpck.BaseEnum;
import com.vci.starter.web.enumpck.BaseEnumInt;
@@ -7,10 +8,8 @@
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.util.ApplicationContextProvider;
import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.bo.BtmOrLinkProcessAttributeInfo;
-import com.vci.web.constant.FieldConstant;
-import com.vci.web.dto.*;
+import com.vci.bo.BtmOrLinkProcessAttributeInfo;
+import com.vci.constant.FieldConstant;
import com.vci.web.service.WebBtmIOServiceI;
import org.apache.commons.lang3.StringUtils;
import org.reflections.Reflections;
@@ -214,7 +213,7 @@
Map<String, OsLifeCycleDTO> lifeCycleDTOMap = new HashMap<String, OsLifeCycleDTO>();
Map<String, OsEnumDTO> enumDTOMap = new HashMap<String, OsEnumDTO>();
Map<String, OsAttributeDTO> attributeDTOMap = new HashMap<String, OsAttributeDTO>();
- Map<String,OsBtmTypeDTO> btmTypeDTOMap = new HashMap<String,OsBtmTypeDTO>();
+ Map<String, OsBtmTypeDTO> btmTypeDTOMap = new HashMap<String,OsBtmTypeDTO>();
Map<String,OsLinkTypeDTO> linkTypeDTOMap = new HashMap<String,OsLinkTypeDTO>();
List<Class<?>> lifeCycleClassList = new ArrayList<Class<?>>();
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/WebUtil.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/WebUtil.java
index cd11d1d..dad510b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/WebUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/WebUtil.java
@@ -10,6 +10,7 @@
import com.vci.corba.omd.data.BusinessObject;
import com.vci.corba.omd.data.LinkObject;
import com.vci.omd.utils.ObjectTool;
+import com.vci.pagemodel.LinkTypeInfoVO;
import com.vci.starter.revision.bo.TreeWrapperOptions;
import com.vci.starter.web.annotation.*;
import com.vci.starter.web.constant.QueryOptionConstant;
@@ -21,7 +22,6 @@
import com.vci.starter.web.toolmodel.DateConverter;
import com.vci.starter.web.util.*;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.pageModel.*;
import com.vci.web.service.impl.WebLoServiceImpl;
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
import net.sf.jsqlparser.statement.select.PlainSelect;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/file/VciZipUtil.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/file/VciZipUtil.java
new file mode 100644
index 0000000..1182e4e
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/file/VciZipUtil.java
@@ -0,0 +1,167 @@
+package com.vci.web.util.file;
+
+import com.vci.properties.VciFileTransProperties;
+import com.vci.starter.web.exception.VciBaseException;
+import com.vci.starter.web.util.LangBaseUtil;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.tools.zip.ZipEntry;
+import org.apache.tools.zip.ZipOutputStream;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 14:27
+ */
+@Component
+public class VciZipUtil {
+ @Autowired(
+ required = false
+ )
+ private VciFileTransProperties transProperties;
+
+ public VciZipUtil() {
+ }
+
+ private String getZipCharset() {
+ return this.transProperties != null && !StringUtils.isBlank(this.transProperties.getZipCharset()) ? this.transProperties.getZipCharset() : "GBK";
+ }
+
+ public void folderToZipFile(String folder, String zipFileName) throws VciBaseException {
+ this.folderToZipFile(folder, zipFileName, this.getZipCharset());
+ }
+
+ public void folderToZipFile(String folder, String zipFileName, String zipEncode) throws VciBaseException {
+ File sourceFile = new File(folder);
+ if (!sourceFile.exists()) {
+ throw new VciBaseException("fileNotFound", new String[]{folder});
+ } else {
+ ZipOutputStream zos = null;
+
+ try {
+ zos = new ZipOutputStream(new FileOutputStream(zipFileName));
+ zos.setEncoding(zipEncode);
+ this.addFileToZip(zos, (new File(folder)).listFiles(), folder + File.separator);
+ } catch (Throwable var14) {
+ throw new VciBaseException(LangBaseUtil.getErrorMsg(var14), new String[0]);
+ } finally {
+ try {
+ if (zos != null) {
+ zos.close();
+ }
+ } catch (Exception var13) {
+ }
+
+ }
+
+ }
+ }
+
+ private void addFileToZip(ZipOutputStream zos, File[] files, String rootPath) throws VciBaseException {
+ if (files != null && files.length > 0) {
+ File[] var4 = files;
+ int var5 = files.length;
+
+ for(int var6 = 0; var6 < var5; ++var6) {
+ File file = var4[var6];
+ if (StringUtils.isBlank(rootPath)) {
+ try {
+ rootPath = file.getParent();
+ if (rootPath == null) {
+ rootPath = file.getPath();
+ }
+ } catch (Throwable var21) {
+ rootPath = file.getPath();
+ }
+ }
+
+ if (!file.exists()) {
+ throw new VciBaseException("fileNotFound", new String[]{file.getAbsolutePath()});
+ }
+
+ if (file.isDirectory()) {
+ this.addFileToZip(zos, file.listFiles(), rootPath);
+ } else {
+ FileInputStream is = null;
+
+ try {
+ is = new FileInputStream(file);
+ String entryName = file.getAbsolutePath().replace(rootPath, "");
+ if (entryName.startsWith("\\")) {
+ entryName = entryName.substring(1);
+ }
+
+ ZipEntry zipEntry = new ZipEntry(entryName);
+ zos.putNextEntry(zipEntry);
+ byte[] b = new byte[100];
+ boolean var12 = false;
+
+ int length;
+ while((length = is.read(b)) != -1) {
+ zos.write(b, 0, length);
+ }
+ } catch (Exception var22) {
+ throw new VciBaseException("zipFileError", new String[]{file.getAbsolutePath()}, var22);
+ } finally {
+ try {
+ IOUtils.closeQuietly(is);
+ } catch (Exception var20) {
+ }
+
+ }
+ }
+ }
+ }
+
+ }
+
+ public void addFileToZip(File file, String zipFile) throws VciBaseException {
+ if (file != null && file.exists()) {
+ if (StringUtils.isBlank(zipFile)) {
+ throw new VciBaseException("zipFileNameNull", new String[0]);
+ } else {
+ this.addFileToZip(new File[]{file}, zipFile);
+ }
+ } else {
+ throw new VciBaseException("fileNotFound", new String[]{file.getAbsolutePath()});
+ }
+ }
+
+ public void addFileToZip(File[] files, String zipFile) throws VciBaseException {
+ this.addFileToZip(files, zipFile, this.getZipCharset());
+ }
+
+ public void addFileToZip(File[] files, String zipFile, String zipEncode) throws VciBaseException {
+ if (files != null && files.length != 0) {
+ if (StringUtils.isBlank(zipFile)) {
+ throw new VciBaseException("zipFileNameNull", new String[0]);
+ } else {
+ ZipOutputStream zos = null;
+
+ try {
+ zos = new ZipOutputStream(new FileOutputStream(zipFile));
+ zos.setEncoding(zipEncode);
+ this.addFileToZip(zos, files, "");
+ } catch (Throwable var13) {
+ throw new VciBaseException(LangBaseUtil.getErrorMsg(var13), new String[0], var13);
+ } finally {
+ try {
+ if (zos != null) {
+ zos.close();
+ }
+ } catch (Exception var12) {
+ }
+
+ }
+
+ }
+ } else {
+ throw new VciBaseException("fileNull", new String[0]);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/file/clientutil/VciFileDocClassifyClientUtil.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/file/clientutil/VciFileDocClassifyClientUtil.java
new file mode 100644
index 0000000..7f38176
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/file/clientutil/VciFileDocClassifyClientUtil.java
@@ -0,0 +1,115 @@
+package com.vci.web.util.file.clientutil;
+
+import com.vci.dto.VciFileDocClassifyDTO;
+import com.vci.dto.VciFileDocClassifyDTOList;
+import com.vci.pagemodel.VciFileDocClassifyVO;
+import com.vci.provider.VciFileDocClassifyProvider;
+import com.vci.starter.web.exception.VciBaseException;
+import com.vci.starter.web.pagemodel.BaseResult;
+import com.vci.starter.web.util.LangBaseUtil;
+import com.vci.starter.web.util.VciBaseUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 14:37
+ */
+public class VciFileDocClassifyClientUtil {
+ private Logger logger = LoggerFactory.getLogger(this.getClass());
+ @Autowired
+ private VciFileDocClassifyProvider fileDocClassifyProvider;
+
+ public VciFileDocClassifyClientUtil() {
+ }
+
+ public void classifyIdNotExistAdd(Map<String, String> classifyIdMap) throws VciBaseException {
+ if (!CollectionUtils.isEmpty(classifyIdMap)) {
+ try {
+ BaseResult baseResult = this.fileDocClassifyProvider.checkClassifyIdsExist((String)classifyIdMap.keySet().stream().collect(Collectors.joining(",")));
+ if (baseResult == null) {
+ throw new VciBaseException("鍦ㄦ煡璇㈡枃浠剁被鍨嬫槸鍚﹀瓨鍦ㄦ椂锛屾湇鍔＄娌℃湁杩斿洖缁撴灉鍊�");
+ }
+
+ if (!baseResult.isSuccess() && !CollectionUtils.isEmpty(baseResult.getData())) {
+ List<VciFileDocClassifyDTO> fileDocClassifyDTOS = new ArrayList();
+ baseResult.getData().stream().forEach((id) -> {
+ VciFileDocClassifyDTO classifyDTO = new VciFileDocClassifyDTO();
+ classifyDTO.setId(id.toString());
+ classifyDTO.setName((String)classifyIdMap.get(id));
+ classifyDTO.setDescription("绯荤粺鍐呯疆鐨勬枃浠剁被鍨嬶紝璇峰嬁鏇存敼鍜屽垹闄�");
+ fileDocClassifyDTOS.add(classifyDTO);
+ });
+ VciFileDocClassifyDTOList classifyDTOList = new VciFileDocClassifyDTOList();
+ classifyDTOList.setDocClassifyDTOList(fileDocClassifyDTOS);
+
+ try {
+ baseResult = this.fileDocClassifyProvider.batchAddClassify(classifyDTOList);
+ if (baseResult == null) {
+ throw new VciBaseException("娣诲姞鏂囦欢绫诲瀷鏃讹紝鏈嶅姟绔病鏈夎繑鍥炵粨鏋滃��");
+ }
+
+ if (!baseResult.isSuccess()) {
+ throw new VciBaseException("鍒涘缓绯荤粺鍐呯疆鐨勬枃浠剁被鍨嬫病鏈夋垚鍔燂紝鏈嶅姟绔病鏈夎繑鍥炰换浣曚俊鎭�");
+ }
+ } catch (VciBaseException var7) {
+ throw var7;
+ } catch (Throwable var8) {
+ String msg = LangBaseUtil.getErrorMsg(var8);
+ if (this.logger.isErrorEnabled()) {
+ this.logger.error(msg, var8);
+ }
+
+ throw new VciBaseException(msg, new String[0], var8);
+ }
+ }
+ } catch (VciBaseException var9) {
+ throw var9;
+ } catch (Throwable var10) {
+ String msg = LangBaseUtil.getErrorMsg(var10);
+ if (this.logger.isErrorEnabled()) {
+ this.logger.error(msg, var10);
+ }
+
+ throw new VciBaseException(msg, new String[0], var10);
+ }
+ }
+
+ }
+
+ public String selectDocClassifyNameById(String id) throws VciBaseException {
+ VciFileDocClassifyVO docClassifyVO = this.selectDocClassifyVOById(id);
+ return docClassifyVO != null ? docClassifyVO.getName() : "";
+ }
+
+ public VciFileDocClassifyVO selectDocClassifyVOById(String id) throws VciBaseException {
+ VciBaseUtil.alertNotNull(new Object[]{id, "鏂囨。绫诲瀷缂栧彿"});
+
+ try {
+ BaseResult baseResult = this.fileDocClassifyProvider.getFileDocClassifyById(id);
+ if (baseResult == null) {
+ throw new VciBaseException("鍦ㄦ煡璇㈡枃浠剁被鍨嬫槸鍚﹀瓨鍦ㄦ椂锛屾湇鍔＄娌℃湁杩斿洖缁撴灉鍊�");
+ } else if (!baseResult.isSuccess()) {
+ throw new VciBaseException(baseResult.getMsg(), baseResult.getMsgObjs());
+ } else {
+ return (VciFileDocClassifyVO)baseResult.getObj();
+ }
+ } catch (VciBaseException var4) {
+ throw var4;
+ } catch (Throwable var5) {
+ String msg = LangBaseUtil.getErrorMsg(var5);
+ if (this.logger.isErrorEnabled()) {
+ this.logger.error(msg, var5);
+ }
+
+ throw new VciBaseException(msg, new String[0], var5);
+ }
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/file/clientutil/VciFileServerClientUtil.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/file/clientutil/VciFileServerClientUtil.java
new file mode 100644
index 0000000..35aebbf
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/file/clientutil/VciFileServerClientUtil.java
@@ -0,0 +1,817 @@
+package com.vci.web.util.file.clientutil;
+
+import com.vci.dto.VciFileObjectDTO;
+import com.vci.dto.VciFileShareDTO;
+import com.vci.dto.VciFileShareHasClassifyDTO;
+import com.vci.pagemodel.VciFileObjectVO;
+import com.vci.pagemodel.VciFileShareResultVO;
+import com.vci.properties.VciFileTransProperties;
+import com.vci.provider.VciFileDownloadProvider;
+import com.vci.provider.VciFileQueryProvider;
+import com.vci.provider.VciFileUploadProvider;
+import com.vci.starter.web.exception.VciBaseException;
+import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.starter.web.pagemodel.BaseResult;
+import com.vci.starter.web.util.BeanUtil;
+import com.vci.starter.web.util.LangBaseUtil;
+import com.vci.starter.web.util.LocalFileUtil;
+import com.vci.starter.web.util.VciBaseUtil;
+import com.vci.web.util.file.VciZipUtil;
+import net.lingala.zip4j.core.ZipFile;
+import net.lingala.zip4j.exception.ZipException;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+import java.io.*;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author ludc
+ * @date 2024/7/16 14:43
+ */
+@Component
+public class VciFileServerClientUtil {
+ public static final int BLOCKSIZE = 1048576;
+ @Autowired(
+ required = false
+ )
+ private VciFileUploadProvider vciFileUploadProvider;
+ @Autowired(
+ required = false
+ )
+ private VciFileDocClassifyClientUtil fileDocClassifyClientUtil;
+ @Autowired
+ private VciFileTransProperties vciFileTransProperties;
+ @Autowired(
+ required = false
+ )
+ private VciFileQueryProvider vciFileQueryProvider;
+ @Autowired(
+ required = false
+ )
+ private VciFileDownloadProvider vciFileDownloadProvider;
+ @Autowired
+ private VciZipUtil zipUtil;
+
+ public VciFileServerClientUtil() {
+ }
+
+ public String getFileExtension(String fileName) {
+ String fileExtension = "";
+ if (fileName.indexOf(".") > -1) {
+ fileExtension = fileName.substring(fileName.lastIndexOf(".") + 1);
+ }
+
+ return fileExtension;
+ }
+
+ public String getFileNameNoExtension(String fileName) {
+ String fileNameNoExtension = fileName.substring(0, fileName.lastIndexOf("."));
+ return fileNameNoExtension;
+ }
+
+ private void getFileFromFolder(File folderFile, Set<File> sourceFileSet) {
+ File[] fileArr = folderFile.listFiles();
+ File[] var4 = fileArr;
+ int var5 = fileArr.length;
+
+ for(int var6 = 0; var6 < var5; ++var6) {
+ File file = var4[var6];
+ if (file.isFile()) {
+ sourceFileSet.add(file);
+ }
+
+ if (file.isDirectory()) {
+ this.getFileFromFolder(file, sourceFileSet);
+ }
+ }
+
+ }
+
+ public String getFileDocClassifyName(String classifyId) throws VciBaseException {
+ return this.fileDocClassifyClientUtil.selectDocClassifyNameById(classifyId);
+ }
+
+ public BaseResult<VciFileObjectVO> uploadFile(VciFileObjectDTO fileObjectDTO) throws VciBaseException {
+ VciBaseUtil.alertNotNull(new Object[]{fileObjectDTO, "鏂囦欢浼犺緭瀵硅薄", fileObjectDTO.getOwnbizOid(), "涓氬姟鏁版嵁涓婚敭", fileObjectDTO.getOwnBtmname(), "涓氬姟鏁版嵁涓氬姟绫诲瀷", fileObjectDTO.getSourceFilePath(), "鏂囦欢璺緞", fileObjectDTO.getFileDocClassify(), "鏂囨。绫诲瀷缂栧彿"});
+ List<VciFileObjectDTO> vciFileObjectDTOS = new ArrayList();
+ Map<String, File> sourceFileMap = new HashMap();
+ String sourceFilePath = fileObjectDTO.getSourceFilePath();
+ File sourceFile = new File(sourceFilePath);
+ if (!sourceFile.exists()) {
+ throw new VciBaseException("fileNotFound", new String[]{sourceFile.getName()});
+ } else {
+ String _key;
+ if (StringUtils.isNotBlank(fileObjectDTO.getFileDocClassify()) && StringUtils.isBlank(fileObjectDTO.getFileDocClassifyName())) {
+ _key = this.getFileDocClassifyName(fileObjectDTO.getFileDocClassify());
+ fileObjectDTO.setFileDocClassifyName(_key);
+ }
+
+ fileObjectDTO.setFileExtension(this.getFileExtension(sourceFile.getName()));
+ if (StringUtils.isBlank(fileObjectDTO.getName())) {
+ fileObjectDTO.setName(this.getFileNameNoExtension(sourceFile.getName()));
+ }
+
+ if (StringUtils.isBlank(fileObjectDTO.getId())) {
+ fileObjectDTO.setId(fileObjectDTO.getName());
+ }
+
+ fileObjectDTO.setFileSize(sourceFile.length());
+ vciFileObjectDTOS.add(fileObjectDTO);
+ _key = fileObjectDTO.getId() + "{##$$}" + fileObjectDTO.getName();
+ sourceFileMap.put(_key, sourceFile);
+ Map<String, VciFileObjectVO> resultMap = this.uploadFile((List)vciFileObjectDTOS, (Map)sourceFileMap);
+ BaseResult result = new BaseResult();
+ if (resultMap != null && resultMap.size() > 0) {
+ List<VciFileObjectVO> resultList = (List)resultMap.values().stream().collect(Collectors.toList());
+ result.setData(resultList);
+ result.setMsg("uploadSuccess");
+ result.setObj(resultMap.get(sourceFilePath));
+ result.setSuccess(true);
+ } else {
+ result.setMsg("uploadFail");
+ }
+
+ return result;
+ }
+ }
+
+ public Map<String, VciFileObjectVO> batchUploadFiles(List<VciFileObjectDTO> fileObjectDTOS) throws VciBaseException {
+ Iterator var2 = fileObjectDTOS.iterator();
+
+ while(var2.hasNext()) {
+ VciFileObjectDTO vciFileObjectDTO = (VciFileObjectDTO)var2.next();
+ VciBaseUtil.alertNotNull(new Object[]{vciFileObjectDTO, "鏂囦欢浼犺緭瀵硅薄", vciFileObjectDTO.getOwnbizOid(), "涓氬姟鏁版嵁涓婚敭", vciFileObjectDTO.getOwnBtmname(), "涓氬姟鏁版嵁涓氬姟绫诲瀷", vciFileObjectDTO.getSourceFilePath(), "鏂囦欢璺緞", vciFileObjectDTO.getFileDocClassify(), "鏂囨。绫诲瀷缂栧彿"});
+ }
+
+ Map<String, File> sourceFileMap = new HashMap();
+ Iterator var9 = fileObjectDTOS.iterator();
+
+ while(var9.hasNext()) {
+ VciFileObjectDTO vciFileObjectDTO = (VciFileObjectDTO)var9.next();
+ String sourceFilePath = vciFileObjectDTO.getSourceFilePath();
+ File sourceFile = new File(sourceFilePath);
+ if (!sourceFile.exists()) {
+ throw new VciBaseException("fileNotFound", new String[]{sourceFile.getName()});
+ }
+
+ String _key;
+ if (StringUtils.isNotBlank(vciFileObjectDTO.getFileDocClassify()) && StringUtils.isBlank(vciFileObjectDTO.getFileDocClassifyName())) {
+ _key = this.getFileDocClassifyName(vciFileObjectDTO.getFileDocClassify());
+ vciFileObjectDTO.setFileDocClassifyName(_key);
+ }
+
+ vciFileObjectDTO.setFileExtension(this.getFileExtension(sourceFile.getName()));
+ if (StringUtils.isBlank(vciFileObjectDTO.getName())) {
+ vciFileObjectDTO.setName(this.getFileNameNoExtension(sourceFile.getName()));
+ }
+
+ if (StringUtils.isBlank(vciFileObjectDTO.getId())) {
+ vciFileObjectDTO.setId(vciFileObjectDTO.getName());
+ }
+
+ vciFileObjectDTO.setFileSize(sourceFile.length());
+ _key = vciFileObjectDTO.getId() + "{##$$}" + vciFileObjectDTO.getName();
+ sourceFileMap.put(_key, sourceFile);
+ }
+
+ return this.uploadFile((List)fileObjectDTOS, (Map)sourceFileMap);
+ }
+
+ public Map<String, VciFileObjectVO> uploadFileForFolder(VciFileObjectDTO fileObjectDTO) throws VciBaseException {
+ VciBaseUtil.alertNotNull(new Object[]{fileObjectDTO, "鏂囦欢鏁版嵁浼犺緭瀵硅薄", fileObjectDTO.getOwnbizOid(), "涓氬姟鏁版嵁涓婚敭", fileObjectDTO.getOwnBtmname(), "涓氬姟鏁版嵁鐨勭被鍨�", fileObjectDTO.getDirPath(), "鏂囦欢澶�", fileObjectDTO.getFileDocClassify(), "鏂囨。绫诲瀷"});
+ Map<String, File> sourceFileMap = new HashMap();
+ List<VciFileObjectDTO> vciFileObjectDTOS = new ArrayList();
+ String dirPath = fileObjectDTO.getDirPath();
+ File dirFile = new File(dirPath);
+ if (!dirFile.isDirectory()) {
+ throw new VciBaseException("isNotFolder", new String[]{dirFile.getName()});
+ } else if (!dirFile.exists()) {
+ throw new VciBaseException("folderNotExist", new String[]{dirFile.getName()});
+ } else {
+ Set<File> sourceFileSet = new HashSet();
+ this.getFileFromFolder(dirFile, sourceFileSet);
+ if (StringUtils.isNotBlank(fileObjectDTO.getFileDocClassify()) && StringUtils.isBlank(fileObjectDTO.getFileDocClassifyName())) {
+ String classifyName = this.getFileDocClassifyName(fileObjectDTO.getFileDocClassify());
+ fileObjectDTO.setFileDocClassifyName(classifyName);
+ }
+
+ Iterator var11 = sourceFileSet.iterator();
+
+ while(var11.hasNext()) {
+ File file = (File)var11.next();
+ VciFileObjectDTO tempDTO = new VciFileObjectDTO();
+ BeanUtil.convert(fileObjectDTO, tempDTO);
+ tempDTO.setFileExtension(this.getFileExtension(file.getName()));
+ tempDTO.setName(this.getFileNameNoExtension(file.getName()));
+ tempDTO.setId(this.getFileNameNoExtension(file.getName()));
+ tempDTO.setFileSize(file.length());
+ vciFileObjectDTOS.add(tempDTO);
+ String _key = tempDTO.getId() + "{##$$}" + tempDTO.getName();
+ sourceFileMap.put(_key, file);
+ }
+
+ return this.uploadFile((List)vciFileObjectDTOS, (Map)sourceFileMap);
+ }
+ }
+
+ private Map<String, VciFileObjectVO> uploadFile(List<VciFileObjectDTO> vciFileObjectDTOS, Map<String, File> sourceFileMap) throws VciBaseException {
+ VciFileObjectDTO parameterObject = new VciFileObjectDTO();
+ parameterObject.setVciFileObjectDTOList(vciFileObjectDTOS);
+ BaseResult<VciFileObjectVO> baseResult = this.vciFileUploadProvider.initUploadFileInfo(parameterObject);
+ if (baseResult.getData() != null && baseResult.getData().size() != 0) {
+ Map<String, VciFileObjectVO> resultMap = new HashMap();
+ Iterator var6 = baseResult.getData().iterator();
+
+ while(var6.hasNext()) {
+ VciFileObjectVO vciFileObjectVO = (VciFileObjectVO)var6.next();
+ String _key = vciFileObjectVO.getId() + "{##$$}" + vciFileObjectVO.getName();
+ File sourceFile = (File)sourceFileMap.get(_key);
+ String sourceFilePath = sourceFile.getAbsolutePath();
+ String tempFolder = sourceFile.getParent() + File.separator + VciBaseUtil.getPk();
+ File tempFolderFile = new File(tempFolder);
+ if (!tempFolderFile.exists()) {
+ tempFolderFile.mkdirs();
+ }
+
+ BaseResult tempBaseResult = null;
+ long fileSize = vciFileObjectVO.getFileSize();
+ FileInputStream in = null;
+
+ try {
+ in = new FileInputStream(sourceFile);
+ byte[] buffer = new byte[1048576];
+
+ int temp;
+ for(temp = 0; (long)temp < fileSize - 1048576L; temp += 1048576) {
+ in.read(buffer, 0, 1048576);
+ MultipartFile multipartFile = this.getMultipartFile(buffer, tempFolderFile);
+ tempBaseResult = this.vciFileUploadProvider.uploadFileForOtherService(multipartFile, (long)temp, vciFileObjectVO.getOid());
+ if (!tempBaseResult.isSuccess()) {
+ throw new VciBaseException(tempBaseResult.getMsg());
+ }
+ }
+
+ int remainSize = (int)(fileSize - (long)temp);
+ buffer = new byte[remainSize];
+ in.read(buffer, 0, remainSize);
+ MultipartFile multipartFile = this.getMultipartFile(buffer, tempFolderFile);
+ tempBaseResult = this.vciFileUploadProvider.uploadFileForOtherService(multipartFile, (long)temp, vciFileObjectVO.getOid());
+ if (!tempBaseResult.isSuccess()) {
+ throw new VciBaseException(tempBaseResult.getMsg());
+ }
+
+ resultMap.put(sourceFilePath, (VciFileObjectVO)tempBaseResult.getObj());
+ } catch (FileNotFoundException var30) {
+ throw new VciBaseException("fileNotFound", new String[]{sourceFile.getName()});
+ } catch (IOException var31) {
+ throw new VciBaseException("fileReadFail", new String[]{var31.getMessage()});
+ } catch (Exception var32) {
+ throw new VciBaseException("uploadFail", new String[]{var32.getMessage()});
+ } finally {
+ if (in != null) {
+ try {
+ in.close();
+ } catch (IOException var29) {
+ var29.printStackTrace();
+ }
+ }
+
+ LocalFileUtil.deleteFile(tempFolderFile);
+ }
+ }
+
+ return resultMap;
+ } else {
+ throw new VciBaseException("fileInfoInitFail");
+ }
+ }
+
+ public MultipartFile getMultipartFile(byte[] buffer, File tempFolderFile) {
+ FileItemFactory factory = new DiskFileItemFactory(10240, tempFolderFile);
+ FileItem item = factory.createItem("file", "multipart/form-data", true, VciBaseUtil.getPk());
+ OutputStream os = null;
+
+ try {
+ os = item.getOutputStream();
+ os.write(buffer);
+ os.close();
+ } catch (IOException var10) {
+ var10.printStackTrace();
+ } finally {
+ IOUtils.closeQuietly(os);
+ }
+
+ MultipartFile mfile = new CommonsMultipartFile(item);
+ return mfile;
+ }
+
+ public BaseResult<VciFileObjectVO> uploadFileByZip(String zipFilePath, VciFileObjectDTO fileObjectDTO) throws VciBaseException {
+ if (StringUtils.isBlank(zipFilePath)) {
+ throw new VciBaseException("fileNull");
+ } else {
+ File zipFile = new File(zipFilePath);
+ if (!zipFile.exists()) {
+ throw new VciBaseException("fileNotFound", new String[]{zipFile.getName()});
+ } else {
+ return this.uploadFileByZip(zipFile, fileObjectDTO);
+ }
+ }
+ }
+
+ public BaseResult<VciFileObjectVO> uploadFileByZip(File zipFile, VciFileObjectDTO fileObjectDTO) throws VciBaseException {
+ if (zipFile != null && zipFile.exists()) {
+ ZipFile zipFileObj = null;
+
+ try {
+ zipFileObj = new ZipFile(zipFile);
+ if (!zipFileObj.isValidZipFile()) {
+ throw new VciBaseException("zipFileError");
+ }
+ } catch (ZipException var5) {
+ throw new VciBaseException("zipFileReadError");
+ }
+
+ return this.uploadFileByZip(zipFileObj, fileObjectDTO);
+ } else {
+ throw new VciBaseException("fileNotFound", new String[]{zipFile.getName()});
+ }
+ }
+
+ public BaseResult<VciFileObjectVO> uploadFileByZip(ZipFile zipFile, VciFileObjectDTO fileObjectDTO) throws VciBaseException {
+ VciBaseUtil.alertNotNull(new Object[]{fileObjectDTO, "鏂囦欢鏁版嵁浼犺緭瀵硅薄", fileObjectDTO.getOwnbizOid(), "涓氬姟鏁版嵁涓婚敭", fileObjectDTO.getOwnBtmname(), "涓氬姟鏁版嵁鐨勭被鍨�", fileObjectDTO.getFileDocClassify(), "鏂囨。绫诲瀷"});
+ String tempFolderPath = zipFile.getFile().getParentFile() + File.separator + VciBaseUtil.getPk();
+ File tempFolder = new File(tempFolderPath);
+ if (!tempFolder.exists()) {
+ tempFolder.mkdirs();
+ }
+
+ try {
+ zipFile.setFileNameCharset(this.vciFileTransProperties.getZipCharset());
+ zipFile.extractAll(tempFolderPath);
+ } catch (ZipException var10) {
+ throw new VciBaseException("zipFileReadError");
+ }
+
+ fileObjectDTO.setDirPath(tempFolderPath);
+ BaseResult baseResult = new BaseResult();
+ Map resultMap = null;
+
+ try {
+ resultMap = this.uploadFileForFolder(fileObjectDTO);
+ } catch (Exception var9) {
+ File folderFile = new File(tempFolderPath);
+ LocalFileUtil.deleteFile(folderFile);
+ throw new VciBaseException("uploadFail");
+ }
+
+ if (resultMap != null && resultMap.size() > 0) {
+ List<VciFileObjectVO> resultList = (List)resultMap.values().stream().collect(Collectors.toList());
+ baseResult.setData(resultList);
+ baseResult.setMsg("uploadSuccess");
+ baseResult.setSuccess(true);
+ } else {
+ baseResult.setMsg("uploadFail");
+ }
+
+ File folderFile = new File(tempFolderPath);
+ LocalFileUtil.deleteFile(folderFile);
+ return baseResult;
+ }
+
+ public BaseResult<VciFileObjectVO> shareFilesToBO(String sourceBtmName, String sourceBusinessOid, String btmName, String businessOid) throws VciBaseException {
+ VciBaseUtil.alertNotNull(new Object[]{sourceBtmName, "鍘熶笟鍔＄被鍨�", sourceBusinessOid, "鍘熶笟鍔℃暟鎹富閿�", btmName, "涓氬姟绫诲瀷", businessOid, "涓氬姟鏁版嵁涓婚敭"});
+ return this.vciFileUploadProvider.shareFilesToBO(sourceBtmName, sourceBusinessOid, btmName, businessOid);
+ }
+
+ public BaseResult shareFilesToBO(String fileOids, String btmName, String businessOid) throws VciBaseException {
+ VciBaseUtil.alertNotNull(new Object[]{fileOids, "鏂囦欢涓婚敭", btmName, "涓氬姟绫诲瀷", businessOid, "涓氬姟鏁版嵁涓婚敭"});
+ return this.vciFileUploadProvider.shareFilesToBO(fileOids, btmName, businessOid);
+ }
+
+ public BaseResult shareAnnexFilesToBO(String sourceBtmName, String sourceBusinessOid, String btmName, String businessOid) throws VciBaseException {
+ VciBaseUtil.alertNotNull(new Object[]{sourceBtmName, "鍘熶笟鍔＄被鍨�", sourceBusinessOid, "鍘熶笟鍔℃暟鎹富閿�", btmName, "涓氬姟绫诲瀷", businessOid, "涓氬姟鏁版嵁涓婚敭"});
+ return this.vciFileUploadProvider.shareAnnexFilesToBO(sourceBtmName, sourceBusinessOid, btmName, businessOid);
+ }
+
+ public BaseResult releasedFile(Collection<VciFileObjectDTO> vciFileObjectDTOS) throws VciBaseException {
+ if (vciFileObjectDTOS != null && vciFileObjectDTOS.size() > 0) {
+ List<String> fileOidList = new ArrayList();
+ Iterator var3 = vciFileObjectDTOS.iterator();
+
+ while(var3.hasNext()) {
+ VciFileObjectDTO fileObjectDTO = (VciFileObjectDTO)var3.next();
+ fileOidList.add(fileObjectDTO.getOid());
+ }
+
+ String fileOids = VciBaseUtil.list2String(fileOidList);
+ return this.vciFileQueryProvider.releasedFile(fileOids);
+ } else {
+ throw new VciBaseException("鏂囦欢瀵硅薄鍒楄〃涓虹┖锛屼笉鑳界敓鏁堟枃浠讹紒");
+ }
+ }
+
+ public BaseResult releasedFile(VciFileObjectDTO fileObjectDTO) throws VciBaseException {
+ VciBaseUtil.alertNotNull(new Object[]{fileObjectDTO, "鏂囦欢浼犺緭瀵硅薄"});
+ return this.vciFileQueryProvider.releasedFile(fileObjectDTO.getOid());
+ }
+
+ public BaseResult uploadFile(InputStream inputStream, VciFileObjectDTO fileObjectDTO) throws VciBaseException {
+ if (inputStream == null) {
+ throw new VciBaseException("uploadFail", new String[]{"鏂囦欢娴�"});
+ } else {
+ List<VciFileObjectDTO> vciFileObjectDTOS = new ArrayList();
+ vciFileObjectDTOS.add(fileObjectDTO);
+ VciFileObjectDTO parameterObject = new VciFileObjectDTO();
+ parameterObject.setVciFileObjectDTOList(vciFileObjectDTOS);
+ BaseResult<VciFileObjectVO> baseResult = this.vciFileUploadProvider.initUploadFileInfo(parameterObject);
+ if (baseResult.getData() != null && baseResult.getData().size() != 0) {
+ VciFileObjectVO vciFileObjectVO = (VciFileObjectVO)baseResult.getData().iterator().next();
+ String tempFolder = LocalFileUtil.getProjectFolder() + File.separator + VciBaseUtil.getPk();
+ File tempFolderFile = new File(tempFolder);
+ if (!tempFolderFile.exists()) {
+ tempFolderFile.mkdirs();
+ }
+
+ BaseResult tempBaseResult;
+ try {
+ int fileSize = inputStream.available();
+ fileObjectDTO.setFileSize((long)fileSize);
+ byte[] buffer = new byte[1048576];
+
+ long temp;
+ for(temp = 0L; temp < (long)fileSize; temp += 1048576L) {
+ inputStream.read(buffer, 0, 1048576);
+ MultipartFile multipartFile = this.getMultipartFile(buffer, tempFolderFile);
+ tempBaseResult = this.vciFileUploadProvider.uploadFileForOtherService(multipartFile, temp, vciFileObjectVO.getOid());
+ if (!tempBaseResult.isSuccess()) {
+ throw new VciBaseException(tempBaseResult.getMsg());
+ }
+ }
+
+ int remainSize = (int)((long)fileSize - temp);
+ buffer = new byte[remainSize];
+ inputStream.read(buffer, 0, remainSize);
+ MultipartFile multipartFile = this.getMultipartFile(buffer, tempFolderFile);
+ tempBaseResult = this.vciFileUploadProvider.uploadFileForOtherService(multipartFile, temp, vciFileObjectVO.getOid());
+ if (!tempBaseResult.isSuccess()) {
+ throw new VciBaseException(tempBaseResult.getMsg());
+ }
+ } catch (Exception var23) {
+ throw new VciBaseException("uploadFail", new String[]{var23.getMessage()});
+ } finally {
+ if (inputStream != null) {
+ try {
+ inputStream.close();
+ } catch (IOException var22) {
+ var22.printStackTrace();
+ }
+ }
+
+ LocalFileUtil.deleteFile(tempFolderFile);
+ }
+
+ return tempBaseResult;
+ } else {
+ throw new VciBaseException("fileInfoInitFail");
+ }
+ }
+ }
+
+ public void downloadFileObject(String tempFilePath, VciFileObjectVO vciFileObjectVO) throws VciBaseException {
+ FileOutputStream out = null;
+ File tempFile = new File(tempFilePath);
+
+ try {
+ File dirFile = tempFile.getParentFile();
+ if (!dirFile.exists()) {
+ dirFile.mkdirs();
+ }
+
+ if (!tempFile.exists()) {
+ tempFile.createNewFile();
+ }
+
+ long fileSize = vciFileObjectVO.getFileSize();
+ int temp = 0;
+
+ byte[] buffer;
+ for(out = new FileOutputStream(tempFile); (long)temp < fileSize; temp += buffer.length) {
+ BaseResult<byte[]> baseResult = this.vciFileDownloadProvider.sectionDownloadByFileOid(vciFileObjectVO.getOid(), (long)temp);
+ buffer = (byte[])baseResult.getObj();
+ out.write(buffer, 0, buffer.length);
+ }
+ } catch (Exception var18) {
+ if (tempFile.exists()) {
+ tempFile.delete();
+ }
+
+ File tempFolderFile = tempFile.getParentFile();
+ File[] files = tempFolderFile.listFiles();
+ if (tempFolderFile.exists() && (files == null || files.length == 0)) {
+ tempFolderFile.delete();
+ }
+
+ throw new VciBaseException("downloadFail", new String[]{var18.getMessage()});
+ } finally {
+ try {
+ if (out != null) {
+ out.close();
+ }
+ } catch (Exception var17) {
+ var17.printStackTrace();
+ }
+
+ }
+
+ }
+
+ public String downloadByFileOid(String fileOid) throws VciBaseException {
+ VciBaseUtil.alertNotNull(new Object[]{fileOid, "鏂囦欢涓婚敭"});
+ String tempFolder = LocalFileUtil.getDefaultTempFolder();
+ return this.downloadByFileOid(tempFolder, fileOid);
+ }
+
+ public String downloadByFileOid(String tempFolder, String fileOid) throws VciBaseException {
+ VciBaseUtil.alertNotNull(new Object[]{fileOid, "鏂囦欢涓婚敭", tempFolder, "涓嬭浇鐨勭洰褰�"});
+ BaseResult<VciFileObjectVO> baseResult = this.vciFileQueryProvider.getFileObjectByOid(fileOid);
+ VciFileObjectVO vciFileObjectVO = (VciFileObjectVO)baseResult.getObj();
+ if (vciFileObjectVO == null) {
+ throw new VciBaseException("杩欎釜鏂囦欢涓嶅瓨鍦�");
+ } else {
+ String tempFilePath = tempFolder + File.separator + vciFileObjectVO.getOid() + File.separator + vciFileObjectVO.getName() + "." + vciFileObjectVO.getFileExtension();
+ this.downloadFileObject(tempFilePath, vciFileObjectVO);
+ return tempFilePath;
+ }
+ }
+
+ public Map<String, String> downloadByFileOids(Collection<String> fileOidCollection) throws VciBaseException {
+ return this.downloadByFileOids(LocalFileUtil.getDefaultTempFolder(), fileOidCollection);
+ }
+
+ public Map<String, String> downloadByFileOids(String tempFolder, Collection<String> fileOidCollection) throws VciBaseException {
+ VciBaseUtil.alertCollectionNotNull("鏂囦欢鐨勪富閿泦鍚�", fileOidCollection);
+ Map<String, String> fileOidPathMap = new HashMap();
+ Iterator var4 = fileOidCollection.iterator();
+
+ while(var4.hasNext()) {
+ String fileOid = (String)var4.next();
+ fileOidPathMap.put(fileOid, this.downloadByFileOid(tempFolder, fileOid));
+ }
+
+ return fileOidPathMap;
+ }
+
+ public String downloadToZipByFileOid(String fileOid) throws VciBaseException {
+ VciBaseUtil.alertNotNull(new Object[]{fileOid, "鏂囦欢鐨勪富閿�"});
+ String tempFolder = LocalFileUtil.getDefaultTempFolder();
+ BaseResult<VciFileObjectVO> baseResult = this.vciFileQueryProvider.getFileObjectByOid(fileOid);
+ VciFileObjectVO vciFileObjectVO = (VciFileObjectVO)baseResult.getObj();
+ String zipFile = tempFolder + File.separator + vciFileObjectVO.getName() + "." + vciFileObjectVO.getFileExtension();
+ this.downloadToZipByFileOid(zipFile, fileOid);
+ return zipFile;
+ }
+
+ public void downloadToZipByFileOid(String zipFile, String fileOid) throws VciBaseException {
+ String tempFolder = LocalFileUtil.getDefaultTempFolder();
+ String filePath = this.downloadByFileOid(tempFolder, fileOid);
+ File file = new File(filePath);
+ this.zipUtil.addFileToZip(file, zipFile);
+ if (file.exists()) {
+ file.delete();
+ }
+
+ File dirFile = file.getParentFile();
+ if (dirFile.exists()) {
+ dirFile.delete();
+ }
+
+ }
+
+ public String downloadToZipByFileOids(Collection<String> fileOidCollection) throws VciBaseException {
+ String zipFile = LocalFileUtil.getDefaultTempFolder() + File.separator + VciBaseUtil.getPk() + ".zip";
+ this.downloadToZipByFileOids(zipFile, fileOidCollection);
+ return zipFile;
+ }
+
+ public void downloadToZipByFileOids(String zipFile, Collection<String> fileOidCollection) throws VciBaseException {
+ VciBaseUtil.alertNotNull(new Object[]{zipFile, "鍘嬬缉鍖呯殑璺緞"});
+ String tempFolder = LocalFileUtil.getDefaultTempFolder();
+ this.downloadByFileOids(tempFolder, fileOidCollection);
+ this.zipUtil.folderToZipFile(tempFolder, zipFile);
+ File folderFile = new File(tempFolder);
+ LocalFileUtil.deleteFile(folderFile);
+ }
+
+ public void downloadToIOByFileOid(OutputStream ops, String fileOid) throws VciBaseException {
+ this.downloadToIOByFileOid(ops, fileOid, true);
+ }
+
+ public void downloadToIOByFileOid(OutputStream ops, String fileOid, boolean closeOutSteam) throws VciBaseException {
+ VciBaseUtil.alertNotNull(new Object[]{ops, "杈撳嚭娴�", fileOid, "鏂囦欢涓婚敭"});
+ BaseResult<VciFileObjectVO> returnBaseResult = this.vciFileQueryProvider.getFileObjectByOid(fileOid);
+ VciFileObjectVO vciFileObjectVO = (VciFileObjectVO)returnBaseResult.getObj();
+
+ try {
+ long fileSize = vciFileObjectVO.getFileSize();
+
+ byte[] buffer;
+ for(int temp = 0; (long)temp <= fileSize; temp += buffer.length) {
+ BaseResult<byte[]> baseResult = this.vciFileDownloadProvider.sectionDownloadByFileOid(vciFileObjectVO.getOid(), (long)temp);
+ buffer = (byte[])baseResult.getObj();
+ ops.write(buffer, temp, buffer.length);
+ }
+ } catch (Throwable var14) {
+ throw new VciBaseException("downloadFail", new String[]{LangBaseUtil.getErrorMsg(var14)}, var14);
+ } finally {
+ if (closeOutSteam) {
+ IOUtils.closeQuietly(ops);
+ }
+
+ }
+
+ }
+
+ public Map<String, String> downloadByOwnbiz(String ownBizOid, String ownBtmName) throws VciBaseException {
+ String tempFolder = LocalFileUtil.getDefaultTempFolder();
+ return this.downloadByOwnbiz(tempFolder, ownBizOid, ownBtmName);
+ }
+
+ public Map<String, String> downloadByOwnbiz(String tempFolder, String ownBizOid, String ownBtmName) throws VciBaseException {
+ return this.downloadByOwnbizAndClassify(tempFolder, ownBizOid, ownBtmName, "");
+ }
+
+ public Map<String, String> downloadByOwnbizAndClassify(String ownBizOid, String ownBtmName, String docClassifyId) throws VciBaseException {
+ String tempFolder = LocalFileUtil.getDefaultTempFolder();
+ return this.downloadByOwnbizAndClassify(tempFolder, ownBizOid, ownBtmName, docClassifyId);
+ }
+
+ public Map<String, String> downloadByOwnbizAndClassify(String tempFolder, String ownBizOid, String ownBtmName, String docClassifyId) throws VciBaseException {
+ VciBaseUtil.alertNotNull(new Object[]{ownBizOid, "涓氬姟涓婚敭", ownBtmName, "涓氬姟绫诲瀷"});
+ if (StringUtils.isBlank(docClassifyId)) {
+ docClassifyId = "";
+ }
+
+ BaseResult<VciFileObjectVO> baseResult = this.vciFileQueryProvider.listFilesByOwnbizAndClassify(ownBizOid, ownBtmName, docClassifyId);
+ if (CollectionUtils.isEmpty(baseResult.getData())) {
+ throw new VciBaseException("fileInfoNotExist", new String[]{""});
+ } else {
+ Map<String, String> fileOidPathMap = new HashMap();
+ baseResult.getData().stream().forEach((vciFileObjectVO) -> {
+ String thisFilePath = tempFolder + File.separator + vciFileObjectVO.getName() + "." + vciFileObjectVO.getFileExtension();
+ this.downloadFileObject(thisFilePath, vciFileObjectVO);
+ fileOidPathMap.put(vciFileObjectVO.getOid(), thisFilePath);
+ });
+ return fileOidPathMap;
+ }
+ }
+
+ public String downloadToZipByOwnbiz(String ownBizOid, String ownBtmName) throws VciBaseException {
+ String zipFile = LocalFileUtil.getDefaultTempFolder() + File.separator + VciBaseUtil.getPk() + ".zip";
+ this.downloadToZipByOwnbiz(zipFile, ownBizOid, ownBtmName);
+ return zipFile;
+ }
+
+ public void downloadToZipByOwnbiz(String zipFile, String ownBizOid, String ownBtmName) throws VciBaseException {
+ VciBaseUtil.alertNotNull(new Object[]{ownBizOid, "涓氬姟涓婚敭", ownBtmName, "涓氬姟绫诲瀷"});
+ String tempFolder = LocalFileUtil.getDefaultTempFolder();
+ this.downloadByOwnbiz(tempFolder, ownBizOid, ownBtmName);
+ this.zipUtil.folderToZipFile(tempFolder, zipFile);
+ File file = new File(tempFolder);
+ LocalFileUtil.deleteFile(file);
+ }
+
+ public String downloadToZipByOwnbizAndClassify(String ownBizOid, String ownBtmName, String docClassifyId) throws VciBaseException {
+ String zipFile = LocalFileUtil.getDefaultTempFolder() + File.separator + VciBaseUtil.getPk() + ".zip";
+ this.downloadToZipByOwnbizAndClassify(zipFile, ownBizOid, ownBtmName, docClassifyId);
+ return zipFile;
+ }
+
+ public void downloadToZipByOwnbizAndClassify(String zipFile, String ownBizOid, String ownBtmName, String docClassifyId) throws VciBaseException {
+ VciBaseUtil.alertNotNull(new Object[]{ownBizOid, "涓氬姟涓婚敭", ownBtmName, "涓氬姟绫诲瀷"});
+ String tempFolder = LocalFileUtil.getDefaultTempFolder();
+ this.downloadByOwnbizAndClassify(tempFolder, ownBizOid, ownBtmName, docClassifyId);
+ this.zipUtil.folderToZipFile(tempFolder, zipFile);
+ File file = new File(tempFolder);
+ LocalFileUtil.deleteFile(file);
+ }
+
+ public BaseResult deleteFileByOid(String fileOids) throws VciBaseException {
+ VciBaseUtil.alertNotNull(new Object[]{fileOids, "鏂囦欢涓婚敭"});
+ return this.vciFileDownloadProvider.deleteFile(fileOids);
+ }
+
+ public BaseResult deleteFileByOwnbiz(String ownBizOid, String ownBtmName) throws VciBaseException {
+ VciBaseUtil.alertNotNull(new Object[]{ownBizOid, "涓氬姟涓婚敭", ownBtmName, "涓氬姟绫诲瀷"});
+ BaseResult<VciFileObjectVO> baseResult = this.vciFileQueryProvider.listFilesByOwnbiz(ownBizOid, ownBtmName);
+ List<VciFileObjectVO> fileObjectVOList = (List)baseResult.getData();
+ if (fileObjectVOList != null && fileObjectVOList.size() > 0) {
+ List<String> fileOidList = new ArrayList();
+ Iterator var6 = fileObjectVOList.iterator();
+
+ while(var6.hasNext()) {
+ VciFileObjectVO fileObjectVO = (VciFileObjectVO)var6.next();
+ fileOidList.add(fileObjectVO.getOid());
+ }
+
+ String fileOids = VciBaseUtil.list2String(fileOidList);
+ return this.deleteFileByOid(fileOids);
+ } else {
+ return BaseResult.successMsg("deleteSuccess");
+ }
+ }
+
+ public BaseResult deleteFileByOwnbizAndClassify(String ownBizOid, String ownBtmName, String docClassifyId) throws VciBaseException {
+ VciBaseUtil.alertNotNull(new Object[]{ownBizOid, "涓氬姟涓婚敭", ownBtmName, "涓氬姟绫诲瀷"});
+ BaseResult<VciFileObjectVO> baseResult = this.vciFileQueryProvider.listFilesByOwnbizAndClassify(ownBizOid, ownBtmName, docClassifyId);
+ List<VciFileObjectVO> fileObjectVOList = (List)baseResult.getData();
+ if (fileObjectVOList != null && fileObjectVOList.size() > 0) {
+ List<String> fileOidList = new ArrayList();
+ Iterator var7 = fileObjectVOList.iterator();
+
+ while(var7.hasNext()) {
+ VciFileObjectVO fileObjectVO = (VciFileObjectVO)var7.next();
+ fileOidList.add(fileObjectVO.getOid());
+ }
+
+ String fileOids = VciBaseUtil.list2String(fileOidList);
+ return this.deleteFileByOid(fileOids);
+ } else {
+ return BaseResult.successMsg("deleteSuccess");
+ }
+ }
+
+ public void batchDeleteFiles(Collection<VciFileObjectVO> fileObjectVOS) throws VciBaseException {
+ if (!CollectionUtils.isEmpty(fileObjectVOS)) {
+ this.batchDeleteFilesByOids((Collection)fileObjectVOS.stream().map(BaseModelVO::getOid).collect(Collectors.toList()));
+ }
+
+ }
+
+ public void batchDeleteFilesByOids(Collection<String> fileOidCollection) throws VciBaseException {
+ if (!CollectionUtils.isEmpty(fileOidCollection)) {
+ VciBaseUtil.switchCollectionForOracleIn(fileOidCollection).forEach((fileOids) -> {
+ BaseResult result = this.vciFileDownloadProvider.deleteFile((String)fileOids.stream().collect(Collectors.joining(",")));
+ if (!result.isSuccess()) {
+ throw new VciBaseException(result.getMsg(), result.getMsgObjs());
+ }
+ });
+ }
+
+ }
+
+ public VciFileObjectDTO fileObjectVO2DTO(VciFileObjectVO fileObjectVO) {
+ VciFileObjectDTO fileObjectDTO = new VciFileObjectDTO();
+ BeanUtil.convert(fileObjectVO, fileObjectDTO);
+ return fileObjectDTO;
+ }
+
+ public VciFileObjectDTO fileObjectVO2DTOForUpdate(VciFileObjectVO fileObjectVO) {
+ VciFileObjectDTO fileObjectDTO = new VciFileObjectDTO();
+ BeanUtil.convert(fileObjectVO, fileObjectDTO);
+ fileObjectDTO.setFileOid(fileObjectVO.getOid());
+ fileObjectDTO.setUpdateFileFlag(true);
+ return fileObjectDTO;
+ }
+
+ public void updateFileInfos(Collection<VciFileObjectDTO> fileObjectDTOS) {
+ if (!CollectionUtils.isEmpty(fileObjectDTOS)) {
+ VciBaseUtil.switchCollectionForOracleIn(fileObjectDTOS).stream().forEach((fileDTOs) -> {
+ BaseResult result = this.vciFileUploadProvider.updateFileInfos(fileDTOs);
+ if (!result.isSuccess()) {
+ throw new VciBaseException(result.getMsg(), result.getMsgObjs());
+ }
+ });
+ }
+
+ }
+
+ public List<VciFileShareResultVO> batchShareFile(Collection<VciFileShareDTO> shareDTOList, String fileDocClassifyId) {
+ if (!CollectionUtils.isEmpty(shareDTOList)) {
+ List<VciFileShareResultVO> resultVOList = new ArrayList();
+ VciBaseUtil.switchCollectionForOracleIn(shareDTOList).stream().forEach((dtos) -> {
+ VciFileShareHasClassifyDTO shareHasClassifyDTO = new VciFileShareHasClassifyDTO();
+ shareHasClassifyDTO.setDocClassifyId(fileDocClassifyId);
+ shareHasClassifyDTO.setShareDTOList((List)dtos.stream().collect(Collectors.toList()));
+ BaseResult<VciFileShareResultVO> result = this.vciFileUploadProvider.batchShareFile(shareHasClassifyDTO);
+ if (!result.isSuccess()) {
+ throw new VciBaseException(result.getMsg(), result.getMsgObjs());
+ } else {
+ resultVOList.addAll(result.getData());
+ }
+ });
+ return resultVOList;
+ } else {
+ return null;
+ }
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/codeTemplate/Mapper.impl.java.vm b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/codeTemplate/Mapper.impl.java.vm
index d805ae2..285e4a8 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/codeTemplate/Mapper.impl.java.vm
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/codeTemplate/Mapper.impl.java.vm
@@ -10,7 +10,7 @@
import com.vci.starter.web.pagemodel.*;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.service.OsLifeCycleServiceI;
-import com.vci.web.pageModel.BatchCBO;
+import com.vci.pagemodel.BatchCBO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import org.springframework.util.CollectionUtils;
@@ -22,7 +22,7 @@
import java.util.HashMap;
import java.util.ArrayList;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/codeTemplate/Mapper.java.vm b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/codeTemplate/Mapper.java.vm
index 9683970..07a03d7 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/codeTemplate/Mapper.java.vm
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/codeTemplate/Mapper.java.vm
@@ -4,7 +4,7 @@
import com.vci.starter.web.pagemodel.*;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.pageModel.BatchCBO;
+import com.vci.pagemodel.BatchCBO;
import java.util.Collection;
import java.util.*;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/codeTemplate/Service.impl.java.vm b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/codeTemplate/Service.impl.java.vm
index 063f446..39f4df3 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/codeTemplate/Service.impl.java.vm
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/codeTemplate/Service.impl.java.vm
@@ -8,7 +8,6 @@
#if(${lcStatusFullClassName} !="")
import ${lcStatusFullClassName};
#end
-import com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant;
import com.vci.starter.revision.service.RevisionModelUtil;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
@@ -23,12 +22,11 @@
import org.springframework.util.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import java.lang.reflect.Field;
import java.util.*;
import com.vci.web.service.WebBoServiceI;
import com.vci.frameworkcore.lcstatuspck.*;
-import com.vci.web.pageModel.BatchCBO;
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
+import com.vci.pagemodel.BatchCBO;
+import static com.vci.constant.FrameWorkLangCodeConstant.*;
import static com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant.*;
/**
* ${comments}鏈嶅姟
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/codeTemplate/Service.java.vm b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/codeTemplate/Service.java.vm
index a8d9ce3..e8a0245 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/codeTemplate/Service.java.vm
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/codeTemplate/Service.java.vm
@@ -17,7 +17,7 @@
import java.util.*;
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
+import static com.vci.constant.FrameWorkLangCodeConstant.*;
/**
* ${comments}鏈嶅姟鎺ュ彛
*
diff --git a/Source/plt-web/plt-web-parent/pom.xml b/Source/plt-web/plt-web-parent/pom.xml
index c609de5..7896881 100644
--- a/Source/plt-web/plt-web-parent/pom.xml
+++ b/Source/plt-web/plt-web-parent/pom.xml
@@ -14,6 +14,7 @@
<module>plt-starter</module>
<module>plt-web-base</module>
<module>plt-poi</module>
+ <module>plt-web-api</module>
</modules>
<properties>
diff --git a/Source/plt-web/plt-web-ui/vue.config.js b/Source/plt-web/plt-web-ui/vue.config.js
index 4cf35ab..7f1500f 100644
--- a/Source/plt-web/plt-web-ui/vue.config.js
+++ b/Source/plt-web/plt-web-ui/vue.config.js
@@ -23,6 +23,7 @@
//寮�鍙戞ā寮忓弽鍚戜唬鐞嗛厤缃紝鐢熶骇妯″紡璇蜂娇鐢∟ginx閮ㄧ讲骞堕厤缃弽鍚戜唬鐞�
devServer: {
port: 12000,
+ disableHostCheck: true, // 璺宠繃妫�鏌ost
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
--
Gitblit v1.9.3