From f0db03d3f084635b48647c4743bfd5de4d2cef5b Mon Sep 17 00:00:00 2001 From: linrf Date: Wed, 28 Jun 2023 18:25:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BB=BB=E5=8A=A1=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/http/HttpTBasicCollectorImpl.java | 2 +- .../basic/ws/WsBasicCollectorImpl.java | 2 +- .../dept/http/HttpDeptCollectorImpl.java | 2 +- .../collect/dept/ws/WsDeptCollectorImpl.java | 2 +- .../noview/DefJobNoViewCollectorImpl.java | 2 +- .../user/http/HttpUserCollectorImpl.java | 2 +- .../collect/user/ws/WsUserCollectorImpl.java | 2 +- collect-sdry/src/main/resources/logback.xml | 12 ++-- .../com/docus/server/collect/ICollector.java | 2 +- .../java/com/docus/server/collect/IJob.java | 2 +- .../basic/http/TBasicHttpCollectJob.java | 2 +- .../basic/http/test/TestRestController.java | 12 +++- .../basic/view/TBasicViewCollectJob.java | 2 +- .../collect/basic/ws/TBasicWsCollectJob.java | 2 +- .../collect/dept/http/DeptHttpCollectJob.java | 2 +- .../collect/dept/view/DeptViewCollectJob.java | 2 +- .../collect/dept/ws/DeptWsCollectJob.java | 2 +- .../report/noview/DefNoViewCollectionJob.java | 2 +- .../collect/report/view/BlViewCollectJob.java | 2 +- .../report/view/EcgViewCollectJob.java | 2 +- .../report/view/EmrViewCollectJob.java | 2 +- .../collect/report/view/HlViewCollectJob.java | 2 +- .../report/view/IssubmitViewCollectJob.java | 2 +- .../report/view/LisViewCollectJob.java | 2 +- .../report/view/PacsViewCollectJob.java | 2 +- .../report/view/VteViewCollectJob.java | 2 +- .../collect/report/view/ZzViewCollectJob.java | 2 +- .../collect/user/http/UserHttpCollectJob.java | 2 +- .../collect/user/view/UserViewCollectJob.java | 2 +- .../collect/user/ws/UserWsCollectJob.java | 2 +- .../collect/web/job/AbstractCollectJob.java | 2 +- .../server/collect/web/job/TrackRetryJob.java | 2 +- .../web/service/TrackRetryService.java | 4 +- .../controller/TaskConfigController.java | 66 ++++++++++++++++++ .../controller/TaskMessageController.java | 56 ++++++++++++++++ .../TaskMessageRetryLogController.java | 40 +++++++++++ .../convert/TaskMessageConvert.java | 21 ++++++ .../convert/TaskMessageConverter.java | 20 +++++- .../convert/TaskMessageRetryLogConverter.java | 8 +++ .../infrastructure/dao/ITaskConfigDao.java | 5 +- .../infrastructure/dao/ITaskMessageDao.java | 7 +- .../dao/ITaskMessageRetryLogDao.java | 5 +- .../dao/impl/TaskConfigDaoImpl.java | 36 +++++++++- .../dao/impl/TaskMessageDaoImpl.java | 38 ++++++++++- .../dao/impl/TaskMessageRetryLogDaoImpl.java | 37 +++++++++- .../mapper/TaskConfigMapper.java | 2 +- .../mapper/TaskMessageMapper.java | 2 +- .../mapper/TaskMessageRetryLogMapper.java | 2 +- .../service/ITaskConfigService.java | 10 ++- .../service/ITaskMessageRetryLogService.java | 11 +++ .../service/ITaskMessageService.java | 7 +- .../service/impl/TaskConfigServiceImpl.java | 21 ++++-- .../impl/TaskMessageRetryLogServiceImpl.java | 26 +++++-- .../service/impl/TaskMessageServiceImpl.java | 14 +++- .../resources/mapper/TaskConfigMapper.xml | 27 ++++++++ .../resources/mapper/TaskMessageMapper.xml | 26 +++++++ .../mapper/TaskMessageRetryLogMapper.xml | 27 ++++++++ .../service/impl/PowerUserServiceImpl.java | 4 +- .../common/GlobalResponseBodyAdvice.java | 51 ++++++++++++++ .../server/api/archivefile/TaskConfigApi.java | 67 +++++++++++++++++++ .../api/archivefile/TaskMessageApi.java | 39 +++++++++++ .../archivefile/TaskMessageRetryLogApi.java | 39 +++++++++++ .../main/java/com/docus/server/entity/A.java | 4 -- .../com/docus/server}/entity/TaskConfig.java | 25 +++++-- .../com/docus/server}/entity/TaskMessage.java | 2 +- .../docus/server/entity/TaskMessageExt.java | 14 ++++ .../server}/entity/TaskMessageRetryLog.java | 2 +- .../com/docus/server/vo/TaskMessageVO.java | 48 +++++++++++++ 68 files changed, 821 insertions(+), 76 deletions(-) create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigController.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskMessageController.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskMessageRetryLogController.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageConvert.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageRetryLogConverter.java create mode 100644 common-docus/docus-archivefile/src/main/resources/mapper/TaskConfigMapper.xml create mode 100644 common-docus/docus-archivefile/src/main/resources/mapper/TaskMessageMapper.xml create mode 100644 common-docus/docus-archivefile/src/main/resources/mapper/TaskMessageRetryLogMapper.xml create mode 100644 docus-api-common/src/main/java/com/docus/server/common/GlobalResponseBodyAdvice.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigApi.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageApi.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageRetryLogApi.java delete mode 100644 docus-client-interface/src/main/java/com/docus/server/entity/A.java rename {common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure => docus-client-interface/src/main/java/com/docus/server}/entity/TaskConfig.java (65%) rename {common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure => docus-client-interface/src/main/java/com/docus/server}/entity/TaskMessage.java (97%) create mode 100644 docus-client-interface/src/main/java/com/docus/server/entity/TaskMessageExt.java rename {common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure => docus-client-interface/src/main/java/com/docus/server}/entity/TaskMessageRetryLog.java (97%) create mode 100644 docus-client-interface/src/main/java/com/docus/server/vo/TaskMessageVO.java 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 2ab3dc2..275a0c5 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,7 +1,7 @@ package com.docus.server.collect.basic.http; import com.docus.server.collect.AbstractHttpCollector; -import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.util.PeriodTime; import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.google.common.collect.Lists; 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 dc63686..871194d 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,7 +1,7 @@ package com.docus.server.collect.basic.ws; import com.docus.server.collect.AbstractWsCollector; -import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.util.PeriodTime; import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.google.common.collect.Lists; 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 db1445e..b2842cf 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,7 +1,7 @@ package com.docus.server.collect.dept.http; import com.docus.server.collect.AbstractHttpCollector; -import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.util.PeriodTime; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.google.common.collect.Lists; 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 a9bca5a..71a62b1 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,7 +1,7 @@ package com.docus.server.collect.dept.ws; import com.docus.server.collect.AbstractWsCollector; -import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.util.PeriodTime; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.google.common.collect.Lists; 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 b774205..52f1056 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,7 +5,7 @@ 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.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.enums.QueryWayEnum; import com.docus.server.util.PeriodTime; import org.springframework.stereotype.Component; 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 e3390d8..409789f 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,7 +1,7 @@ package com.docus.server.collect.user.http; import com.docus.server.collect.AbstractHttpCollector; -import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.util.PeriodTime; import com.docus.server.sys.common.pojo.dto.UserDTO; import com.google.common.collect.Lists; 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 4032a18..8ae5a31 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,7 +1,7 @@ package com.docus.server.collect.user.ws; import com.docus.server.collect.AbstractWsCollector; -import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.util.PeriodTime; import com.docus.server.sys.common.pojo.dto.UserDTO; import com.google.common.collect.Lists; diff --git a/collect-sdry/src/main/resources/logback.xml b/collect-sdry/src/main/resources/logback.xml index 95faea9..df6f6ae 100644 --- a/collect-sdry/src/main/resources/logback.xml +++ b/collect-sdry/src/main/resources/logback.xml @@ -9,11 +9,11 @@ - - - - - + + + + + @@ -53,7 +53,7 @@ - + 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 baa9e62..6cb44e8 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,6 +1,6 @@ package com.docus.server.collect; -import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.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 956c5dd..92bd859 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,6 +1,6 @@ package com.docus.server.collect; -import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.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 988870c..e015fc2 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,7 +1,7 @@ package com.docus.server.collect.basic.http; import com.docus.server.collect.ICollector; -import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.util.PeriodTime; import com.docus.server.record.common.pojo.dto.TBasicDTO; 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 a7a95db..b1f2350 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 @@ -6,12 +6,12 @@ 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.entity.TaskMessage; +import com.docus.server.archivefile.service.ITaskMessageService; import com.docus.server.collect.IConverter; import com.docus.server.collect.IHttpResult; -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.archivefile.service.ITaskMessageService; import com.docus.server.enums.CollectTypeEnum; import com.docus.server.enums.StateEnum; import com.github.pagehelper.PageHelper; @@ -68,4 +68,12 @@ public class TestRestController { return CommonResult.success(pageResult); } + + @ApiOperation("TEST-4") + @GetMapping("/get4") + public PageResult get4() throws Exception { + PageHelper.startPage(1, 10); + List list = messageService.findByState(StateEnum.OK); + return new PageResult<>(list); + } } 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 149116f..b65ce08 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,7 +1,7 @@ package com.docus.server.collect.basic.view; import com.docus.server.collect.ICollector; -import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.util.PeriodTime; import com.docus.server.his.service.IHisService; 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 a3b34ce..ac56f41 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,7 +1,7 @@ package com.docus.server.collect.basic.ws; import com.docus.server.collect.ICollector; -import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.util.PeriodTime; import com.docus.server.record.common.pojo.dto.TBasicDTO; 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 f50206c..ba63d96 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,7 +1,7 @@ package com.docus.server.collect.dept.http; import com.docus.server.collect.ICollector; -import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.util.PeriodTime; import com.docus.server.sys.common.pojo.dto.DeptDTO; 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 beb18b9..4292065 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,7 +1,7 @@ package com.docus.server.collect.dept.view; import com.docus.server.collect.ICollector; -import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.util.PeriodTime; import com.docus.server.his.service.IHisService; 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 7aa8721..9ba8f72 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,7 +1,7 @@ package com.docus.server.collect.dept.ws; import com.docus.server.collect.ICollector; -import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.util.PeriodTime; import com.docus.server.sys.common.pojo.dto.DeptDTO; 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 ee6f0e7..445c594 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,7 +3,7 @@ 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.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.util.PeriodTime; import com.xxl.job.core.handler.annotation.XxlJob; 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 a1a9d95..ed43b81 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,7 +4,7 @@ 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.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; 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 9f21683..682dd7c 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,7 +3,7 @@ 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.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; 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 cd2e2aa..6cddbf3 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,7 +3,7 @@ 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.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; 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 25ffef4..096b1b3 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,7 +3,7 @@ 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.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; 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 e9296dc..5dd72b4 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,7 +3,7 @@ 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.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; 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 8e5b91f..8611b78 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,7 +3,7 @@ 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.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; 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 5e6e687..71b2493 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,7 +3,7 @@ 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.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; 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 bd1a0de..eb0d816 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,7 +3,7 @@ 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.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; 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 41703a2..fe3a009 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,7 +3,7 @@ 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.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; 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 5c107b5..93a71c2 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,7 +1,7 @@ package com.docus.server.collect.user.http; import com.docus.server.collect.ICollector; -import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.util.PeriodTime; import com.docus.server.sys.common.pojo.dto.UserDTO; 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 21e5aee..4db7810 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,7 +4,7 @@ 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.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.util.PeriodTime; import com.docus.server.his.service.IHisService; 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 c8fe514..604d569 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,7 +1,7 @@ package com.docus.server.collect.user.ws; import com.docus.server.collect.ICollector; -import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.util.PeriodTime; import com.docus.server.sys.common.pojo.dto.UserDTO; 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 d4f9ff9..d77b4ef 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,7 +2,7 @@ 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.entity.TaskConfig; import com.docus.server.archivefile.service.ITaskConfigService; import com.docus.server.collect.IJob; import com.docus.server.collect.web.service.CollectService; 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 1d746c5..38f90d0 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,6 +1,6 @@ package com.docus.server.collect.web.job; -import com.docus.server.archivefile.infrastructure.entity.TaskMessage; +import com.docus.server.entity.TaskMessage; import com.docus.server.archivefile.service.ITaskMessageService; import com.docus.server.collect.web.service.TrackRetryService; import com.docus.server.enums.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 79a2d79..32ec05e 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 @@ -7,8 +7,8 @@ import com.docus.log.executor.TrackRetrySpringExecutor; import com.docus.log.handler.IJobHandler; import com.docus.log.handler.impl.MethodJobHandler; 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.entity.TaskMessage; +import com.docus.server.entity.TaskMessageRetryLog; import com.docus.server.enums.StateEnum; import com.docus.server.util.ExceptionUtils; import lombok.extern.slf4j.Slf4j; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigController.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigController.java new file mode 100644 index 0000000..e67df02 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigController.java @@ -0,0 +1,66 @@ +package com.docus.server.archivefile.controller; + +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.api.archivefile.TaskConfigApi; +import com.docus.server.archivefile.service.ITaskConfigService; +import com.docus.server.entity.TaskConfig; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * Controller + * Generated on 2023-06-28 + */ +@RestController +public class TaskConfigController implements TaskConfigApi { + @Resource + private ITaskConfigService taskConfigService; + + /** + * 按主键查询 + * + * @param id 主键Id + * @return 实体 + */ + @Override + public TaskConfig find(String id) { + return taskConfigService.getTaskConfigById(id); + } + + /** + * 关键字搜素 + * + * @param searchRequest 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchRequest searchRequest) { + return taskConfigService.search(searchRequest); + } + + /** + * 新增或编辑 + * + * @param taskConfig 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean saveOrUpdate(TaskConfig taskConfig) { + return taskConfigService.updateTaskConfig(taskConfig); + } + + /** + * 批量删除 + * + * @param ids 主键ids + * @return 成功或失败 + */ + @Override + public int delete(List ids) { + return taskConfigService.deleteTaskConfig(ids); + } + +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskMessageController.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskMessageController.java new file mode 100644 index 0000000..6e8c751 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskMessageController.java @@ -0,0 +1,56 @@ +package com.docus.server.archivefile.controller; + +import com.docus.core.util.ListUtils; +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.api.archivefile.TaskMessageApi; +import com.docus.server.archivefile.convert.TaskMessageConvert; +import com.docus.server.archivefile.convert.TaskMessageConverter; +import com.docus.server.archivefile.service.ITaskMessageRetryLogService; +import com.docus.server.archivefile.service.ITaskMessageService; +import com.docus.server.entity.TaskMessage; +import com.docus.server.entity.TaskMessageRetryLog; +import com.docus.server.vo.TaskMessageVO; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 被动接收任务表 Controller + * Generated on 2023-06-28 + */ +@RestController +public class TaskMessageController implements TaskMessageApi { + @Resource + private ITaskMessageService taskMessageService; + @Resource + private ITaskMessageRetryLogService taskMessageRetryLogService; + @Resource + private TaskMessageConverter taskMessageConverter; + + /** + * 按主键查询 + * + * @param id 主键Id + * @return实体 + */ + @Override + public TaskMessageVO find(String id) { + TaskMessage taskMessage = taskMessageService.findById(id); + return TaskMessageConvert.INSTANCE.convert(taskMessage); + } + + /* + * 关键字搜素 + * @param searchRequest 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchRequest searchRequest) { + PageResult pageResult = taskMessageService.search(searchRequest); + List retryLogs = taskMessageRetryLogService.findByTaskIds(ListUtils.distinctSelect(pageResult.getList(), TaskMessage::getId)); + List taskMessages = taskMessageConverter.toTaskMessageVO(pageResult.getList(), retryLogs); + return new PageResult<>(taskMessages, pageResult.getTotal(), pageResult.getPageNum(), pageResult.getPageSize()); + } +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskMessageRetryLogController.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskMessageRetryLogController.java new file mode 100644 index 0000000..a32e2ec --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskMessageRetryLogController.java @@ -0,0 +1,40 @@ +package com.docus.server.archivefile.controller; + +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.api.archivefile.TaskMessageRetryLogApi; +import com.docus.server.archivefile.service.ITaskMessageRetryLogService; +import com.docus.server.entity.TaskMessageRetryLog; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RestController; + +/** + * 任务消息重试表 Controller + * Generated on 2023-06-28 + */ +@RestController +public class TaskMessageRetryLogController implements TaskMessageRetryLogApi { + @Autowired + private ITaskMessageRetryLogService taskMessageRetryLogService; + + /** + * 按主键查询 + * + * @param id 主键Id + * @return实体 + */ + @Override + public TaskMessageRetryLog find(String id) { + return taskMessageRetryLogService.findById(id); + } + + /* + * 关键字搜素 + * @param searchRequest 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchRequest searchRequest) { + return taskMessageRetryLogService.search(searchRequest); + } +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageConvert.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageConvert.java new file mode 100644 index 0000000..6b00f22 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageConvert.java @@ -0,0 +1,21 @@ +package com.docus.server.archivefile.convert; + +import com.docus.server.entity.TaskMessage; +import com.docus.server.vo.TaskMessageVO; +import org.mapstruct.Mapper; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +@Mapper +public interface TaskMessageConvert { + + TaskMessageConvert INSTANCE = Mappers.getMapper(TaskMessageConvert.class); + + @Mappings({}) + TaskMessageVO convert(TaskMessage taskMessage); + + @Mappings({}) + List convert(List taskMessages); +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageConverter.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageConverter.java index 1a04f00..6aa468a 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageConverter.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageConverter.java @@ -1,13 +1,19 @@ package com.docus.server.archivefile.convert; import com.docus.core.util.DateUtil; +import com.docus.core.util.ListUtils; +import com.docus.core.util.property.Setters; import com.docus.infrastructure.redis.service.IdService; -import com.docus.server.archivefile.infrastructure.entity.TaskMessage; +import com.docus.server.entity.TaskMessage; +import com.docus.server.entity.TaskMessageRetryLog; import com.docus.server.enums.CollectTypeEnum; import com.docus.server.enums.StateEnum; +import com.docus.server.vo.TaskMessageVO; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import java.util.List; +import java.util.Map; @Component public class TaskMessageConverter { @@ -28,4 +34,16 @@ public class TaskMessageConverter { taskOriginalMessage.setUpdateTime(DateUtil.now()); return taskOriginalMessage; } + + public List toTaskMessageVO(List list, List taskMessageRetryLogs) { + Map longTaskMessageRetryLogMap = ListUtils.toMap(taskMessageRetryLogs, TaskMessageRetryLog::getMessageId); + + List taskMessageVOList = TaskMessageConvert.INSTANCE.convert(list); + + return Setters.instance().list(taskMessageVOList).cycleSetProperties(taskMessage -> { + if (longTaskMessageRetryLogMap.containsKey(taskMessage.getId())) { + taskMessage.setHaveRetryLog(true); + } + }); + } } diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageRetryLogConverter.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageRetryLogConverter.java new file mode 100644 index 0000000..a789ce2 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageRetryLogConverter.java @@ -0,0 +1,8 @@ +package com.docus.server.archivefile.convert; + +import org.springframework.stereotype.Component; + +@Component +public class TaskMessageRetryLogConverter { + +} 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 index 3a8110c..364af1b 100644 --- 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 @@ -1,7 +1,10 @@ package com.docus.server.archivefile.infrastructure.dao; import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.TaskConfig; public interface ITaskConfigDao extends IBaseDao { + PageResult searchTaskConfig(SearchRequest searchRequest); } 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 index af6fdb4..7f1ff93 100644 --- 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 @@ -1,8 +1,11 @@ package com.docus.server.archivefile.infrastructure.dao; - import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.server.archivefile.infrastructure.entity.TaskMessage; +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.TaskMessage; public interface ITaskMessageDao extends IBaseDao { + + PageResult searchTaskMessage(SearchRequest request); } 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 index f3b3e26..41660dc 100644 --- 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 @@ -1,7 +1,10 @@ package com.docus.server.archivefile.infrastructure.dao; import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.server.archivefile.infrastructure.entity.TaskMessageRetryLog; +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.TaskMessageRetryLog; public interface ITaskMessageRetryLogDao extends IBaseDao { + PageResult search(SearchRequest searchRequest); } 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 index 5bc999e..783c1c9 100644 --- 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 @@ -1,13 +1,47 @@ 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.core.util.Func; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; 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 com.docus.server.entity.TaskConfig; +import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository public class TaskConfigDaoImpl extends BaseDaoImpl implements ITaskConfigDao { + @Override + public PageResult searchTaskConfig(SearchRequest searchRequest) { + PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize()); + + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + //时间范围，默认按createTime + if (searchRequest.getBeginTime() != null) { + query.ge(TaskConfig::getCreateTime, searchRequest.getBeginTime()); + } + if (searchRequest.getEndTime() != null) { + query.le(TaskConfig::getCreateTime, searchRequest.getEndTime()); + } + if (searchRequest.getParams("state") != null) { + query.eq(TaskConfig::getState, searchRequest.getParams("state")); + } + if (Func.isNotBlank(searchRequest.getKeyword())) { + query.like(TaskConfig::getName, String.format("%s%s%s", "%", searchRequest.getKeyword(), "%")); + } + if (searchRequest.getParams("type") != null) { + query.eq(TaskConfig::getType, searchRequest.getParams("type")); + } + //默认createTime倒序排序 + query.orderByDesc(TaskConfig::getCreateTime); + List list = super.find(query); + return new PageResult<>(list); + } } 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 index 8f10ea2..325d368 100644 --- 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 @@ -1,11 +1,47 @@ 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.core.util.Func; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; 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 com.docus.server.entity.TaskMessage; +import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository public class TaskMessageDaoImpl extends BaseDaoImpl implements ITaskMessageDao { + + @Override + public PageResult searchTaskMessage(SearchRequest searchRequest) { + PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize()); + + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + //时间范围，默认按createTime + if (searchRequest.getBeginTime() != null) { + query.ge(TaskMessage::getCreateTime, searchRequest.getBeginTime()); + } + if (searchRequest.getEndTime() != null) { + query.le(TaskMessage::getCreateTime, searchRequest.getEndTime()); + } + if (searchRequest.getParams("state") != null) { + query.eq(TaskMessage::getState, searchRequest.getParams("state")); + } + if (Func.isNotBlank(searchRequest.getKeyword())) { + query.like(TaskMessage::getName, String.format("%s%s%s", "%", searchRequest.getKeyword(), "%")); + } + if (searchRequest.getParams("collectType") != null) { + query.eq(TaskMessage::getCollectType, searchRequest.getParams("collectType")); + } + + //默认createTime倒序排序 + query.orderByDesc(TaskMessage::getCreateTime); + List list = super.find(query); + return new PageResult<>(list); + } } 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 index 396a395..7fdd1d4 100644 --- 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 @@ -1,11 +1,46 @@ 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.core.util.Func; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; 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 com.docus.server.entity.TaskMessageRetryLog; +import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository public class TaskMessageRetryLogDaoImpl extends BaseDaoImpl implements ITaskMessageRetryLogDao { + @Override + public PageResult search(SearchRequest searchRequest) { + PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize()); + + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + //时间范围，默认按createTime + if (searchRequest.getBeginTime() != null) { + query.ge(TaskMessageRetryLog::getCreateTime, searchRequest.getBeginTime()); + } + if (searchRequest.getEndTime() != null) { + query.le(TaskMessageRetryLog::getCreateTime, searchRequest.getEndTime()); + } + if (searchRequest.getParams("state") != null) { + query.eq(TaskMessageRetryLog::getState, searchRequest.getParams("state")); + } + if (Func.isNotBlank(searchRequest.getKeyword())) { + query.like(TaskMessageRetryLog::getName, String.format("%s%s%s", "%", searchRequest.getKeyword(), "%")); + } + if (searchRequest.getParams("collectType") != null) { + query.eq(TaskMessageRetryLog::getCollectType, searchRequest.getParams("collectType")); + } + + //默认createTime倒序排序 + query.orderByDesc(TaskMessageRetryLog::getCreateTime); + List list = super.find(query); + return new PageResult<>(list); + } } diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskConfigMapper.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskConfigMapper.java index b552966..6c4b886 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/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.archivefile.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.server.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 index 0f602dd..26a6d6f 100644 --- 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 @@ -1,7 +1,7 @@ package com.docus.server.archivefile.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.docus.server.archivefile.infrastructure.entity.TaskMessage; +import com.docus.server.entity.TaskMessage; import org.apache.ibatis.annotations.Mapper; /** 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 index e3201be..38df899 100644 --- 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 @@ -1,7 +1,7 @@ package com.docus.server.archivefile.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.docus.server.archivefile.infrastructure.entity.TaskMessageRetryLog; +import com.docus.server.entity.TaskMessageRetryLog; import org.apache.ibatis.annotations.Mapper; /** diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskConfigService.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskConfigService.java index 8a5bb39..74ef3ae 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskConfigService.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskConfigService.java @@ -1,8 +1,11 @@ package com.docus.server.archivefile.service; -import com.docus.server.archivefile.infrastructure.entity.TaskConfig; +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.TaskConfig; import java.util.Date; +import java.util.List; public interface ITaskConfigService { @@ -12,6 +15,9 @@ public interface ITaskConfigService { TaskConfig getTaskConfigById(String taskConfigId); - void updateTaskConfig(TaskConfig taskConfig); + boolean updateTaskConfig(TaskConfig taskConfig); + PageResult search(SearchRequest searchRequest); + + int deleteTaskConfig(List ids); } 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 index df4079b..2a95f92 100644 --- 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 @@ -1,4 +1,15 @@ package com.docus.server.archivefile.service; +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.TaskMessageRetryLog; + +import java.util.List; + public interface ITaskMessageRetryLogService { + List findByTaskIds(List taskIds); + + TaskMessageRetryLog findById(String id); + + PageResult search(SearchRequest searchRequest); } 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 index f01679e..0f13ed9 100644 --- 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 @@ -1,6 +1,8 @@ package com.docus.server.archivefile.service; -import com.docus.server.archivefile.infrastructure.entity.TaskMessage; +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.TaskMessage; import com.docus.server.enums.CollectTypeEnum; import com.docus.server.enums.StateEnum; @@ -14,4 +16,7 @@ public interface ITaskMessageService { List findByState(StateEnum stateEnum); + TaskMessage findById(String id); + + PageResult search(SearchRequest searchRequest); } diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigServiceImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigServiceImpl.java index d1291d5..d3ff6a4 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigServiceImpl.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigServiceImpl.java @@ -1,17 +1,19 @@ package com.docus.server.archivefile.service.impl; +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.archivefile.infrastructure.dao.ITaskConfigDao; -import com.docus.server.archivefile.infrastructure.entity.TaskConfig; import com.docus.server.archivefile.service.ITaskConfigService; +import com.docus.server.entity.TaskConfig; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Date; +import java.util.List; @Service public class TaskConfigServiceImpl implements ITaskConfigService { - @Resource private ITaskConfigDao taskConfigDao; @@ -39,8 +41,19 @@ public class TaskConfigServiceImpl implements ITaskConfigService { @Transactional(rollbackFor = Exception.class) @Override - public void updateTaskConfig(TaskConfig taskConfig) { - taskConfigDao.saveOrUpdate(taskConfig); + public boolean updateTaskConfig(TaskConfig taskConfig) { + return taskConfigDao.saveOrUpdate(taskConfig); + } + + @Override + public PageResult search(SearchRequest searchRequest) { + return taskConfigDao.searchTaskConfig(searchRequest); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public int deleteTaskConfig(List ids) { + return taskConfigDao.deleteByIdList(ids); } } 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 index 5484bf0..ef164a6 100644 --- 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 @@ -1,17 +1,35 @@ 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.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.archivefile.convert.TaskMessageRetryLogConverter; +import com.docus.server.archivefile.infrastructure.dao.ITaskMessageRetryLogDao; import com.docus.server.archivefile.service.ITaskMessageRetryLogService; +import com.docus.server.entity.TaskMessageRetryLog; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; @Service public class TaskMessageRetryLogServiceImpl implements ITaskMessageRetryLogService { @Resource - private TaskMessageConverter converter; + private TaskMessageRetryLogConverter taskMessageRetryLogConverter; @Resource - private ITaskMessageDao taskMessageDao; + private ITaskMessageRetryLogDao taskMessageRetryLogDao; + @Override + public List findByTaskIds(List taskIds) { + return taskMessageRetryLogDao.findBy("messageId", taskIds); + } + + @Override + public TaskMessageRetryLog findById(String id) { + return taskMessageRetryLogDao.findById(id); + } + + @Override + public PageResult search(SearchRequest searchRequest) { + return taskMessageRetryLogDao.search(searchRequest); + } } \ 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 index 9211982..88c0571 100644 --- 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 @@ -2,10 +2,12 @@ package com.docus.server.archivefile.service.impl; import com.docus.core.util.DateUtil; import com.docus.core.util.Func; +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.archivefile.convert.TaskMessageConverter; import com.docus.server.archivefile.infrastructure.dao.ITaskMessageDao; -import com.docus.server.archivefile.infrastructure.entity.TaskMessage; import com.docus.server.archivefile.service.ITaskMessageService; +import com.docus.server.entity.TaskMessage; import com.docus.server.enums.CollectTypeEnum; import com.docus.server.enums.StateEnum; import org.springframework.stereotype.Service; @@ -52,4 +54,14 @@ public class TaskMessageServiceImpl implements ITaskMessageService { public List findByState(StateEnum stateEnum) { return taskMessageDao.findBy("state", stateEnum); } + + @Override + public TaskMessage findById(String id) { + return taskMessageDao.findById(id); + } + + @Override + public PageResult search(SearchRequest request) { + return taskMessageDao.searchTaskMessage(request); + } } diff --git a/common-docus/docus-archivefile/src/main/resources/mapper/TaskConfigMapper.xml b/common-docus/docus-archivefile/src/main/resources/mapper/TaskConfigMapper.xml new file mode 100644 index 0000000..f9bf314 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/resources/mapper/TaskConfigMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + id, name, type, start_time, end_time, all_pointer_time, page_size, spilt_period, inc_pointer_time, param, state, last_error_msg + + + diff --git a/common-docus/docus-archivefile/src/main/resources/mapper/TaskMessageMapper.xml b/common-docus/docus-archivefile/src/main/resources/mapper/TaskMessageMapper.xml new file mode 100644 index 0000000..bf1c0ef --- /dev/null +++ b/common-docus/docus-archivefile/src/main/resources/mapper/TaskMessageMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + id, name, memo, collect_type, retry_key, json_str, source, state, error_msg, create_time, update_time + + + diff --git a/common-docus/docus-archivefile/src/main/resources/mapper/TaskMessageRetryLogMapper.xml b/common-docus/docus-archivefile/src/main/resources/mapper/TaskMessageRetryLogMapper.xml new file mode 100644 index 0000000..abcec3e --- /dev/null +++ b/common-docus/docus-archivefile/src/main/resources/mapper/TaskMessageRetryLogMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + id, message_id, name, memo, collect_type, retry_key, json_str, source, state, error_msg, create_time, update_time + + + diff --git a/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java b/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java index 704e646..942c928 100644 --- a/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java +++ b/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java @@ -41,8 +41,8 @@ public class PowerUserServiceImpl implements IPowerUserService { } @Override - public List findByUserNameList(Collection values) { - return userDao.findByList("userName", values); + public List findByUserNameList(Collection userNames) { + return userDao.findBy("userName", userNames); } @Transactional diff --git a/docus-api-common/src/main/java/com/docus/server/common/GlobalResponseBodyAdvice.java b/docus-api-common/src/main/java/com/docus/server/common/GlobalResponseBodyAdvice.java new file mode 100644 index 0000000..a778920 --- /dev/null +++ b/docus-api-common/src/main/java/com/docus/server/common/GlobalResponseBodyAdvice.java @@ -0,0 +1,51 @@ +package com.docus.server.common; + +import com.docus.infrastructure.web.api.CommonResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.core.MethodParameter; +import org.springframework.http.MediaType; +import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.http.server.ServerHttpRequest; +import org.springframework.http.server.ServerHttpResponse; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; + +import javax.servlet.http.HttpServletRequest; + +//统一controller输出格式，和抛出的异常 +@RestControllerAdvice +public class GlobalResponseBodyAdvice implements ResponseBodyAdvice { + + private static final Logger logger = LoggerFactory.getLogger(GlobalResponseBodyAdvice.class); + + @Override + public boolean supports(MethodParameter methodParameter, Class> aClass) { + return !CommonResult.class.isAssignableFrom(methodParameter.getParameterType()); + } + + @Override + public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType mediaType, Class> aClass, + ServerHttpRequest request, ServerHttpResponse response) { + String path = request.getURI().getPath(); + // 跟swagger冲突，跳出response包装 + if (path.contains("swagger") || path.contains("api-docs")) { + return body; + } + + //springBootAdmin获取服务信息 + if (path.startsWith("/actuator")) { + return body; + } + + return CommonResult.success(body); + } + + @ResponseBody + @ExceptionHandler(value = Exception.class) + public Object defaultErrorHandler(HttpServletRequest req, Exception ex) { + return CommonResult.failed("系统出错"); + } +} diff --git a/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigApi.java b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigApi.java new file mode 100644 index 0000000..9c2b3e2 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigApi.java @@ -0,0 +1,67 @@ +package com.docus.server.api.archivefile; + +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.TaskConfig; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.List; + + +/** + * API + * Generated on 2023-06-28 + */ +@Api(value = "主动消息任务管理接口", tags = "主动消息任务管理接口") +@FeignClient(value = "docus-collector-api", contextId = "docus-collector-api.TaskConfigApi") +@RequestMapping("/taskConfig") +public interface TaskConfigApi { + + /** + * 按主键查询 + * + * @param id 主键id + * @return 实体 + */ + @ApiOperation("按主键查询") + @GetMapping("/find/{id}") + TaskConfig find(@PathVariable(value = "id") String id); + + /** + * 关键字搜素 + * + * @param searchRequest 搜索参数 + * @return 分页列表 + */ + @ApiOperation("关键字搜素") + @PostMapping("/search") + PageResult search(@RequestBody SearchRequest searchRequest); + + /** + * 新增或编辑 + * + * @param taskConfig 编辑参数 + * @return 成功或失败 + */ + @ApiOperation("新增或编辑") + @PostMapping("/saveOrUpdate") + boolean saveOrUpdate(@RequestBody TaskConfig taskConfig); + + /** + * 批量删除 + * + * @param ids 主键ids + * @return 成功或失败 + */ + @ApiOperation("批量删除") + @DeleteMapping("/delete") + int delete(@RequestBody List ids); +} diff --git a/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageApi.java b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageApi.java new file mode 100644 index 0000000..1897242 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageApi.java @@ -0,0 +1,39 @@ +package com.docus.server.api.archivefile; + +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.vo.TaskMessageVO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + + +/** + * 被动接收任务表 API + * Generated on 2023-06-28 + */ +@FeignClient(value = "docus-collector-api", contextId = "docus-collector-api.TaskMessageApi") +@RequestMapping("/taskMessage") +public interface TaskMessageApi { + + /** + * 按主键查询 + * + * @param id 主键id + * @return 实体 + */ + @GetMapping("/find/{id}") + TaskMessageVO find(@PathVariable(value = "id") String id); + + /* + * 关键字搜素 + * @param searchRequest 搜索参数 + * @return 分页列表 + */ + @PostMapping("/search") + PageResult search(@RequestBody SearchRequest searchRequest); + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageRetryLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageRetryLogApi.java new file mode 100644 index 0000000..6598fb6 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageRetryLogApi.java @@ -0,0 +1,39 @@ +package com.docus.server.api.archivefile; + +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.TaskMessageRetryLog; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + + +/** + * 任务消息重试表 API + * Generated on 2023-06-28 + */ +@FeignClient(value = "docus-collector-api", contextId = "docus-collector-api.TaskMessageRetryLogApi") +@RequestMapping("/taskMessageRetryLog") +public interface TaskMessageRetryLogApi { + + /** + * 按主键查询 + * + * @param id 主键id + * @return 实体 + */ + @GetMapping("/find/{id}") + TaskMessageRetryLog find(@PathVariable(value = "id") String id); + + /* + * 关键字搜素 + * @param searchRequest 搜索参数 + * @return 分页列表 + */ + @PostMapping("/search") + PageResult search(@RequestBody SearchRequest searchRequest); + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/A.java b/docus-client-interface/src/main/java/com/docus/server/entity/A.java deleted file mode 100644 index 81dbd73..0000000 --- a/docus-client-interface/src/main/java/com/docus/server/entity/A.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.entity; - -public class A { -} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskConfig.java b/docus-client-interface/src/main/java/com/docus/server/entity/TaskConfig.java similarity index 65% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskConfig.java rename to docus-client-interface/src/main/java/com/docus/server/entity/TaskConfig.java index b9f6f88..1d3e73b 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskConfig.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/TaskConfig.java @@ -1,9 +1,12 @@ -package com.docus.server.archivefile.infrastructure.entity; +package com.docus.server.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.docus.server.enums.StateEnum; import com.docus.server.util.DateSpiltUtil; import com.docus.server.util.PeriodTime; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -12,36 +15,42 @@ import java.util.List; /** * 收集数据任务配置 */ - +@ApiModel(value = "TaskConfig对象", description = "") @Data +@JsonIgnoreProperties(value = {"incPeriodTimes", "allPeriodTimes", "offset", "pageNum"}) public class TaskConfig { - + @ApiModelProperty(value = "主键") private String id; /** * 任务名字 */ + @ApiModelProperty(value = "任务名字") private String name; /** * 任务类型。 dept，user.... */ + @ApiModelProperty(value = "任务类型") private String type; /** * 数据起始时间范围 */ + @ApiModelProperty(value = "数据起始时间范围") private Date startTime; /** * 数据结束时间范围 */ + @ApiModelProperty(value = "数据结束时间范围") private Date endTime; /** * 指针时间，当前全量任务的任务执行到的时间 */ + @ApiModelProperty(value = "指针时间，当前全量任务的任务执行到的时间") private Date allPointerTime; /** * 偏移量 @@ -56,33 +65,39 @@ public class TaskConfig { /** * 每页大小 */ + @ApiModelProperty(value = "每页大小") private int pageSize; /** * 时间分割周期，把起始时间结束时间进行分割，单位为秒 */ + @ApiModelProperty(value = "时间分割周期，把起始时间结束时间进行分割，单位为秒") private Long spiltPeriod; /** * 指针时间，当前增量任务的执行到的时间 */ + @ApiModelProperty(value = "指针时间，当前增量任务的执行到的时间") private Date incPointerTime; /** * 任务其他参数配置 */ + @ApiModelProperty(value = "任务其他参数配置") private String param; /** * 执行状态 */ + @ApiModelProperty(value = "执行状态") private StateEnum state = StateEnum.OK; /** * 上回失败信息 */ + @ApiModelProperty(value = "上回失败信息") private String lastErrorMsg; - + @ApiModelProperty(value = "创建时间") private Date createTime; - + @ApiModelProperty(value = "更新时间") private Date updateTime; public List getAllPeriodTimes() { diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskMessage.java b/docus-client-interface/src/main/java/com/docus/server/entity/TaskMessage.java similarity index 97% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskMessage.java rename to docus-client-interface/src/main/java/com/docus/server/entity/TaskMessage.java index 248ba6d..1b6fc04 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskMessage.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/TaskMessage.java @@ -1,4 +1,4 @@ -package com.docus.server.archivefile.infrastructure.entity; +package com.docus.server.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/TaskMessageExt.java b/docus-client-interface/src/main/java/com/docus/server/entity/TaskMessageExt.java new file mode 100644 index 0000000..1ef8b6b --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/entity/TaskMessageExt.java @@ -0,0 +1,14 @@ +package com.docus.server.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +public class TaskMessageExt extends TaskMessage { + + @ApiModelProperty(value = "是否有重试详情日志") + private boolean haveRetryLog; + +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskMessageRetryLog.java b/docus-client-interface/src/main/java/com/docus/server/entity/TaskMessageRetryLog.java similarity index 97% rename from common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskMessageRetryLog.java rename to docus-client-interface/src/main/java/com/docus/server/entity/TaskMessageRetryLog.java index cd83b52..12e1a54 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskMessageRetryLog.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/TaskMessageRetryLog.java @@ -1,4 +1,4 @@ -package com.docus.server.archivefile.infrastructure.entity; +package com.docus.server.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/TaskMessageVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/TaskMessageVO.java new file mode 100644 index 0000000..ccf71cf --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/vo/TaskMessageVO.java @@ -0,0 +1,48 @@ +package com.docus.server.vo; + +import com.docus.server.enums.CollectTypeEnum; +import com.docus.server.enums.StateEnum; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +public class TaskMessageVO { + + @ApiModelProperty(value = "主键") + private Long id; + + @ApiModelProperty(value = "采集名字") + private String name; + + @ApiModelProperty(value = "采集描述") + private String memo; + + @ApiModelProperty(value = "采集类型") + private CollectTypeEnum collectType; + + @ApiModelProperty(value = "重试标示") + private String retryKey; + + @ApiModelProperty(value = "原始报文转对象json") + private String jsonStr; + + @ApiModelProperty(value = "原始报文") + private String source; + + @ApiModelProperty(value = "状态 1：失败，0:成功") + private StateEnum state; + + @ApiModelProperty(value = "本批次异常信息") + private String errorMsg; + + @ApiModelProperty(value = "入库时间") + private Date createTime; + + @ApiModelProperty(value = "入库更新时间") + private Date updateTime; + + @ApiModelProperty(value = "是否有重试详情日志") + private boolean haveRetryLog; +}