From 9460764c55e33e214e6a57c4bc2d3d3a20b0882e Mon Sep 17 00:00:00 2001 From: beeajax <1105173470@qq.com> Date: Thu, 29 Jun 2023 22:45:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E5=8A=A8=E4=BB=BB=E5=8A=A1=E9=87=8D?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/http/TBasicHttpCollectJob.java | 8 +- .../basic/view/TBasicViewCollectJob.java | 10 +- .../collect/basic/ws/TBasicWsCollectJob.java | 8 +- .../collect/dept/http/DeptHttpCollectJob.java | 8 +- .../collect/dept/view/DeptViewCollectJob.java | 8 +- .../collect/dept/ws/DeptWsCollectJob.java | 4 +- .../report/noview/DefNoViewCollectionJob.java | 8 +- .../collect/report/view/BlViewCollectJob.java | 8 +- .../report/view/EcgViewCollectJob.java | 8 +- .../report/view/EmrViewCollectJob.java | 8 +- .../collect/report/view/HlViewCollectJob.java | 8 +- .../report/view/IssubmitViewCollectJob.java | 8 +- .../report/view/LisViewCollectJob.java | 8 +- .../report/view/PacsViewCollectJob.java | 8 +- .../report/view/VteViewCollectJob.java | 8 +- .../collect/report/view/ZzViewCollectJob.java | 8 +- .../collect/user/http/UserHttpCollectJob.java | 8 +- .../collect/user/view/UserViewCollectJob.java | 8 +- .../collect/user/ws/UserWsCollectJob.java | 8 +- .../collect/web/job/AbstractCollectJob.java | 18 ++- .../server/collect/web/job/TrackRetryJob.java | 2 +- .../collect/web/process/RetryProcessor.java | 24 ---- .../archivefile/controller/Package.java | 5 - .../controller/TaskConfigController.java | 10 ++ .../TaskConfigRetryLogController.java | 41 ++++++ .../controller/TaskMessageController.java | 4 +- .../archivefile/controller/param/Package.java | 4 - .../archivefile/controller/vo/Package.java | 4 - .../convert/TaskConfigRetryLogConvert.java | 23 ++++ .../convert/TaskMessageRetryLogConvert.java | 6 - .../dao/ITaskConfigRetryLogDao.java | 10 ++ .../dao/impl/TaskConfigRetryLogDaoImpl.java | 47 +++++++ .../mapper/TaskConfigRetryLogMapper.java | 14 +++ .../archivefile/process/RetryProcessor.java | 96 ++++++++++++++ .../service/ITaskConfigRetryLogService.java | 11 ++ .../service/ITaskConfigService.java | 4 + .../service/ITaskMessageService.java | 4 +- .../impl/TaskConfigRetryLogServiceImpl.java | 26 ++++ .../service/impl/TaskConfigServiceImpl.java | 29 +++++ .../service/impl/TaskMessageServiceImpl.java | 18 +-- .../service/impl/TrackRetryService.java | 45 +++---- .../mapper/TaskConfigRetryLogMapper.xml | 30 +++++ .../server/api/archivefile/TaskConfigApi.java | 16 +++ .../archivefile/TaskConfigRetryLogApi.java | 36 ++++++ .../api/archivefile/TaskMessageApi.java | 4 +- .../server/entity/TaskConfigRetryLog.java | 118 ++++++++++++++++++ .../docus/server/entity/TaskMessageExt.java | 14 --- .../com/docus/server/util/ExceptionUtils.java | 18 --- 48 files changed, 629 insertions(+), 202 deletions(-) delete mode 100644 common-collect/src/main/java/com/docus/server/collect/web/process/RetryProcessor.java delete mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/Package.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigRetryLogController.java delete mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/param/Package.java delete mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/vo/Package.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskConfigRetryLogConvert.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskConfigRetryLogDao.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskConfigRetryLogDaoImpl.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskConfigRetryLogMapper.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/process/RetryProcessor.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskConfigRetryLogService.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigRetryLogServiceImpl.java create mode 100644 common-docus/docus-archivefile/src/main/resources/mapper/TaskConfigRetryLogMapper.xml create mode 100644 docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigRetryLogApi.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/entity/TaskConfigRetryLog.java delete mode 100644 docus-client-interface/src/main/java/com/docus/server/entity/TaskMessageExt.java delete mode 100644 docus-client-interface/src/main/java/com/docus/server/util/ExceptionUtils.java 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 e015fc2..d0c73e5 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 @@ -26,16 +26,16 @@ public class TBasicHttpCollectJob extends AbstractCollectJob { * xxl jobhandler 手工执行 */ @XxlJob("startAllTBasicHttpCollect") - public void startAllTBasicHttpCollect() { - super.startCollectAll(getJobParam()); + public void startAllTBasicHttpCollect(String param) { + super.startCollectAll(getJobParam(param)); } /** * xxl jobhandler 配置定时启动，如果未完成任务跳过。 */ @XxlJob("startIncTBasicHttpCollect") - public void startIncTBasicHttpCollect() { - super.startCollectIncrement(getJobParam()); + public void startIncTBasicHttpCollect(String param) { + super.startCollectIncrement(getJobParam(param)); } 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 b65ce08..a916b2a 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 @@ -28,20 +28,20 @@ public class TBasicViewCollectJob extends AbstractCollectJob { * xxl jobhandler 手工执行，全量执行 */ @XxlJob("startAllTBasicViewCollect") - public void startAllTBasicViewCollect() { - super.startCollectAll(getJobParam()); + public void startAllTBasicViewCollect(String param) { + super.startCollectAll(getJobParam(param)); } /** * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集 */ @XxlJob("startIncTBasicViewCollect") - public void startIncTBasicViewCollect() { - super.startCollectIncrement(getJobParam()); + public void startIncTBasicViewCollect(String param) { + super.startCollectIncrement(getJobParam(param)); } @Override - public void doHandle(List results,String param) { + public void doHandle(List results, String param) { basicService.batchSaveBasics(results); } 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 ac56f41..178169c 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 @@ -26,16 +26,16 @@ public class TBasicWsCollectJob extends AbstractCollectJob { * xxl jobhandler 手工执行 */ @XxlJob("startAllTBasicWsCollect") - public void startAllTBasicWsCollect() { - super.startCollectAll(getJobParam()); + public void startAllTBasicWsCollect(String param) { + super.startCollectAll(getJobParam(param)); } /** * xxl jobhandler 配置定时启动，如果未完成任务跳过。 */ @XxlJob("startIncTBasicWsCollect") - public void startIncTBasicWsCollect() { - super.startCollectIncrement(getJobParam()); + public void startIncTBasicWsCollect(String param) { + super.startCollectIncrement(getJobParam(param)); } @Override 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 ba63d96..93392c6 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 @@ -27,16 +27,16 @@ public class DeptHttpCollectJob extends AbstractCollectJob { * xxl jobhandler 手工执行 */ @XxlJob("startAllDeptHttpCollect") - public void startAllDeptHttpCollect() { - super.startCollectAll(getJobParam()); + public void startAllDeptHttpCollect(String param) { + super.startCollectAll(getJobParam(param)); } /** * xxl jobhandler 配置定时启动，如果未完成任务跳过。 */ @XxlJob("startIncDeptHttpCollect") - public void startIncDeptHttpCollect() { - super.startCollectIncrement(getJobParam()); + public void startIncDeptHttpCollect(String param) { + super.startCollectIncrement(getJobParam(param)); } @Override 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 4292065..13cd0ca 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 @@ -29,8 +29,8 @@ public class DeptViewCollectJob extends AbstractCollectJob { * xxl jobhandler 手工执行，全量执行 */ @XxlJob("startAllDeptViewCollect") - public void startAllDeptViewCollect() { - super.startCollectAll(getJobParam()); + public void startAllDeptViewCollect(String param) { + super.startCollectAll(getJobParam(param)); } /** @@ -38,8 +38,8 @@ public class DeptViewCollectJob extends AbstractCollectJob { */ @XxlJob("startIncDeptViewCollect") - public void startIncDeptViewCollect() { - super.startCollectIncrement(getJobParam()); + public void startIncDeptViewCollect(String param) { + super.startCollectIncrement(getJobParam(param)); } @Override 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 106c610..ea744a9 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 @@ -29,7 +29,7 @@ public class DeptWsCollectJob extends AbstractCollectJob { @XxlJob("startAllDeptWsCollect") @TrackRetryListener("startAllDeptWsCollect") public void startAllDeptWsCollect(String param) { - super.startCollectAll(getJobParam()); + super.startCollectAll(getJobParam(param)); } /** @@ -38,7 +38,7 @@ public class DeptWsCollectJob extends AbstractCollectJob { @XxlJob("startIncDeptWsCollect") @TrackRetryListener("startIncDeptWsCollect") public void startIncDeptWsCollect(String param) { - super.startCollectIncrement(getJobParam()); + super.startCollectIncrement(getJobParam(param)); } @Override 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 445c594..815bbf1 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 @@ -33,16 +33,16 @@ public class DefNoViewCollectionJob extends AbstractCollectJob> { * xxl jobhandler 手工执行，全量执行 */ @XxlJob("startAllBlViewCollect") - public void startAllBlViewCollect() { - super.startCollectAll(getJobParam()); + public void startAllBlViewCollect(String param) { + super.startCollectAll(getJobParam(param)); } /** * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集 */ @XxlJob("startIncBlViewCollect") - public void startIncBlViewCollect() { - super.startCollectIncrement(getJobParam()); + public void startIncBlViewCollect(String param) { + super.startCollectIncrement(getJobParam(param)); } @SuppressWarnings("unchecked") 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 682dd7c..025e087 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 @@ -34,16 +34,16 @@ public class EcgViewCollectJob extends AbstractCollectJob> { * xxl jobhandler 手工执行，全量执行 */ @XxlJob("startAllEcgViewCollect") - public void startAllEcgViewCollect() { - super.startCollectAll(getJobParam()); + public void startAllEcgViewCollect(String param) { + super.startCollectAll(getJobParam(param)); } /** * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集 */ @XxlJob("startIncEcgViewCollect") - public void startIncEcgViewCollect() { - super.startCollectIncrement(getJobParam()); + public void startIncEcgViewCollect(String param) { + super.startCollectIncrement(getJobParam(param)); } @SuppressWarnings("unchecked") 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 6cddbf3..a5dffcd 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 @@ -34,16 +34,16 @@ public class EmrViewCollectJob extends AbstractCollectJob> { * xxl jobhandler 手工执行，全量执行 */ @XxlJob("startAllEmrViewCollect") - public void startAllEmrViewCollect() { - super.startCollectAll(getJobParam()); + public void startAllEmrViewCollect(String param) { + super.startCollectAll(getJobParam(param)); } /** * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集 */ @XxlJob("startIncEmrViewCollect") - public void startIncEmrViewCollect() { - super.startCollectIncrement(getJobParam()); + public void startIncEmrViewCollect(String param) { + super.startCollectIncrement(getJobParam(param)); } @SuppressWarnings("unchecked") 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 096b1b3..ee3af47 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 @@ -34,16 +34,16 @@ public class HlViewCollectJob extends AbstractCollectJob> { * xxl jobhandler 手工执行，全量执行 */ @XxlJob("startAllHlViewCollect") - public void startAllHlViewCollect() { - super.startCollectAll(getJobParam()); + public void startAllHlViewCollect(String param) { + super.startCollectAll(getJobParam(param)); } /** * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集 */ @XxlJob("startIncHlViewCollect") - public void startIncHlViewCollect() { - super.startCollectIncrement(getJobParam()); + public void startIncHlViewCollect(String param) { + super.startCollectIncrement(getJobParam(param)); } @SuppressWarnings("unchecked") 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 5dd72b4..5406d34 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 @@ -34,16 +34,16 @@ public class IssubmitViewCollectJob extends AbstractCollectJob> { * xxl jobhandler 手工执行，全量执行 */ @XxlJob("startAllLisViewCollect") - public void startAllLisViewCollect() { - super.startCollectAll(getJobParam()); + public void startAllLisViewCollect(String param) { + super.startCollectAll(getJobParam(param)); } /** * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集 */ @XxlJob("startIncLisViewCollect") - public void startIncLisViewCollect() { - super.startCollectIncrement(getJobParam()); + public void startIncLisViewCollect(String param) { + super.startCollectIncrement(getJobParam(param)); } @SuppressWarnings("unchecked") 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 71b2493..582eabe 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 @@ -34,16 +34,16 @@ public class PacsViewCollectJob extends AbstractCollectJob> * xxl jobhandler 手工执行，全量执行 */ @XxlJob("startAllPacsViewCollect") - public void startAllPacsViewCollect() { - super.startCollectAll(getJobParam()); + public void startAllPacsViewCollect(String param) { + super.startCollectAll(getJobParam(param)); } /** * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集 */ @XxlJob("startIncPacsViewCollect") - public void startIncPacsViewCollect() { - super.startCollectIncrement(getJobParam()); + public void startIncPacsViewCollect(String param) { + super.startCollectIncrement(getJobParam(param)); } @SuppressWarnings("unchecked") 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 eb0d816..e996c7b 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 @@ -34,16 +34,16 @@ public class VteViewCollectJob extends AbstractCollectJob> { * xxl jobhandler 手工执行，全量执行 */ @XxlJob("startAllVteViewCollect") - public void startAllVteViewCollect() { - super.startCollectAll(getJobParam()); + public void startAllVteViewCollect(String param) { + super.startCollectAll(getJobParam(param)); } /** * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集 */ @XxlJob("startIncVteViewCollect") - public void startIncVteViewCollect() { - super.startCollectIncrement(getJobParam()); + public void startIncVteViewCollect(String param) { + super.startCollectIncrement(getJobParam(param)); } @SuppressWarnings("unchecked") 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 fe3a009..72b3a22 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 @@ -34,16 +34,16 @@ public class ZzViewCollectJob extends AbstractCollectJob> { * xxl jobhandler 手工执行，全量执行 */ @XxlJob("startAllZzViewCollect") - public void startAllZzViewCollect() { - super.startCollectAll(getJobParam()); + public void startAllZzViewCollect(String param) { + super.startCollectAll(getJobParam(param)); } /** * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集 */ @XxlJob("startIncZzViewCollect") - public void startIncZzViewCollect() { - super.startCollectIncrement(getJobParam()); + public void startIncZzViewCollect(String param) { + super.startCollectIncrement(getJobParam(param)); } @SuppressWarnings("unchecked") 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 93a71c2..321c3ae 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 @@ -26,16 +26,16 @@ public class UserHttpCollectJob extends AbstractCollectJob { * xxl jobhandler 手工执行 */ @XxlJob("startAllUserHttpCollect") - public void startAllUserHttpCollect() { - super.startCollectAll(getJobParam()); + public void startAllUserHttpCollect(String param) { + super.startCollectAll(getJobParam(param)); } /** * xxl jobhandler 配置定时启动，如果未完成任务跳过。 */ @XxlJob("startIncUserHttpCollect") - public void startIncUserHttpCollect() { - super.startCollectIncrement(getJobParam()); + public void startIncUserHttpCollect(String param) { + super.startCollectIncrement(getJobParam(param)); } @Override 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 4db7810..ee447d1 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 @@ -36,16 +36,16 @@ public class UserViewCollectJob extends AbstractCollectJob { * xxl jobhandler 手工执行，全量执行 */ @XxlJob("startAllUserViewCollect") - public void startAllUserViewCollect() { - super.startCollectAll(getJobParam()); + public void startAllUserViewCollect(String param) { + super.startCollectAll(getJobParam(param)); } /** * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集 */ @XxlJob("startIncUserViewCollect") - public void startIncUserViewCollect() { - super.startCollectIncrement(getJobParam()); + public void startIncUserViewCollect(String param) { + super.startCollectIncrement(getJobParam(param)); } @Override 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 604d569..f828856 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 @@ -26,16 +26,16 @@ public class UserWsCollectJob extends AbstractCollectJob { * xxl jobhandler 手工执行 */ @XxlJob("startAllUserWsCollect") - public void startAllUserWsCollect() { - super.startCollectAll(getJobParam()); + public void startAllUserWsCollect(String param) { + super.startCollectAll(getJobParam(param)); } /** * xxl jobhandler 配置定时启动，如果未完成任务跳过。 */ @XxlJob("startIncUserWsCollect") - public void startIncUserWsCollect() { - super.startCollectIncrement(getJobParam()); + public void startIncUserWsCollect(String param) { + super.startCollectIncrement(getJobParam(param)); } @Override 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 d77b4ef..738cf31 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 @@ -1,18 +1,18 @@ package com.docus.server.collect.web.job; +import com.docus.core.util.ExceptionUtils; import com.docus.core.util.Func; import com.docus.infrastructure.redis.service.IdService; -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; import com.docus.server.common.config.UserProperties; +import com.docus.server.entity.TaskConfig; 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 lombok.extern.slf4j.Slf4j; @@ -51,12 +51,15 @@ public abstract class AbstractCollectJob implements IJob { taskConfigService.updateAllPointerDate(taskConfigId, periodTime.getPeriodEndDate()); } + refreshTaskState(taskConfig); } catch (Exception ex) { log.error(ex.getMessage(), ex); updateTaskState(ExceptionUtils.getExceptionMessage(ex), taskConfig); + refreshTaskState(taskConfig); + throw new RuntimeException(ex); } - refreshTaskState(taskConfig); + } @Override @@ -72,12 +75,15 @@ public abstract class AbstractCollectJob implements IJob { taskConfigService.updateIncPointerDate(taskConfigId, periodTime.getPeriodEndDate()); } + refreshTaskState(taskConfig); } catch (Exception ex) { log.error(ex.getMessage(), ex); updateTaskState(ExceptionUtils.getExceptionMessage(ex), taskConfig); + refreshTaskState(taskConfig); + throw new RuntimeException(ex); } - refreshTaskState(taskConfig); + } @@ -132,7 +138,7 @@ public abstract class AbstractCollectJob implements IJob { return taskConfigService.getTaskConfigById(taskConfigId); } - protected String getJobParam() { - return XxlJobHelper.getJobParam(); + protected String getJobParam(String param) { + return Func.isNotBlank(param) ? param : XxlJobHelper.getJobParam(); } } 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 a00461c..f51f485 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 @@ -28,7 +28,7 @@ public class TrackRetryJob { List messages = messageService.findByState(StateEnum.FAIL); for (TaskMessage message : messages) { - trackRetryService.doRetry(message); + trackRetryService.doRetryTaskMessage(message); } } 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 deleted file mode 100644 index 5c7016f..0000000 --- a/common-collect/src/main/java/com/docus/server/collect/web/process/RetryProcessor.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.docus.server.collect.web.process; - -import com.docus.log.context.TrackContext; -import com.docus.log.processor.AbstractProcessor; -import com.docus.server.archivefile.service.ITaskMessageService; -import lombok.extern.slf4j.Slf4j; - -import javax.annotation.Resource; - -/** - * 重试处理器 - * - * @author linruifeng - */ -@Slf4j -public class RetryProcessor extends AbstractProcessor { - @Resource - private ITaskMessageService messageService; - - @Override - public Object doProcess(TrackContext context) { - return null; - } -} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/Package.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/Package.java deleted file mode 100644 index 65a1b37..0000000 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/Package.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.docus.server.record.controller; - -public class Package { - -} 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 index e67df02..e0c4898 100644 --- 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 @@ -63,4 +63,14 @@ public class TaskConfigController implements TaskConfigApi { return taskConfigService.deleteTaskConfig(ids); } + @Override + public void searchRetry(SearchRequest searchRequest) throws Exception { + taskConfigService.searchRetry(searchRequest); + } + + @Override + public void findRetry(List ids) throws Exception { + taskConfigService.findRetry(ids); + } + } diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigRetryLogController.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigRetryLogController.java new file mode 100644 index 0000000..db2b069 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigRetryLogController.java @@ -0,0 +1,41 @@ +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.TaskConfigRetryLogApi; +import com.docus.server.archivefile.service.ITaskConfigRetryLogService; +import com.docus.server.entity.TaskConfigRetryLog; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RestController; + +/** + * 主动任务配置重试表 Controller + * Generated on 2023-06-29 + */ +@RestController +public class TaskConfigRetryLogController implements TaskConfigRetryLogApi { + @Autowired + private ITaskConfigRetryLogService taskConfigRetryLogService; + + /** + * 按主键查询 + * + * @param id 主键Id + * @return 实体 + */ + @Override + public TaskConfigRetryLog find(String id) { + return taskConfigRetryLogService.findById(id); + } + + /** + * 关键字搜素 + * + * @param searchRequest 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchRequest searchRequest) { + return taskConfigRetryLogService.search(searchRequest); + } +} 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 index 3c0b755..e91178d 100644 --- 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 @@ -50,7 +50,7 @@ public class TaskMessageController implements TaskMessageApi { * @param searchRequest 搜索参数 */ @Override - public void searchRetry(SearchRequest searchRequest) { + public void searchRetry(SearchRequest searchRequest) throws Exception { taskMessageService.searchRetry(searchRequest); } @@ -58,7 +58,7 @@ public class TaskMessageController implements TaskMessageApi { * 根据主键批量重试 */ @Override - public void findRetry(List ids) { + public void findRetry(List ids) throws Exception { taskMessageService.findRetry(ids); } } diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/param/Package.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/param/Package.java deleted file mode 100644 index aceed35..0000000 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/param/Package.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.record.controller.param; - -public class Package { -} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/vo/Package.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/vo/Package.java deleted file mode 100644 index 0b5b3fd..0000000 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/vo/Package.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.record.controller.vo; - -public class Package { -} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskConfigRetryLogConvert.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskConfigRetryLogConvert.java new file mode 100644 index 0000000..bf603ac --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskConfigRetryLogConvert.java @@ -0,0 +1,23 @@ +package com.docus.server.archivefile.convert; + +import com.docus.server.entity.TaskConfig; +import com.docus.server.entity.TaskConfigRetryLog; +import org.mapstruct.Mapper; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +@Mapper +public interface TaskConfigRetryLogConvert { + TaskConfigRetryLogConvert INSTANCE = Mappers.getMapper(TaskConfigRetryLogConvert.class); + + @Mappings({}) + TaskConfigRetryLog convert(TaskConfig taskConfig); + + default TaskConfigRetryLog toConvertRetryLog(TaskConfig taskConfig, Long id) { + TaskConfigRetryLog taskConfigRetryLog = convert(taskConfig); + taskConfigRetryLog.setId(id); + taskConfigRetryLog.setMessageId(taskConfig.getId()); + return taskConfigRetryLog; + } + +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageRetryLogConvert.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageRetryLogConvert.java index 18d4a07..72433b7 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageRetryLogConvert.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageRetryLogConvert.java @@ -2,7 +2,6 @@ package com.docus.server.archivefile.convert; import com.docus.server.entity.TaskMessage; import com.docus.server.entity.TaskMessageRetryLog; -import com.docus.server.enums.StateEnum; import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; @@ -21,9 +20,4 @@ public interface TaskMessageRetryLogConvert { return taskMessageRetryLog; } - default void afterThrowingProcess(String errorMsg, TaskMessageRetryLog taskMessageRetryLog) { - taskMessageRetryLog.setErrorMsg(errorMsg); - taskMessageRetryLog.setState(StateEnum.FAIL); - } - } diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskConfigRetryLogDao.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskConfigRetryLogDao.java new file mode 100644 index 0000000..afb2d0f --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskConfigRetryLogDao.java @@ -0,0 +1,10 @@ +package com.docus.server.archivefile.infrastructure.dao; + +import com.docus.infrastructure.core.db.dao.IBaseDao; +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.TaskConfigRetryLog; + +public interface ITaskConfigRetryLogDao extends IBaseDao { + PageResult search(SearchRequest searchRequest); +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskConfigRetryLogDaoImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskConfigRetryLogDaoImpl.java new file mode 100644 index 0000000..438becc --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskConfigRetryLogDaoImpl.java @@ -0,0 +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.ITaskConfigRetryLogDao; +import com.docus.server.archivefile.infrastructure.mapper.TaskConfigRetryLogMapper; +import com.docus.server.entity.TaskConfigRetryLog; +import com.github.pagehelper.PageHelper; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public class TaskConfigRetryLogDaoImpl extends BaseDaoImpl implements ITaskConfigRetryLogDao { + + @Override + public PageResult search(SearchRequest searchRequest) { + PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize()); + + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + //时间范围，默认按createTime + if (searchRequest.getBeginTime() != null) { + query.ge(TaskConfigRetryLog::getCreateTime, searchRequest.getBeginTime()); + } + if (searchRequest.getEndTime() != null) { + query.le(TaskConfigRetryLog::getCreateTime, searchRequest.getEndTime()); + } + if (searchRequest.getParams("state") != null) { + query.eq(TaskConfigRetryLog::getState, searchRequest.getParams("state")); + } + if (Func.isNotBlank(searchRequest.getKeyword())) { + query.like(TaskConfigRetryLog::getName, String.format("%s%s%s", "%", searchRequest.getKeyword(), "%")); + } + if (searchRequest.getParams("type") != null) { + query.eq(TaskConfigRetryLog::getType, searchRequest.getParams("type")); + } + + //默认createTime倒序排序 + query.orderByDesc(TaskConfigRetryLog::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/TaskConfigRetryLogMapper.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskConfigRetryLogMapper.java new file mode 100644 index 0000000..4de2ca9 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskConfigRetryLogMapper.java @@ -0,0 +1,14 @@ +package com.docus.server.archivefile.infrastructure.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.docus.server.entity.TaskConfigRetryLog; +import org.apache.ibatis.annotations.Mapper; + +/** + * 主动任务配置重试表 Mapper 接口 + * Generated on 2023-06-29 + */ +@Mapper +public interface TaskConfigRetryLogMapper extends BaseMapper { + +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/process/RetryProcessor.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/process/RetryProcessor.java new file mode 100644 index 0000000..5ec3b69 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/process/RetryProcessor.java @@ -0,0 +1,96 @@ +package com.docus.server.archivefile.process; + +import com.docus.infrastructure.redis.service.IdService; +import com.docus.log.context.TrackContext; +import com.docus.log.processor.AbstractProcessor; +import com.docus.server.archivefile.convert.TaskConfigRetryLogConvert; +import com.docus.server.archivefile.convert.TaskMessageRetryLogConvert; +import com.docus.server.archivefile.infrastructure.dao.ITaskConfigDao; +import com.docus.server.archivefile.infrastructure.dao.ITaskConfigRetryLogDao; +import com.docus.server.archivefile.infrastructure.dao.ITaskMessageDao; +import com.docus.server.archivefile.infrastructure.dao.ITaskMessageRetryLogDao; +import com.docus.server.entity.TaskConfig; +import com.docus.server.entity.TaskConfigRetryLog; +import com.docus.server.entity.TaskMessage; +import com.docus.server.entity.TaskMessageRetryLog; +import com.docus.server.enums.StateEnum; +import lombok.extern.slf4j.Slf4j; + +import javax.annotation.Resource; +import java.util.Date; + +/** + * 重试处理器 + * + * @author linruifeng + */ +@Slf4j +public class RetryProcessor extends AbstractProcessor { + public static final String EMPTY_STRING = ""; + @Resource + private ITaskMessageRetryLogDao taskMessageRetryLogDao; + @Resource + private ITaskConfigRetryLogDao taskConfigRetryLogDao; + @Resource + private ITaskMessageDao taskMessageDao; + @Resource + private ITaskConfigDao taskConfigDao; + @Resource + private IdService idService; + + @Override + public Object doProcess(TrackContext context) { + + String group = context.getGroup(); + + if ("doRetryTaskMessage".equalsIgnoreCase(group)) { + + doRetryTaskMessageLog(context); + + } else if ("doRetryTaskConfig".equalsIgnoreCase(group)) { + + doRetryTaskConfigLog(context); + } + return null; + } + + private void doRetryTaskConfigLog(TrackContext context) { + boolean error = context.isError(); + TaskConfig taskConfig = (TaskConfig) context.getArgs()[0]; + TaskConfig taskConfigDO = taskConfigDao.findById(taskConfig.getId()); + TaskConfigRetryLog taskConfigRetryLog = TaskConfigRetryLogConvert.INSTANCE.toConvertRetryLog(taskConfig, idService.getDateSeq()); + if (error) { + taskConfigRetryLog.setLastErrorMsg(context.getExMessageResult()); + taskConfigRetryLog.setState(StateEnum.FAIL); + taskConfigDO.setState(StateEnum.FAIL); + taskConfigDO.setUpdateTime(new Date()); + } else { + taskConfigRetryLog.setLastErrorMsg(EMPTY_STRING); + taskConfigRetryLog.setState(StateEnum.OK); + taskConfigDO.setState(StateEnum.OK); + taskConfigDO.setUpdateTime(new Date()); + } + taskConfigRetryLogDao.save(taskConfigRetryLog); + taskConfigDao.updateById(taskConfigDO); + } + + private void doRetryTaskMessageLog(TrackContext context) { + boolean error = context.isError(); + TaskMessage taskMessage = (TaskMessage) context.getArgs()[0]; + TaskMessage taskMessageDO = taskMessageDao.findById(taskMessage.getId()); + TaskMessageRetryLog taskMessageRetryLog = TaskMessageRetryLogConvert.INSTANCE.toConvertRetryLog(taskMessage, idService.getDateSeq()); + if (error) { + taskMessageRetryLog.setErrorMsg(context.getExMessageResult()); + taskMessageRetryLog.setState(StateEnum.FAIL); + taskMessageDO.setState(StateEnum.FAIL); + taskMessageDO.setUpdateTime(new Date()); + } else { + taskMessageRetryLog.setErrorMsg(EMPTY_STRING); + taskMessageRetryLog.setState(StateEnum.OK); + taskMessageDO.setState(StateEnum.OK); + taskMessageDO.setUpdateTime(new Date()); + } + taskMessageRetryLogDao.save(taskMessageRetryLog); + taskMessageDao.updateById(taskMessageDO); + } +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskConfigRetryLogService.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskConfigRetryLogService.java new file mode 100644 index 0000000..2ff4c3d --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskConfigRetryLogService.java @@ -0,0 +1,11 @@ +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.TaskConfigRetryLog; + +public interface ITaskConfigRetryLogService { + TaskConfigRetryLog findById(String id); + + PageResult search(SearchRequest searchRequest); +} 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 74ef3ae..fac10b7 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 @@ -20,4 +20,8 @@ public interface ITaskConfigService { PageResult search(SearchRequest searchRequest); int deleteTaskConfig(List ids); + + void searchRetry(SearchRequest searchRequest) throws Exception; + + void findRetry(List ids) throws Exception; } 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 14f32b7..d6a346a 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 @@ -21,7 +21,7 @@ public interface ITaskMessageService { PageResult search(SearchRequest searchRequest); - void searchRetry(SearchRequest searchRequest); + void searchRetry(SearchRequest searchRequest) throws Exception; - void findRetry(List ids); + void findRetry(List ids) throws Exception; } diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigRetryLogServiceImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigRetryLogServiceImpl.java new file mode 100644 index 0000000..6268799 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigRetryLogServiceImpl.java @@ -0,0 +1,26 @@ +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.ITaskConfigRetryLogDao; +import com.docus.server.archivefile.service.ITaskConfigRetryLogService; +import com.docus.server.entity.TaskConfigRetryLog; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class TaskConfigRetryLogServiceImpl implements ITaskConfigRetryLogService { + @Resource + private ITaskConfigRetryLogDao taskConfigRetryLogDao; + + @Override + public TaskConfigRetryLog findById(String id) { + return taskConfigRetryLogDao.findById(id); + } + + @Override + public PageResult search(SearchRequest searchRequest) { + return taskConfigRetryLogDao.search(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 b757b15..dd990c1 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 @@ -9,6 +9,7 @@ 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 org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.Date; @@ -20,6 +21,8 @@ public class TaskConfigServiceImpl implements ITaskConfigService { private ITaskConfigDao taskConfigDao; @Resource private IdService idService; + @Resource + private TrackRetryService trackRetryService; @Transactional(rollbackFor = Exception.class) @Override @@ -62,4 +65,30 @@ public class TaskConfigServiceImpl implements ITaskConfigService { return taskConfigDao.deleteByIdList(ids); } + public PageResult searchTaskMessage(SearchRequest request) { + return taskConfigDao.searchTaskConfig(request); + } + + @Override + public void searchRetry(SearchRequest searchRequest) throws Exception { + PageResult result = searchTaskMessage(searchRequest); + actionRetry(result.getList()); + } + + @Override + public void findRetry(List ids) throws Exception { + List taskMessages = taskConfigDao.findByIds(ids); + actionRetry(taskMessages); + } + + private void actionRetry(List list) throws Exception { + if (CollectionUtils.isEmpty(list)) { + return; + } + + for (TaskConfig config : list) { + trackRetryService.doRetryTaskConfig(config); + } + } + } 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 ccdf7e0..2cc0708 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 @@ -28,14 +28,14 @@ import java.util.Map; @Slf4j @Service public class TaskMessageServiceImpl implements ITaskMessageService { - @Resource - private ITaskMessageDao taskMessageDao; @Resource private ITaskMessageRetryLogDao taskMessageRetryLogDao; @Resource - private IdService idService; - @Resource private TrackRetryService trackRetryService; + @Resource + private ITaskMessageDao taskMessageDao; + @Resource + private IdService idService; /** * 新增 ws xml 原始报文 @@ -100,25 +100,25 @@ public class TaskMessageServiceImpl implements ITaskMessageService { @Override - public void searchRetry(SearchRequest searchRequest) { + public void searchRetry(SearchRequest searchRequest) throws Exception { PageResult result = searchTaskMessage(searchRequest); actionRetry(result.getList()); } @Override - public void findRetry(List ids) { - List taskMessages = taskMessageDao.findBy("id", ids); + public void findRetry(List ids) throws Exception { + List taskMessages = taskMessageDao.findByIds(ids); actionRetry(taskMessages); } - private void actionRetry(List taskMessages) { + private void actionRetry(List taskMessages) throws Exception { if (CollectionUtils.isEmpty(taskMessages)) { return; } for (TaskMessage message : taskMessages) { - trackRetryService.doRetry(message); + trackRetryService.doRetryTaskMessage(message); } } diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TrackRetryService.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TrackRetryService.java index 38ba3b6..434ec9c 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TrackRetryService.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TrackRetryService.java @@ -1,54 +1,39 @@ package com.docus.server.archivefile.service.impl; import com.docus.core.util.json.JSON; -import com.docus.infrastructure.redis.service.IdService; +import com.docus.log.annotation.TrackLogGroup; import com.docus.log.executor.TrackRetrySpringExecutor; import com.docus.log.handler.IJobHandler; import com.docus.log.handler.impl.MethodJobHandler; -import com.docus.server.archivefile.convert.TaskMessageRetryLogConvert; -import com.docus.server.archivefile.infrastructure.dao.ITaskMessageRetryLogDao; +import com.docus.server.archivefile.process.RetryProcessor; +import com.docus.server.entity.TaskConfig; import com.docus.server.entity.TaskMessage; -import com.docus.server.entity.TaskMessageRetryLog; -import com.docus.server.util.ExceptionUtils; import lombok.extern.slf4j.Slf4j; -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 */ @Service @Slf4j public class TrackRetryService { - @Resource - private ITaskMessageRetryLogDao taskMessageRetryLogDao; - @Resource - private IdService idService; + @TrackLogGroup(group = "doRetryTaskMessage", processor = RetryProcessor.class) @Async("recordMessage") - @Retryable(value = Exception.class, maxAttempts = 3, backoff = @Backoff(delay = 2000L, multiplier = 1.5)) - public void doRetry(TaskMessage message) { - TaskMessageRetryLogConvert retryLogConvert = TaskMessageRetryLogConvert.INSTANCE; - TaskMessageRetryLog taskMessageRetryLog = retryLogConvert.toConvertRetryLog(message, 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)); + public void doRetryTaskMessage(TaskMessage 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); + jobHandler.execute(o); + } - } catch (Exception e) { - log.error(e.getMessage(), e); - retryLogConvert.afterThrowingProcess(ExceptionUtils.getExceptionMessage(e), taskMessageRetryLog); - } + @TrackLogGroup(group = "doRetryTaskConfig", processor = RetryProcessor.class) + @Async("recordMessage") + public void doRetryTaskConfig(TaskConfig config) throws Exception { + IJobHandler jobHandler = TrackRetrySpringExecutor.loadJobHandler(config.getType()); - taskMessageRetryLogDao.save(taskMessageRetryLog); + jobHandler.execute(String.valueOf(config.getId())); } - } diff --git a/common-docus/docus-archivefile/src/main/resources/mapper/TaskConfigRetryLogMapper.xml b/common-docus/docus-archivefile/src/main/resources/mapper/TaskConfigRetryLogMapper.xml new file mode 100644 index 0000000..ec60dc5 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/resources/mapper/TaskConfigRetryLogMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id, message_id, name, type, start_time, end_time, all_pointer_time, page_size, spilt_period, inc_pointer_time, param, state, last_error_msg, create_time, update_time + + + 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 index 9c2b3e2..e92c2e1 100644 --- 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 @@ -64,4 +64,20 @@ public interface TaskConfigApi { @ApiOperation("批量删除") @DeleteMapping("/delete") int delete(@RequestBody List ids); + + /** + * 查询范围批量重试 + * + * @param searchRequest 搜索参数 + */ + @ApiOperation("查询范围批量重试") + @PostMapping("/search/retry") + void searchRetry(@RequestBody SearchRequest searchRequest) throws Exception; + + /** + * 根据主键批量重试 + */ + @ApiOperation("根据主键批量重试") + @PostMapping("/find/retry") + void findRetry(@RequestBody List ids) throws Exception; } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigRetryLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigRetryLogApi.java new file mode 100644 index 0000000..e25450a --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigRetryLogApi.java @@ -0,0 +1,36 @@ +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.TaskConfigRetryLog; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + + +/** + * 主动任务配置重试表 API + * Generated on 2023-06-29 + */ +@FeignClient(value = "tsms-auth-api", contextId = "tsms-auth-api.TaskConfigRetryLogApi") +@RequestMapping("/taskConfigRetryLog") +public interface TaskConfigRetryLogApi { + + /** + * 按主键查询 + * + * @param id 主键id + * @return 实体 + */ + @GetMapping("/find/{id}") + TaskConfigRetryLog 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/TaskMessageApi.java b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageApi.java index 2923a78..3f92f99 100644 --- 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 @@ -51,12 +51,12 @@ public interface TaskMessageApi { */ @ApiOperation("查询范围批量重试") @PostMapping("/search/retry") - void searchRetry(@RequestBody SearchRequest searchRequest); + void searchRetry(@RequestBody SearchRequest searchRequest) throws Exception; /** * 根据主键批量重试 */ @ApiOperation("根据主键批量重试") @PostMapping("/find/retry") - void findRetry(@RequestBody List ids); + void findRetry(@RequestBody List ids) throws Exception; } diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/TaskConfigRetryLog.java b/docus-client-interface/src/main/java/com/docus/server/entity/TaskConfigRetryLog.java new file mode 100644 index 0000000..321a9e3 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/entity/TaskConfigRetryLog.java @@ -0,0 +1,118 @@ +package com.docus.server.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.StateEnum; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.Date; + + +/** + *

+ * 主动任务配置重试表 + *

+ * + * @author AutoGenerator + * @since 2023-06-29 + */ +@Data +@TableName("task_config_retry_log") +public class TaskConfigRetryLog implements Serializable { + + /** + * - bigint(20) + */ + @TableId(value = "id", type = IdType.ASSIGN_UUID) + private Long id; + + /** + * 重试消息主键 - bigint(20) + */ + @TableField("message_id") + private Long messageId; + + /** + * 任务名字 - varchar(255) + */ + @TableField("name") + private String name; + + /** + * 任务类型。 dept，user.... - varchar(255) + */ + @TableField("type") + private String type; + + /** + * 数据起始时间范围 - datetime + */ + @TableField("start_time") + private LocalDateTime startTime; + + /** + * 数据结束时间范围 - datetime + */ + @TableField("end_time") + private LocalDateTime endTime; + + /** + * 指针时间，当前全量任务的任务执行到的时间 - datetime + */ + @TableField("all_pointer_time") + private LocalDateTime allPointerTime; + + /** + * 每页大小 - double + */ + @TableField("page_size") + private Double pageSize; + + /** + * 时间分割周期，把起始时间结束时间进行分割，单位为秒 - varchar(255) + */ + @TableField("spilt_period") + private String spiltPeriod; + + /** + * 指针时间，当前增量任务的执行到的时间 - datetime + */ + @TableField("inc_pointer_time") + private LocalDateTime incPointerTime; + + /** + * 任务其他参数配置 - varchar(500) + */ + @TableField("param") + private String param; + + /** + * 执行状态0：成功，1:失败 - int(11) + */ + @TableField("state") + private StateEnum state; + + /** + * 上回失败信息 - varchar(5000) + */ + @TableField("last_error_msg") + private String lastErrorMsg; + + /** + * 入库时间 - datetime + */ + @TableField("create_time") + private Date createTime; + + /** + * 入库更新时间 - datetime + */ + @TableField("update_time") + private Date updateTime; + + +} 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 deleted file mode 100644 index 1ef8b6b..0000000 --- a/docus-client-interface/src/main/java/com/docus/server/entity/TaskMessageExt.java +++ /dev/null @@ -1,14 +0,0 @@ -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/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 deleted file mode 100644 index 786955e..0000000 --- a/docus-client-interface/src/main/java/com/docus/server/util/ExceptionUtils.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.docus.server.util; - -import java.io.PrintWriter; -import java.io.StringWriter; - -public class ExceptionUtils { - - public static String getExceptionMessage(Throwable ex) { - StringWriter stringWriter = new StringWriter(); - ex.printStackTrace(new PrintWriter(stringWriter)); - String errorMessage = stringWriter.toString(); - - if (null != errorMessage && errorMessage.length() > 1000) { - return errorMessage.substring(0, 1000); - } - return errorMessage; - } -}