From ca342f8153bf29c281e624e432c4ee6e1039af77 Mon Sep 17 00:00:00 2001 From: linrf Date: Wed, 14 Jun 2023 15:46:19 +0800 Subject: [PATCH] =?UTF-8?q?viewtask=2010=20=E7=A7=8Djob=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../infrastructure/mapper/BlDeptMapper.java | 9 +- .../docus/server/bl/service/IBlService.java | 14 +- .../server/bl/service/impl/BlServiceImpl.java | 31 ++-- .../main/resources/mapper/BlDeptMapper.xml | 139 +++++++++++++++++- .../collect/dept/ws/WsDeptResultImpl.java | 2 +- .../collect/report/ReportConverter.java | 4 +- ...ceImpl.java => BaseViewJobResultImpl.java} | 36 +++-- .../report/view/BlViewJobResultImpl.java | 11 ++ .../report/view/EcgViewJobResultImpl.java | 11 ++ .../report/view/EmrViewJobResultImpl.java | 11 ++ .../report/view/HlViewJobResultImpl.java | 11 ++ .../view/IssubmitViewJobResultImpl.java | 11 ++ .../report/view/LisViewJobResultImpl.java | 11 ++ .../report/view/PacsViewJobResultImpl.java | 11 ++ .../report/view/VteViewJobResultImpl.java | 11 ++ .../report/view/ZzViewJobResultImpl.java | 11 ++ .../collect/user/ws/WsUserResultImpl.java | 128 ++++++++-------- .../collect/web/common/BasicProperties.java | 0 .../collect/web/common/DocusProperties.java | 0 .../web/common/NoViewChNewbornProperties.java | 0 .../collect/web/common/NoViewProperties.java | 0 .../collect/web/common/dto/BasicQueryDto.java | 0 .../web/common/dto/CollectionForJZHDto.java | 0 .../web/common/dto/CollectionRequire.java | 0 .../common/dto/CollectionRequireTimeDto.java | 0 .../web/common/dto/CollectionSaveDto.java | 0 .../collect/web/common/dto/DaTypeDto.java | 0 .../collect/web/common/dto/DableJsonDto.java | 0 .../collect/web/common/dto/DataFormatDto.java | 0 .../collect/web/common/dto/DataSourceDto.java | 0 .../web/common/dto/DataSourcesDto.java | 0 .../web/common/dto/DataTransferJsonDto.java | 0 .../collect/web/common/dto/FieldJsonDto.java | 0 .../collect/web/common/dto/HoliDay.java | 0 .../common/dto/MutliDataTransferJsonDto.java | 0 .../web/common/dto/NoViewCollectionDto.java | 0 .../collect/web/common/dto/NoViewConfig.java | 0 .../web/common/dto/NoViewMakeUpDto.java | 0 .../collect/web/common/dto/TaskCollect.java | 0 .../web/common/dto/ViewReportTwoDto.java | 0 .../web/common/dto/two/ReportDownTwoDto.java | 0 .../common/dto/two/ReportHospitalTwoDto.java | 0 .../common/dto/two/ReportPatientTwoDto.java | 0 .../web/common/dto/two/ReportTaskTwoDto.java | 0 .../collect/web/enums/ColectNameEnum.java | 0 .../collect/web/enums/DisposeModeEnum.java | 0 .../collect/web/enums}/HospitalEnum.java | 2 +- .../collect/web/enums/RedisKeyEnum.java | 0 .../server/collect/web/utils/DateUtils.java | 0 .../collect/web/utils/DynamicAnnotation.java | 0 .../server/collect/web/utils/HoliDayUtil.java | 6 +- .../collect/web/utils/MqQueueUtils.java | 0 .../server/collect/web/utils/RedisMq.java | 0 .../web/utils/SpringRestTemplateUtils.java | 0 .../collect/web/utils/TableJsonRead.java | 0 .../server/collect/web/utils/UrlEncode.java | 0 .../server/collect/web/utils/XaUtils.java | 0 .../com/docus/server/collect/IJobResult.java | 17 +++ .../basic/http/TBasicHttpCollectJob.java | 4 +- .../basic/view/TBasicViewCollectJob.java | 4 +- .../collect/basic/ws/TBasicWsCollectJob.java | 4 +- .../collect/dept/http/DeptHttpCollectJob.java | 4 +- .../collect/dept/view/DeptViewCollectJob.java | 4 +- .../collect/dept/ws/DeptWsCollectJob.java | 4 +- .../collect/report/view/BlViewCollectJob.java | 59 ++++++++ .../report/view/EcgViewCollectJob.java | 59 ++++++++ .../report/view/EmrViewCollectJob.java | 59 ++++++++ .../collect/report/view/HlViewCollectJob.java | 59 ++++++++ .../collect/report/view/IHospitalService.java | 16 -- .../report/view/IssubmitViewCollectJob.java | 59 ++++++++ .../report/view/LisViewCollectJob.java | 13 +- .../report/view/PacsViewCollectJob.java | 59 ++++++++ .../report/view/VteViewCollectJob.java | 59 ++++++++ .../collect/report/view/ZzViewCollectJob.java | 59 ++++++++ .../collect/user/http/UserHttpCollectJob.java | 4 +- .../collect/user/view/UserViewCollectJob.java | 6 +- .../collect/user/ws/UserWsCollectJob.java | 4 +- .../docus/server/collect/web/common/A.java | 8 + .../collect/web/job/AbstractCollectJob.java | 12 +- .../collect/web/process/JobProcessor.java | 2 +- .../collect/web/process/VisitorProcessor.java | 2 +- docus-api-common/pom.xml | 32 ++++ .../server/common/CommonApplication.java | 0 .../docus/server/common/bean/MqExchange.java | 0 .../com/docus/server/common/bean/MqQueue.java | 0 .../com/docus/server/common/bean/Result.java | 0 .../server/common/config/RabbitMQConfig.java | 0 .../ServletListenerRegistrationConfig.java | 0 .../server/common/config/UserProperties.java | 0 .../server/common/constants/Constants.java | 0 .../common/constants/RabbitMQProperty.java | 0 .../docus/server/common/db/KeyGenerator.java | 0 .../handler/LocalDateTimeTypeHandler.java | 0 .../db/type/handler/LocalDateTypeHandler.java | 0 .../db/type/handler/LocalTimeTypeHandler.java | 0 .../common/declare/AbstractDeclare.java | 0 .../server/common/declare/AmBindDeclare.java | 0 .../common/declare/AmExchangeDeclare.java | 0 .../server/common/declare/AmQueueDeclare.java | 0 .../server/common/enums/EnumItemView.java | 0 .../common/enums/EnumTypeHandlerDispatch.java | 0 .../docus/server/common/enums/FlagEnum.java | 0 .../server/common/enums/IIntegerEnum.java | 0 .../common/enums/IntegerEnumHandler.java | 0 .../docus/server/common/enums/StateEnum.java | 0 .../docus/server/common/exception/Assert.java | 0 .../common/exception/BaseException.java | 0 .../exception/GlobalExceptionHandler.java | 0 .../server/common/exception/IResult.java | 0 .../common/exception/RabbitMQException.java | 0 .../exception/RabbitMQExceptionAssert.java | 0 .../exception/RabbitMQExceptionUtils.java | 0 .../common/listen/AbstractMessageHandler.java | 0 .../listen/InitThreadLocalPoolListen.java | 0 .../server/common/listen/MessageListen.java | 0 .../server/common/message/MessageData.java | 0 .../server/common/message/MqMessage.java | 0 .../register/AbstractRegisterQueue.java | 0 .../docus/server/common/request/Request.java | 0 .../server/common/request/RequestQueue.java | 0 .../common/send/AbstractReceiveService.java | 0 .../common/send/AbstractSendService.java | 0 .../server/common/service/IBaseService.java | 0 .../common/service/RabbitMQApiService.java | 0 .../common/service/impl/BaseServiceImpl.java | 0 .../service/impl/RabbitMQApiServiceImpl.java | 0 .../server/common/service/impl/Sort.java | 0 .../server/common/thread/RequestThread.java | 0 .../common/thread/RequestThreadPool.java | 0 .../server/common/type/AmExcepitonEnum.java | 0 .../server/common/type/ExchangeTypeEnum.java | 0 .../docus/server/common/type/ResultEnum.java | 0 .../docus/server/common/util/ClassUtils.java | 0 .../com/docus/server/common/util}/IdUtil.java | 2 +- .../com/docus/server/common/util}/IpUtil.java | 2 +- .../docus/server/common/util}/MapObjUtil.java | 2 +- .../server/common/util}/ParamsUtils.java | 2 +- .../server/common/util/RabbitMQUtils.java | 0 .../server/common/util/ResultWapper.java | 0 .../server/common/util}/SpringUtils.java | 2 +- .../docus/server/common/util/UUIDUtils.java | 0 .../server/common/util/ValidateUtils.java | 0 .../common/util/ValidatorResultUtil.java | 0 .../src/main/resources/application.properties | 0 docus-archivefile/pom.xml | 2 +- .../pom.xml | 4 +- .../main/java/com/docus/server/client/A.java | 8 + .../docus/server/client/api/IHospitalApi.java | 4 +- docus-medical-record/pom.xml | 2 +- docus-sys/pom.xml | 2 +- .../infrastructure/mapper/EcgDeptMapper.java | 18 ++- .../docus/server/ecg/service/IEcgService.java | 14 +- .../ecg/service/impl/EcgServiceImpl.java | 35 +++-- .../main/resources/mapper/EcgDeptMapper.xml | 138 ++++++++++++++++- .../infrastructure/mapper/EmrDeptMapper.java | 18 ++- .../docus/server/emr/service/IEmrService.java | 14 +- .../emr/service/impl/EmrServiceImpl.java | 35 +++-- .../main/resources/mapper/EmrDeptMapper.xml | 139 +++++++++++++++++- .../infrastructure/mapper/HlDeptMapper.java | 19 ++- .../docus/server/hl/service/IHlService.java | 14 +- .../server/hl/service/impl/HlServiceImpl.java | 35 +++-- .../main/resources/mapper/HlDeptMapper.xml | 138 ++++++++++++++++- .../mapper/IssubmitDeptMapper.java | 19 ++- .../issubmit/service/IIssubmitService.java | 14 +- .../service/impl/IssubmitServiceImpl.java | 34 +++-- .../resources/mapper/IssubmitDeptMapper.xml | 139 +++++++++++++++++- .../docus/server/lis/service/ILisService.java | 6 +- .../lis/service/impl/LisServiceImpl.java | 7 +- .../infrastructure/mapper/PacsDeptMapper.java | 19 ++- .../server/pacs/service/IPacsService.java | 14 +- .../pacs/service/impl/PacsServiceImpl.java | 35 +++-- .../main/resources/mapper/PacsDeptMapper.xml | 139 +++++++++++++++++- pom.xml | 3 +- .../infrastructure/mapper/VteDeptMapper.java | 18 ++- .../docus/server/vte/service/IVteService.java | 14 +- .../vte/service/impl/VteServiceImpl.java | 32 ++-- .../main/resources/mapper/VteDeptMapper.xml | 139 +++++++++++++++++- .../infrastructure/mapper/ZzDeptMapper.java | 19 ++- .../docus/server/zz/service/IZzService.java | 14 +- .../server/zz/service/impl/ZzServiceImpl.java | 35 +++-- .../main/resources/mapper/ZzDeptMapper.xml | 138 ++++++++++++++++- 181 files changed, 2141 insertions(+), 428 deletions(-) rename collect-sdry/src/main/java/com/docus/server/collect/report/view/{HospitalServiceImpl.java => BaseViewJobResultImpl.java} (94%) create mode 100644 collect-sdry/src/main/java/com/docus/server/collect/report/view/BlViewJobResultImpl.java create mode 100644 collect-sdry/src/main/java/com/docus/server/collect/report/view/EcgViewJobResultImpl.java create mode 100644 collect-sdry/src/main/java/com/docus/server/collect/report/view/EmrViewJobResultImpl.java create mode 100644 collect-sdry/src/main/java/com/docus/server/collect/report/view/HlViewJobResultImpl.java create mode 100644 collect-sdry/src/main/java/com/docus/server/collect/report/view/IssubmitViewJobResultImpl.java create mode 100644 collect-sdry/src/main/java/com/docus/server/collect/report/view/LisViewJobResultImpl.java create mode 100644 collect-sdry/src/main/java/com/docus/server/collect/report/view/PacsViewJobResultImpl.java create mode 100644 collect-sdry/src/main/java/com/docus/server/collect/report/view/VteViewJobResultImpl.java create mode 100644 collect-sdry/src/main/java/com/docus/server/collect/report/view/ZzViewJobResultImpl.java rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/BasicProperties.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/DocusProperties.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/NoViewChNewbornProperties.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/NoViewProperties.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/BasicQueryDto.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/CollectionForJZHDto.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/CollectionRequire.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/CollectionRequireTimeDto.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/CollectionSaveDto.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/DaTypeDto.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/DableJsonDto.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/DataFormatDto.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/DataSourceDto.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/DataSourcesDto.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/DataTransferJsonDto.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/FieldJsonDto.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/HoliDay.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/MutliDataTransferJsonDto.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/NoViewCollectionDto.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/NoViewConfig.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/NoViewMakeUpDto.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/TaskCollect.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/ViewReportTwoDto.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/two/ReportDownTwoDto.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/two/ReportHospitalTwoDto.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/two/ReportPatientTwoDto.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/common/dto/two/ReportTaskTwoDto.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/enums/ColectNameEnum.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/enums/DisposeModeEnum.java (100%) rename {common-collect/src/main/java/com/docus/server/collect/web/service => collect-sdry/src/main/java/com/docus/server/collect/web/enums}/HospitalEnum.java (91%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/enums/RedisKeyEnum.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/utils/DateUtils.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/utils/DynamicAnnotation.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/utils/HoliDayUtil.java (94%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/utils/MqQueueUtils.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/utils/RedisMq.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/utils/SpringRestTemplateUtils.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/utils/TableJsonRead.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/utils/UrlEncode.java (100%) rename {common-collect => collect-sdry}/src/main/java/com/docus/server/collect/web/utils/XaUtils.java (100%) create mode 100644 common-collect/src/main/java/com/docus/server/collect/IJobResult.java create mode 100644 common-collect/src/main/java/com/docus/server/collect/report/view/BlViewCollectJob.java create mode 100644 common-collect/src/main/java/com/docus/server/collect/report/view/EcgViewCollectJob.java create mode 100644 common-collect/src/main/java/com/docus/server/collect/report/view/EmrViewCollectJob.java create mode 100644 common-collect/src/main/java/com/docus/server/collect/report/view/HlViewCollectJob.java delete mode 100644 common-collect/src/main/java/com/docus/server/collect/report/view/IHospitalService.java create mode 100644 common-collect/src/main/java/com/docus/server/collect/report/view/IssubmitViewCollectJob.java create mode 100644 common-collect/src/main/java/com/docus/server/collect/report/view/PacsViewCollectJob.java create mode 100644 common-collect/src/main/java/com/docus/server/collect/report/view/VteViewCollectJob.java create mode 100644 common-collect/src/main/java/com/docus/server/collect/report/view/ZzViewCollectJob.java create mode 100644 common-collect/src/main/java/com/docus/server/collect/web/common/A.java create mode 100644 docus-api-common/pom.xml rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/CommonApplication.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/bean/MqExchange.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/bean/MqQueue.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/bean/Result.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/config/RabbitMQConfig.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/config/ServletListenerRegistrationConfig.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/config/UserProperties.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/constants/Constants.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/constants/RabbitMQProperty.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/db/KeyGenerator.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/db/type/handler/LocalDateTimeTypeHandler.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/db/type/handler/LocalDateTypeHandler.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/db/type/handler/LocalTimeTypeHandler.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/declare/AbstractDeclare.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/declare/AmBindDeclare.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/declare/AmExchangeDeclare.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/declare/AmQueueDeclare.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/enums/EnumItemView.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/enums/EnumTypeHandlerDispatch.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/enums/FlagEnum.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/enums/IIntegerEnum.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/enums/IntegerEnumHandler.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/enums/StateEnum.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/exception/Assert.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/exception/BaseException.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/exception/GlobalExceptionHandler.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/exception/IResult.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/exception/RabbitMQException.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/exception/RabbitMQExceptionAssert.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/exception/RabbitMQExceptionUtils.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/listen/AbstractMessageHandler.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/listen/InitThreadLocalPoolListen.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/listen/MessageListen.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/message/MessageData.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/message/MqMessage.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/register/AbstractRegisterQueue.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/request/Request.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/request/RequestQueue.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/send/AbstractReceiveService.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/send/AbstractSendService.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/service/IBaseService.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/service/RabbitMQApiService.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/service/impl/BaseServiceImpl.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/service/impl/RabbitMQApiServiceImpl.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/service/impl/Sort.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/thread/RequestThread.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/thread/RequestThreadPool.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/type/AmExcepitonEnum.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/type/ExchangeTypeEnum.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/type/ResultEnum.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/util/ClassUtils.java (100%) rename {common-collect/src/main/java/com/docus/server/collect/web/utils => docus-api-common/src/main/java/com/docus/server/common/util}/IdUtil.java (90%) rename {common-collect/src/main/java/com/docus/server/collect/web/utils => docus-api-common/src/main/java/com/docus/server/common/util}/IpUtil.java (97%) rename {common-collect/src/main/java/com/docus/server/collect/web/utils => docus-api-common/src/main/java/com/docus/server/common/util}/MapObjUtil.java (99%) rename {common-collect/src/main/java/com/docus/server/collect/web/utils => docus-api-common/src/main/java/com/docus/server/common/util}/ParamsUtils.java (94%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/util/RabbitMQUtils.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/util/ResultWapper.java (100%) rename {common-collect/src/main/java/com/docus/server/collect/web/utils => docus-api-common/src/main/java/com/docus/server/common/util}/SpringUtils.java (99%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/util/UUIDUtils.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/util/ValidateUtils.java (100%) rename {docus-common => docus-api-common}/src/main/java/com/docus/server/common/util/ValidatorResultUtil.java (100%) rename {docus-common => docus-api-common}/src/main/resources/application.properties (100%) rename {docus-common => docus-client-interface}/pom.xml (88%) create mode 100644 docus-client-interface/src/main/java/com/docus/server/client/A.java rename docus-common/src/main/java/com/docus/server/common/IHospital.java => docus-client-interface/src/main/java/com/docus/server/client/api/IHospitalApi.java (93%) diff --git a/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/mapper/BlDeptMapper.java b/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/mapper/BlDeptMapper.java index a434031..4210d62 100644 --- a/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/mapper/BlDeptMapper.java +++ b/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/mapper/BlDeptMapper.java @@ -13,10 +13,17 @@ import java.util.Map; @DS(DSKeyConstants.DS_KEY) public interface BlDeptMapper { - List> list(@Param("startDate") Date startDate, + List> page(@Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("offset") int offset, @Param("pageSize") int pageSize); + List> BatchForJZH(@Param("jzhs") List jzhs); + + List> BatchForJZHAndAdmissTimes(@Param("datas") List> datas); + + List> BatchForZYHAndAdmissTimes(@Param("datas") List> datas); + + List> BatchForEXAMTIME(@Param("datas") List> datas); } diff --git a/bl-sysem/src/main/java/com/docus/server/bl/service/IBlService.java b/bl-sysem/src/main/java/com/docus/server/bl/service/IBlService.java index f559885..d42efd2 100644 --- a/bl-sysem/src/main/java/com/docus/server/bl/service/IBlService.java +++ b/bl-sysem/src/main/java/com/docus/server/bl/service/IBlService.java @@ -1,16 +1,6 @@ package com.docus.server.bl.service; -import com.docus.server.record.common.pojo.dto.TBasicDTO; -import com.docus.server.sys.common.pojo.dto.UserDTO; +import com.docus.server.client.api.IHospitalApi; -import java.util.Date; -import java.util.List; -import java.util.Map; - -public interface IBlService { - List> list(Date startDate, Date endDate, int pageNum, int pageSize); - - List getUserListView(Date startDate, Date endDate, int pageNum, int pageSize); - - List getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize); +public interface IBlService extends IHospitalApi { } diff --git a/bl-sysem/src/main/java/com/docus/server/bl/service/impl/BlServiceImpl.java b/bl-sysem/src/main/java/com/docus/server/bl/service/impl/BlServiceImpl.java index 4effb5e..2dd6ad8 100644 --- a/bl-sysem/src/main/java/com/docus/server/bl/service/impl/BlServiceImpl.java +++ b/bl-sysem/src/main/java/com/docus/server/bl/service/impl/BlServiceImpl.java @@ -1,11 +1,8 @@ package com.docus.server.bl.service.impl; +import com.docus.server.bl.common.DSKeyConstants; import com.docus.server.bl.infrastructure.mapper.BlDeptMapper; -import com.docus.server.bl.infrastructure.mapper.BlTBasicMapper; -import com.docus.server.bl.infrastructure.mapper.BlUserMapper; import com.docus.server.bl.service.IBlService; -import com.docus.server.record.common.pojo.dto.TBasicDTO; -import com.docus.server.sys.common.pojo.dto.UserDTO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; @@ -13,27 +10,35 @@ import java.util.Date; import java.util.List; import java.util.Map; -@Component +@Component(DSKeyConstants.DS_KEY + "ServiceImpl") @AllArgsConstructor public class BlServiceImpl implements IBlService { private final BlDeptMapper blDeptMapper; - private final BlUserMapper blUserMapper; - private final BlTBasicMapper blTBasicMapper; @Override - public List> list(Date startDate, Date endDate, int pageNum, int pageSize) { - return blDeptMapper.list(startDate, endDate, (pageNum - 1) * pageSize, pageSize); + public List> page(Date startDate, Date endDate, int pageNum, int pageSize) { + return blDeptMapper.page(startDate, endDate, (pageNum - 1) * pageSize, pageSize); } @Override - public List getUserListView(Date startDate, Date endDate, int pageNum, int pageSize) { - return blUserMapper.getUserListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize); + public List> BatchForJZH(List jzhs) { + return blDeptMapper.BatchForJZH(jzhs); } @Override - public List getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize) { - return blTBasicMapper.getTBasicListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize); + public List> BatchForJZHAndAdmissTimes(List> datas) { + return blDeptMapper.BatchForJZHAndAdmissTimes(datas); + } + + @Override + public List> BatchForZYHAndAdmissTimes(List> datas) { + return blDeptMapper.BatchForZYHAndAdmissTimes(datas); + } + + @Override + public List> BatchForEXAMTIME(List> datas) { + return blDeptMapper.BatchForEXAMTIME(datas); } } diff --git a/bl-sysem/src/main/resources/mapper/BlDeptMapper.xml b/bl-sysem/src/main/resources/mapper/BlDeptMapper.xml index c0fe31c..00618aa 100644 --- a/bl-sysem/src/main/resources/mapper/BlDeptMapper.xml +++ b/bl-sysem/src/main/resources/mapper/BlDeptMapper.xml @@ -4,13 +4,144 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + SELECT DISTINCT + '6' AS SYS_CODE, + ZYH AS ZYH, + JZH AS FVISIT_ID, + FILE_NAME AS REPORT_NAME, + '' AS BGLX, + '1503577916225949698' AS ASSORTID, + EXAM_NO AS RP_EXAM_NO, + 1 AS PATH_TYPE, + FILE_PATHFILE_PATH AS FILE_PATH, + 0 AS ISDELETE, + 0 AS state, + '' AS jch, + '' AS checktime, + date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME + FROM + V_JSWZH_LISRECORD + WHERE + 1 = 1 + AND AFFIRM_TIME ]]> #{startDate} + AND AFFIRM_TIME #{endDate} + ORDER BY + date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') DESC LIMIT #{offset}, #{pageSize} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +