From a6c6f7bd6f7b3fe2b859e2f899af6d8da3ca5fbe Mon Sep 17 00:00:00 2001 From: linrf Date: Sun, 25 Jun 2023 09:58:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Eretry=20log=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/http/HttpTBasicCollectorImpl.java | 4 +- .../basic/ws/WsBasicCollectorImpl.java | 4 +- .../dept/http/HttpDeptCollectorImpl.java | 4 +- .../collect/dept/ws/WsDeptCollectorImpl.java | 4 +- .../collect/report/ReportConverter.java | 2 +- .../noview/DefJobNoViewCollectorImpl.java | 4 +- .../report/noview/DefNoViewJobResultImpl.java | 2 +- .../view/AbstractViewJobResultImpl.java | 2 +- .../user/http/HttpUserCollectorImpl.java | 4 +- .../collect/user/ws/WsUserCollectorImpl.java | 4 +- .../web/common/dto/CollectionSaveDto.java | 2 +- .../com/docus/server/collect/ICollector.java | 4 +- .../java/com/docus/server/collect/IJob.java | 4 +- .../basic/http/TBasicHttpCollectJob.java | 4 +- .../basic/http/test/TestRestController.java | 34 ++++++-- .../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 +- .../event/TaskConsumptionReportDownEvent.java | 2 +- .../report/listener/ReportDownListener.java | 12 +-- .../report/noview/DefNoViewCollectionJob.java | 4 +- .../report/service/IReportService.java | 2 +- .../service/impl/ReportServiceImpl.java | 10 +-- .../collect/report/view/BlViewCollectJob.java | 4 +- .../report/view/EcgViewCollectJob.java | 4 +- .../report/view/EmrViewCollectJob.java | 4 +- .../collect/report/view/HlViewCollectJob.java | 4 +- .../report/view/IssubmitViewCollectJob.java | 4 +- .../report/view/LisViewCollectJob.java | 4 +- .../report/view/PacsViewCollectJob.java | 4 +- .../report/view/VteViewCollectJob.java | 4 +- .../collect/report/view/ZzViewCollectJob.java | 4 +- .../report/ws/impl/ReportServerImpl.java | 2 +- .../collect/user/http/UserHttpCollectJob.java | 4 +- .../collect/user/view/UserViewCollectJob.java | 4 +- .../collect/user/ws/UserWsCollectJob.java | 4 +- .../docus/server/collect/web/common/A.java | 4 - .../server/collect/web/common/pojo/A.java | 4 + .../collect/web/common}/pojo/dto/IdType.java | 2 +- .../web/common}/pojo/dto/InpatientNo.java | 2 +- .../web/common}/pojo/dto/ReportDTO.java | 2 +- .../web/common}/pojo/dto/ReportDownDTO.java | 2 +- .../pojo/dto/ReportDownPatientDTO.java | 4 +- .../pojo/dto/ReportDownScanFileDTO.java | 4 +- .../collect/web/dao/ITaskConfigDao.java | 7 -- .../web/dao/ITaskOriginalMessageDao.java | 8 -- .../web/dao/impl/TaskConfigDaoImpl.java | 14 ---- .../dao/impl/TaskOriginalMessageDaoImpl.java | 11 --- .../collect/web/job/AbstractCollectJob.java | 21 ++--- .../server/collect/web/job/TrackRetryJob.java | 10 +-- .../web/mapper/TaskOriginalMessageMapper.java | 14 ---- .../collect/web/process/RetryProcessor.java | 4 +- .../collect/web/process/VisitorProcessor.java | 12 +-- .../service/ITaskOriginalMessageService.java | 17 ---- .../web/service/TrackRetryService.java | 41 ++++++++-- .../server/collect/web/service/impl/A.java | 4 + .../impl/TaskOriginalMessageServiceImpl.java | 55 ------------- .../archivefile/RecordExceptionEnum.java | 2 +- .../convert/TaskMessageConverter.java | 10 +-- .../impl/AfCollectSysDictionaryDaoImpl.java | 11 --- .../infrastructure/cache/TaskCacheLayer.java | 7 ++ .../infrastructure/client/DownLoadAPI.java | 4 + .../dao/IAfCollectSysDictionaryDao.java | 4 +- .../dao/IAfViewCollectionLogDao.java | 4 +- .../infrastructure/dao/ITaskConfigDao.java | 7 ++ .../infrastructure/dao/ITaskMessageDao.java | 8 ++ .../dao/ITaskMessageRetryLogDao.java | 7 ++ .../impl/AfCollectSysDictionaryDaoImpl.java | 11 +++ .../dao/impl/AfViewCollectionLogDaoImpl.java | 8 +- .../dao/impl/TaskConfigDaoImpl.java | 13 +++ .../dao/impl/TaskMessageDaoImpl.java | 11 +++ .../dao/impl/TaskMessageRetryLogDaoImpl.java | 11 +++ .../entity/AfCollectTask.java | 2 +- .../entity/AfJobTime.java | 2 +- .../entity/AfReportRecord.java | 4 +- .../entity/AfViewCollectionLog.java | 2 +- .../entity/CollectsysDictionary.java | 2 +- .../infrastructure}/entity/TaskConfig.java | 6 +- .../infrastructure/entity/TaskMessage.java | 8 +- .../entity/TaskMessageRetryLog.java | 81 +++++++++++++++++++ .../mapper/AfCollectSysDictionaryMapper.java | 4 +- .../mapper/AfCollectTaskMapper.java | 4 +- .../mapper/AfJobTimeMapper.java | 4 +- .../mapper/AfReportRecordMapper.java | 4 +- .../mapper/AfViewCollectionLogMapper.java | 4 +- .../mapper/TaskConfigMapper.java | 4 +- .../mapper/TaskMessageMapper.java | 14 ++++ .../mapper/TaskMessageRetryLogMapper.java | 14 ++++ .../IAfCollectSysDictionaryService.java | 2 +- .../service/IAfViewCollectionLogService.java | 2 +- .../service/ITaskConfigService.java | 4 +- .../service/ITaskMessageRetryLogService.java | 4 + .../service/ITaskMessageService.java | 17 ++++ .../impl/AfCollectSysDictionaryImpl.java | 4 +- .../impl/AfViewCollectionLogServiceImpl.java | 4 +- .../service/impl/TaskConfigServiceImpl.java | 8 +- .../impl/TaskMessageRetryLogServiceImpl.java | 17 ++++ .../service/impl/TaskMessageServiceImpl.java | 55 +++++++++++++ .../resources/mapper/AfCollectTaskMapper.xml | 4 +- .../main/resources/mapper/AfJobTimeMapper.xml | 4 +- .../resources/mapper/AfReportRecordMapper.xml | 8 +- .../docus/server/annotation/CacheLayer.java | 17 ++++ .../main/java/com/docus/server/util/A.java | 8 -- .../com/docus/server/util}/DateSpiltUtil.java | 2 +- .../com/docus/server/util/ExceptionUtils.java | 14 ++++ .../com/docus/server/util}/PeriodTime.java | 2 +- 108 files changed, 542 insertions(+), 335 deletions(-) create mode 100644 common-collect/src/main/java/com/docus/server/collect/web/common/pojo/A.java rename {common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile => common-collect/src/main/java/com/docus/server/collect/web/common}/pojo/dto/IdType.java (68%) rename {common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile => common-collect/src/main/java/com/docus/server/collect/web/common}/pojo/dto/InpatientNo.java (91%) rename {common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile => common-collect/src/main/java/com/docus/server/collect/web/common}/pojo/dto/ReportDTO.java (96%) rename {common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile => common-collect/src/main/java/com/docus/server/collect/web/common}/pojo/dto/ReportDownDTO.java (92%) rename {common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile => common-collect/src/main/java/com/docus/server/collect/web/common}/pojo/dto/ReportDownPatientDTO.java (90%) rename {common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile => common-collect/src/main/java/com/docus/server/collect/web/common}/pojo/dto/ReportDownScanFileDTO.java (93%) delete mode 100644 common-collect/src/main/java/com/docus/server/collect/web/dao/ITaskConfigDao.java delete mode 100644 common-collect/src/main/java/com/docus/server/collect/web/dao/ITaskOriginalMessageDao.java delete mode 100644 common-collect/src/main/java/com/docus/server/collect/web/dao/impl/TaskConfigDaoImpl.java delete mode 100644 common-collect/src/main/java/com/docus/server/collect/web/dao/impl/TaskOriginalMessageDaoImpl.java delete mode 100644 common-collect/src/main/java/com/docus/server/collect/web/mapper/TaskOriginalMessageMapper.java delete mode 100644 common-collect/src/main/java/com/docus/server/collect/web/service/ITaskOriginalMessageService.java create mode 100644 common-collect/src/main/java/com/docus/server/collect/web/service/impl/A.java delete mode 100644 common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskOriginalMessageServiceImpl.java rename common-collect/src/main/java/com/docus/server/collect/web/convert/TaskOriginalMessageConverter.java => common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageConverter.java (71%) delete mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/impl/AfCollectSysDictionaryDaoImpl.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/cache/TaskCacheLayer.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/client/DownLoadAPI.java rename common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/{ => infrastructure}/dao/IAfCollectSysDictionaryDao.java (51%) rename common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/{ => infrastructure}/dao/IAfViewCollectionLogDao.java (64%) create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskConfigDao.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskMessageDao.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskMessageRetryLogDao.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/AfCollectSysDictionaryDaoImpl.java rename common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/{ => infrastructure}/dao/impl/AfViewCollectionLogDaoImpl.java (71%) create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskConfigDaoImpl.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskMessageDaoImpl.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskMessageRetryLogDaoImpl.java rename common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/{pojo => infrastructure}/entity/AfCollectTask.java (97%) rename common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/{pojo => infrastructure}/entity/AfJobTime.java (93%) rename common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/{pojo => infrastructure}/entity/AfReportRecord.java (93%) rename common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/{pojo => infrastructure}/entity/AfViewCollectionLog.java (95%) rename common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/{pojo => infrastructure}/entity/CollectsysDictionary.java (92%) rename {common-collect/src/main/java/com/docus/server/collect/web/common => common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure}/entity/TaskConfig.java (92%) rename common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskOriginalMessage.java => common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskMessage.java (89%) create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskMessageRetryLog.java rename common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/{ => infrastructure}/mapper/AfCollectSysDictionaryMapper.java (59%) rename common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/{ => infrastructure}/mapper/AfCollectTaskMapper.java (80%) rename common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/{ => infrastructure}/mapper/AfJobTimeMapper.java (85%) rename common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/{ => infrastructure}/mapper/AfReportRecordMapper.java (94%) rename common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/{ => infrastructure}/mapper/AfViewCollectionLogMapper.java (64%) rename {common-collect/src/main/java/com/docus/server/collect/web => common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure}/mapper/TaskConfigMapper.java (58%) create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskMessageMapper.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskMessageRetryLogMapper.java rename {common-collect/src/main/java/com/docus/server/collect/web => common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile}/service/ITaskConfigService.java (70%) create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskMessageRetryLogService.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskMessageService.java rename {common-collect/src/main/java/com/docus/server/collect/web => common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile}/service/impl/TaskConfigServiceImpl.java (82%) create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskMessageRetryLogServiceImpl.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskMessageServiceImpl.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/annotation/CacheLayer.java delete mode 100644 docus-client-interface/src/main/java/com/docus/server/util/A.java rename {common-collect/src/main/java/com/docus/server/collect/web/utils => docus-client-interface/src/main/java/com/docus/server/util}/DateSpiltUtil.java (96%) create mode 100644 docus-client-interface/src/main/java/com/docus/server/util/ExceptionUtils.java rename {common-collect/src/main/java/com/docus/server/collect/web/utils => docus-client-interface/src/main/java/com/docus/server/util}/PeriodTime.java (90%) diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicCollectorImpl.java index 0c80522..2ab3dc2 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicCollectorImpl.java @@ -1,8 +1,8 @@ package com.docus.server.collect.basic.http; import com.docus.server.collect.AbstractHttpCollector; -import com.docus.server.collect.web.common.entity.TaskConfig; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.util.PeriodTime; import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.google.common.collect.Lists; import org.springframework.stereotype.Component; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java index 7d941f1..dc63686 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java @@ -1,8 +1,8 @@ package com.docus.server.collect.basic.ws; import com.docus.server.collect.AbstractWsCollector; -import com.docus.server.collect.web.common.entity.TaskConfig; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.util.PeriodTime; import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.google.common.collect.Lists; import org.springframework.stereotype.Component; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptCollectorImpl.java index fd8d7ff..db1445e 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptCollectorImpl.java @@ -1,8 +1,8 @@ package com.docus.server.collect.dept.http; import com.docus.server.collect.AbstractHttpCollector; -import com.docus.server.collect.web.common.entity.TaskConfig; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.util.PeriodTime; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.google.common.collect.Lists; import org.springframework.stereotype.Component; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptCollectorImpl.java index 45584b4..a9bca5a 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptCollectorImpl.java @@ -1,8 +1,8 @@ package com.docus.server.collect.dept.ws; import com.docus.server.collect.AbstractWsCollector; -import com.docus.server.collect.web.common.entity.TaskConfig; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.util.PeriodTime; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.google.common.collect.Lists; import org.springframework.stereotype.Component; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java index da531d8..45609cc 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java @@ -5,7 +5,7 @@ import com.docus.core.util.Func; import com.docus.core.util.ParamsUtils; import com.docus.core.util.XmlUtil; import com.docus.infrastructure.core.exception.BaseException; -import com.docus.server.archivefile.pojo.dto.ReportDTO; +import com.docus.server.archivefile.infrastructure.pojo.dto.ReportDTO; import com.docus.server.collect.IConverter; import com.docus.server.collect.web.utils.TableJsonRead; import org.springframework.stereotype.Component; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefJobNoViewCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefJobNoViewCollectorImpl.java index 7cbaf6e..b774205 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefJobNoViewCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefJobNoViewCollectorImpl.java @@ -5,9 +5,9 @@ import com.docus.core.util.MapObjUtil; import com.docus.core.util.json.JSON; import com.docus.server.collect.AbstractJobCollector; import com.docus.server.collect.web.common.dto.NoViewCollectionDto; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import com.docus.server.collect.web.enums.QueryWayEnum; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.util.PeriodTime; import org.springframework.stereotype.Component; import java.util.ArrayList; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefNoViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefNoViewJobResultImpl.java index ddadb54..6be4f2e 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefNoViewJobResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefNoViewJobResultImpl.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; import com.docus.core.util.Func; import com.docus.core.util.MapObjUtil; -import com.docus.server.archivefile.pojo.entity.CollectsysDictionary; +import com.docus.server.archivefile.infrastructure.entity.CollectsysDictionary; import com.docus.server.archivefile.service.IAfCollectSysDictionaryService; import com.docus.server.collect.web.common.DocusProperties; import com.docus.server.collect.web.common.NoViewChNewbornProperties; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/AbstractViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/AbstractViewJobResultImpl.java index 97e7798..3dd9297 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/view/AbstractViewJobResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/AbstractViewJobResultImpl.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson.serializer.SerializerFeature; import com.docus.core.util.SpringUtils; import com.docus.infrastructure.redis.service.IdService; import com.docus.server.api.IHospitalApi; -import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog; +import com.docus.server.archivefile.infrastructure.entity.AfViewCollectionLog; import com.docus.server.archivefile.service.IAfViewCollectionLogService; import com.docus.server.collect.IJobResult; import com.docus.server.collect.web.common.BasicProperties; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserCollectorImpl.java index 90e4589..e3390d8 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserCollectorImpl.java @@ -1,8 +1,8 @@ package com.docus.server.collect.user.http; import com.docus.server.collect.AbstractHttpCollector; -import com.docus.server.collect.web.common.entity.TaskConfig; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.util.PeriodTime; import com.docus.server.sys.common.pojo.dto.UserDTO; import com.google.common.collect.Lists; import org.springframework.stereotype.Component; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserCollectorImpl.java index a9f02fc..4032a18 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserCollectorImpl.java @@ -1,8 +1,8 @@ package com.docus.server.collect.user.ws; import com.docus.server.collect.AbstractWsCollector; -import com.docus.server.collect.web.common.entity.TaskConfig; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.util.PeriodTime; import com.docus.server.sys.common.pojo.dto.UserDTO; import com.google.common.collect.Lists; import org.springframework.stereotype.Component; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/CollectionSaveDto.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/CollectionSaveDto.java index 75cc82e..93fa40c 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/CollectionSaveDto.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/CollectionSaveDto.java @@ -1,6 +1,6 @@ package com.docus.server.collect.web.common.dto; -import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog; +import com.docus.server.archivefile.infrastructure.entity.AfViewCollectionLog; import lombok.Data; import java.util.ArrayList; diff --git a/common-collect/src/main/java/com/docus/server/collect/ICollector.java b/common-collect/src/main/java/com/docus/server/collect/ICollector.java index c7bbac5..baa9e62 100644 --- a/common-collect/src/main/java/com/docus/server/collect/ICollector.java +++ b/common-collect/src/main/java/com/docus/server/collect/ICollector.java @@ -1,7 +1,7 @@ package com.docus.server.collect; -import com.docus.server.collect.web.common.entity.TaskConfig; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.util.PeriodTime; import java.util.List; diff --git a/common-collect/src/main/java/com/docus/server/collect/IJob.java b/common-collect/src/main/java/com/docus/server/collect/IJob.java index 845f909..956c5dd 100644 --- a/common-collect/src/main/java/com/docus/server/collect/IJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/IJob.java @@ -1,7 +1,7 @@ package com.docus.server.collect; -import com.docus.server.collect.web.common.entity.TaskConfig; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.util.PeriodTime; public interface IJob { diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java index 71c18ed..988870c 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java @@ -1,9 +1,9 @@ package com.docus.server.collect.basic.http; import com.docus.server.collect.ICollector; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.util.PeriodTime; import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/http/test/TestRestController.java b/common-collect/src/main/java/com/docus/server/collect/basic/http/test/TestRestController.java index bd6fcd7..a7a95db 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/http/test/TestRestController.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/http/test/TestRestController.java @@ -1,17 +1,20 @@ package com.docus.server.collect.basic.http.test; import com.docus.core.util.json.JSON; +import com.docus.infrastructure.web.api.CommonResult; +import com.docus.infrastructure.web.response.PageResult; import com.docus.log.executor.TrackRetrySpringExecutor; import com.docus.log.handler.IJobHandler; import com.docus.log.handler.impl.MethodJobHandler; import com.docus.server.collect.IConverter; import com.docus.server.collect.IHttpResult; -import com.docus.server.collect.web.common.entity.TaskOriginalMessage; +import com.docus.server.archivefile.infrastructure.entity.TaskMessage; import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; -import com.docus.server.collect.web.service.ITaskOriginalMessageService; +import com.docus.server.archivefile.service.ITaskMessageService; import com.docus.server.enums.CollectTypeEnum; import com.docus.server.enums.StateEnum; +import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -20,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; /** @@ -39,15 +43,29 @@ public class TestRestController { @Resource private CollectService collectService; @Resource - private ITaskOriginalMessageService messageService; + private ITaskMessageService messageService; @ApiOperation("TEST-2") @GetMapping("/get2") public void get2(String msg) throws Exception { - TaskOriginalMessage message = messageService.findByState(StateEnum.FAIL).get(0); - IJobHandler jobHandler = TrackRetrySpringExecutor.loadJobHandler(message.getRetryKey()); - String name = ((MethodJobHandler) jobHandler).getMethod().getParameterTypes()[0].getName(); - Object o = JSON.fromJSON(message.getJsonStr(), Class.forName(name)); - jobHandler.execute(o); + try { + TaskMessage message = messageService.findByState(StateEnum.FAIL).get(0); + IJobHandler jobHandler = TrackRetrySpringExecutor.loadJobHandler(message.getRetryKey()); + String name = ((MethodJobHandler) jobHandler).getMethod().getParameterTypes()[0].getName(); + Object o = JSON.fromJSON(message.getJsonStr(), Class.forName(name)); + jobHandler.execute(o); + } catch (Exception ex) { + System.out.println(ex.getMessage()); + } + } + + @ApiOperation("TEST-3") + @GetMapping("/get3") + public CommonResult> get3() throws Exception { + PageHelper.startPage(1, 10); + List list = messageService.findByState(StateEnum.OK); + PageResult pageResult = new PageResult<>(list); + + return CommonResult.success(pageResult); } } diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java index 6da1074..149116f 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java @@ -1,9 +1,9 @@ package com.docus.server.collect.basic.view; import com.docus.server.collect.ICollector; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.util.PeriodTime; import com.docus.server.his.service.IHisService; import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.xxl.job.core.handler.annotation.XxlJob; diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/ws/TBasicWsCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/basic/ws/TBasicWsCollectJob.java index 68e98b1..a3b34ce 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/ws/TBasicWsCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/ws/TBasicWsCollectJob.java @@ -1,9 +1,9 @@ package com.docus.server.collect.basic.ws; import com.docus.server.collect.ICollector; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.util.PeriodTime; import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; diff --git a/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptHttpCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptHttpCollectJob.java index bd4e663..f50206c 100644 --- a/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptHttpCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptHttpCollectJob.java @@ -1,9 +1,9 @@ package com.docus.server.collect.dept.http; import com.docus.server.collect.ICollector; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.util.PeriodTime; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; diff --git a/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java index cadac76..beb18b9 100644 --- a/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java @@ -1,9 +1,9 @@ package com.docus.server.collect.dept.view; import com.docus.server.collect.ICollector; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.util.PeriodTime; import com.docus.server.his.service.IHisService; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.xxl.job.core.handler.annotation.XxlJob; diff --git a/common-collect/src/main/java/com/docus/server/collect/dept/ws/DeptWsCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/dept/ws/DeptWsCollectJob.java index 9444af1..7aa8721 100644 --- a/common-collect/src/main/java/com/docus/server/collect/dept/ws/DeptWsCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/ws/DeptWsCollectJob.java @@ -1,9 +1,9 @@ package com.docus.server.collect.dept.ws; import com.docus.server.collect.ICollector; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.util.PeriodTime; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/event/TaskConsumptionReportDownEvent.java b/common-collect/src/main/java/com/docus/server/collect/report/event/TaskConsumptionReportDownEvent.java index 259adf8..5fe02a3 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/event/TaskConsumptionReportDownEvent.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/event/TaskConsumptionReportDownEvent.java @@ -1,6 +1,6 @@ package com.docus.server.collect.report.event; -import com.docus.server.archivefile.pojo.dto.ReportDTO; +import com.docus.server.archivefile.infrastructure.pojo.dto.ReportDTO; import lombok.Getter; import org.springframework.context.ApplicationEvent; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/listener/ReportDownListener.java b/common-collect/src/main/java/com/docus/server/collect/report/listener/ReportDownListener.java index e49bb75..85a0580 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/listener/ReportDownListener.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/listener/ReportDownListener.java @@ -6,12 +6,12 @@ import cn.hutool.http.HttpUtil; import com.docus.core.util.Func; import com.docus.infrastructure.web.api.CommonResult; import com.docus.infrastructure.web.api.ResultCode; -import com.docus.server.archivefile.mapper.AfReportRecordMapper; -import com.docus.server.archivefile.pojo.dto.ReportDTO; -import com.docus.server.archivefile.pojo.dto.ReportDownDTO; -import com.docus.server.archivefile.pojo.dto.ReportDownPatientDTO; -import com.docus.server.archivefile.pojo.dto.ReportDownScanFileDTO; -import com.docus.server.archivefile.pojo.entity.AfReportRecord; +import com.docus.server.archivefile.infrastructure.mapper.AfReportRecordMapper; +import com.docus.server.archivefile.infrastructure.pojo.dto.ReportDTO; +import com.docus.server.archivefile.infrastructure.pojo.dto.ReportDownDTO; +import com.docus.server.archivefile.infrastructure.pojo.dto.ReportDownPatientDTO; +import com.docus.server.archivefile.infrastructure.pojo.dto.ReportDownScanFileDTO; +import com.docus.server.archivefile.infrastructure.entity.AfReportRecord; import com.docus.server.collect.report.event.TaskConsumptionReportDownEvent; import com.docus.server.collect.report.event.ThreePartyPushReportDownEvent; import lombok.extern.slf4j.Slf4j; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/noview/DefNoViewCollectionJob.java b/common-collect/src/main/java/com/docus/server/collect/report/noview/DefNoViewCollectionJob.java index 23a1729..ee6f0e7 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/noview/DefNoViewCollectionJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/noview/DefNoViewCollectionJob.java @@ -3,9 +3,9 @@ package com.docus.server.collect.report.noview; import com.docus.server.collect.ICollector; import com.docus.server.collect.IJob; import com.docus.server.collect.IJobResult; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.util.PeriodTime; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/service/IReportService.java b/common-collect/src/main/java/com/docus/server/collect/report/service/IReportService.java index 63493e7..8b56157 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/service/IReportService.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/service/IReportService.java @@ -1,7 +1,7 @@ package com.docus.server.collect.report.service; -import com.docus.server.archivefile.pojo.dto.ReportDTO; +import com.docus.server.archivefile.infrastructure.pojo.dto.ReportDTO; import java.util.List; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/service/impl/ReportServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/report/service/impl/ReportServiceImpl.java index 2e04653..beb86a3 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/service/impl/ReportServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/service/impl/ReportServiceImpl.java @@ -3,11 +3,11 @@ package com.docus.server.collect.report.service.impl; import com.docus.core.util.Func; import com.docus.infrastructure.redis.service.IdService; import com.docus.log.annotation.TrackRetryListener; -import com.docus.server.archivefile.mapper.AfCollectTaskMapper; -import com.docus.server.archivefile.mapper.AfReportRecordMapper; -import com.docus.server.archivefile.pojo.dto.ReportDTO; -import com.docus.server.archivefile.pojo.entity.AfCollectTask; -import com.docus.server.archivefile.pojo.entity.AfReportRecord; +import com.docus.server.archivefile.infrastructure.mapper.AfCollectTaskMapper; +import com.docus.server.archivefile.infrastructure.mapper.AfReportRecordMapper; +import com.docus.server.archivefile.infrastructure.pojo.dto.ReportDTO; +import com.docus.server.archivefile.infrastructure.entity.AfCollectTask; +import com.docus.server.archivefile.infrastructure.entity.AfReportRecord; import com.docus.server.collect.report.event.TaskConsumptionReportDownEvent; import com.docus.server.collect.report.event.ThreePartyPushReportDownEvent; import com.docus.server.collect.report.service.IReportService; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/BlViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/BlViewCollectJob.java index 5045102..a1a9d95 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/BlViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/BlViewCollectJob.java @@ -4,9 +4,9 @@ import com.docus.server.bl.service.IBlService; import com.docus.server.collect.ICollector; import com.docus.server.collect.IJob; import com.docus.server.collect.IJobResult; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/EcgViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/EcgViewCollectJob.java index 5165961..9f21683 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/EcgViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/EcgViewCollectJob.java @@ -3,9 +3,9 @@ package com.docus.server.collect.report.view; import com.docus.server.collect.ICollector; import com.docus.server.collect.IJob; import com.docus.server.collect.IJobResult; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; import com.docus.server.ecg.service.IEcgService; import com.xxl.job.core.handler.annotation.XxlJob; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/EmrViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/EmrViewCollectJob.java index 22d95df..cd2e2aa 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/EmrViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/EmrViewCollectJob.java @@ -3,9 +3,9 @@ package com.docus.server.collect.report.view; import com.docus.server.collect.ICollector; import com.docus.server.collect.IJob; import com.docus.server.collect.IJobResult; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; import com.docus.server.emr.service.IEmrService; import com.xxl.job.core.handler.annotation.XxlJob; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/HlViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/HlViewCollectJob.java index 89a5906..25ffef4 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/HlViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/HlViewCollectJob.java @@ -3,9 +3,9 @@ package com.docus.server.collect.report.view; import com.docus.server.collect.ICollector; import com.docus.server.collect.IJob; import com.docus.server.collect.IJobResult; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; import com.docus.server.hl.service.IHlService; import com.xxl.job.core.handler.annotation.XxlJob; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/IssubmitViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/IssubmitViewCollectJob.java index 0910a1b..e9296dc 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/IssubmitViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/IssubmitViewCollectJob.java @@ -3,9 +3,9 @@ package com.docus.server.collect.report.view; import com.docus.server.collect.ICollector; import com.docus.server.collect.IJob; import com.docus.server.collect.IJobResult; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; import com.docus.server.issubmit.service.IIssubmitService; import com.xxl.job.core.handler.annotation.XxlJob; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/LisViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/LisViewCollectJob.java index e17e2f7..8e5b91f 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/LisViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/LisViewCollectJob.java @@ -3,9 +3,9 @@ package com.docus.server.collect.report.view; import com.docus.server.collect.ICollector; import com.docus.server.collect.IJob; import com.docus.server.collect.IJobResult; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; import com.docus.server.lis.service.ILisService; import com.xxl.job.core.handler.annotation.XxlJob; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/PacsViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/PacsViewCollectJob.java index 0b517bd..5e6e687 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/PacsViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/PacsViewCollectJob.java @@ -3,9 +3,9 @@ package com.docus.server.collect.report.view; import com.docus.server.collect.ICollector; import com.docus.server.collect.IJob; import com.docus.server.collect.IJobResult; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; import com.docus.server.pacs.service.IPacsService; import com.xxl.job.core.handler.annotation.XxlJob; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/VteViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/VteViewCollectJob.java index 74e8b57..bd1a0de 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/VteViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/VteViewCollectJob.java @@ -3,9 +3,9 @@ package com.docus.server.collect.report.view; import com.docus.server.collect.ICollector; import com.docus.server.collect.IJob; import com.docus.server.collect.IJobResult; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; import com.docus.server.vte.service.IVteService; import com.xxl.job.core.handler.annotation.XxlJob; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/ZzViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/ZzViewCollectJob.java index 8f0a9d3..41703a2 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/ZzViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/ZzViewCollectJob.java @@ -3,9 +3,9 @@ package com.docus.server.collect.report.view; import com.docus.server.collect.ICollector; import com.docus.server.collect.IJob; import com.docus.server.collect.IJobResult; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; import com.docus.server.zz.service.IZzService; import com.xxl.job.core.handler.annotation.XxlJob; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/ws/impl/ReportServerImpl.java b/common-collect/src/main/java/com/docus/server/collect/report/ws/impl/ReportServerImpl.java index 71bef34..f475b77 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/ws/impl/ReportServerImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/ws/impl/ReportServerImpl.java @@ -3,7 +3,7 @@ package com.docus.server.collect.report.ws.impl; import com.docus.core.util.json.JSON; import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; -import com.docus.server.archivefile.pojo.dto.ReportDTO; +import com.docus.server.archivefile.infrastructure.pojo.dto.ReportDTO; import com.docus.server.collect.IConverter; import com.docus.server.collect.IWsResult; import com.docus.server.collect.report.service.IReportService; diff --git a/common-collect/src/main/java/com/docus/server/collect/user/http/UserHttpCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/user/http/UserHttpCollectJob.java index 8e8e776..5c107b5 100644 --- a/common-collect/src/main/java/com/docus/server/collect/user/http/UserHttpCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/http/UserHttpCollectJob.java @@ -1,9 +1,9 @@ package com.docus.server.collect.user.http; import com.docus.server.collect.ICollector; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.util.PeriodTime; import com.docus.server.sys.common.pojo.dto.UserDTO; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; diff --git a/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java index cc522d6..21e5aee 100644 --- a/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java @@ -4,9 +4,9 @@ import com.docus.core.util.DateUtil; import com.docus.core.util.Func; import com.docus.core.util.ListUtils; import com.docus.server.collect.ICollector; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.util.PeriodTime; import com.docus.server.his.service.IHisService; import com.docus.server.sys.common.pojo.dto.UserDTO; import com.docus.server.sys.common.pojo.entity.PowerDept; diff --git a/common-collect/src/main/java/com/docus/server/collect/user/ws/UserWsCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/user/ws/UserWsCollectJob.java index 9b8fe8f..c8fe514 100644 --- a/common-collect/src/main/java/com/docus/server/collect/user/ws/UserWsCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/ws/UserWsCollectJob.java @@ -1,9 +1,9 @@ package com.docus.server.collect.user.ws; import com.docus.server.collect.ICollector; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.util.PeriodTime; import com.docus.server.sys.common.pojo.dto.UserDTO; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/A.java b/common-collect/src/main/java/com/docus/server/collect/web/common/A.java index 29b2ead..811f03a 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/common/A.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/common/A.java @@ -1,8 +1,4 @@ package com.docus.server.collect.web.common; -/** - * @author linruifeng - * @date 2023/6/14 14:10 - */ public class A { } diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/A.java b/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/A.java new file mode 100644 index 0000000..fc1879d --- /dev/null +++ b/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/A.java @@ -0,0 +1,4 @@ +package com.docus.server.collect.web.common.pojo; + +public class A { +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/IdType.java b/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/IdType.java similarity index 68% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/IdType.java rename to common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/IdType.java index df082a0..e69e5ea 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/IdType.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/IdType.java @@ -1,4 +1,4 @@ -package com.docus.server.record.common.pojo.dto; +package com.docus.server.collect.web.common.pojo.dto; public enum IdType { /** diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/InpatientNo.java b/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/InpatientNo.java similarity index 91% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/InpatientNo.java rename to common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/InpatientNo.java index 448258b..8faba6b 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/InpatientNo.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/InpatientNo.java @@ -1,4 +1,4 @@ -package com.docus.server.record.common.pojo.dto; +package com.docus.server.collect.web.common.pojo.dto; import com.docus.infrastructure.core.exception.BaseException; import com.docus.server.record.RecordExceptionEnum; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDTO.java b/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDTO.java similarity index 96% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDTO.java rename to common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDTO.java index f819cb6..ac7d228 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDTO.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDTO.java @@ -1,4 +1,4 @@ -package com.docus.server.archivefile.pojo.dto; +package com.docus.server.collect.web.common.pojo.dto; import lombok.Data; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDownDTO.java b/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDownDTO.java similarity index 92% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDownDTO.java rename to common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDownDTO.java index d56634c..e0116ff 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDownDTO.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDownDTO.java @@ -1,4 +1,4 @@ -package com.docus.server.archivefile.pojo.dto; +package com.docus.server.collect.web.common.pojo.dto; import io.swagger.annotations.ApiModelProperty; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDownPatientDTO.java b/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDownPatientDTO.java similarity index 90% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDownPatientDTO.java rename to common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDownPatientDTO.java index de67e18..07af860 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDownPatientDTO.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDownPatientDTO.java @@ -1,6 +1,6 @@ -package com.docus.server.archivefile.pojo.dto; +package com.docus.server.collect.web.common.pojo.dto; -import com.docus.server.archivefile.pojo.entity.AfReportRecord; +import com.docus.server.collect.web.common.pojo.entity.AfReportRecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDownScanFileDTO.java b/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDownScanFileDTO.java similarity index 93% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDownScanFileDTO.java rename to common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDownScanFileDTO.java index 57806e3..5777de2 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDownScanFileDTO.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDownScanFileDTO.java @@ -1,6 +1,6 @@ -package com.docus.server.archivefile.pojo.dto; +package com.docus.server.collect.web.common.pojo.dto; -import com.docus.server.archivefile.pojo.entity.AfReportRecord; +import com.docus.server.collect.web.common.pojo.entity.AfReportRecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/dao/ITaskConfigDao.java b/common-collect/src/main/java/com/docus/server/collect/web/dao/ITaskConfigDao.java deleted file mode 100644 index 6025754..0000000 --- a/common-collect/src/main/java/com/docus/server/collect/web/dao/ITaskConfigDao.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.docus.server.collect.web.dao; - -import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.server.collect.web.common.entity.TaskConfig; - -public interface ITaskConfigDao extends IBaseDao { -} diff --git a/common-collect/src/main/java/com/docus/server/collect/web/dao/ITaskOriginalMessageDao.java b/common-collect/src/main/java/com/docus/server/collect/web/dao/ITaskOriginalMessageDao.java deleted file mode 100644 index 2dea5ce..0000000 --- a/common-collect/src/main/java/com/docus/server/collect/web/dao/ITaskOriginalMessageDao.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.docus.server.collect.web.dao; - - -import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.server.collect.web.common.entity.TaskOriginalMessage; - -public interface ITaskOriginalMessageDao extends IBaseDao { -} diff --git a/common-collect/src/main/java/com/docus/server/collect/web/dao/impl/TaskConfigDaoImpl.java b/common-collect/src/main/java/com/docus/server/collect/web/dao/impl/TaskConfigDaoImpl.java deleted file mode 100644 index 9381532..0000000 --- a/common-collect/src/main/java/com/docus/server/collect/web/dao/impl/TaskConfigDaoImpl.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.docus.server.collect.web.dao.impl; - -import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; -import com.docus.server.collect.web.common.entity.TaskConfig; -import com.docus.server.collect.web.dao.ITaskConfigDao; -import com.docus.server.collect.web.mapper.TaskConfigMapper; -import org.springframework.stereotype.Repository; - -@Repository -public class TaskConfigDaoImpl extends BaseDaoImpl implements ITaskConfigDao { - - - -} diff --git a/common-collect/src/main/java/com/docus/server/collect/web/dao/impl/TaskOriginalMessageDaoImpl.java b/common-collect/src/main/java/com/docus/server/collect/web/dao/impl/TaskOriginalMessageDaoImpl.java deleted file mode 100644 index 3af5589..0000000 --- a/common-collect/src/main/java/com/docus/server/collect/web/dao/impl/TaskOriginalMessageDaoImpl.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.docus.server.collect.web.dao.impl; - -import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; -import com.docus.server.collect.web.common.entity.TaskOriginalMessage; -import com.docus.server.collect.web.dao.ITaskOriginalMessageDao; -import com.docus.server.collect.web.mapper.TaskOriginalMessageMapper; -import org.springframework.stereotype.Repository; - -@Repository -public class TaskOriginalMessageDaoImpl extends BaseDaoImpl implements ITaskOriginalMessageDao { -} diff --git a/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java index 4ac9baa..d4f9ff9 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java @@ -2,19 +2,19 @@ package com.docus.server.collect.web.job; import com.docus.core.util.Func; import com.docus.infrastructure.redis.service.IdService; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.archivefile.service.ITaskConfigService; import com.docus.server.collect.IJob; -import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.service.CollectService; -import com.docus.server.collect.web.service.ITaskConfigService; -import com.docus.server.collect.web.utils.PeriodTime; import com.docus.server.common.config.UserProperties; import com.docus.server.enums.StateEnum; import com.docus.server.record.service.ITBasicService; import com.docus.server.sys.service.IPowerDeptService; import com.docus.server.sys.service.IPowerThirdLoginService; import com.docus.server.sys.service.IPowerUserService; +import com.docus.server.util.ExceptionUtils; +import com.docus.server.util.PeriodTime; import com.xxl.job.core.context.XxlJobHelper; -import jodd.exception.ExceptionUtil; import lombok.extern.slf4j.Slf4j; import javax.annotation.Resource; @@ -53,7 +53,7 @@ public abstract class AbstractCollectJob implements IJob { } } catch (Exception ex) { log.error(ex.getMessage(), ex); - updateTaskState(getExceptionMessage(ex), taskConfig); + updateTaskState(ExceptionUtils.getExceptionMessage(ex), taskConfig); } refreshTaskState(taskConfig); @@ -74,7 +74,7 @@ public abstract class AbstractCollectJob implements IJob { } } catch (Exception ex) { log.error(ex.getMessage(), ex); - updateTaskState(getExceptionMessage(ex), taskConfig); + updateTaskState(ExceptionUtils.getExceptionMessage(ex), taskConfig); } refreshTaskState(taskConfig); @@ -135,13 +135,4 @@ public abstract class AbstractCollectJob implements IJob { protected String getJobParam() { return XxlJobHelper.getJobParam(); } - - private String getExceptionMessage(Exception ex) { - String lastErrorMsg = ExceptionUtil.exceptionChainToString(ex); - if (null != lastErrorMsg && lastErrorMsg.length() > 1000) { - return lastErrorMsg.substring(0, 1000); - } - return lastErrorMsg; - } - } diff --git a/common-collect/src/main/java/com/docus/server/collect/web/job/TrackRetryJob.java b/common-collect/src/main/java/com/docus/server/collect/web/job/TrackRetryJob.java index 11aeecb..1d746c5 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/job/TrackRetryJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/job/TrackRetryJob.java @@ -1,7 +1,7 @@ package com.docus.server.collect.web.job; -import com.docus.server.collect.web.common.entity.TaskOriginalMessage; -import com.docus.server.collect.web.service.ITaskOriginalMessageService; +import com.docus.server.archivefile.infrastructure.entity.TaskMessage; +import com.docus.server.archivefile.service.ITaskMessageService; import com.docus.server.collect.web.service.TrackRetryService; import com.docus.server.enums.StateEnum; import com.xxl.job.core.handler.annotation.XxlJob; @@ -19,15 +19,15 @@ import java.util.List; public class TrackRetryJob { @Resource - private ITaskOriginalMessageService messageService; + private ITaskMessageService messageService; @Resource private TrackRetryService trackRetryService; @XxlJob("trackRetryJob") public void retry() throws Exception { - List messages = messageService.findByState(StateEnum.FAIL); + List messages = messageService.findByState(StateEnum.FAIL); - for (TaskOriginalMessage message : messages) { + for (TaskMessage message : messages) { trackRetryService.doRetry(message); } } diff --git a/common-collect/src/main/java/com/docus/server/collect/web/mapper/TaskOriginalMessageMapper.java b/common-collect/src/main/java/com/docus/server/collect/web/mapper/TaskOriginalMessageMapper.java deleted file mode 100644 index efc48c9..0000000 --- a/common-collect/src/main/java/com/docus/server/collect/web/mapper/TaskOriginalMessageMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.docus.server.collect.web.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.docus.server.collect.web.common.entity.TaskOriginalMessage; -import org.apache.ibatis.annotations.Mapper; - -/** - * Mapper 接口 - * Generated on 2023-06-01 - */ -@Mapper -public interface TaskOriginalMessageMapper extends BaseMapper { - -} diff --git a/common-collect/src/main/java/com/docus/server/collect/web/process/RetryProcessor.java b/common-collect/src/main/java/com/docus/server/collect/web/process/RetryProcessor.java index 4b42011..5c7016f 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/process/RetryProcessor.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/process/RetryProcessor.java @@ -2,7 +2,7 @@ package com.docus.server.collect.web.process; import com.docus.log.context.TrackContext; import com.docus.log.processor.AbstractProcessor; -import com.docus.server.collect.web.service.ITaskOriginalMessageService; +import com.docus.server.archivefile.service.ITaskMessageService; import lombok.extern.slf4j.Slf4j; import javax.annotation.Resource; @@ -15,7 +15,7 @@ import javax.annotation.Resource; @Slf4j public class RetryProcessor extends AbstractProcessor { @Resource - private ITaskOriginalMessageService messageService; + private ITaskMessageService messageService; @Override public Object doProcess(TrackContext context) { diff --git a/common-collect/src/main/java/com/docus/server/collect/web/process/VisitorProcessor.java b/common-collect/src/main/java/com/docus/server/collect/web/process/VisitorProcessor.java index 00f796c..7e38828 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/process/VisitorProcessor.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/process/VisitorProcessor.java @@ -8,7 +8,7 @@ import com.docus.log.context.TrackContext; import com.docus.log.processor.AbstractProcessor; import com.docus.server.collect.IConverter; import com.docus.server.collect.IResult; -import com.docus.server.collect.web.service.ITaskOriginalMessageService; +import com.docus.server.archivefile.service.ITaskMessageService; import com.docus.server.enums.CollectTypeEnum; import com.docus.server.enums.StateEnum; import com.fasterxml.jackson.core.type.TypeReference; @@ -21,7 +21,7 @@ import java.util.Map; */ @Slf4j public class VisitorProcessor extends AbstractProcessor { - private ITaskOriginalMessageService messageService; + private ITaskMessageService messageService; private IConverter converter; private IResult result; @@ -37,9 +37,9 @@ public class VisitorProcessor extends AbstractProcessor { if (Func.isEmpty(message)) { throw new RuntimeException("参数为空"); } - Long taskId = messageService.insertTaskOriginalMessage("", message, IIntegerEnum.fromDisplay(CollectTypeEnum.class, context.getGroup()), retryKey); + Long taskId = messageService.insertTaskMessage("", message, IIntegerEnum.fromDisplay(CollectTypeEnum.class, context.getGroup()), retryKey); String jsonStr = JSON.toJSON(converter.convert(message, context.getGroup())); - messageService.updateTaskOriginalMessage(taskId, jsonStr, context.getExMessageResult(), StateEnum.OK); + messageService.updateTaskMessage(taskId, jsonStr, context.getExMessageResult(), StateEnum.OK); Map params = context.getParams(); params.put("taskId", taskId); params.put("jsonStr", jsonStr); @@ -70,7 +70,7 @@ public class VisitorProcessor extends AbstractProcessor { } else { log.info("=== AOP 异常通知 ==="); log.error((String) params.get("msg")); - messageService.updateTaskOriginalMessage(taskId, afterReturnResult, context.getExMessageResult(), StateEnum.FAIL); + messageService.updateTaskMessage(taskId, afterReturnResult, context.getExMessageResult(), StateEnum.FAIL); return result.fail(params); } } catch (Exception e) { @@ -85,6 +85,6 @@ public class VisitorProcessor extends AbstractProcessor { public void initBeans(String[] beanNames) { this.converter = (IConverter) SpringUtils.getBean(beanNames[0]); this.result = (IResult) SpringUtils.getBean(beanNames[1]); - this.messageService = SpringUtils.getBean(ITaskOriginalMessageService.class); + this.messageService = SpringUtils.getBean(ITaskMessageService.class); } } diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskOriginalMessageService.java b/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskOriginalMessageService.java deleted file mode 100644 index 0d261e1..0000000 --- a/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskOriginalMessageService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.docus.server.collect.web.service; - -import com.docus.server.collect.web.common.entity.TaskOriginalMessage; -import com.docus.server.enums.CollectTypeEnum; -import com.docus.server.enums.StateEnum; - -import java.util.List; - -public interface ITaskOriginalMessageService { - - Long insertTaskOriginalMessage(String json, String xml, CollectTypeEnum collectType, String retryKey); - - void updateTaskOriginalMessage(Long id, String json, String exMessageResult, StateEnum stateEnum); - - List findByState(StateEnum stateEnum); - -} diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/TrackRetryService.java b/common-collect/src/main/java/com/docus/server/collect/web/service/TrackRetryService.java index 57c267f..1ab7ef1 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/service/TrackRetryService.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/TrackRetryService.java @@ -1,27 +1,54 @@ package com.docus.server.collect.web.service; import com.docus.core.util.json.JSON; +import com.docus.infrastructure.redis.service.IdService; import com.docus.log.executor.TrackRetrySpringExecutor; import com.docus.log.handler.IJobHandler; import com.docus.log.handler.impl.MethodJobHandler; -import com.docus.server.collect.web.common.entity.TaskOriginalMessage; +import com.docus.server.archivefile.infrastructure.dao.ITaskMessageRetryLogDao; +import com.docus.server.archivefile.infrastructure.entity.TaskMessage; +import com.docus.server.archivefile.infrastructure.entity.TaskMessageRetryLog; +import com.docus.server.enums.StateEnum; +import com.docus.server.util.ExceptionUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.retry.annotation.Backoff; import org.springframework.retry.annotation.Retryable; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import javax.annotation.Resource; + @Service +@Slf4j public class TrackRetryService { + @Resource + private ITaskMessageRetryLogDao taskMessageRetryLogDao; + @Resource + private IdService idService; @Async("recordMessage") @Retryable(value = Exception.class, maxAttempts = 3, backoff = @Backoff(delay = 2000L, multiplier = 1.5)) - public void doRetry(TaskOriginalMessage message) throws Exception { - IJobHandler jobHandler = TrackRetrySpringExecutor.loadJobHandler(message.getRetryKey()); - String name = ((MethodJobHandler) jobHandler).getMethod().getParameterTypes()[0].getName(); - Object o = JSON.fromJSON(message.getJsonStr(), Class.forName(name)); - jobHandler.execute(o); + public void doRetry(TaskMessage message) throws Exception { + TaskMessageRetryLog taskMessageRetryLog = new TaskMessageRetryLog(); + BeanUtils.copyProperties(message, taskMessageRetryLog); + taskMessageRetryLog.setMessageId(message.getId()); + taskMessageRetryLog.setId(idService.getDateSeq()); + + try { + IJobHandler jobHandler = TrackRetrySpringExecutor.loadJobHandler(message.getRetryKey()); + String name = ((MethodJobHandler) jobHandler).getMethod().getParameterTypes()[0].getName(); + Object o = JSON.fromJSON(message.getJsonStr(), Class.forName(name)); + jobHandler.execute(o); + + } catch (Exception e) { + log.error(e.getMessage(), e); + + taskMessageRetryLog.setErrorMsg(ExceptionUtils.getExceptionMessage(e)); + taskMessageRetryLog.setState(StateEnum.FAIL); + } - //to write retry log + taskMessageRetryLogDao.save(taskMessageRetryLog); } } diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/impl/A.java b/common-collect/src/main/java/com/docus/server/collect/web/service/impl/A.java new file mode 100644 index 0000000..e21b325 --- /dev/null +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/impl/A.java @@ -0,0 +1,4 @@ +package com.docus.server.collect.web.service.impl; + +public class A { +} diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskOriginalMessageServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskOriginalMessageServiceImpl.java deleted file mode 100644 index 18bf0cb..0000000 --- a/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskOriginalMessageServiceImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.docus.server.collect.web.service.impl; - -import com.docus.core.util.DateUtil; -import com.docus.core.util.Func; -import com.docus.server.collect.web.common.entity.TaskOriginalMessage; -import com.docus.server.collect.web.convert.TaskOriginalMessageConverter; -import com.docus.server.collect.web.dao.ITaskOriginalMessageDao; -import com.docus.server.collect.web.service.ITaskOriginalMessageService; -import com.docus.server.enums.CollectTypeEnum; -import com.docus.server.enums.StateEnum; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.List; - -@Service -public class TaskOriginalMessageServiceImpl implements ITaskOriginalMessageService { - @Resource - private TaskOriginalMessageConverter converter; - @Resource - private ITaskOriginalMessageDao taskOriginalMessageDao; - - /** - * 新增 ws xml 原始报文 - */ - @Transactional(rollbackFor = Exception.class) - @Override - public Long insertTaskOriginalMessage(String json, String xml, CollectTypeEnum collectType, String retryKey) { - TaskOriginalMessage taskOriginalMessage = converter.toConvertTaskOriginalMessageDO(json, xml, collectType, retryKey); - taskOriginalMessageDao.save(taskOriginalMessage); - return taskOriginalMessage.getId(); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void updateTaskOriginalMessage(Long id, String json, String exMessageResult, StateEnum stateEnum) { - if (null == id) { - return; - } - TaskOriginalMessage taskOriginalMessage = taskOriginalMessageDao.findById(id); - if (Func.isNotEmpty(taskOriginalMessage)) { - taskOriginalMessage.setJsonStr(json); - taskOriginalMessage.setUpdateTime(DateUtil.now()); - taskOriginalMessage.setState(stateEnum); - taskOriginalMessage.setErrorMsg(exMessageResult); - taskOriginalMessageDao.updateById(taskOriginalMessage); - } - } - - @Override - public List findByState(StateEnum stateEnum) { - return taskOriginalMessageDao.findBy("state", stateEnum); - } -} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/RecordExceptionEnum.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/RecordExceptionEnum.java index 2b98c78..7ce9cbc 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/RecordExceptionEnum.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/RecordExceptionEnum.java @@ -1,4 +1,4 @@ -package com.docus.server.record; +package com.docus.server.archivefile; import com.docus.infrastructure.core.exception.IErrorCode; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/convert/TaskOriginalMessageConverter.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageConverter.java similarity index 71% rename from common-collect/src/main/java/com/docus/server/collect/web/convert/TaskOriginalMessageConverter.java rename to common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageConverter.java index fd76158..1a04f00 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/convert/TaskOriginalMessageConverter.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageConverter.java @@ -1,8 +1,8 @@ -package com.docus.server.collect.web.convert; +package com.docus.server.archivefile.convert; import com.docus.core.util.DateUtil; import com.docus.infrastructure.redis.service.IdService; -import com.docus.server.collect.web.common.entity.TaskOriginalMessage; +import com.docus.server.archivefile.infrastructure.entity.TaskMessage; import com.docus.server.enums.CollectTypeEnum; import com.docus.server.enums.StateEnum; import org.springframework.stereotype.Component; @@ -10,12 +10,12 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; @Component -public class TaskOriginalMessageConverter { +public class TaskMessageConverter { @Resource private IdService idService; - public TaskOriginalMessage toConvertTaskOriginalMessageDO(String json, String xml, CollectTypeEnum collectType, String retryKey) { - TaskOriginalMessage taskOriginalMessage = new TaskOriginalMessage(); + public TaskMessage toConvertTaskOriginalMessageDO(String json, String xml, CollectTypeEnum collectType, String retryKey) { + TaskMessage taskOriginalMessage = new TaskMessage(); taskOriginalMessage.setId(idService.getDateSeq()); taskOriginalMessage.setName(collectType.name()); taskOriginalMessage.setMemo(collectType.getDesc()); diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/impl/AfCollectSysDictionaryDaoImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/impl/AfCollectSysDictionaryDaoImpl.java deleted file mode 100644 index f58e09e..0000000 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/impl/AfCollectSysDictionaryDaoImpl.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.docus.server.archivefile.dao.impl; - -import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; -import com.docus.server.archivefile.dao.IAfCollectSysDictionaryDao; -import com.docus.server.archivefile.mapper.AfCollectSysDictionaryMapper; -import com.docus.server.archivefile.pojo.entity.CollectsysDictionary; -import org.springframework.stereotype.Repository; - -@Repository -public class AfCollectSysDictionaryDaoImpl extends BaseDaoImpl implements IAfCollectSysDictionaryDao { -} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/cache/TaskCacheLayer.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/cache/TaskCacheLayer.java new file mode 100644 index 0000000..26d2c88 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/cache/TaskCacheLayer.java @@ -0,0 +1,7 @@ +package com.docus.server.archivefile.infrastructure.cache; + +import com.docus.server.annotation.CacheLayer; + +@CacheLayer +public class TaskCacheLayer { +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/client/DownLoadAPI.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/client/DownLoadAPI.java new file mode 100644 index 0000000..a1c3e51 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/client/DownLoadAPI.java @@ -0,0 +1,4 @@ +package com.docus.server.archivefile.infrastructure.client; + +public class DownLoadAPI { +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/IAfCollectSysDictionaryDao.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/IAfCollectSysDictionaryDao.java similarity index 51% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/IAfCollectSysDictionaryDao.java rename to common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/IAfCollectSysDictionaryDao.java index 0fd9cbb..01fe43b 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/IAfCollectSysDictionaryDao.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/IAfCollectSysDictionaryDao.java @@ -1,7 +1,7 @@ -package com.docus.server.archivefile.dao; +package com.docus.server.archivefile.infrastructure.dao; import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.server.archivefile.pojo.entity.CollectsysDictionary; +import com.docus.server.archivefile.infrastructure.entity.CollectsysDictionary; public interface IAfCollectSysDictionaryDao extends IBaseDao { } diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/IAfViewCollectionLogDao.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/IAfViewCollectionLogDao.java similarity index 64% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/IAfViewCollectionLogDao.java rename to common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/IAfViewCollectionLogDao.java index 5f6466a..89221f4 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/IAfViewCollectionLogDao.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/IAfViewCollectionLogDao.java @@ -1,7 +1,7 @@ -package com.docus.server.archivefile.dao; +package com.docus.server.archivefile.infrastructure.dao; import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog; +import com.docus.server.archivefile.infrastructure.entity.AfViewCollectionLog; import java.util.List; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskConfigDao.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskConfigDao.java new file mode 100644 index 0000000..3a8110c --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskConfigDao.java @@ -0,0 +1,7 @@ +package com.docus.server.archivefile.infrastructure.dao; + +import com.docus.infrastructure.core.db.dao.IBaseDao; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; + +public interface ITaskConfigDao extends IBaseDao { +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskMessageDao.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskMessageDao.java new file mode 100644 index 0000000..af6fdb4 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskMessageDao.java @@ -0,0 +1,8 @@ +package com.docus.server.archivefile.infrastructure.dao; + + +import com.docus.infrastructure.core.db.dao.IBaseDao; +import com.docus.server.archivefile.infrastructure.entity.TaskMessage; + +public interface ITaskMessageDao extends IBaseDao { +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskMessageRetryLogDao.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskMessageRetryLogDao.java new file mode 100644 index 0000000..f3b3e26 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskMessageRetryLogDao.java @@ -0,0 +1,7 @@ +package com.docus.server.archivefile.infrastructure.dao; + +import com.docus.infrastructure.core.db.dao.IBaseDao; +import com.docus.server.archivefile.infrastructure.entity.TaskMessageRetryLog; + +public interface ITaskMessageRetryLogDao extends IBaseDao { +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/AfCollectSysDictionaryDaoImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/AfCollectSysDictionaryDaoImpl.java new file mode 100644 index 0000000..2ad399f --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/AfCollectSysDictionaryDaoImpl.java @@ -0,0 +1,11 @@ +package com.docus.server.archivefile.infrastructure.dao.impl; + +import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.server.archivefile.infrastructure.dao.IAfCollectSysDictionaryDao; +import com.docus.server.archivefile.infrastructure.mapper.AfCollectSysDictionaryMapper; +import com.docus.server.archivefile.infrastructure.entity.CollectsysDictionary; +import org.springframework.stereotype.Repository; + +@Repository +public class AfCollectSysDictionaryDaoImpl extends BaseDaoImpl implements IAfCollectSysDictionaryDao { +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/impl/AfViewCollectionLogDaoImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/AfViewCollectionLogDaoImpl.java similarity index 71% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/impl/AfViewCollectionLogDaoImpl.java rename to common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/AfViewCollectionLogDaoImpl.java index 4311709..4b68cf8 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/impl/AfViewCollectionLogDaoImpl.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/AfViewCollectionLogDaoImpl.java @@ -1,11 +1,11 @@ -package com.docus.server.archivefile.dao.impl; +package com.docus.server.archivefile.infrastructure.dao.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; -import com.docus.server.archivefile.dao.IAfViewCollectionLogDao; -import com.docus.server.archivefile.mapper.AfViewCollectionLogMapper; -import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog; +import com.docus.server.archivefile.infrastructure.dao.IAfViewCollectionLogDao; +import com.docus.server.archivefile.infrastructure.mapper.AfViewCollectionLogMapper; +import com.docus.server.archivefile.infrastructure.entity.AfViewCollectionLog; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskConfigDaoImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskConfigDaoImpl.java new file mode 100644 index 0000000..5bc999e --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskConfigDaoImpl.java @@ -0,0 +1,13 @@ +package com.docus.server.archivefile.infrastructure.dao.impl; + +import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.server.archivefile.infrastructure.dao.ITaskConfigDao; +import com.docus.server.archivefile.infrastructure.mapper.TaskConfigMapper; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import org.springframework.stereotype.Repository; + +@Repository +public class TaskConfigDaoImpl extends BaseDaoImpl implements ITaskConfigDao { + + +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskMessageDaoImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskMessageDaoImpl.java new file mode 100644 index 0000000..8f10ea2 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskMessageDaoImpl.java @@ -0,0 +1,11 @@ +package com.docus.server.archivefile.infrastructure.dao.impl; + +import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.server.archivefile.infrastructure.dao.ITaskMessageDao; +import com.docus.server.archivefile.infrastructure.mapper.TaskMessageMapper; +import com.docus.server.archivefile.infrastructure.entity.TaskMessage; +import org.springframework.stereotype.Repository; + +@Repository +public class TaskMessageDaoImpl extends BaseDaoImpl implements ITaskMessageDao { +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskMessageRetryLogDaoImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskMessageRetryLogDaoImpl.java new file mode 100644 index 0000000..396a395 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskMessageRetryLogDaoImpl.java @@ -0,0 +1,11 @@ +package com.docus.server.archivefile.infrastructure.dao.impl; + +import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.server.archivefile.infrastructure.dao.ITaskMessageRetryLogDao; +import com.docus.server.archivefile.infrastructure.entity.TaskMessageRetryLog; +import com.docus.server.archivefile.infrastructure.mapper.TaskMessageRetryLogMapper; +import org.springframework.stereotype.Repository; + +@Repository +public class TaskMessageRetryLogDaoImpl extends BaseDaoImpl implements ITaskMessageRetryLogDao { +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfCollectTask.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/AfCollectTask.java similarity index 97% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfCollectTask.java rename to common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/AfCollectTask.java index 410604b..2ad6c31 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfCollectTask.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/AfCollectTask.java @@ -1,4 +1,4 @@ -package com.docus.server.archivefile.pojo.entity; +package com.docus.server.archivefile.infrastructure.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfJobTime.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/AfJobTime.java similarity index 93% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfJobTime.java rename to common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/AfJobTime.java index bac4d5d..b719be5 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfJobTime.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/AfJobTime.java @@ -1,4 +1,4 @@ -package com.docus.server.archivefile.pojo.entity; +package com.docus.server.archivefile.infrastructure.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfReportRecord.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/AfReportRecord.java similarity index 93% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfReportRecord.java rename to common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/AfReportRecord.java index 14143fd..9ef3f42 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfReportRecord.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/AfReportRecord.java @@ -1,6 +1,6 @@ -package com.docus.server.archivefile.pojo.entity; +package com.docus.server.archivefile.infrastructure.entity; -import com.docus.server.archivefile.pojo.dto.ReportDTO; +import com.docus.server.archivefile.infrastructure.pojo.dto.ReportDTO; import lombok.Data; import java.io.Serializable; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfViewCollectionLog.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/AfViewCollectionLog.java similarity index 95% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfViewCollectionLog.java rename to common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/AfViewCollectionLog.java index 8d33878..f2d587e 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfViewCollectionLog.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/AfViewCollectionLog.java @@ -1,4 +1,4 @@ -package com.docus.server.archivefile.pojo.entity; +package com.docus.server.archivefile.infrastructure.entity; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/CollectsysDictionary.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/CollectsysDictionary.java similarity index 92% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/CollectsysDictionary.java rename to common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/CollectsysDictionary.java index 2c1ac13..a04374b 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/CollectsysDictionary.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/CollectsysDictionary.java @@ -1,4 +1,4 @@ -package com.docus.server.archivefile.pojo.entity; +package com.docus.server.archivefile.infrastructure.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskConfig.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskConfig.java similarity index 92% rename from common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskConfig.java rename to common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskConfig.java index 644610b..288eca5 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskConfig.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskConfig.java @@ -1,9 +1,9 @@ -package com.docus.server.collect.web.common.entity; +package com.docus.server.archivefile.infrastructure.entity; import com.baomidou.mybatisplus.annotation.TableField; -import com.docus.server.collect.web.utils.DateSpiltUtil; -import com.docus.server.collect.web.utils.PeriodTime; import com.docus.server.enums.StateEnum; +import com.docus.server.util.DateSpiltUtil; +import com.docus.server.util.PeriodTime; import lombok.Data; import java.util.Date; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskOriginalMessage.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskMessage.java similarity index 89% rename from common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskOriginalMessage.java rename to common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskMessage.java index 0179909..248ba6d 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskOriginalMessage.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskMessage.java @@ -1,4 +1,4 @@ -package com.docus.server.collect.web.common.entity; +package com.docus.server.archivefile.infrastructure.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -25,9 +25,9 @@ import java.util.Date; */ @Data @EqualsAndHashCode(callSuper = false) -@TableName("task_original_message") -@ApiModel(value = "TaskOriginalMessage对象", description = "") -public class TaskOriginalMessage implements Serializable { +@TableName("task_message") +@ApiModel(value = "TaskMessage对象", description = "") +public class TaskMessage implements Serializable { @ApiModelProperty(value = "主键") @TableId(value = "id", type = IdType.ASSIGN_UUID) diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskMessageRetryLog.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskMessageRetryLog.java new file mode 100644 index 0000000..cd83b52 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskMessageRetryLog.java @@ -0,0 +1,81 @@ +package com.docus.server.archivefile.infrastructure.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.docus.server.enums.CollectTypeEnum; +import com.docus.server.enums.StateEnum; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.Date; + + +/** + *

+ * 被动接收任务表 + *

+ * + * @author AutoGenerator + * @since 2023-06-25 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("task_message_retry_log") +@ApiModel(value = "TaskMessageRetryLog对象", description = "被动接收任务表") +public class TaskMessageRetryLog implements Serializable { + + @ApiModelProperty(value = "主键") + @TableId(value = "id", type = IdType.ASSIGN_UUID) + private Long id; + + @ApiModelProperty(value = "重试消息主键") + @TableField("message_id") + private Long messageId; + + @ApiModelProperty(value = "消息名字") + @TableField("name") + private String name; + + @ApiModelProperty(value = "消息描述") + @TableField("memo") + private String memo; + + @ApiModelProperty(value = "消息类型") + @TableField("collect_type") + private CollectTypeEnum collectType; + + @ApiModelProperty(value = "重试标示") + @TableField("retry_key") + private String retryKey; + + @ApiModelProperty(value = "原始报文转对象json") + @TableField("json_str") + private String jsonStr; + + @ApiModelProperty(value = "原始报文") + @TableField("source") + private String source; + + @ApiModelProperty(value = "状态 0：成功，1:失败") + @TableField("state") + private StateEnum state = StateEnum.OK; + + @ApiModelProperty(value = "本批次异常信息") + @TableField("error_msg") + private String errorMsg; + + @ApiModelProperty(value = "入库时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "入库更新时间") + @TableField("update_time") + private Date updateTime; + + +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfCollectSysDictionaryMapper.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/AfCollectSysDictionaryMapper.java similarity index 59% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfCollectSysDictionaryMapper.java rename to common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/AfCollectSysDictionaryMapper.java index 7d1f1f6..5e8fee2 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfCollectSysDictionaryMapper.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/AfCollectSysDictionaryMapper.java @@ -1,7 +1,7 @@ -package com.docus.server.archivefile.mapper; +package com.docus.server.archivefile.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.docus.server.archivefile.pojo.entity.CollectsysDictionary; +import com.docus.server.archivefile.infrastructure.entity.CollectsysDictionary; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfCollectTaskMapper.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/AfCollectTaskMapper.java similarity index 80% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfCollectTaskMapper.java rename to common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/AfCollectTaskMapper.java index 5cd744f..1e436b1 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfCollectTaskMapper.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/AfCollectTaskMapper.java @@ -1,6 +1,6 @@ -package com.docus.server.archivefile.mapper; +package com.docus.server.archivefile.infrastructure.mapper; -import com.docus.server.archivefile.pojo.entity.AfCollectTask; +import com.docus.server.archivefile.infrastructure.entity.AfCollectTask; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfJobTimeMapper.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/AfJobTimeMapper.java similarity index 85% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfJobTimeMapper.java rename to common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/AfJobTimeMapper.java index eb418e1..c84877c 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfJobTimeMapper.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/AfJobTimeMapper.java @@ -1,6 +1,6 @@ -package com.docus.server.archivefile.mapper; +package com.docus.server.archivefile.infrastructure.mapper; -import com.docus.server.archivefile.pojo.entity.AfJobTime; +import com.docus.server.archivefile.infrastructure.entity.AfJobTime; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfReportRecordMapper.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/AfReportRecordMapper.java similarity index 94% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfReportRecordMapper.java rename to common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/AfReportRecordMapper.java index 2b1b3a3..41285ea 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfReportRecordMapper.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/AfReportRecordMapper.java @@ -1,6 +1,6 @@ -package com.docus.server.archivefile.mapper; +package com.docus.server.archivefile.infrastructure.mapper; -import com.docus.server.archivefile.pojo.entity.AfReportRecord; +import com.docus.server.archivefile.infrastructure.entity.AfReportRecord; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfViewCollectionLogMapper.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/AfViewCollectionLogMapper.java similarity index 64% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfViewCollectionLogMapper.java rename to common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/AfViewCollectionLogMapper.java index 47f74b7..a56b236 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfViewCollectionLogMapper.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/AfViewCollectionLogMapper.java @@ -1,7 +1,7 @@ -package com.docus.server.archivefile.mapper; +package com.docus.server.archivefile.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog; +import com.docus.server.archivefile.infrastructure.entity.AfViewCollectionLog; import org.apache.ibatis.annotations.Mapper; /** diff --git a/common-collect/src/main/java/com/docus/server/collect/web/mapper/TaskConfigMapper.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskConfigMapper.java similarity index 58% rename from common-collect/src/main/java/com/docus/server/collect/web/mapper/TaskConfigMapper.java rename to common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskConfigMapper.java index a76ac0a..b552966 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/mapper/TaskConfigMapper.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskConfigMapper.java @@ -1,7 +1,7 @@ -package com.docus.server.collect.web.mapper; +package com.docus.server.archivefile.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskMessageMapper.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskMessageMapper.java new file mode 100644 index 0000000..0f602dd --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskMessageMapper.java @@ -0,0 +1,14 @@ +package com.docus.server.archivefile.infrastructure.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.docus.server.archivefile.infrastructure.entity.TaskMessage; +import org.apache.ibatis.annotations.Mapper; + +/** + * Mapper 接口 + * Generated on 2023-06-01 + */ +@Mapper +public interface TaskMessageMapper extends BaseMapper { + +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskMessageRetryLogMapper.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskMessageRetryLogMapper.java new file mode 100644 index 0000000..e3201be --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskMessageRetryLogMapper.java @@ -0,0 +1,14 @@ +package com.docus.server.archivefile.infrastructure.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.docus.server.archivefile.infrastructure.entity.TaskMessageRetryLog; +import org.apache.ibatis.annotations.Mapper; + +/** + * 被动接收任务表 Mapper 接口 + * Generated on 2023-06-25 + */ +@Mapper +public interface TaskMessageRetryLogMapper extends BaseMapper { + +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfCollectSysDictionaryService.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfCollectSysDictionaryService.java index 4d24516..071b86d 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfCollectSysDictionaryService.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfCollectSysDictionaryService.java @@ -1,6 +1,6 @@ package com.docus.server.archivefile.service; -import com.docus.server.archivefile.pojo.entity.CollectsysDictionary; +import com.docus.server.archivefile.infrastructure.entity.CollectsysDictionary; import java.util.List; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfViewCollectionLogService.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfViewCollectionLogService.java index 8c87cb9..4985e58 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfViewCollectionLogService.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfViewCollectionLogService.java @@ -1,6 +1,6 @@ package com.docus.server.archivefile.service; -import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog; +import com.docus.server.archivefile.infrastructure.entity.AfViewCollectionLog; import java.util.List; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskConfigService.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskConfigService.java similarity index 70% rename from common-collect/src/main/java/com/docus/server/collect/web/service/ITaskConfigService.java rename to common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskConfigService.java index 68850b8..8a5bb39 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskConfigService.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskConfigService.java @@ -1,6 +1,6 @@ -package com.docus.server.collect.web.service; +package com.docus.server.archivefile.service; -import com.docus.server.collect.web.common.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import java.util.Date; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskMessageRetryLogService.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskMessageRetryLogService.java new file mode 100644 index 0000000..df4079b --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskMessageRetryLogService.java @@ -0,0 +1,4 @@ +package com.docus.server.archivefile.service; + +public interface ITaskMessageRetryLogService { +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskMessageService.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskMessageService.java new file mode 100644 index 0000000..f01679e --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskMessageService.java @@ -0,0 +1,17 @@ +package com.docus.server.archivefile.service; + +import com.docus.server.archivefile.infrastructure.entity.TaskMessage; +import com.docus.server.enums.CollectTypeEnum; +import com.docus.server.enums.StateEnum; + +import java.util.List; + +public interface ITaskMessageService { + + Long insertTaskMessage(String json, String xml, CollectTypeEnum collectType, String retryKey); + + void updateTaskMessage(Long id, String json, String exMessageResult, StateEnum stateEnum); + + List findByState(StateEnum stateEnum); + +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfCollectSysDictionaryImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfCollectSysDictionaryImpl.java index 7c6db8d..f610ff9 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfCollectSysDictionaryImpl.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfCollectSysDictionaryImpl.java @@ -1,7 +1,7 @@ package com.docus.server.archivefile.service.impl; -import com.docus.server.archivefile.dao.IAfCollectSysDictionaryDao; -import com.docus.server.archivefile.pojo.entity.CollectsysDictionary; +import com.docus.server.archivefile.infrastructure.dao.impl.IAfCollectSysDictionaryDao; +import com.docus.server.archivefile.infrastructure.entity.CollectsysDictionary; import com.docus.server.archivefile.service.IAfCollectSysDictionaryService; import org.springframework.stereotype.Service; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfViewCollectionLogServiceImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfViewCollectionLogServiceImpl.java index 2bf74ed..dd296e2 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfViewCollectionLogServiceImpl.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfViewCollectionLogServiceImpl.java @@ -1,8 +1,8 @@ package com.docus.server.archivefile.service.impl; import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.server.archivefile.dao.IAfViewCollectionLogDao; -import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog; +import com.docus.server.archivefile.infrastructure.dao.impl.IAfViewCollectionLogDao; +import com.docus.server.archivefile.infrastructure.entity.AfViewCollectionLog; import com.docus.server.archivefile.service.IAfViewCollectionLogService; import org.springframework.stereotype.Service; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskConfigServiceImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigServiceImpl.java similarity index 82% rename from common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskConfigServiceImpl.java rename to common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigServiceImpl.java index ae84989..f6f244d 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskConfigServiceImpl.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigServiceImpl.java @@ -1,8 +1,8 @@ -package com.docus.server.collect.web.service.impl; +package com.docus.server.archivefile.service.impl; -import com.docus.server.collect.web.common.entity.TaskConfig; -import com.docus.server.collect.web.dao.ITaskConfigDao; -import com.docus.server.collect.web.service.ITaskConfigService; +import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.archivefile.infrastructure.dao.impl.ITaskConfigDao; +import com.docus.server.archivefile.service.ITaskConfigService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskMessageRetryLogServiceImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskMessageRetryLogServiceImpl.java new file mode 100644 index 0000000..5484bf0 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskMessageRetryLogServiceImpl.java @@ -0,0 +1,17 @@ +package com.docus.server.archivefile.service.impl; + +import com.docus.server.archivefile.convert.TaskMessageConverter; +import com.docus.server.archivefile.infrastructure.dao.ITaskMessageDao; +import com.docus.server.archivefile.service.ITaskMessageRetryLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class TaskMessageRetryLogServiceImpl implements ITaskMessageRetryLogService { + @Resource + private TaskMessageConverter converter; + @Resource + private ITaskMessageDao taskMessageDao; + +} \ No newline at end of file diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskMessageServiceImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskMessageServiceImpl.java new file mode 100644 index 0000000..3429ac0 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskMessageServiceImpl.java @@ -0,0 +1,55 @@ +package com.docus.server.archivefile.service.impl; + +import com.docus.core.util.DateUtil; +import com.docus.core.util.Func; +import com.docus.server.archivefile.infrastructure.entity.TaskMessage; +import com.docus.server.archivefile.convert.TaskMessageConverter; +import com.docus.server.archivefile.infrastructure.dao.impl.ITaskMessageDao; +import com.docus.server.archivefile.service.ITaskMessageService; +import com.docus.server.enums.CollectTypeEnum; +import com.docus.server.enums.StateEnum; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class TaskMessageServiceImpl implements ITaskMessageService { + @Resource + private TaskMessageConverter converter; + @Resource + private ITaskMessageDao taskMessageDao; + + /** + * 新增 ws xml 原始报文 + */ + @Transactional(rollbackFor = Exception.class) + @Override + public Long insertTaskMessage(String json, String xml, CollectTypeEnum collectType, String retryKey) { + TaskMessage taskOriginalMessage = converter.toConvertTaskOriginalMessageDO(json, xml, collectType, retryKey); + taskMessageDao.save(taskOriginalMessage); + return taskOriginalMessage.getId(); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public void updateTaskMessage(Long id, String json, String exMessageResult, StateEnum stateEnum) { + if (null == id) { + return; + } + TaskMessage taskOriginalMessage = taskMessageDao.findById(id); + if (Func.isNotEmpty(taskOriginalMessage)) { + taskOriginalMessage.setJsonStr(json); + taskOriginalMessage.setUpdateTime(DateUtil.now()); + taskOriginalMessage.setState(stateEnum); + taskOriginalMessage.setErrorMsg(exMessageResult); + taskMessageDao.updateById(taskOriginalMessage); + } + } + + @Override + public List findByState(StateEnum stateEnum) { + return taskMessageDao.findBy("state", stateEnum); + } +} diff --git a/common-docus/docus-archivefile/src/main/resources/mapper/AfCollectTaskMapper.xml b/common-docus/docus-archivefile/src/main/resources/mapper/AfCollectTaskMapper.xml index 7356aa5..ed002db 100644 --- a/common-docus/docus-archivefile/src/main/resources/mapper/AfCollectTaskMapper.xml +++ b/common-docus/docus-archivefile/src/main/resources/mapper/AfCollectTaskMapper.xml @@ -2,14 +2,14 @@ - + INSERT INTO `docus_archivefile`.`af_collect_task`(`id`, `patient_id`, `sysflag`, `state`, `C1`,`C2`, `C3`) VALUES (#{task.id}, #{task.patientId}, #{task.sysflag}, '0', #{task.C1}, #{task.C2}, #{task.C3}); - select * from `docus_archivefile`.`af_collect_task` where `id` = #{id} diff --git a/common-docus/docus-archivefile/src/main/resources/mapper/AfJobTimeMapper.xml b/common-docus/docus-archivefile/src/main/resources/mapper/AfJobTimeMapper.xml index 44b99fc..c37a145 100644 --- a/common-docus/docus-archivefile/src/main/resources/mapper/AfJobTimeMapper.xml +++ b/common-docus/docus-archivefile/src/main/resources/mapper/AfJobTimeMapper.xml @@ -2,7 +2,7 @@ - + INSERT INTO `docus_archivefile`.`af_job_time`(`id`, `update_time`, `job_type`) VALUES (#{afJobTime.id}, #{afJobTime.updateTime}, #{afJobTime.jobType}); @@ -14,7 +14,7 @@ WHERE `id` = #{afJobTime.id}; - select id, DATE_FORMAT(update_time,'%Y-%m-%d %H:%i:%s') as updateTime,job_type as jobType from `docus_archivefile`.`af_job_time` where job_type= #{jobType} diff --git a/common-docus/docus-archivefile/src/main/resources/mapper/AfReportRecordMapper.xml b/common-docus/docus-archivefile/src/main/resources/mapper/AfReportRecordMapper.xml index da2483d..1b701e3 100644 --- a/common-docus/docus-archivefile/src/main/resources/mapper/AfReportRecordMapper.xml +++ b/common-docus/docus-archivefile/src/main/resources/mapper/AfReportRecordMapper.xml @@ -2,7 +2,7 @@ - + INSERT INTO `docus_archivefile`.`af_report_record`(`task_id`, `inpatient_no`, `jzh`, `admiss_times`, `down_url`, @@ -35,7 +35,7 @@ where `task_id` = #{taskId} - select * from `docus_archivefile`.`af_report_record` where `task_id` = #{taskId} @@ -58,7 +58,7 @@ #{taskId} - SELECT `task_id`, `inpatient_no`, `admiss_times`, `patient_id` FROM `docus_archivefile`.`af_report_record` WHERE `state` = 0 diff --git a/docus-client-interface/src/main/java/com/docus/server/annotation/CacheLayer.java b/docus-client-interface/src/main/java/com/docus/server/annotation/CacheLayer.java new file mode 100644 index 0000000..a3bafac --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/annotation/CacheLayer.java @@ -0,0 +1,17 @@ +package com.docus.server.annotation; + +import org.springframework.stereotype.Component; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@Component +public @interface CacheLayer { + String value() default ""; +} diff --git a/docus-client-interface/src/main/java/com/docus/server/util/A.java b/docus-client-interface/src/main/java/com/docus/server/util/A.java deleted file mode 100644 index b15d6be..0000000 --- a/docus-client-interface/src/main/java/com/docus/server/util/A.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.docus.server.util; - -/** - * @author linruifeng - * @date 2023/6/14 11:35 - */ -public class A { -} diff --git a/common-collect/src/main/java/com/docus/server/collect/web/utils/DateSpiltUtil.java b/docus-client-interface/src/main/java/com/docus/server/util/DateSpiltUtil.java similarity index 96% rename from common-collect/src/main/java/com/docus/server/collect/web/utils/DateSpiltUtil.java rename to docus-client-interface/src/main/java/com/docus/server/util/DateSpiltUtil.java index 5700c95..56c6f94 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/utils/DateSpiltUtil.java +++ b/docus-client-interface/src/main/java/com/docus/server/util/DateSpiltUtil.java @@ -1,4 +1,4 @@ -package com.docus.server.collect.web.utils; +package com.docus.server.util; import java.util.ArrayList; import java.util.Date; diff --git a/docus-client-interface/src/main/java/com/docus/server/util/ExceptionUtils.java b/docus-client-interface/src/main/java/com/docus/server/util/ExceptionUtils.java new file mode 100644 index 0000000..c0bc7d2 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/util/ExceptionUtils.java @@ -0,0 +1,14 @@ +package com.docus.server.util; + +import jodd.exception.ExceptionUtil; + +public class ExceptionUtils { + + public static String getExceptionMessage(Throwable ex) { + String errorMessage = ExceptionUtil.exceptionChainToString(ex); + if (null != errorMessage && errorMessage.length() > 1000) { + return errorMessage.substring(0, 1000); + } + return errorMessage; + } +} diff --git a/common-collect/src/main/java/com/docus/server/collect/web/utils/PeriodTime.java b/docus-client-interface/src/main/java/com/docus/server/util/PeriodTime.java similarity index 90% rename from common-collect/src/main/java/com/docus/server/collect/web/utils/PeriodTime.java rename to docus-client-interface/src/main/java/com/docus/server/util/PeriodTime.java index b830d5b..a7c0bcb 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/utils/PeriodTime.java +++ b/docus-client-interface/src/main/java/com/docus/server/util/PeriodTime.java @@ -1,4 +1,4 @@ -package com.docus.server.collect.web.utils; +package com.docus.server.util; import com.docus.core.util.Func; import lombok.AllArgsConstructor;