From f56a4fe61beb17e69d52025921ec159afd324087 Mon Sep 17 00:00:00 2001 From: "476474485@qq.com" Date: Wed, 11 Sep 2024 15:15:22 +0800 Subject: [PATCH] grpu8 --- .../acctVouchInfo/dao/IAcctVouchInfoDao.java | 0 .../dao/impl/AcctVouchInfoDaoImpl.java | 5 +- .../entity/AcctVouchInfoEntity.java | 3 +- .../entity/AcctVouchInfoEntity.xml | 0 .../entity/AcctVouchInfoEntityVo.java | 0 .../service/IAcctVouchInfoService.java | 5 +- .../impl/AcctVouchInfoServiceImpl.java | 0 .../dictAcctSubj/dao/IDictAcctSubjDao.java | 0 .../dao/impl/DictAcctSubjDaoImpl.java | 0 .../entity/DictAcctSubjEntity.java | 0 .../entity/DictAcctSubjEntity.xml | 0 .../entity/DictAcctSubjEntityVo.java | 0 .../service/IDictAcctSubjService.java | 0 .../service/impl/DictAcctSubjServiceImpl.java | 0 .../dictCheckType/dao/IDictCheckTypeDao.java | 0 .../dao/impl/DictCheckTypeDaoImpl.java | 6 +- .../entity/DictCheckTypeEntity.java | 0 .../entity/DictCheckTypeEntity.xml | 0 .../entity/DictCheckTypeEntityVo.java | 0 .../service/IDictCheckTypeService.java | 0 .../impl/DictCheckTypeServiceImpl.java | 0 .../attachment/dao/IAttachmentFileDao.java | 26 +- .../dao/impl/AttachmentFileDaoImpl.java | 46 +- .../entity/AttachmentFileEntity.java | 240 ++++----- .../entity/AttachmentFileEntity.xml | 172 +++---- .../service/IAttachmentFileService.java | 74 +-- .../impl/AttachmentFileServiceImpl.java | 458 +++++++++--------- .../controlindex/dao/IControlIndexDao.java | 0 .../dao/impl/ControlIndexDaoImpl.java | 0 .../entity/ControlIndexEntity.java | 0 .../entity/ControlIndexEntity.xml | 0 .../service/IControlIndexService.java | 0 .../service/impl/ControlIndexServiceImpl.java | 0 .../gbizbsyrec/dao/IGbiZbsyrecDao.java | 0 .../dao/impl/GbiZbsyrecDaoImpl.java | 0 .../gbizbsyrec/entity/GbiZbsyrecEntity.java | 0 .../gbizbsyrec/entity/GbiZbsyrecEntity.xml | 0 .../service/IGbiZbsyrecService.java | 0 .../service/impl/GbiZbsyrecServiceImpl.java | 0 .../nxproof/gbizbxmb/dao/IGbiZbxmbDao.java | 0 .../gbizbxmb/dao/impl/GbiZbxmbDaoImpl.java | 0 .../gbizbxmb/entity/GbiZbxmbEntity.java | 0 .../gbizbxmb/entity/GbiZbxmbEntity.xml | 0 .../gbizbxmb/service/IGbiZbxmbService.java | 0 .../service/impl/GbiZbxmbServiceImpl.java | 0 .../nxproof/glPzml/dao/ISenderGlPzmlDao.java | 0 .../glPzml/dao/impl/SenderGlPzmlDaoImpl.java | 0 .../glPzml/entity/SenderGlPzmlEntity.java | 0 .../glPzml/entity/SenderGlPzmlEntity.xml | 0 .../glPzml/service/ISenderGlPzmlService.java | 0 .../service/impl/SenderGlPzmlServiceImpl.java | 0 .../nxproof/glPznr/dao/ISenderGlPznrDao.java | 0 .../glPznr/dao/impl/SenderGlPznrDaoImpl.java | 0 .../glPznr/entity/SenderGlPznrEntity.java | 0 .../glPznr/entity/SenderGlPznrEntity.xml | 0 .../glPznr/service/ISenderGlPznrService.java | 0 .../service/impl/SenderGlPznrServiceImpl.java | 0 .../nxproof/glYeb/dao/ISenderGlYebDao.java | 0 .../glYeb/dao/impl/SenderGlYebDaoImpl.java | 0 .../glYeb/entity/SenderGlYebEntity.java | 0 .../glYeb/entity/SenderGlYebEntity.xml | 0 .../glYeb/service/ISenderGlYebService.java | 0 .../service/impl/SenderGlYebServiceImpl.java | 0 .../nxproof/glZtcs/dao/ISenderGlZtcsDao.java | 0 .../glZtcs/dao/impl/SenderGlZtcsDaoImpl.java | 0 .../glZtcs/entity/SenderGlZtcsEntity.java | 0 .../glZtcs/entity/SenderGlZtcsEntity.xml | 0 .../glZtcs/service/ISenderGlZtcsService.java | 0 .../service/impl/SenderGlZtcsServiceImpl.java | 0 .../grpU8/nxproof/glczrz/dao/IGlCzrzDao.java | 0 .../glczrz/dao/impl/GlCzrzDaoImpl.java | 0 .../nxproof/glczrz/entity/GlCzrzEntity.java | 0 .../nxproof/glczrz/entity/GlCzrzEntity.xml | 0 .../glczrz/service/IGlCzrzService.java | 0 .../service/impl/GlCzrzServiceImpl.java | 0 .../nxproof/glfzxzl/dao/IGlFzxzlDao.java | 0 .../glfzxzl/dao/impl/GlFzxzlDaoImpl.java | 0 .../nxproof/glfzxzl/entity/GlFzxzlEntity.java | 0 .../nxproof/glfzxzl/entity/GlFzxzlEntity.xml | 0 .../glfzxzl/service/IGlFzxzlService.java | 0 .../service/impl/GlFzxzlServiceImpl.java | 0 .../nxproof/glkmxx/dao/ISenderGlKmxxDao.java | 0 .../glkmxx/dao/impl/SenderGlKmxxDaoImpl.java | 0 .../glkmxx/entity/SenderGlKmxxEntity.java | 0 .../glkmxx/entity/SenderGlKmxxEntity.xml | 0 .../glkmxx/service/ISenderGlKmxxService.java | 0 .../service/impl/SenderGlKmxxServiceImpl.java | 0 .../nxproof/glxmzl/dao/ISenderGlXmzlDao.java | 0 .../glxmzl/dao/impl/SenderGlXmzlDaoImpl.java | 0 .../glxmzl/entity/SenderGlXmzlEntity.java | 0 .../glxmzl/entity/SenderGlXmzlEntity.xml | 0 .../glxmzl/service/ISenderGlXmzlService.java | 0 .../service/impl/SenderGlXmzlServiceImpl.java | 0 .../nxproof/oerannex/dao/IOerAnnexDao.java | 34 +- .../oerannex/dao/impl/OerAnnexDaoImpl.java | 80 +-- .../oerannex/entity/OerAnnexEntity.java | 298 ++++++------ .../oerannex/entity/OerAnnexEntity.xml | 250 +++++----- .../oerannex/service/IOerAnnexService.java | 0 .../service/impl/OerAnnexServiceImpl.java | 264 +++++----- .../nxproof/oerdjjsfs/dao/IOerDjjsfsDao.java | 0 .../oerdjjsfs/dao/impl/OerDjjsfsDaoImpl.java | 0 .../oerdjjsfs/entity/OerDjjsfsEntity.java | 0 .../oerdjjsfs/entity/OerDjjsfsEntity.xml | 0 .../oerdjjsfs/service/IOerDjjsfsService.java | 0 .../service/impl/OerDjjsfsServiceImpl.java | 0 .../oerdjml/controller/OerDjmlController.java | 0 .../nxproof/oerdjml/dao/IOerDjmlDao.java | 0 .../oerdjml/dao/impl/OerDjmlDaoImpl.java | 0 .../nxproof/oerdjml/dto/FileInfoDTO.java | 0 .../oerdjml/entity/GbiZbsyrecAllEntity.java | 0 .../nxproof/oerdjml/entity/OerDjmlEntity.java | 0 .../nxproof/oerdjml/entity/OerDjmlEntity.xml | 0 .../oerdjml/entity/OerDjnrAllEntity.java | 0 .../oerdjml/entity/OerYszbAllEntity.java | 0 .../oerdjml/service/IOerDjmlExtService.java | 0 .../oerdjml/service/IOerDjmlService.java | 0 .../service/impl/OerDjmlExtServiceImpl.java | 0 .../service/impl/OerDjmlServiceImpl.java | 0 .../nxproof/oerdjnr/dao/IOerDjnrDao.java | 0 .../oerdjnr/dao/impl/OerDjnrDaoImpl.java | 0 .../nxproof/oerdjnr/entity/OerDjnrEntity.java | 0 .../nxproof/oerdjnr/entity/OerDjnrEntity.xml | 0 .../oerdjnr/service/IOerDjnrService.java | 0 .../service/impl/OerDjnrServiceImpl.java | 0 .../nxproof/oeryszb/dao/IOerYszbDao.java | 0 .../oeryszb/dao/impl/OerYszbDaoImpl.java | 0 .../nxproof/oeryszb/entity/OerYszbEntity.java | 0 .../nxproof/oeryszb/entity/OerYszbEntity.xml | 0 .../oeryszb/service/IOerYszbService.java | 0 .../service/impl/OerYszbServiceImpl.java | 0 .../pubauditlog/dao/IPubAuditLogDao.java | 0 .../dao/impl/PubAuditLogDaoImpl.java | 0 .../pubauditlog/entity/PubAuditLogEntity.java | 0 .../pubauditlog/entity/PubAuditLogEntity.xml | 0 .../service/IPubAuditLogService.java | 0 .../service/impl/PubAuditLogServiceImpl.java | 0 .../pubbmxx/dao/ISenderPubbmxxDao.java | 0 .../dao/impl/SenderPubbmxxDaoImpl.java | 0 .../pubbmxx/entity/SenderPubbmxxEntity.java | 0 .../pubbmxx/entity/SenderPubbmxxEntity.xml | 0 .../service/ISenderPubbmxxService.java | 0 .../impl/SenderPubbmxxServiceImpl.java | 0 .../pubkjqj/dao/ISenderPubkjqjDao.java | 0 .../dao/impl/SenderPubkjqjDaoImpl.java | 0 .../pubkjqj/entity/SenderPubkjqjEntity.java | 0 .../pubkjqj/entity/SenderPubkjqjEntity.xml | 0 .../service/ISenderPubkjqjService.java | 0 .../impl/SenderPubkjqjServiceImpl.java | 0 .../pubobjflow/dao/IPubObjFlowDao.java | 0 .../dao/impl/PubObjFlowDaoImpl.java | 0 .../pubobjflow/entity/PubObjFlowEntity.java | 0 .../pubobjflow/entity/PubObjFlowEntity.xml | 0 .../service/IPubObjFlowService.java | 0 .../service/impl/PubObjFlowServiceImpl.java | 0 .../pubzyxx/dao/ISenderPubzyxxDao.java | 0 .../dao/impl/SenderPubzyxxDaoImpl.java | 0 .../pubzyxx/entity/SenderPubzyxxEntity.java | 0 .../pubzyxx/entity/SenderPubzyxxEntity.xml | 0 .../service/ISenderPubzyxxService.java | 0 .../impl/SenderPubzyxxServiceImpl.java | 0 .../grpU8/nxproof/zbwhsz/dao/IZbWhszDao.java | 0 .../zbwhsz/dao/impl/ZbWhszDaoImpl.java | 0 .../nxproof/zbwhsz/entity/ZbWhszEntity.java | 0 .../nxproof/zbwhsz/entity/ZbWhszEntity.xml | 0 .../zbwhsz/service/IZbWhszService.java | 0 .../service/impl/ZbWhszServiceImpl.java | 0 .../grpU8/nxproof/zbzbly/dao/IZbZblyDao.java | 0 .../zbzbly/dao/impl/ZbZblyDaoImpl.java | 0 .../nxproof/zbzbly/entity/ZbZblyEntity.java | 0 .../nxproof/zbzbly/entity/ZbZblyEntity.xml | 0 .../zbzbly/service/IZbZblyService.java | 0 .../service/impl/ZbZblyServiceImpl.java | 0 172 files changed, 978 insertions(+), 983 deletions(-) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/IAcctVouchInfoDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/impl/AcctVouchInfoDaoImpl.java (94%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntity.java (99%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntityVo.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java (95%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/impl/AcctVouchInfoServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/IDictAcctSubjDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/impl/DictAcctSubjDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntityVo.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/IDictAcctSubjService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/impl/DictAcctSubjServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/IDictCheckTypeDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/impl/DictCheckTypeDaoImpl.java (87%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntityVo.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/IDictCheckTypeService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/impl/DictCheckTypeServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/dao/IAttachmentFileDao.java (96%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/dao/impl/AttachmentFileDaoImpl.java (97%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/entity/AttachmentFileEntity.java (95%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/entity/AttachmentFileEntity.xml (97%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/service/IAttachmentFileService.java (95%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/service/impl/AttachmentFileServiceImpl.java (97%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/dao/IControlIndexDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/dao/impl/ControlIndexDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/entity/ControlIndexEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/entity/ControlIndexEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/service/IControlIndexService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/service/impl/ControlIndexServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/dao/IGbiZbsyrecDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/dao/impl/GbiZbsyrecDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/entity/GbiZbsyrecEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/entity/GbiZbsyrecEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/service/IGbiZbsyrecService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/service/impl/GbiZbsyrecServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/dao/IGbiZbxmbDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/dao/impl/GbiZbxmbDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/entity/GbiZbxmbEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/entity/GbiZbxmbEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/IGbiZbxmbService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/impl/GbiZbxmbServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/ISenderGlPzmlDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/ISenderGlPzmlService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/ISenderGlPznrDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/impl/SenderGlPznrDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/service/ISenderGlPznrService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/service/impl/SenderGlPznrServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/dao/ISenderGlYebDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/dao/impl/SenderGlYebDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/entity/SenderGlYebEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/entity/SenderGlYebEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/service/ISenderGlYebService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/service/impl/SenderGlYebServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/dao/ISenderGlZtcsDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/dao/impl/SenderGlZtcsDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/entity/SenderGlZtcsEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/entity/SenderGlZtcsEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/service/ISenderGlZtcsService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/service/impl/SenderGlZtcsServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/dao/IGlCzrzDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/dao/impl/GlCzrzDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/entity/GlCzrzEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/entity/GlCzrzEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/service/IGlCzrzService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/service/impl/GlCzrzServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/IGlFzxzlDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/impl/GlFzxzlDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/service/IGlFzxzlService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/service/impl/GlFzxzlServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/ISenderGlKmxxDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/impl/SenderGlKmxxDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/entity/SenderGlKmxxEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/entity/SenderGlKmxxEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/service/ISenderGlKmxxService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/service/impl/SenderGlKmxxServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/dao/ISenderGlXmzlDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/dao/impl/SenderGlXmzlDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/entity/SenderGlXmzlEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/entity/SenderGlXmzlEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/service/ISenderGlXmzlService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/service/impl/SenderGlXmzlServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/dao/IOerAnnexDao.java (96%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/dao/impl/OerAnnexDaoImpl.java (97%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/entity/OerAnnexEntity.java (95%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/entity/OerAnnexEntity.xml (97%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/service/IOerAnnexService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/service/impl/OerAnnexServiceImpl.java (96%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/dao/IOerDjjsfsDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/dao/impl/OerDjjsfsDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/entity/OerDjjsfsEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/entity/OerDjjsfsEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/service/IOerDjjsfsService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/service/impl/OerDjjsfsServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/controller/OerDjmlController.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/dao/IOerDjmlDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/dao/impl/OerDjmlDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/dto/FileInfoDTO.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/GbiZbsyrecAllEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjnrAllEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerYszbAllEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/IOerDjmlExtService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/IOerDjmlService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/dao/IOerDjnrDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/dao/impl/OerDjnrDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/service/IOerDjnrService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/service/impl/OerDjnrServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/dao/IOerYszbDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/dao/impl/OerYszbDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/entity/OerYszbEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/entity/OerYszbEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/service/IOerYszbService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/service/impl/OerYszbServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/dao/IPubAuditLogDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/dao/impl/PubAuditLogDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/entity/PubAuditLogEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/entity/PubAuditLogEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/service/IPubAuditLogService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/service/impl/PubAuditLogServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/dao/ISenderPubbmxxDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/dao/impl/SenderPubbmxxDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/entity/SenderPubbmxxEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/entity/SenderPubbmxxEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/service/ISenderPubbmxxService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/service/impl/SenderPubbmxxServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/dao/ISenderPubkjqjDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/dao/impl/SenderPubkjqjDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/entity/SenderPubkjqjEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/entity/SenderPubkjqjEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/service/ISenderPubkjqjService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/service/impl/SenderPubkjqjServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/dao/IPubObjFlowDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/dao/impl/PubObjFlowDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/entity/PubObjFlowEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/entity/PubObjFlowEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/service/IPubObjFlowService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/service/impl/PubObjFlowServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/dao/ISenderPubzyxxDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/dao/impl/SenderPubzyxxDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/entity/SenderPubzyxxEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/entity/SenderPubzyxxEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/service/ISenderPubzyxxService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/service/impl/SenderPubzyxxServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/dao/IZbWhszDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/dao/impl/ZbWhszDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/entity/ZbWhszEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/entity/ZbWhszEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/service/IZbWhszService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/service/impl/ZbWhszServiceImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/dao/IZbZblyDao.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/dao/impl/ZbZblyDaoImpl.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/entity/ZbZblyEntity.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/entity/ZbZblyEntity.xml (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/service/IZbZblyService.java (100%) rename service/{ => service-grp}/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/service/impl/ZbZblyServiceImpl.java (100%) diff --git a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/IAcctVouchInfoDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/IAcctVouchInfoDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/IAcctVouchInfoDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/IAcctVouchInfoDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/impl/AcctVouchInfoDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/impl/AcctVouchInfoDaoImpl.java similarity index 94% rename from service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/impl/AcctVouchInfoDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/impl/AcctVouchInfoDaoImpl.java index cfbf3b6b..ab22e944 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/impl/AcctVouchInfoDaoImpl.java +++ b/service/service-grp/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/impl/AcctVouchInfoDaoImpl.java @@ -1,12 +1,11 @@ package com.hzya.frame.grpU8.acctVouchInfo.dao.impl; import com.baomidou.dynamic.datasource.annotation.DS; -import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; -import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity; +import com.hzya.frame.basedao.dao.MybatisGenericDao; import com.hzya.frame.grpU8.acctVouchInfo.dao.IAcctVouchInfoDao; +import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity; import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntityVo; import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntity.java similarity index 99% rename from service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntity.java index 8af372bb..5c4fd0aa 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntity.java +++ b/service/service-grp/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntity.java @@ -1,6 +1,5 @@ package com.hzya.frame.grpU8.acctVouchInfo.entity; -import java.util.Date; import com.hzya.frame.web.entity.BaseEntity; /** * 子表(AcctVouchInfo)实体类 @@ -9,7 +8,7 @@ import com.hzya.frame.web.entity.BaseEntity; * @since 2024-07-09 11:25:15 */ public class AcctVouchInfoEntity extends BaseEntity { - + /** 年度 */ private String acct_year; /** 月份 */ diff --git a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntityVo.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntityVo.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntityVo.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntityVo.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java similarity index 95% rename from service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java index 0c41c1fb..6f6d9c26 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java +++ b/service/service-grp/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java @@ -1,10 +1,9 @@ package com.hzya.frame.grpU8.acctVouchInfo.service; import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity; -import com.hzya.frame.web.entity.JsonResultEntity; -import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity; import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity; +import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity; /** * 子表(AcctVouchInfo)表服务接口 * diff --git a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/impl/AcctVouchInfoServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/impl/AcctVouchInfoServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/impl/AcctVouchInfoServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/impl/AcctVouchInfoServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/IDictAcctSubjDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/IDictAcctSubjDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/IDictAcctSubjDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/IDictAcctSubjDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/impl/DictAcctSubjDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/impl/DictAcctSubjDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/impl/DictAcctSubjDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/impl/DictAcctSubjDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntityVo.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntityVo.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntityVo.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntityVo.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/IDictAcctSubjService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/IDictAcctSubjService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/IDictAcctSubjService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/IDictAcctSubjService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/impl/DictAcctSubjServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/impl/DictAcctSubjServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/impl/DictAcctSubjServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/impl/DictAcctSubjServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/IDictCheckTypeDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/IDictCheckTypeDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/IDictCheckTypeDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/IDictCheckTypeDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/impl/DictCheckTypeDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/impl/DictCheckTypeDaoImpl.java similarity index 87% rename from service/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/impl/DictCheckTypeDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/impl/DictCheckTypeDaoImpl.java index 76955876..ac5026a1 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/impl/DictCheckTypeDaoImpl.java +++ b/service/service-grp/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/impl/DictCheckTypeDaoImpl.java @@ -1,13 +1,11 @@ package com.hzya.frame.grpU8.dictCheckType.dao.impl; import com.baomidou.dynamic.datasource.annotation.DS; -import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntity; -import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntityVo; -import com.hzya.frame.grpU8.dictCheckType.entity.DictCheckTypeEntity; +import com.hzya.frame.basedao.dao.MybatisGenericDao; import com.hzya.frame.grpU8.dictCheckType.dao.IDictCheckTypeDao; +import com.hzya.frame.grpU8.dictCheckType.entity.DictCheckTypeEntity; import com.hzya.frame.grpU8.dictCheckType.entity.DictCheckTypeEntityVo; import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntityVo.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntityVo.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntityVo.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntityVo.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/IDictCheckTypeService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/IDictCheckTypeService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/IDictCheckTypeService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/IDictCheckTypeService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/impl/DictCheckTypeServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/impl/DictCheckTypeServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/impl/DictCheckTypeServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/impl/DictCheckTypeServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/dao/IAttachmentFileDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/dao/IAttachmentFileDao.java similarity index 96% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/dao/IAttachmentFileDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/dao/IAttachmentFileDao.java index 20867a14..c0ad3988 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/dao/IAttachmentFileDao.java +++ b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/dao/IAttachmentFileDao.java @@ -1,13 +1,13 @@ -package com.hzya.frame.grpU8.nxproof.attachment.dao;/* -* @Description 附件 -* @Author xiangerlin - @Date 2022-10-26 11:17 -*/ - - -import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity; - -public interface IAttachmentFileDao extends IBaseDao { - Integer saveData(AttachmentFileEntity entity); -} +package com.hzya.frame.grpU8.nxproof.attachment.dao;/* +* @Description 附件 +* @Author xiangerlin + @Date 2022-10-26 11:17 +*/ + + +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity; + +public interface IAttachmentFileDao extends IBaseDao { + Integer saveData(AttachmentFileEntity entity); +} diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/dao/impl/AttachmentFileDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/dao/impl/AttachmentFileDaoImpl.java similarity index 97% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/dao/impl/AttachmentFileDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/dao/impl/AttachmentFileDaoImpl.java index 3de2969b..86470034 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/dao/impl/AttachmentFileDaoImpl.java +++ b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/dao/impl/AttachmentFileDaoImpl.java @@ -1,23 +1,23 @@ -package com.hzya.frame.grpU8.nxproof.attachment.dao.impl;/* -* @Description 附件 -* @Author xiangerlin - @Date 2022-10-26 11:18 -*/ - - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.grpU8.nxproof.attachment.dao.IAttachmentFileDao; -import com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity; -import com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity; -import org.springframework.stereotype.Repository; - -@Repository -public class AttachmentFileDaoImpl extends MybatisGenericDao implements IAttachmentFileDao { - @DS("#entity.dataSourceCode") - @Override - public Integer saveData(AttachmentFileEntity entity) { - Integer o = super.insert("com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity.AttachmentFileEntity_insert", entity); - return o; - } -} +package com.hzya.frame.grpU8.nxproof.attachment.dao.impl;/* +* @Description 附件 +* @Author xiangerlin + @Date 2022-10-26 11:18 +*/ + + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.grpU8.nxproof.attachment.dao.IAttachmentFileDao; +import com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity; +import com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity; +import org.springframework.stereotype.Repository; + +@Repository +public class AttachmentFileDaoImpl extends MybatisGenericDao implements IAttachmentFileDao { + @DS("#entity.dataSourceCode") + @Override + public Integer saveData(AttachmentFileEntity entity) { + Integer o = super.insert("com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity.AttachmentFileEntity_insert", entity); + return o; + } +} diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/entity/AttachmentFileEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/entity/AttachmentFileEntity.java similarity index 95% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/entity/AttachmentFileEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/entity/AttachmentFileEntity.java index 719706e4..a13657f7 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/entity/AttachmentFileEntity.java +++ b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/entity/AttachmentFileEntity.java @@ -1,120 +1,120 @@ -package com.hzya.frame.grpU8.nxproof.attachment.entity;/* -* @Description 附件表 -* @Author xiangerlin - @Date 2022-10-26 10:40 -*/ - - -import com.hzya.frame.web.entity.BaseEntity; - -public class AttachmentFileEntity extends BaseEntity { - - private String aTGuid;//主键id - private String createDate;//创建日期 - private String createID;//创建人id - private String updateDate;//更新日期 - private String updateID;//更新人id - private String deleteDate;//删除日期 - private String deleteID;//删除人 - private String aTFileName;//附件名 - private String aTExtName;//附件后缀名 - private byte[] aTFile;//附件 二进制文件 - private String relationApp;//固定传 OER - private String isDELETE;//删除标记 0是未删除 - - public String getaTGuid() { - return aTGuid; - } - - public void setaTGuid(String aTGuid) { - this.aTGuid = aTGuid; - } - - public String getCreateDate() { - return createDate; - } - - public void setCreateDate(String createDate) { - this.createDate = createDate; - } - - public String getCreateID() { - return createID; - } - - public void setCreateID(String createID) { - this.createID = createID; - } - - public String getUpdateDate() { - return updateDate; - } - - public void setUpdateDate(String updateDate) { - this.updateDate = updateDate; - } - - public String getUpdateID() { - return updateID; - } - - public void setUpdateID(String updateID) { - this.updateID = updateID; - } - - public String getDeleteDate() { - return deleteDate; - } - - public void setDeleteDate(String deleteDate) { - this.deleteDate = deleteDate; - } - - public String getDeleteID() { - return deleteID; - } - - public void setDeleteID(String deleteID) { - this.deleteID = deleteID; - } - - public String getaTFileName() { - return aTFileName; - } - - public void setaTFileName(String aTFileName) { - this.aTFileName = aTFileName; - } - - public String getaTExtName() { - return aTExtName; - } - - public void setaTExtName(String aTExtName) { - this.aTExtName = aTExtName; - } - - public byte[] getaTFile() { - return aTFile; - } - - public void setaTFile(byte[] aTFile) { - this.aTFile = aTFile; - } - - public String getRelationApp() { - return relationApp; - } - - public void setRelationApp(String relationApp) { - this.relationApp = relationApp; - } - - public String getIsDELETE() { - return isDELETE; - } - - public void setIsDELETE(String isDELETE) { - this.isDELETE = isDELETE; - } -} +package com.hzya.frame.grpU8.nxproof.attachment.entity;/* +* @Description 附件表 +* @Author xiangerlin + @Date 2022-10-26 10:40 +*/ + + +import com.hzya.frame.web.entity.BaseEntity; + +public class AttachmentFileEntity extends BaseEntity { + + private String aTGuid;//主键id + private String createDate;//创建日期 + private String createID;//创建人id + private String updateDate;//更新日期 + private String updateID;//更新人id + private String deleteDate;//删除日期 + private String deleteID;//删除人 + private String aTFileName;//附件名 + private String aTExtName;//附件后缀名 + private byte[] aTFile;//附件 二进制文件 + private String relationApp;//固定传 OER + private String isDELETE;//删除标记 0是未删除 + + public String getaTGuid() { + return aTGuid; + } + + public void setaTGuid(String aTGuid) { + this.aTGuid = aTGuid; + } + + public String getCreateDate() { + return createDate; + } + + public void setCreateDate(String createDate) { + this.createDate = createDate; + } + + public String getCreateID() { + return createID; + } + + public void setCreateID(String createID) { + this.createID = createID; + } + + public String getUpdateDate() { + return updateDate; + } + + public void setUpdateDate(String updateDate) { + this.updateDate = updateDate; + } + + public String getUpdateID() { + return updateID; + } + + public void setUpdateID(String updateID) { + this.updateID = updateID; + } + + public String getDeleteDate() { + return deleteDate; + } + + public void setDeleteDate(String deleteDate) { + this.deleteDate = deleteDate; + } + + public String getDeleteID() { + return deleteID; + } + + public void setDeleteID(String deleteID) { + this.deleteID = deleteID; + } + + public String getaTFileName() { + return aTFileName; + } + + public void setaTFileName(String aTFileName) { + this.aTFileName = aTFileName; + } + + public String getaTExtName() { + return aTExtName; + } + + public void setaTExtName(String aTExtName) { + this.aTExtName = aTExtName; + } + + public byte[] getaTFile() { + return aTFile; + } + + public void setaTFile(byte[] aTFile) { + this.aTFile = aTFile; + } + + public String getRelationApp() { + return relationApp; + } + + public void setRelationApp(String relationApp) { + this.relationApp = relationApp; + } + + public String getIsDELETE() { + return isDELETE; + } + + public void setIsDELETE(String isDELETE) { + this.isDELETE = isDELETE; + } +} diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/entity/AttachmentFileEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/entity/AttachmentFileEntity.xml similarity index 97% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/entity/AttachmentFileEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/entity/AttachmentFileEntity.xml index 0833a4d1..285043d7 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/entity/AttachmentFileEntity.xml +++ b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/entity/AttachmentFileEntity.xml @@ -1,86 +1,86 @@ - - - - - - - - - - - - - - - - - - - - - - ATGuid, - CreateDate, - CreateID, - UpdateDate, - UpdateID, - DeleteDate, - DeleteID, - ATFileName, - ATExtName, - ATFile, - RelationApp, - ISDELETE - - - - - - - - - - insert into AT_AttachmentFile( - - aTGuid, - createDate, - createID, - updateDate , - updateID, - deleteDate, - deleteID, - aTFileName, - aTExtName, - aTFile, - relationApp, - isDELETE - - )values - ( - - #{aTGuid}, - #{createDate}, - #{createID}, - #{updateDate} , - #{updateID}, - #{deleteDate}, - #{deleteID}, - #{aTFileName}, - #{aTExtName}, - #{aTFile,typeHandler=org.apache.ibatis.type.BlobTypeHandler}, - 'OER', - 0 - - - ) - - + + + + + + + + + + + + + + + + + + + + + + ATGuid, + CreateDate, + CreateID, + UpdateDate, + UpdateID, + DeleteDate, + DeleteID, + ATFileName, + ATExtName, + ATFile, + RelationApp, + ISDELETE + + + + + + + + + + insert into AT_AttachmentFile( + + aTGuid, + createDate, + createID, + updateDate , + updateID, + deleteDate, + deleteID, + aTFileName, + aTExtName, + aTFile, + relationApp, + isDELETE + + )values + ( + + #{aTGuid}, + #{createDate}, + #{createID}, + #{updateDate} , + #{updateID}, + #{deleteDate}, + #{deleteID}, + #{aTFileName}, + #{aTExtName}, + #{aTFile,typeHandler=org.apache.ibatis.type.BlobTypeHandler}, + 'OER', + 0 + + + ) + + diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/service/IAttachmentFileService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/service/IAttachmentFileService.java similarity index 95% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/service/IAttachmentFileService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/service/IAttachmentFileService.java index 39c98d48..15f057ff 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/service/IAttachmentFileService.java +++ b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/service/IAttachmentFileService.java @@ -1,37 +1,37 @@ -package com.hzya.frame.grpU8.nxproof.attachment.service;/* -* @Description -* @Author xiangerlin - @Date 2022-10-26 11:19 -*/ - -import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity; - -import java.util.List; - -public interface IAttachmentFileService { - - /** - * 保存附件 - * @param entity - */ - void saveAttachment(AttachmentFileEntity entity); - - List queryFile(AttachmentFileEntity entity)throws Exception; - - /** - * 调用http接口查询单据附件 - * @param billCode - * @return - * @throws Exception - */ - List queryFileByCode(String billCode)throws Exception; - - /** - * 附件上传 - * @param fileList - * @param mlid - * @param kjnd - */ - void uploadAttachment(List fileList,String mlid,String kjnd); -} +package com.hzya.frame.grpU8.nxproof.attachment.service;/* +* @Description +* @Author xiangerlin + @Date 2022-10-26 11:19 +*/ + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity; + +import java.util.List; + +public interface IAttachmentFileService { + + /** + * 保存附件 + * @param entity + */ + void saveAttachment(AttachmentFileEntity entity); + + List queryFile(AttachmentFileEntity entity)throws Exception; + + /** + * 调用http接口查询单据附件 + * @param billCode + * @return + * @throws Exception + */ + List queryFileByCode(String billCode)throws Exception; + + /** + * 附件上传 + * @param fileList + * @param mlid + * @param kjnd + */ + void uploadAttachment(List fileList,String mlid,String kjnd); +} diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/service/impl/AttachmentFileServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/service/impl/AttachmentFileServiceImpl.java similarity index 97% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/service/impl/AttachmentFileServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/service/impl/AttachmentFileServiceImpl.java index e0c7bef1..eacee3ac 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/service/impl/AttachmentFileServiceImpl.java +++ b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/service/impl/AttachmentFileServiceImpl.java @@ -1,229 +1,229 @@ -package com.hzya.frame.grpU8.nxproof.attachment.service.impl;/* -* @Description -* @Author xiangerlin - @Date 2022-10-26 11:20 -*/ - -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpRequest; -import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.basedao.service.impl.BaseService; -import com.hzya.frame.grpU8.nxproof.attachment.dao.IAttachmentFileDao; -import com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity; -import com.hzya.frame.grpU8.nxproof.attachment.service.IAttachmentFileService; -import com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity; -import com.hzya.frame.grpU8.nxproof.oerannex.service.IOerAnnexService; -import com.hzya.frame.grpU8.nxproof.oerdjml.dto.FileInfoDTO; -import org.apache.commons.collections.CollectionUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.io.*; -import java.net.URLDecoder; -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -@Service -public class AttachmentFileServiceImpl extends BaseService implements IAttachmentFileService { - - Logger logger = LogManager.getLogger(getClass()); - - protected IAttachmentFileDao attachmentFileDao; - - @Autowired - public void setBillLogDao(IAttachmentFileDao dao) { - this.attachmentFileDao = dao; - this.dao=dao; - } - @Autowired - private IOerAnnexService oerAnnexService; - /** - * 保存附件 - * @param entity - */ - @Override - public void saveAttachment(AttachmentFileEntity entity) { - entity.setaTGuid("A1:"+IdUtil.fastUUID()); - String date = DateUtil.format(new Date(), "yyyyMMdd HH:mm:ss"); - entity.setCreateDate(date); - entity.setUpdateDate(date); - String fileName = entity.getaTFileName(); - if (StrUtil.isNotEmpty(fileName)){ - int index = fileName.lastIndexOf("."); - if (index > 0){ - String suffix = fileName.substring(index); - entity.setaTExtName(suffix); - String prefix = fileName.substring(0,index); - entity.setaTFileName(prefix); - } - } - attachmentFileDao.save("AttachmentFileEntity_insert",entity); - } - - @Override - public List queryFile(AttachmentFileEntity entity) throws Exception { - List list = attachmentFileDao.query(entity); - return list; - } - - /** - * 调用http接口查询单据附件 - * - * @param billCode 单据号 - * @return - * @throws Exception - */ - @Override - public List queryFileByCode(String billCode) throws Exception { - List list = new ArrayList<>(); - if (StrUtil.isNotEmpty(billCode)){ - JSONObject params = new JSONObject(); - params.put("billNo",billCode); - String res = HttpRequest.post("/grp/af/findFilesBB").body(params.toString()).execute().body(); - logger.info("根据单号:{},查询到到附件列表为:{}",billCode,res); - if (StrUtil.isNotEmpty(res)){ - JSONObject resJson = JSONObject.parseObject(res); - int pageCount = resJson.getIntValue("pageCount"); - boolean success = resJson.getBoolean("success"); - if (success){ - String dataStr = resJson.getString("data"); - list = JSONObject.parseArray(dataStr,JSONObject.class); - if (null != list && list.size() >0){ - for (JSONObject jsonObject : list) { - String fileName = jsonObject.getString("fileName"); - if (StrUtil.isNotEmpty(fileName)){ - // 使用indexOf找到"."的位置 - int dotIndex = fileName.lastIndexOf('.'); - // 确保找到了"."，防止indexOf返回-1的情况 - if (dotIndex != -1){ - String ext_name = fileName.substring(dotIndex); - jsonObject.put("Ext",ext_name); - } - } - } - } - } - } - } - return list; - } - - /** - * 附件上传 - * - * @param fileList - * @param mlid - * @param kjnd - */ - @Override - public void uploadAttachment(List fileList, String mlid, String kjnd) { - if (CollectionUtils.isNotEmpty(fileList) && StrUtil.isNotEmpty(mlid) && StrUtil.isNotEmpty(kjnd)){ - try { - //附件下载 - List fileInfoList = fileDownload(fileList); - //附件保存到grp库里 - if (CollectionUtils.isNotEmpty(fileInfoList)){ - //保存前先删一下历史附件 - OerAnnexEntity delete = new OerAnnexEntity(); - //delete.setGsdm(Constant.CONFIGMAP.get("gsdm")); - delete.setKjnd(kjnd); - delete.setMlid(mlid); - //oerAnnexService.deleteAnnex(delete); - int no = 1; - for (FileInfoDTO fileInfo : fileInfoList) { - try { - AttachmentFileEntity fileEntity = new AttachmentFileEntity(); - String fileName = URLDecoder.decode(fileInfo.getFile_name(), "UTF-8"); - fileEntity.setaTFileName(fileName); - fileEntity.setaTFile(fileInfo.getData()); - this.saveAttachment(fileEntity); - //保存附件关系 - OerAnnexEntity annexEntity = new OerAnnexEntity(); - annexEntity.setMlid(mlid); - annexEntity.setKjnd(kjnd); - annexEntity.setAnnexName(fileName); - annexEntity.setAnnexSize(Convert.toLong(fileInfo.getFile_size())); - annexEntity.setOnlyid(fileEntity.getaTGuid()); - annexEntity.setXh(String.valueOf(no)); - oerAnnexService.saveAnnex(annexEntity); - no++; - }catch (Exception e){ - logger.error("保存附件到grp出错:{}",e); - } - } - } - }catch (Exception e){ - logger.error("保存附件到grp出错:{}",e); - } - } - } - - private List fileDownload(List fileList){ - String dir = "1"; - List files = new ArrayList<>(); - //1、下载附件 - for (JSONObject fileObj : fileList) { - try { - FileInfoDTO fileInfoDTO = new FileInfoDTO(); - String url = fileObj.getString("url"); - String fileName = URLDecoder.decode(fileObj.getString("fileName")); - File file = HttpUtil.downloadFileFromUrl(url, dir); - if (null != file){ - String zipPath = dir + File.separator + fileName.split("\\.")[0] + ".zip"; - ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipPath), Charset.forName("GBK")); - writeZipFile(file, zos,fileName); - zos.close(); - // 获取压缩文件的字节数组 - File zipFile = new File(zipPath); - ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream((int) zipFile.length()); - BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(zipFile)); - int buf_size = 1024; - byte[] buffer = new byte[buf_size]; - int len = 0; - while (-1 != (len = bufferedInputStream.read(buffer, 0, buf_size))) { - byteArrayOutputStream.write(buffer, 0, len); - } - byte[] fileByte = byteArrayOutputStream.toByteArray(); - fileInfoDTO.setData(fileByte); - fileInfoDTO.setFile_size(fileObj.getString("size")); - fileInfoDTO.setFile_name(fileName); - files.add(fileInfoDTO); - } - }catch (Exception e){ - logger.error("上传附件出错:{}",e); - } - } - return files; - } - private void writeZipFile(File file,ZipOutputStream zos,String fileName){ - if (null != file && null !=zos){ - try { - logger.info("=====压缩文件====="); - zos.putNextEntry(new ZipEntry(fileName)); - FileInputStream fos = new FileInputStream(file); - BufferedInputStream bis = new BufferedInputStream(fos); - int len; - byte[] buf = new byte[1024]; - while ((len = bis.read(buf, 0, 1024)) != -1) { - zos.write(buf, 0, len); - } - bis.close(); - fos.close(); - logger.info("=====压缩完成====="); - }catch (Exception e){ - e.printStackTrace(); - logger.error("=====压缩文件出错====="); - } - } - } -} +package com.hzya.frame.grpU8.nxproof.attachment.service.impl;/* +* @Description +* @Author xiangerlin + @Date 2022-10-26 11:20 +*/ + +import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpUtil; +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.grpU8.nxproof.attachment.dao.IAttachmentFileDao; +import com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity; +import com.hzya.frame.grpU8.nxproof.attachment.service.IAttachmentFileService; +import com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity; +import com.hzya.frame.grpU8.nxproof.oerannex.service.IOerAnnexService; +import com.hzya.frame.grpU8.nxproof.oerdjml.dto.FileInfoDTO; +import org.apache.commons.collections.CollectionUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.*; +import java.net.URLDecoder; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +@Service +public class AttachmentFileServiceImpl extends BaseService implements IAttachmentFileService { + + Logger logger = LogManager.getLogger(getClass()); + + protected IAttachmentFileDao attachmentFileDao; + + @Autowired + public void setBillLogDao(IAttachmentFileDao dao) { + this.attachmentFileDao = dao; + this.dao=dao; + } + @Autowired + private IOerAnnexService oerAnnexService; + /** + * 保存附件 + * @param entity + */ + @Override + public void saveAttachment(AttachmentFileEntity entity) { + entity.setaTGuid("A1:"+IdUtil.fastUUID()); + String date = DateUtil.format(new Date(), "yyyyMMdd HH:mm:ss"); + entity.setCreateDate(date); + entity.setUpdateDate(date); + String fileName = entity.getaTFileName(); + if (StrUtil.isNotEmpty(fileName)){ + int index = fileName.lastIndexOf("."); + if (index > 0){ + String suffix = fileName.substring(index); + entity.setaTExtName(suffix); + String prefix = fileName.substring(0,index); + entity.setaTFileName(prefix); + } + } + attachmentFileDao.save("AttachmentFileEntity_insert",entity); + } + + @Override + public List queryFile(AttachmentFileEntity entity) throws Exception { + List list = attachmentFileDao.query(entity); + return list; + } + + /** + * 调用http接口查询单据附件 + * + * @param billCode 单据号 + * @return + * @throws Exception + */ + @Override + public List queryFileByCode(String billCode) throws Exception { + List list = new ArrayList<>(); + if (StrUtil.isNotEmpty(billCode)){ + JSONObject params = new JSONObject(); + params.put("billNo",billCode); + String res = HttpRequest.post("/grp/af/findFilesBB").body(params.toString()).execute().body(); + logger.info("根据单号:{},查询到到附件列表为:{}",billCode,res); + if (StrUtil.isNotEmpty(res)){ + JSONObject resJson = JSONObject.parseObject(res); + int pageCount = resJson.getIntValue("pageCount"); + boolean success = resJson.getBoolean("success"); + if (success){ + String dataStr = resJson.getString("data"); + list = JSONObject.parseArray(dataStr,JSONObject.class); + if (null != list && list.size() >0){ + for (JSONObject jsonObject : list) { + String fileName = jsonObject.getString("fileName"); + if (StrUtil.isNotEmpty(fileName)){ + // 使用indexOf找到"."的位置 + int dotIndex = fileName.lastIndexOf('.'); + // 确保找到了"."，防止indexOf返回-1的情况 + if (dotIndex != -1){ + String ext_name = fileName.substring(dotIndex); + jsonObject.put("Ext",ext_name); + } + } + } + } + } + } + } + return list; + } + + /** + * 附件上传 + * + * @param fileList + * @param mlid + * @param kjnd + */ + @Override + public void uploadAttachment(List fileList, String mlid, String kjnd) { + if (CollectionUtils.isNotEmpty(fileList) && StrUtil.isNotEmpty(mlid) && StrUtil.isNotEmpty(kjnd)){ + try { + //附件下载 + List fileInfoList = fileDownload(fileList); + //附件保存到grp库里 + if (CollectionUtils.isNotEmpty(fileInfoList)){ + //保存前先删一下历史附件 + OerAnnexEntity delete = new OerAnnexEntity(); + //delete.setGsdm(Constant.CONFIGMAP.get("gsdm")); + delete.setKjnd(kjnd); + delete.setMlid(mlid); + //oerAnnexService.deleteAnnex(delete); + int no = 1; + for (FileInfoDTO fileInfo : fileInfoList) { + try { + AttachmentFileEntity fileEntity = new AttachmentFileEntity(); + String fileName = URLDecoder.decode(fileInfo.getFile_name(), "UTF-8"); + fileEntity.setaTFileName(fileName); + fileEntity.setaTFile(fileInfo.getData()); + this.saveAttachment(fileEntity); + //保存附件关系 + OerAnnexEntity annexEntity = new OerAnnexEntity(); + annexEntity.setMlid(mlid); + annexEntity.setKjnd(kjnd); + annexEntity.setAnnexName(fileName); + annexEntity.setAnnexSize(Convert.toLong(fileInfo.getFile_size())); + annexEntity.setOnlyid(fileEntity.getaTGuid()); + annexEntity.setXh(String.valueOf(no)); + oerAnnexService.saveAnnex(annexEntity); + no++; + }catch (Exception e){ + logger.error("保存附件到grp出错:{}",e); + } + } + } + }catch (Exception e){ + logger.error("保存附件到grp出错:{}",e); + } + } + } + + private List fileDownload(List fileList){ + String dir = "1"; + List files = new ArrayList<>(); + //1、下载附件 + for (JSONObject fileObj : fileList) { + try { + FileInfoDTO fileInfoDTO = new FileInfoDTO(); + String url = fileObj.getString("url"); + String fileName = URLDecoder.decode(fileObj.getString("fileName")); + File file = HttpUtil.downloadFileFromUrl(url, dir); + if (null != file){ + String zipPath = dir + File.separator + fileName.split("\\.")[0] + ".zip"; + ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipPath), Charset.forName("GBK")); + writeZipFile(file, zos,fileName); + zos.close(); + // 获取压缩文件的字节数组 + File zipFile = new File(zipPath); + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream((int) zipFile.length()); + BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(zipFile)); + int buf_size = 1024; + byte[] buffer = new byte[buf_size]; + int len = 0; + while (-1 != (len = bufferedInputStream.read(buffer, 0, buf_size))) { + byteArrayOutputStream.write(buffer, 0, len); + } + byte[] fileByte = byteArrayOutputStream.toByteArray(); + fileInfoDTO.setData(fileByte); + fileInfoDTO.setFile_size(fileObj.getString("size")); + fileInfoDTO.setFile_name(fileName); + files.add(fileInfoDTO); + } + }catch (Exception e){ + logger.error("上传附件出错:{}",e); + } + } + return files; + } + private void writeZipFile(File file,ZipOutputStream zos,String fileName){ + if (null != file && null !=zos){ + try { + logger.info("=====压缩文件====="); + zos.putNextEntry(new ZipEntry(fileName)); + FileInputStream fos = new FileInputStream(file); + BufferedInputStream bis = new BufferedInputStream(fos); + int len; + byte[] buf = new byte[1024]; + while ((len = bis.read(buf, 0, 1024)) != -1) { + zos.write(buf, 0, len); + } + bis.close(); + fos.close(); + logger.info("=====压缩完成====="); + }catch (Exception e){ + e.printStackTrace(); + logger.error("=====压缩文件出错====="); + } + } + } +} diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/dao/IControlIndexDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/dao/IControlIndexDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/dao/IControlIndexDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/dao/IControlIndexDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/dao/impl/ControlIndexDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/dao/impl/ControlIndexDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/dao/impl/ControlIndexDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/dao/impl/ControlIndexDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/entity/ControlIndexEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/entity/ControlIndexEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/entity/ControlIndexEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/entity/ControlIndexEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/entity/ControlIndexEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/entity/ControlIndexEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/entity/ControlIndexEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/entity/ControlIndexEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/service/IControlIndexService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/service/IControlIndexService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/service/IControlIndexService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/service/IControlIndexService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/service/impl/ControlIndexServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/service/impl/ControlIndexServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/service/impl/ControlIndexServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/controlindex/service/impl/ControlIndexServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/dao/IGbiZbsyrecDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/dao/IGbiZbsyrecDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/dao/IGbiZbsyrecDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/dao/IGbiZbsyrecDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/dao/impl/GbiZbsyrecDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/dao/impl/GbiZbsyrecDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/dao/impl/GbiZbsyrecDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/dao/impl/GbiZbsyrecDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/entity/GbiZbsyrecEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/entity/GbiZbsyrecEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/entity/GbiZbsyrecEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/entity/GbiZbsyrecEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/entity/GbiZbsyrecEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/entity/GbiZbsyrecEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/entity/GbiZbsyrecEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/entity/GbiZbsyrecEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/service/IGbiZbsyrecService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/service/IGbiZbsyrecService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/service/IGbiZbsyrecService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/service/IGbiZbsyrecService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/service/impl/GbiZbsyrecServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/service/impl/GbiZbsyrecServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/service/impl/GbiZbsyrecServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/service/impl/GbiZbsyrecServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/dao/IGbiZbxmbDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/dao/IGbiZbxmbDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/dao/IGbiZbxmbDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/dao/IGbiZbxmbDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/dao/impl/GbiZbxmbDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/dao/impl/GbiZbxmbDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/dao/impl/GbiZbxmbDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/dao/impl/GbiZbxmbDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/entity/GbiZbxmbEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/entity/GbiZbxmbEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/entity/GbiZbxmbEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/entity/GbiZbxmbEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/entity/GbiZbxmbEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/entity/GbiZbxmbEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/entity/GbiZbxmbEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/entity/GbiZbxmbEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/IGbiZbxmbService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/IGbiZbxmbService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/IGbiZbxmbService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/IGbiZbxmbService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/impl/GbiZbxmbServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/impl/GbiZbxmbServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/impl/GbiZbxmbServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/impl/GbiZbxmbServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/ISenderGlPzmlDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/ISenderGlPzmlDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/ISenderGlPzmlDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/ISenderGlPzmlDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/ISenderGlPzmlService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/ISenderGlPzmlService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/ISenderGlPzmlService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/ISenderGlPzmlService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/ISenderGlPznrDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/ISenderGlPznrDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/ISenderGlPznrDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/ISenderGlPznrDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/impl/SenderGlPznrDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/impl/SenderGlPznrDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/impl/SenderGlPznrDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/impl/SenderGlPznrDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/service/ISenderGlPznrService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/service/ISenderGlPznrService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/service/ISenderGlPznrService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/service/ISenderGlPznrService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/service/impl/SenderGlPznrServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/service/impl/SenderGlPznrServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/service/impl/SenderGlPznrServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/service/impl/SenderGlPznrServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/dao/ISenderGlYebDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/dao/ISenderGlYebDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/dao/ISenderGlYebDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/dao/ISenderGlYebDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/dao/impl/SenderGlYebDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/dao/impl/SenderGlYebDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/dao/impl/SenderGlYebDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/dao/impl/SenderGlYebDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/entity/SenderGlYebEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/entity/SenderGlYebEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/entity/SenderGlYebEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/entity/SenderGlYebEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/entity/SenderGlYebEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/entity/SenderGlYebEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/entity/SenderGlYebEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/entity/SenderGlYebEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/service/ISenderGlYebService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/service/ISenderGlYebService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/service/ISenderGlYebService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/service/ISenderGlYebService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/service/impl/SenderGlYebServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/service/impl/SenderGlYebServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/service/impl/SenderGlYebServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/service/impl/SenderGlYebServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/dao/ISenderGlZtcsDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/dao/ISenderGlZtcsDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/dao/ISenderGlZtcsDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/dao/ISenderGlZtcsDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/dao/impl/SenderGlZtcsDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/dao/impl/SenderGlZtcsDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/dao/impl/SenderGlZtcsDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/dao/impl/SenderGlZtcsDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/entity/SenderGlZtcsEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/entity/SenderGlZtcsEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/entity/SenderGlZtcsEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/entity/SenderGlZtcsEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/entity/SenderGlZtcsEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/entity/SenderGlZtcsEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/entity/SenderGlZtcsEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/entity/SenderGlZtcsEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/service/ISenderGlZtcsService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/service/ISenderGlZtcsService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/service/ISenderGlZtcsService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/service/ISenderGlZtcsService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/service/impl/SenderGlZtcsServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/service/impl/SenderGlZtcsServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/service/impl/SenderGlZtcsServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/service/impl/SenderGlZtcsServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/dao/IGlCzrzDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/dao/IGlCzrzDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/dao/IGlCzrzDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/dao/IGlCzrzDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/dao/impl/GlCzrzDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/dao/impl/GlCzrzDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/dao/impl/GlCzrzDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/dao/impl/GlCzrzDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/entity/GlCzrzEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/entity/GlCzrzEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/entity/GlCzrzEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/entity/GlCzrzEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/entity/GlCzrzEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/entity/GlCzrzEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/entity/GlCzrzEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/entity/GlCzrzEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/service/IGlCzrzService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/service/IGlCzrzService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/service/IGlCzrzService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/service/IGlCzrzService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/service/impl/GlCzrzServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/service/impl/GlCzrzServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/service/impl/GlCzrzServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/service/impl/GlCzrzServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/IGlFzxzlDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/IGlFzxzlDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/IGlFzxzlDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/IGlFzxzlDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/impl/GlFzxzlDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/impl/GlFzxzlDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/impl/GlFzxzlDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/impl/GlFzxzlDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/service/IGlFzxzlService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/service/IGlFzxzlService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/service/IGlFzxzlService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/service/IGlFzxzlService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/service/impl/GlFzxzlServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/service/impl/GlFzxzlServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/service/impl/GlFzxzlServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/service/impl/GlFzxzlServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/ISenderGlKmxxDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/ISenderGlKmxxDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/ISenderGlKmxxDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/ISenderGlKmxxDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/impl/SenderGlKmxxDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/impl/SenderGlKmxxDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/impl/SenderGlKmxxDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/impl/SenderGlKmxxDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/entity/SenderGlKmxxEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/entity/SenderGlKmxxEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/entity/SenderGlKmxxEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/entity/SenderGlKmxxEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/entity/SenderGlKmxxEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/entity/SenderGlKmxxEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/entity/SenderGlKmxxEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/entity/SenderGlKmxxEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/service/ISenderGlKmxxService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/service/ISenderGlKmxxService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/service/ISenderGlKmxxService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/service/ISenderGlKmxxService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/service/impl/SenderGlKmxxServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/service/impl/SenderGlKmxxServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/service/impl/SenderGlKmxxServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/service/impl/SenderGlKmxxServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/dao/ISenderGlXmzlDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/dao/ISenderGlXmzlDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/dao/ISenderGlXmzlDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/dao/ISenderGlXmzlDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/dao/impl/SenderGlXmzlDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/dao/impl/SenderGlXmzlDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/dao/impl/SenderGlXmzlDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/dao/impl/SenderGlXmzlDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/entity/SenderGlXmzlEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/entity/SenderGlXmzlEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/entity/SenderGlXmzlEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/entity/SenderGlXmzlEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/entity/SenderGlXmzlEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/entity/SenderGlXmzlEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/entity/SenderGlXmzlEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/entity/SenderGlXmzlEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/service/ISenderGlXmzlService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/service/ISenderGlXmzlService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/service/ISenderGlXmzlService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/service/ISenderGlXmzlService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/service/impl/SenderGlXmzlServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/service/impl/SenderGlXmzlServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/service/impl/SenderGlXmzlServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/service/impl/SenderGlXmzlServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/dao/IOerAnnexDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/dao/IOerAnnexDao.java similarity index 96% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/dao/IOerAnnexDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/dao/IOerAnnexDao.java index cbd78980..00ec8043 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/dao/IOerAnnexDao.java +++ b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/dao/IOerAnnexDao.java @@ -1,17 +1,17 @@ -package com.hzya.frame.grpU8.nxproof.oerannex.dao;/* -* @Description 附件关系表 -* @Author xiangerlin - @Date 2022-10-26 10:04 -*/ - - -import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity; - -public interface IOerAnnexDao extends IBaseDao { - Integer deleteAnnex(OerAnnexEntity delete); - - OerAnnexEntity queryMaxId(OerAnnexEntity entity); - - Integer saveData(OerAnnexEntity annexEntity); -} +package com.hzya.frame.grpU8.nxproof.oerannex.dao;/* +* @Description 附件关系表 +* @Author xiangerlin + @Date 2022-10-26 10:04 +*/ + + +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity; + +public interface IOerAnnexDao extends IBaseDao { + Integer deleteAnnex(OerAnnexEntity delete); + + OerAnnexEntity queryMaxId(OerAnnexEntity entity); + + Integer saveData(OerAnnexEntity annexEntity); +} diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/dao/impl/OerAnnexDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/dao/impl/OerAnnexDaoImpl.java similarity index 97% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/dao/impl/OerAnnexDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/dao/impl/OerAnnexDaoImpl.java index bb6c8eb9..c9ddd139 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/dao/impl/OerAnnexDaoImpl.java +++ b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/dao/impl/OerAnnexDaoImpl.java @@ -1,40 +1,40 @@ -package com.hzya.frame.grpU8.nxproof.oerannex.dao.impl;/* -* @Description 附件关系表 -* @Author xiangerlin - @Date 2022-10-26 10:05 -*/ - - - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.grpU8.nxproof.oerannex.dao.IOerAnnexDao; -import com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity; -import com.hzya.frame.grpU8.nxproof.oerdjml.entity.OerDjmlEntity; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public class OerAnnexDaoImpl extends MybatisGenericDao implements IOerAnnexDao { - @DS("#entity.dataSourceCode") - @Override - public Integer deleteAnnex(OerAnnexEntity entity) { - Integer o = super.delete( "com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity.OerAnnexEntity_delete", entity); - return o; - } - - @DS("#entity.dataSourceCode") - @Override - public OerAnnexEntity queryMaxId(OerAnnexEntity entity) { - OerAnnexEntity o = super.query(entity,"com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity.OerAnnexEntity_max_id"); - return o; - } - - @DS("#entity.dataSourceCode") - @Override - public Integer saveData(OerAnnexEntity entity) { - Integer o = super.insert("com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity.OerAnnexEntity_insert",entity); - return o; - } -} +package com.hzya.frame.grpU8.nxproof.oerannex.dao.impl;/* +* @Description 附件关系表 +* @Author xiangerlin + @Date 2022-10-26 10:05 +*/ + + + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.grpU8.nxproof.oerannex.dao.IOerAnnexDao; +import com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity; +import com.hzya.frame.grpU8.nxproof.oerdjml.entity.OerDjmlEntity; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public class OerAnnexDaoImpl extends MybatisGenericDao implements IOerAnnexDao { + @DS("#entity.dataSourceCode") + @Override + public Integer deleteAnnex(OerAnnexEntity entity) { + Integer o = super.delete( "com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity.OerAnnexEntity_delete", entity); + return o; + } + + @DS("#entity.dataSourceCode") + @Override + public OerAnnexEntity queryMaxId(OerAnnexEntity entity) { + OerAnnexEntity o = super.query(entity,"com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity.OerAnnexEntity_max_id"); + return o; + } + + @DS("#entity.dataSourceCode") + @Override + public Integer saveData(OerAnnexEntity entity) { + Integer o = super.insert("com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity.OerAnnexEntity_insert",entity); + return o; + } +} diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/entity/OerAnnexEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/entity/OerAnnexEntity.java similarity index 95% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/entity/OerAnnexEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/entity/OerAnnexEntity.java index ebbddd5a..fc797b01 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/entity/OerAnnexEntity.java +++ b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/entity/OerAnnexEntity.java @@ -1,149 +1,149 @@ -package com.hzya.frame.grpU8.nxproof.oerannex.entity; - -import com.hzya.frame.web.entity.BaseEntity; - -/* -* @Description 附件关系表 -* @Author xiangerlin - @Date 2022-10-26 8:44 -*/ -public class OerAnnexEntity extends BaseEntity { - - private String annexid; //主键id - private String mlid;//报销单id - private String gsdm;//公司代码 默认001 - private String kjnd;//会计年度 - private String bnxid;// 不知道是什么 填0 - private String xh;//序号 - private String onlyid;// AT_AttachmentFile 表的主键ATGuid - private String annexName;//附件名 - private Long annexSize;//附件大小 - private String showSize;//附件大小显示值 - private String ole;// 不知道是什么，填空 - private String fjType;//附件类型， 数据库中只有 其他、其他其他(&Z)、合同3种类型 - private String fpid;//不知道是什么 填空 - - private String maxAnnexid;//最大id - - private String aTextName;//后缀名 - - public String getAnnexid() { - return annexid; - } - - public void setAnnexid(String annexid) { - this.annexid = annexid; - } - - public String getMlid() { - return mlid; - } - - public void setMlid(String mlid) { - this.mlid = mlid; - } - - public String getGsdm() { - return gsdm; - } - - public void setGsdm(String gsdm) { - this.gsdm = gsdm; - } - - public String getKjnd() { - return kjnd; - } - - public void setKjnd(String kjnd) { - this.kjnd = kjnd; - } - - public String getBnxid() { - return bnxid; - } - - public void setBnxid(String bnxid) { - this.bnxid = bnxid; - } - - public String getXh() { - return xh; - } - - public void setXh(String xh) { - this.xh = xh; - } - - public String getOnlyid() { - return onlyid; - } - - public void setOnlyid(String onlyid) { - this.onlyid = onlyid; - } - - public String getAnnexName() { - return annexName; - } - - public void setAnnexName(String annexName) { - this.annexName = annexName; - } - - public Long getAnnexSize() { - return annexSize; - } - - public void setAnnexSize(Long annexSize) { - this.annexSize = annexSize; - } - - public String getShowSize() { - return showSize; - } - - public void setShowSize(String showSize) { - this.showSize = showSize; - } - - public String getOle() { - return ole; - } - - public void setOle(String ole) { - this.ole = ole; - } - - public String getFjType() { - return fjType; - } - - public void setFjType(String fjType) { - this.fjType = fjType; - } - - public String getFpid() { - return fpid; - } - - public void setFpid(String fpid) { - this.fpid = fpid; - } - - public String getMaxAnnexid() { - return maxAnnexid; - } - - public void setMaxAnnexid(String maxAnnexid) { - this.maxAnnexid = maxAnnexid; - } - - public String getaTextName() { - return aTextName; - } - - public void setaTextName(String aTextName) { - this.aTextName = aTextName; - } -} +package com.hzya.frame.grpU8.nxproof.oerannex.entity; + +import com.hzya.frame.web.entity.BaseEntity; + +/* +* @Description 附件关系表 +* @Author xiangerlin + @Date 2022-10-26 8:44 +*/ +public class OerAnnexEntity extends BaseEntity { + + private String annexid; //主键id + private String mlid;//报销单id + private String gsdm;//公司代码 默认001 + private String kjnd;//会计年度 + private String bnxid;// 不知道是什么 填0 + private String xh;//序号 + private String onlyid;// AT_AttachmentFile 表的主键ATGuid + private String annexName;//附件名 + private Long annexSize;//附件大小 + private String showSize;//附件大小显示值 + private String ole;// 不知道是什么，填空 + private String fjType;//附件类型， 数据库中只有 其他、其他其他(&Z)、合同3种类型 + private String fpid;//不知道是什么 填空 + + private String maxAnnexid;//最大id + + private String aTextName;//后缀名 + + public String getAnnexid() { + return annexid; + } + + public void setAnnexid(String annexid) { + this.annexid = annexid; + } + + public String getMlid() { + return mlid; + } + + public void setMlid(String mlid) { + this.mlid = mlid; + } + + public String getGsdm() { + return gsdm; + } + + public void setGsdm(String gsdm) { + this.gsdm = gsdm; + } + + public String getKjnd() { + return kjnd; + } + + public void setKjnd(String kjnd) { + this.kjnd = kjnd; + } + + public String getBnxid() { + return bnxid; + } + + public void setBnxid(String bnxid) { + this.bnxid = bnxid; + } + + public String getXh() { + return xh; + } + + public void setXh(String xh) { + this.xh = xh; + } + + public String getOnlyid() { + return onlyid; + } + + public void setOnlyid(String onlyid) { + this.onlyid = onlyid; + } + + public String getAnnexName() { + return annexName; + } + + public void setAnnexName(String annexName) { + this.annexName = annexName; + } + + public Long getAnnexSize() { + return annexSize; + } + + public void setAnnexSize(Long annexSize) { + this.annexSize = annexSize; + } + + public String getShowSize() { + return showSize; + } + + public void setShowSize(String showSize) { + this.showSize = showSize; + } + + public String getOle() { + return ole; + } + + public void setOle(String ole) { + this.ole = ole; + } + + public String getFjType() { + return fjType; + } + + public void setFjType(String fjType) { + this.fjType = fjType; + } + + public String getFpid() { + return fpid; + } + + public void setFpid(String fpid) { + this.fpid = fpid; + } + + public String getMaxAnnexid() { + return maxAnnexid; + } + + public void setMaxAnnexid(String maxAnnexid) { + this.maxAnnexid = maxAnnexid; + } + + public String getaTextName() { + return aTextName; + } + + public void setaTextName(String aTextName) { + this.aTextName = aTextName; + } +} diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/entity/OerAnnexEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/entity/OerAnnexEntity.xml similarity index 97% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/entity/OerAnnexEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/entity/OerAnnexEntity.xml index d9bd9cdd..fd4cde53 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/entity/OerAnnexEntity.xml +++ b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/entity/OerAnnexEntity.xml @@ -1,125 +1,125 @@ - - - - - - - - - - - - - - - - - - - - - - - AnnexID, - MLID, - GSDM, - KJND, - BNXID, - XH, - OnlyID, - AnnexName, - AnnexSize, - ShowSize, - OLE, - FJType, - FPID - - - - - - - - - - - - - - - - insert into OER_ANNEX( - - AnnexID, - MLID, - gsdm, - kjnd , - xh, - onlyid, - annexName, - annexSize, - showSize, - fjType, - bnxid, - ole, - fpid - - )values - ( - - #{annexid}, - #{mlid}, - #{gsdm}, - #{kjnd} , - #{xh}, - #{onlyid}, - #{annexName}, - #{annexSize}, - #{showSize}, - #{fjType}, - 0, - null, - '' - - ) - - - - delete from OER_ANNEX where mlid = #{mlid} and kjnd = #{kjnd} and gsdm = #{gsdm} - - + + + + + + + + + + + + + + + + + + + + + + + AnnexID, + MLID, + GSDM, + KJND, + BNXID, + XH, + OnlyID, + AnnexName, + AnnexSize, + ShowSize, + OLE, + FJType, + FPID + + + + + + + + + + + + + + + + insert into OER_ANNEX( + + AnnexID, + MLID, + gsdm, + kjnd , + xh, + onlyid, + annexName, + annexSize, + showSize, + fjType, + bnxid, + ole, + fpid + + )values + ( + + #{annexid}, + #{mlid}, + #{gsdm}, + #{kjnd} , + #{xh}, + #{onlyid}, + #{annexName}, + #{annexSize}, + #{showSize}, + #{fjType}, + 0, + null, + '' + + ) + + + + delete from OER_ANNEX where mlid = #{mlid} and kjnd = #{kjnd} and gsdm = #{gsdm} + + diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/service/IOerAnnexService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/service/IOerAnnexService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/service/IOerAnnexService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/service/IOerAnnexService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/service/impl/OerAnnexServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/service/impl/OerAnnexServiceImpl.java similarity index 96% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/service/impl/OerAnnexServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/service/impl/OerAnnexServiceImpl.java index 5691cc0e..bca22a9a 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/service/impl/OerAnnexServiceImpl.java +++ b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/service/impl/OerAnnexServiceImpl.java @@ -1,132 +1,132 @@ -package com.hzya.frame.grpU8.nxproof.oerannex.service.impl;/* -* @Description 附件关系表 -* @Author xiangerlin - @Date 2022-10-26 10:07 -*/ - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; -import com.hzya.frame.basedao.service.impl.BaseService; -import com.hzya.frame.grpU8.nxproof.oerannex.dao.IOerAnnexDao; -import com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity; -import com.hzya.frame.grpU8.nxproof.oerannex.service.IOerAnnexService; -import com.hzya.frame.web.exception.BaseSystemException; -import org.apache.commons.collections.CollectionUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -@Service -public class OerAnnexServiceImpl extends BaseService implements IOerAnnexService { - - Logger logger = LogManager.getLogger(getClass()); - - protected IOerAnnexDao oerAnnexDao; - - @Autowired - public void setBillLogDao(IOerAnnexDao dao) { - this.oerAnnexDao = dao; - this.dao=dao; - } - - /** - * 查询附件关系 - * - * @param entity - * @return - * @throws Exception - */ - @Override - public List queryAnnex(OerAnnexEntity entity) throws Exception { - List annexList = oerAnnexDao.query(entity); - return annexList; - } - - /** - * 删除附件关系 - * - * @param entity - * @throws Exception - */ - @Override - public void deleteAnnex(OerAnnexEntity entity){ - if (null != entity && StrUtil.isNotEmpty(entity.getMlid()) && StrUtil.isNotEmpty(entity.getKjnd())){ - oerAnnexDao.delete("OerAnnexEntity_delete",entity); - } - } - - /** - * 查询最大id - * @param entity - * @return - * @throws Exception - */ - @Override - public String queryMaxId(OerAnnexEntity entity) throws Exception { - if (null == entity){ - entity = new OerAnnexEntity(); - } - if (StrUtil.isEmpty(entity.getKjnd())){ - entity.setKjnd(String.valueOf(DateUtil.year(new Date()))); - } - OerAnnexEntity max = oerAnnexDao.query(entity,"OerAnnexEntity_max_id"); - if (null != max){ - Long max_value = Long.valueOf(max.getMaxAnnexid()); - return String.valueOf(max_value+1); - } - return null; - } - - /** - * 保存附件关系 - * @param entity - * @throws Exception - */ - @Override - public void saveAnnex(OerAnnexEntity entity) throws Exception { - if (null == entity){ - throw new BaseSystemException("参数不能为空"); - } - //entity.setAcc_name(Constant.CONFIGMAP.get("file_acc_name")); - entity.setAnnexid(queryMaxId(entity)); - if (null != entity.getAnnexSize()){ - int fileSize = entity.getAnnexSize().intValue(); - String showSize = ""; - if (fileSize < 1000) { - showSize = fileSize + "b"; - } else if (1000 < fileSize && fileSize < 1000000) { - showSize = (fileSize / 1000) + " KB"; - } else { - showSize = (fileSize / 1000000) + " MB"; - } - entity.setShowSize(showSize); - } - /* if (!entity.getAnnexName().contains("合同")) { - entity.setFjType("其它"); - }else { - entity.setFjType("合同"); - }*/ - entity.setFjType("其它"); - oerAnnexDao.save(entity); - } - - /** - * 查询附件关系，联查附件对象表 - * - * @param mlid - * @return - * @throws Exception - */ - @Override - public List queryAnnexAndFile(String mlid) throws Exception { - OerAnnexEntity entity = new OerAnnexEntity(); - entity.setMlid(mlid); - List oerAnnexList = oerAnnexDao.queryList(entity, "OerAnnexEntity_list_base_join_attachment"); - return oerAnnexList; - } -} +package com.hzya.frame.grpU8.nxproof.oerannex.service.impl;/* +* @Description 附件关系表 +* @Author xiangerlin + @Date 2022-10-26 10:07 +*/ + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.grpU8.nxproof.oerannex.dao.IOerAnnexDao; +import com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity; +import com.hzya.frame.grpU8.nxproof.oerannex.service.IOerAnnexService; +import com.hzya.frame.web.exception.BaseSystemException; +import org.apache.commons.collections.CollectionUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +@Service +public class OerAnnexServiceImpl extends BaseService implements IOerAnnexService { + + Logger logger = LogManager.getLogger(getClass()); + + protected IOerAnnexDao oerAnnexDao; + + @Autowired + public void setBillLogDao(IOerAnnexDao dao) { + this.oerAnnexDao = dao; + this.dao=dao; + } + + /** + * 查询附件关系 + * + * @param entity + * @return + * @throws Exception + */ + @Override + public List queryAnnex(OerAnnexEntity entity) throws Exception { + List annexList = oerAnnexDao.query(entity); + return annexList; + } + + /** + * 删除附件关系 + * + * @param entity + * @throws Exception + */ + @Override + public void deleteAnnex(OerAnnexEntity entity){ + if (null != entity && StrUtil.isNotEmpty(entity.getMlid()) && StrUtil.isNotEmpty(entity.getKjnd())){ + oerAnnexDao.delete("OerAnnexEntity_delete",entity); + } + } + + /** + * 查询最大id + * @param entity + * @return + * @throws Exception + */ + @Override + public String queryMaxId(OerAnnexEntity entity) throws Exception { + if (null == entity){ + entity = new OerAnnexEntity(); + } + if (StrUtil.isEmpty(entity.getKjnd())){ + entity.setKjnd(String.valueOf(DateUtil.year(new Date()))); + } + OerAnnexEntity max = oerAnnexDao.query(entity,"OerAnnexEntity_max_id"); + if (null != max){ + Long max_value = Long.valueOf(max.getMaxAnnexid()); + return String.valueOf(max_value+1); + } + return null; + } + + /** + * 保存附件关系 + * @param entity + * @throws Exception + */ + @Override + public void saveAnnex(OerAnnexEntity entity) throws Exception { + if (null == entity){ + throw new BaseSystemException("参数不能为空"); + } + //entity.setAcc_name(Constant.CONFIGMAP.get("file_acc_name")); + entity.setAnnexid(queryMaxId(entity)); + if (null != entity.getAnnexSize()){ + int fileSize = entity.getAnnexSize().intValue(); + String showSize = ""; + if (fileSize < 1000) { + showSize = fileSize + "b"; + } else if (1000 < fileSize && fileSize < 1000000) { + showSize = (fileSize / 1000) + " KB"; + } else { + showSize = (fileSize / 1000000) + " MB"; + } + entity.setShowSize(showSize); + } + /* if (!entity.getAnnexName().contains("合同")) { + entity.setFjType("其它"); + }else { + entity.setFjType("合同"); + }*/ + entity.setFjType("其它"); + oerAnnexDao.save(entity); + } + + /** + * 查询附件关系，联查附件对象表 + * + * @param mlid + * @return + * @throws Exception + */ + @Override + public List queryAnnexAndFile(String mlid) throws Exception { + OerAnnexEntity entity = new OerAnnexEntity(); + entity.setMlid(mlid); + List oerAnnexList = oerAnnexDao.queryList(entity, "OerAnnexEntity_list_base_join_attachment"); + return oerAnnexList; + } +} diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/dao/IOerDjjsfsDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/dao/IOerDjjsfsDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/dao/IOerDjjsfsDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/dao/IOerDjjsfsDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/dao/impl/OerDjjsfsDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/dao/impl/OerDjjsfsDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/dao/impl/OerDjjsfsDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/dao/impl/OerDjjsfsDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/entity/OerDjjsfsEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/entity/OerDjjsfsEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/entity/OerDjjsfsEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/entity/OerDjjsfsEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/entity/OerDjjsfsEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/entity/OerDjjsfsEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/entity/OerDjjsfsEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/entity/OerDjjsfsEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/service/IOerDjjsfsService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/service/IOerDjjsfsService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/service/IOerDjjsfsService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/service/IOerDjjsfsService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/service/impl/OerDjjsfsServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/service/impl/OerDjjsfsServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/service/impl/OerDjjsfsServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/service/impl/OerDjjsfsServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/controller/OerDjmlController.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/controller/OerDjmlController.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/controller/OerDjmlController.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/controller/OerDjmlController.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/dao/IOerDjmlDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/dao/IOerDjmlDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/dao/IOerDjmlDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/dao/IOerDjmlDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/dao/impl/OerDjmlDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/dao/impl/OerDjmlDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/dao/impl/OerDjmlDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/dao/impl/OerDjmlDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/dto/FileInfoDTO.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/dto/FileInfoDTO.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/dto/FileInfoDTO.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/dto/FileInfoDTO.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/GbiZbsyrecAllEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/GbiZbsyrecAllEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/GbiZbsyrecAllEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/GbiZbsyrecAllEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjnrAllEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjnrAllEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjnrAllEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjnrAllEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerYszbAllEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerYszbAllEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerYszbAllEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerYszbAllEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/IOerDjmlExtService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/IOerDjmlExtService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/IOerDjmlExtService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/IOerDjmlExtService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/IOerDjmlService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/IOerDjmlService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/IOerDjmlService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/IOerDjmlService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/dao/IOerDjnrDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/dao/IOerDjnrDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/dao/IOerDjnrDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/dao/IOerDjnrDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/dao/impl/OerDjnrDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/dao/impl/OerDjnrDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/dao/impl/OerDjnrDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/dao/impl/OerDjnrDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/service/IOerDjnrService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/service/IOerDjnrService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/service/IOerDjnrService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/service/IOerDjnrService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/service/impl/OerDjnrServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/service/impl/OerDjnrServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/service/impl/OerDjnrServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/service/impl/OerDjnrServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/dao/IOerYszbDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/dao/IOerYszbDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/dao/IOerYszbDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/dao/IOerYszbDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/dao/impl/OerYszbDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/dao/impl/OerYszbDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/dao/impl/OerYszbDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/dao/impl/OerYszbDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/entity/OerYszbEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/entity/OerYszbEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/entity/OerYszbEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/entity/OerYszbEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/entity/OerYszbEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/entity/OerYszbEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/entity/OerYszbEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/entity/OerYszbEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/service/IOerYszbService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/service/IOerYszbService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/service/IOerYszbService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/service/IOerYszbService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/service/impl/OerYszbServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/service/impl/OerYszbServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/service/impl/OerYszbServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/service/impl/OerYszbServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/dao/IPubAuditLogDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/dao/IPubAuditLogDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/dao/IPubAuditLogDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/dao/IPubAuditLogDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/dao/impl/PubAuditLogDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/dao/impl/PubAuditLogDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/dao/impl/PubAuditLogDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/dao/impl/PubAuditLogDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/entity/PubAuditLogEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/entity/PubAuditLogEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/entity/PubAuditLogEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/entity/PubAuditLogEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/entity/PubAuditLogEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/entity/PubAuditLogEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/entity/PubAuditLogEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/entity/PubAuditLogEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/service/IPubAuditLogService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/service/IPubAuditLogService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/service/IPubAuditLogService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/service/IPubAuditLogService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/service/impl/PubAuditLogServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/service/impl/PubAuditLogServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/service/impl/PubAuditLogServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/service/impl/PubAuditLogServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/dao/ISenderPubbmxxDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/dao/ISenderPubbmxxDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/dao/ISenderPubbmxxDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/dao/ISenderPubbmxxDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/dao/impl/SenderPubbmxxDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/dao/impl/SenderPubbmxxDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/dao/impl/SenderPubbmxxDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/dao/impl/SenderPubbmxxDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/entity/SenderPubbmxxEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/entity/SenderPubbmxxEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/entity/SenderPubbmxxEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/entity/SenderPubbmxxEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/entity/SenderPubbmxxEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/entity/SenderPubbmxxEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/entity/SenderPubbmxxEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/entity/SenderPubbmxxEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/service/ISenderPubbmxxService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/service/ISenderPubbmxxService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/service/ISenderPubbmxxService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/service/ISenderPubbmxxService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/service/impl/SenderPubbmxxServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/service/impl/SenderPubbmxxServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/service/impl/SenderPubbmxxServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/service/impl/SenderPubbmxxServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/dao/ISenderPubkjqjDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/dao/ISenderPubkjqjDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/dao/ISenderPubkjqjDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/dao/ISenderPubkjqjDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/dao/impl/SenderPubkjqjDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/dao/impl/SenderPubkjqjDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/dao/impl/SenderPubkjqjDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/dao/impl/SenderPubkjqjDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/entity/SenderPubkjqjEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/entity/SenderPubkjqjEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/entity/SenderPubkjqjEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/entity/SenderPubkjqjEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/entity/SenderPubkjqjEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/entity/SenderPubkjqjEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/entity/SenderPubkjqjEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/entity/SenderPubkjqjEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/service/ISenderPubkjqjService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/service/ISenderPubkjqjService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/service/ISenderPubkjqjService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/service/ISenderPubkjqjService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/service/impl/SenderPubkjqjServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/service/impl/SenderPubkjqjServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/service/impl/SenderPubkjqjServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/service/impl/SenderPubkjqjServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/dao/IPubObjFlowDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/dao/IPubObjFlowDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/dao/IPubObjFlowDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/dao/IPubObjFlowDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/dao/impl/PubObjFlowDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/dao/impl/PubObjFlowDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/dao/impl/PubObjFlowDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/dao/impl/PubObjFlowDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/entity/PubObjFlowEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/entity/PubObjFlowEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/entity/PubObjFlowEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/entity/PubObjFlowEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/entity/PubObjFlowEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/entity/PubObjFlowEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/entity/PubObjFlowEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/entity/PubObjFlowEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/service/IPubObjFlowService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/service/IPubObjFlowService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/service/IPubObjFlowService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/service/IPubObjFlowService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/service/impl/PubObjFlowServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/service/impl/PubObjFlowServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/service/impl/PubObjFlowServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/service/impl/PubObjFlowServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/dao/ISenderPubzyxxDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/dao/ISenderPubzyxxDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/dao/ISenderPubzyxxDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/dao/ISenderPubzyxxDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/dao/impl/SenderPubzyxxDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/dao/impl/SenderPubzyxxDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/dao/impl/SenderPubzyxxDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/dao/impl/SenderPubzyxxDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/entity/SenderPubzyxxEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/entity/SenderPubzyxxEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/entity/SenderPubzyxxEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/entity/SenderPubzyxxEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/entity/SenderPubzyxxEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/entity/SenderPubzyxxEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/entity/SenderPubzyxxEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/entity/SenderPubzyxxEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/service/ISenderPubzyxxService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/service/ISenderPubzyxxService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/service/ISenderPubzyxxService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/service/ISenderPubzyxxService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/service/impl/SenderPubzyxxServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/service/impl/SenderPubzyxxServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/service/impl/SenderPubzyxxServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/service/impl/SenderPubzyxxServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/dao/IZbWhszDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/dao/IZbWhszDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/dao/IZbWhszDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/dao/IZbWhszDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/dao/impl/ZbWhszDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/dao/impl/ZbWhszDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/dao/impl/ZbWhszDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/dao/impl/ZbWhszDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/entity/ZbWhszEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/entity/ZbWhszEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/entity/ZbWhszEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/entity/ZbWhszEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/entity/ZbWhszEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/entity/ZbWhszEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/entity/ZbWhszEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/entity/ZbWhszEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/service/IZbWhszService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/service/IZbWhszService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/service/IZbWhszService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/service/IZbWhszService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/service/impl/ZbWhszServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/service/impl/ZbWhszServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/service/impl/ZbWhszServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/service/impl/ZbWhszServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/dao/IZbZblyDao.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/dao/IZbZblyDao.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/dao/IZbZblyDao.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/dao/IZbZblyDao.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/dao/impl/ZbZblyDaoImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/dao/impl/ZbZblyDaoImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/dao/impl/ZbZblyDaoImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/dao/impl/ZbZblyDaoImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/entity/ZbZblyEntity.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/entity/ZbZblyEntity.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/entity/ZbZblyEntity.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/entity/ZbZblyEntity.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/entity/ZbZblyEntity.xml b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/entity/ZbZblyEntity.xml similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/entity/ZbZblyEntity.xml rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/entity/ZbZblyEntity.xml diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/service/IZbZblyService.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/service/IZbZblyService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/service/IZbZblyService.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/service/IZbZblyService.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/service/impl/ZbZblyServiceImpl.java b/service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/service/impl/ZbZblyServiceImpl.java similarity index 100% rename from service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/service/impl/ZbZblyServiceImpl.java rename to service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/service/impl/ZbZblyServiceImpl.java