From 6c87182ea776ee0bf29170d90cbafd07d6133ff8 Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Thu, 4 Apr 2024 20:16:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:=203.2.0=201.=20=E4=BF=AE=E5=A4=8Dsqlserve?= =?UTF-8?q?r=20=E6=9F=A5=E8=AF=A2=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/core/client/RetryEndPoint.java | 8 ++- .../persistence/mapper/JobSummaryMapper.java | 2 + .../mapper/RetrySummaryMapper.java | 2 + .../sqlserver/mapper/JobSummaryMapper.xml | 3 +- .../sqlserver/mapper/RetrySummaryMapper.xml | 67 +++++++++---------- .../sqlserver/mapper/RetryTaskMapper.xml | 20 +++--- .../sqlserver/mapper/WorkflowMapper.xml | 16 ++--- .../service/impl/DashBoardServiceImpl.java | 32 +++++---- 8 files changed, 79 insertions(+), 71 deletions(-) diff --git a/easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/client/RetryEndPoint.java b/easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/client/RetryEndPoint.java index 2c3961e1..e4e91c6b 100644 --- a/easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/client/RetryEndPoint.java +++ b/easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/client/RetryEndPoint.java @@ -103,7 +103,13 @@ public class RetryEndPoint { executeRespDto.setStatusCode(RetryResultStatusEnum.STOP.getStatus()); executeRespDto.setExceptionMsg("下游标记不需要重试"); } else { - executeRespDto.setStatusCode(retryerResultContext.getRetryResultStatusEnum().getStatus()); + RetryResultStatusEnum retryResultStatusEnum = retryerResultContext.getRetryResultStatusEnum(); + if (Objects.isNull(retryResultStatusEnum)) { + retryResultStatusEnum = RetryResultStatusEnum.STOP; + retryerResultContext.setMessage("未获取重试状态. 任务停止"); + } + + executeRespDto.setStatusCode(retryResultStatusEnum.getStatus()); executeRespDto.setExceptionMsg(retryerResultContext.getMessage()); } diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobSummaryMapper.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobSummaryMapper.java index 99744e90..668c7d60 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobSummaryMapper.java +++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobSummaryMapper.java @@ -34,4 +34,6 @@ public interface JobSummaryMapper extends BaseMapper { List dashboardRank( @Param("systemTaskType") Integer systemTaskType, @Param("ew") Wrapper wrapper); DashboardCardResponseDO.JobTask toJobTask(@Param("ew") Wrapper wrapper); + + long countJobTask(@Param("ew") Wrapper wrapper); } diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/RetrySummaryMapper.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/RetrySummaryMapper.java index f46f4fff..45a48bd6 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/RetrySummaryMapper.java +++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/RetrySummaryMapper.java @@ -37,4 +37,6 @@ public interface RetrySummaryMapper extends BaseMapper { List retryLineList(@Param("dateFormat") String dateFormat, @Param("ew") Wrapper wrapper); List dashboardRank(@Param("ew") Wrapper wrapper); + + long countRetryTask(@Param("ew") Wrapper wrapper); } diff --git a/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml b/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml index a7f6a3d2..284c4468 100644 --- a/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml +++ b/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml @@ -134,8 +134,7 @@ - SELECT COUNT(DISTINCT group_name) FROM job ${ew.customSqlSegment} diff --git a/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetrySummaryMapper.xml b/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetrySummaryMapper.xml index cab617aa..084f551e 100644 --- a/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetrySummaryMapper.xml +++ b/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetrySummaryMapper.xml @@ -16,52 +16,47 @@ - INSERT INTO job_summary (namespace_id, group_name, business_id, trigger_at, system_task_type, - success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason) + INSERT INTO + retry_summary (namespace_id, group_name, scene_name, trigger_at, running_num, finish_num, max_count_num, + suspend_num) VALUES ( #{item.namespaceId}, #{item.groupName}, - #{item.businessId}, + #{item.sceneName}, #{item.triggerAt}, - #{item.systemTaskType}, - #{item.successNum}, - #{item.failNum}, - #{item.failReason}, - #{item.stopNum}, - #{item.stopReason}, - #{item.cancelNum}, - #{item.cancelReason} + #{item.runningNum}, + #{item.finishNum}, + #{item.maxCountNum}, + #{item.suspendNum} ) - UPDATE job_summary - SET success_num = src.success_num, - fail_num = src.fail_num, - fail_reason = src.fail_reason, - stop_num = src.stop_num, - stop_reason = src.stop_reason, - cancel_num = src.cancel_num, - cancel_reason = src.cancel_reason - FROM job_summary AS dest - JOIN ( - - SELECT - #{item.successNum} AS success_num, - #{item.failNum} AS fail_num, - #{item.failReason} AS fail_reason, - #{item.stopNum} AS stop_num, - #{item.stopReason} AS stop_reason, - #{item.cancelNum} AS cancel_num, - #{item.cancelReason} AS cancel_reason, - #{item.triggerAt} AS trigger_at, - #{item.businessId} AS business_id - - ) AS src - ON (dest.trigger_at = src.trigger_at AND dest.business_id = src.business_id) + UPDATE retry_summary + SET running_num = src.running_num, + finish_num = src.finish_num, + max_count_num = src.max_count_num, + suspend_num = src.suspend_num + FROM retry_summary AS dest + JOIN ( + + SELECT + #{item.runningNum} AS running_num, + #{item.finishNum} AS finish_num, + #{item.maxCountNum} AS max_count_num, + #{item.suspendNum} AS suspend_num, + #{item.triggerAt} AS trigger_at, + #{item.sceneName} AS scene_name, + #{item.namespaceId} AS namespace_id, + #{item.groupName} AS group_name + + ) AS src + ON (dest.trigger_at = src.trigger_at AND dest.group_name = src.group_name + AND dest.scene_name = src.scene_name AND dest.namespace_id = src.namespace_id + ) +