From 02b900125f254b7cbabba58a9f4891e847e98e12 Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Tue, 5 Dec 2023 18:32:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=202.5.0=201.=20=E4=BF=AE=E5=A4=8D=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E9=87=8D=E8=AF=95=E5=9C=BA=E6=99=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=94=99=E8=AF=AF=202.=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=92=8C=E5=9C=BA=E6=99=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98=203.=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4retry=5Fsummary=E7=9A=84=E5=A4=9A=E4=BD=99=E7=B4=A2?= =?UTF-8?q?=E5=BC=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/sql/easy_retry_mysql.sql | 3 +-- .../resources/mysql/mapper/RetrySummaryMapper.xml | 4 ++-- .../web/service/impl/RetryTaskServiceImpl.java | 15 +++++++-------- frontend/src/views/dashboard/RetryAnalysis.vue | 4 ++-- frontend/src/views/task/NotifyList.vue | 5 ----- frontend/src/views/task/SceneList.vue | 5 ----- 6 files changed, 12 insertions(+), 24 deletions(-) diff --git a/doc/sql/easy_retry_mysql.sql b/doc/sql/easy_retry_mysql.sql index e12efe301..b15798041 100644 --- a/doc/sql/easy_retry_mysql.sql +++ b/doc/sql/easy_retry_mysql.sql @@ -435,8 +435,7 @@ CREATE TABLE `retry_summary` `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', PRIMARY KEY (`id`), - KEY `idx_namespace_id_group_name_scene_name` (`namespace_id`, `group_name`, scene_name), UNIQUE KEY `uk_scene_name_trigger_at` (`namespace_id`, `group_name`, `scene_name`, `trigger_at`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 - DEFAULT CHARSET = utf8mb4 COMMENT ='DashBoard_Retry'; \ No newline at end of file + DEFAULT CHARSET = utf8mb4 COMMENT ='DashBoard_Retry'; diff --git a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/RetrySummaryMapper.xml b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/RetrySummaryMapper.xml index c0abcbcfc..4201a9f4f 100644 --- a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/RetrySummaryMapper.xml +++ b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/RetrySummaryMapper.xml @@ -157,9 +157,9 @@ diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/RetryTaskServiceImpl.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/RetryTaskServiceImpl.java index 5fed4a20f..78662c227 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/RetryTaskServiceImpl.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/RetryTaskServiceImpl.java @@ -177,22 +177,21 @@ public class RetryTaskServiceImpl implements RetryTaskService { } if (RetryStatusEnum.FINISH.getStatus().equals(retryStatusEnum.getStatus())) { - RetryTaskLogMessage retryTaskLogMessage = new RetryTaskLogMessage(); retryTaskLogMessage.setUniqueId(retryTask.getUniqueId()); retryTaskLogMessage.setGroupName(retryTask.getGroupName()); retryTaskLogMessage.setMessage("手动操作完成"); retryTaskLogMessage.setCreateDt(LocalDateTime.now()); retryTaskLogMessageMapper.insert(retryTaskLogMessage); - - RetryTaskLog retryTaskLog = new RetryTaskLog(); - retryTaskLog.setRetryStatus(RetryStatusEnum.FINISH.getStatus()); - retryTaskLogMapper.update(retryTaskLog, new LambdaUpdateWrapper() - .eq(RetryTaskLog::getNamespaceId, namespaceId) - .eq(RetryTaskLog::getUniqueId, retryTask.getUniqueId()) - .eq(RetryTaskLog::getGroupName, retryTask.getGroupName())); } + RetryTaskLog retryTaskLog = new RetryTaskLog(); + retryTaskLog.setRetryStatus(requestVO.getRetryStatus()); + retryTaskLogMapper.update(retryTaskLog, new LambdaUpdateWrapper() + .eq(RetryTaskLog::getNamespaceId, namespaceId) + .eq(RetryTaskLog::getUniqueId, retryTask.getUniqueId()) + .eq(RetryTaskLog::getGroupName, retryTask.getGroupName())); + retryTask.setUpdateDt(LocalDateTime.now()); return retryTaskAccess.updateById(requestVO.getGroupName(), namespaceId, retryTask); } diff --git a/frontend/src/views/dashboard/RetryAnalysis.vue b/frontend/src/views/dashboard/RetryAnalysis.vue index 4655ac65f..9aeff74d5 100644 --- a/frontend/src/views/dashboard/RetryAnalysis.vue +++ b/frontend/src/views/dashboard/RetryAnalysis.vue @@ -10,7 +10,7 @@ - +
- + diff --git a/frontend/src/views/task/NotifyList.vue b/frontend/src/views/task/NotifyList.vue index e92bd0260..757db6520 100644 --- a/frontend/src/views/task/NotifyList.vue +++ b/frontend/src/views/task/NotifyList.vue @@ -189,11 +189,6 @@ export default { created () { getAllGroupNameList().then((res) => { this.groupNameList = res.data - if (this.groupNameList !== null && this.groupNameList.length > 0) { - this.queryParam['groupName'] = this.groupNameList[0] - this.$refs.table.refresh(true) - this.handleChange(this.groupNameList[0]) - } }) const groupName = this.$route.query.groupName diff --git a/frontend/src/views/task/SceneList.vue b/frontend/src/views/task/SceneList.vue index 03b5137ec..3cc859a55 100644 --- a/frontend/src/views/task/SceneList.vue +++ b/frontend/src/views/task/SceneList.vue @@ -216,11 +216,6 @@ export default { created () { getAllGroupNameList().then((res) => { this.groupNameList = res.data - if (this.groupNameList !== null && this.groupNameList.length > 0) { - this.queryParam['groupName'] = this.groupNameList[0] - this.$refs.table.refresh(true) - this.handleChange(this.groupNameList[0]) - } }) }, methods: {