From c09294e2b02b485a241ee1905d38b4bb85dc9033 Mon Sep 17 00:00:00 2001
From: byteblogs168 <598092184@qq.com>
Date: Tue, 5 Dec 2023 23:40:41 +0800
Subject: [PATCH] =?UTF-8?q?reactor:2.5.0=201.=20job=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=81=9C=E6=AD=A2=20=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E6=95=B0=E9=87=8F=202.=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=9C=BA=E6=99=AF=E5=92=8C=E9=80=9A=E7=9F=A5=E7=BB=84?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=A1=86=E5=BC=82=E5=B8=B8=203.=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Djob=E7=BB=9F=E8=AE=A1=E8=A1=A8=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B0=83=E5=BA=A6=E6=88=90=E5=8A=9F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataobject/DashboardCardResponseDO.java        |  4 ++++
 .../resources/mysql/mapper/JobSummaryMapper.xml    | 14 +++++++++++---
 .../task/support/schedule/JobSummarySchedule.java  |  4 ++--
 .../model/response/DashboardCardResponseVO.java    |  4 ++++
 .../convert/JobSummaryResponseVOConverter.java     |  2 +-
 .../web/service/impl/DashBoardServiceImpl.java     |  1 +
 .../src/locales/lang/zh-CN/dashboard/analysis.js   |  2 ++
 frontend/src/views/dashboard/Analysis.vue          |  8 ++++++++
 frontend/src/views/dashboard/JobAnalysis.vue       |  2 +-
 frontend/src/views/task/NotifyList.vue             | 10 +++++++---
 frontend/src/views/task/RetryLogList.vue           | 10 +++++++---
 frontend/src/views/task/SceneList.vue              | 10 +++++++---
 12 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/dataobject/DashboardCardResponseDO.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/dataobject/DashboardCardResponseDO.java
index 58c7e0b2..d71171e2 100644
--- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/dataobject/DashboardCardResponseDO.java
+++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/dataobject/DashboardCardResponseDO.java
@@ -52,6 +52,10 @@ public class DashboardCardResponseDO {
         private Integer successNum;
         //失败
         private Integer failNum;
+        //取消
+        private Integer cancelNum;
+        //停止
+        private Integer stopNum;
         // 总数
         private Integer totalNum;
         // 成功率
diff --git a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml
index 18eec6cf..d43b8daf 100644
--- a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml
+++ b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml
@@ -39,7 +39,13 @@
             )
         </foreach>
         ON DUPLICATE KEY UPDATE
-        job_id = values(`job_id`), trigger_at = values(`trigger_at`)
+        success_num = values(`success_num`),
+        fail_num = values(`fail_num`),
+        fail_reason = values(`fail_reason`),
+        stop_num = values(`stop_num`),
+        stop_reason = values(`stop_reason`),
+        cancel_num = values(`cancel_num`),
+        cancel_reason = values(`cancel_reason`)
     </insert>
 
     <select id="jobLineList"
@@ -82,7 +88,9 @@
     <select id="toJobTask"
             resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardCardResponseDO$JobTask">
         SELECT ifnull(sum(success_num), 0)                                    AS successNum,
-               ifnull(sum(fail_num + stop_num + cancel_num), 0)               AS failNum,
+               ifnull(sum(stop_num), 0)                                       AS stopNum,
+               ifnull(sum(cancel_num), 0)                                     AS cancelNum,
+               ifnull(sum(fail_num), 0)                                       AS failNum,
                ifnull(sum(success_num + fail_num + stop_num + cancel_num), 0) AS totalNum
         FROM job_summary
         WHERE namespace_id = #{namespaceId}
@@ -92,7 +100,7 @@
             resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Rank">
         SELECT
         CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id=job_id)) `name`,
-        SUM(success_num + fail_num + stop_num + cancel_num) AS total FROM job_summary
+        SUM(fail_num) AS total FROM job_summary
         <where>
             <if test="groupName != '' and groupName != null">
                 AND group_name = #{groupName}
diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java
index d3c3014b..beeb4392 100644
--- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java
+++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
  *
  * @author: wodeyangzipingpingwuqi
  * @date : 2023-11-21 11:15
- * @since 2.1.0
+ * @since 2.5.0
  */
 @Component
 @Slf4j
@@ -69,7 +69,7 @@ public class JobSummarySchedule extends AbstractSchedule implements Lifecycle {
 
                 // insertOrUpdate
                 List<JobSummary> jobSummaryList = jobSummaryList(todayFrom, summaryResponseDOList);
-                int totalJobSummary = jobSummaryMapper.insertOrUpdate(jobSummaryList);
+                 int totalJobSummary = jobSummaryMapper.insertOrUpdate(jobSummaryList);
                 LogUtils.debug(log, "job summary dashboard success todayFrom:[{}] todayTo:[{}] total:[{}]", todayFrom, todayTo, totalJobSummary);
             }
         } catch (Exception e) {
diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/DashboardCardResponseVO.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/DashboardCardResponseVO.java
index 79ec1434..97049e64 100644
--- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/DashboardCardResponseVO.java
+++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/DashboardCardResponseVO.java
@@ -66,6 +66,10 @@ public class DashboardCardResponseVO {
         private Integer successNum;
         //失败
         private Integer failNum;
+        //取消
+        private Integer cancelNum;
+        //停止
+        private Integer stopNum;
         // 总数
         private Integer totalNum;
         // 成功率
diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobSummaryResponseVOConverter.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobSummaryResponseVOConverter.java
index fdd308f0..7cebd922 100644
--- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobSummaryResponseVOConverter.java
+++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobSummaryResponseVOConverter.java
@@ -35,6 +35,6 @@ public interface JobSummaryResponseVOConverter {
         if (Objects.isNull(totalNum) || totalNum == 0) {
             return null;
         }
-        return new BigDecimal(successNum + "").divide(new BigDecimal(totalNum + ""), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+        return new BigDecimal(String.valueOf(successNum)).divide(new BigDecimal(String.valueOf(totalNum)), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
     }
 }
diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java
index a4eb0b15..52598388 100644
--- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java
+++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java
@@ -17,6 +17,7 @@ import com.aizuda.easy.retry.server.web.service.DashBoardService;
 import com.aizuda.easy.retry.server.web.service.convert.*;
 import com.aizuda.easy.retry.server.web.util.UserSessionUtils;
 import com.aizuda.easy.retry.template.datasource.persistence.dataobject.ActivePodQuantityResponseDO;
+import com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardCardResponseDO;
 import com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO;
 import com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardLineResponseDO;
 import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobSummaryMapper;
diff --git a/frontend/src/locales/lang/zh-CN/dashboard/analysis.js b/frontend/src/locales/lang/zh-CN/dashboard/analysis.js
index b4ea5dbb..d73a2bde 100644
--- a/frontend/src/locales/lang/zh-CN/dashboard/analysis.js
+++ b/frontend/src/locales/lang/zh-CN/dashboard/analysis.js
@@ -5,6 +5,8 @@ export default {
   'dashboard.analysis.day-sales': '日均任务',
   'dashboard.analysis.job_success': '成功',
   'dashboard.analysis.job_fail': '失败',
+  'dashboard.analysis.job_stop': '停止',
+  'dashboard.analysis.job_cancel': '取消',
   'dashboard.analysis.visits': '定时任务',
   'dashboard.analysis.visits-trend': '访问量趋势',
   'dashboard.analysis.visits-ranking': '门店访问量排名',
diff --git a/frontend/src/views/dashboard/Analysis.vue b/frontend/src/views/dashboard/Analysis.vue
index 31a1475d..5edc9fc2 100644
--- a/frontend/src/views/dashboard/Analysis.vue
+++ b/frontend/src/views/dashboard/Analysis.vue
@@ -47,6 +47,12 @@
             <a-divider type="vertical" />
             {{ $t('dashboard.analysis.job_fail') }}
             <span>{{ jobTask.failNum }}</span>
+            <a-divider type="vertical" />
+            {{ $t('dashboard.analysis.job_stop') }}
+            <span>{{ jobTask.stopNum }}</span>
+            <a-divider type="vertical" />
+            {{ $t('dashboard.analysis.job_cancel') }}
+            <span>{{ jobTask.cancelNum }}</span>
           </template>
         </chart-card>
       </a-col>
@@ -153,6 +159,8 @@ export default {
         successRate: 0,
         successNum: 0,
         failNum: 0,
+        cancelNum: 0,
+        stopNum: 0,
         totalNum: 0
       },
       onLineService: {
diff --git a/frontend/src/views/dashboard/JobAnalysis.vue b/frontend/src/views/dashboard/JobAnalysis.vue
index fa1ba72a..0e719fac 100644
--- a/frontend/src/views/dashboard/JobAnalysis.vue
+++ b/frontend/src/views/dashboard/JobAnalysis.vue
@@ -5,7 +5,7 @@
         <g2-job-line ref="jobViewChart" name="G2JobLine" />
       </a-col>
       <a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
-        <rank-list :title="$t('dashboard.analysis.sales-ranking')" :list="rankList" />
+        <rank-list title="失败任务排名" :list="rankList" />
       </a-col>
     </a-row>
     <a-row :gutter="24" type="flex" :style="{ marginTop: '24px' }">
diff --git a/frontend/src/views/task/NotifyList.vue b/frontend/src/views/task/NotifyList.vue
index 757db652..20901028 100644
--- a/frontend/src/views/task/NotifyList.vue
+++ b/frontend/src/views/task/NotifyList.vue
@@ -208,9 +208,13 @@ export default {
       this.$router.push({ path: '/retry/notify/config', query: { id: record.id } })
     },
     handleChange (value) {
-      getSceneList({ groupName: value }).then((res) => {
-        this.sceneList = res.data
-      })
+      if (value) {
+        getSceneList({ groupName: value }).then((res) => {
+          this.sceneList = res.data
+        })
+      } else {
+        this.sceneList = []
+      }
     }
   }
 }
diff --git a/frontend/src/views/task/RetryLogList.vue b/frontend/src/views/task/RetryLogList.vue
index e70ff62d..bbbfc480 100644
--- a/frontend/src/views/task/RetryLogList.vue
+++ b/frontend/src/views/task/RetryLogList.vue
@@ -263,9 +263,13 @@ export default {
       this.$refs.table.refresh(true)
     },
     handleChange (value) {
-      getSceneList({ 'groupName': value }).then(res => {
-        this.sceneList = res.data
-      })
+      if (value) {
+        getSceneList({ groupName: value }).then((res) => {
+          this.sceneList = res.data
+        })
+      } else {
+        this.sceneList = []
+      }
     },
     toggleAdvanced () {
       this.advanced = !this.advanced
diff --git a/frontend/src/views/task/SceneList.vue b/frontend/src/views/task/SceneList.vue
index 3cc859a5..f8eb7a2f 100644
--- a/frontend/src/views/task/SceneList.vue
+++ b/frontend/src/views/task/SceneList.vue
@@ -230,9 +230,13 @@ export default {
       this.$router.push({ path: '/retry/scene/config', query: { id: record.id } })
     },
     handleChange (value) {
-      getSceneList({ groupName: value }).then((res) => {
-        this.sceneList = res.data
-      })
+      if (value) {
+        getSceneList({ groupName: value }).then((res) => {
+          this.sceneList = res.data
+        })
+      } else {
+        this.sceneList = []
+      }
     }
   }
 }