From 829f8fb1d0e242d98be562034b74d22a7cc004f3 Mon Sep 17 00:00:00 2001 From: zhengweilin Date: Fri, 8 Dec 2023 09:50:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=202.5.0:=201=E3=80=81=E4=BB=AA=E8=A1=A8?= =?UTF-8?q?=E7=9B=98=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=8A=98=E7=BA=BF?= =?UTF-8?q?=E5=9B=BE=E6=96=B0=E5=A2=9E=E5=8F=96=E6=B6=88=E3=80=81=E5=81=9C?= =?UTF-8?q?=E6=AD=A2=E7=BB=9F=E8=AE=A1=E7=BB=B4=E5=BA=A6=202=E3=80=81?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E7=9B=98=E9=87=8D=E8=AF=95=E3=80=81=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A4=A7=E4=BA=8E0=203=E3=80=81=E4=BB=AA=E8=A1=A8?= =?UTF-8?q?=E7=9B=98=E7=BB=84=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E6=B8=85?= =?UTF-8?q?=E9=99=A4=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataobject/DashboardLineResponseDO.java | 4 +-- .../mysql/mapper/JobSummaryMapper.xml | 5 +-- .../mysql/mapper/RetrySummaryMapper.xml | 1 + .../server/web/model/enums/DateTypeEnum.java | 16 ++++----- .../response/DashboardLineResponseVO.java | 4 +-- frontend/src/components/Charts/JobLine.vue | 2 +- frontend/src/views/dashboard/Analysis.vue | 2 +- frontend/src/views/dashboard/JobAnalysis.vue | 34 +++++++++---------- 8 files changed, 35 insertions(+), 33 deletions(-) diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/dataobject/DashboardLineResponseDO.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/dataobject/DashboardLineResponseDO.java index 0dfd1b2e..31146af3 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/dataobject/DashboardLineResponseDO.java +++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/dataobject/DashboardLineResponseDO.java @@ -57,12 +57,12 @@ public class DashboardLineResponseDO { /** * 定时-停止数 */ - private Long stopNum; + private Long stop; /** * 定时-取消数 */ - private Long cancelNum; + private Long cancel; /** * 定时-成功数 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 d43b8daf..ebfee3b8 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 @@ -71,8 +71,8 @@ AS createDt, ifnull(SUM(success_num), 0) AS success, ifnull(SUM(fail_num), 0) AS failNum, - ifnull(SUM(stop_num), 0) AS stopNum, - ifnull(SUM(cancel_num), 0) AS cancelNum, + ifnull(SUM(stop_num), 0) AS stop, + ifnull(SUM(cancel_num), 0) AS cancel, ifnull(SUM(fail_num + stop_num + cancel_num), 0) AS fail, ifnull(SUM(success_num + fail_num + stop_num + cancel_num), 0) AS total FROM job_summary @@ -109,6 +109,7 @@ AND namespace_id = #{namespaceId} GROUP BY namespace_id, group_name, job_id + HAVING total > 0 ORDER BY total DESC LIMIT 10 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 3bb19590..b85f03ad 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 @@ -123,6 +123,7 @@ AND trigger_at >= #{startTime} AND trigger_at <= #{endTime} GROUP BY namespace_id, group_name, scene_name + HAVING total > 0 ORDER BY total DESC LIMIT 10 diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/enums/DateTypeEnum.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/enums/DateTypeEnum.java index 82ab0952..a471d772 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/enums/DateTypeEnum.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/enums/DateTypeEnum.java @@ -39,8 +39,8 @@ public enum DateTypeEnum { .setSuccess(0L) .setSuccessNum(0L) .setSuspendNum(0L) - .setStopNum(0L) - .setCancelNum(0L) + .setStop(0L) + .setCancel(0L) .setCreateDt(format); dashboardLineResponseVOList.add(dashboardLineResponseVO); } @@ -74,8 +74,8 @@ public enum DateTypeEnum { .setSuccess(0L) .setSuccessNum(0L) .setSuspendNum(0L) - .setStopNum(0L) - .setCancelNum(0L) + .setStop(0L) + .setCancel(0L) .setCreateDt(format); dashboardLineResponseVOList.add(dashboardLineResponseVO); } @@ -110,8 +110,8 @@ public enum DateTypeEnum { .setSuccess(0L) .setSuccessNum(0L) .setSuspendNum(0L) - .setStopNum(0L) - .setCancelNum(0L) + .setStop(0L) + .setCancel(0L) .setCreateDt(format); dashboardLineResponseVOList.add(dashboardLineResponseVO); } @@ -146,8 +146,8 @@ public enum DateTypeEnum { .setSuccess(0L) .setSuccessNum(0L) .setSuspendNum(0L) - .setStopNum(0L) - .setCancelNum(0L) + .setStop(0L) + .setCancel(0L) .setCreateDt(format); dashboardLineResponseVOList.add(dashboardLineResponseVO); } diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/DashboardLineResponseVO.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/DashboardLineResponseVO.java index 8f1cbf36..647684b8 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/DashboardLineResponseVO.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/DashboardLineResponseVO.java @@ -59,12 +59,12 @@ public class DashboardLineResponseVO { /** * 定时-停止数 */ - private Long stopNum; + private Long stop; /** * 定时-取消数 */ - private Long cancelNum; + private Long cancel; /** * 定时-成功数 diff --git a/frontend/src/components/Charts/JobLine.vue b/frontend/src/components/Charts/JobLine.vue index 28ff8a0a..920f4a62 100644 --- a/frontend/src/components/Charts/JobLine.vue +++ b/frontend/src/components/Charts/JobLine.vue @@ -43,7 +43,7 @@ export default { var dv = ds.createView().source(viewRecords) dv.transform({ type: 'fold', - fields: ['success', 'fail'], + fields: ['success', 'fail', 'stop', 'cancel'], key: 'name', value: 'viewTotal', retains: ['total', 'createDt'] diff --git a/frontend/src/views/dashboard/Analysis.vue b/frontend/src/views/dashboard/Analysis.vue index 5edc9fc2..0f31d126 100644 --- a/frontend/src/views/dashboard/Analysis.vue +++ b/frontend/src/views/dashboard/Analysis.vue @@ -89,7 +89,7 @@
- + {{ item }} diff --git a/frontend/src/views/dashboard/JobAnalysis.vue b/frontend/src/views/dashboard/JobAnalysis.vue index 0e719fac..13c5ade3 100644 --- a/frontend/src/views/dashboard/JobAnalysis.vue +++ b/frontend/src/views/dashboard/JobAnalysis.vue @@ -70,10 +70,10 @@ export default { groupName: '', startTime: '', endTime: '', - successNum: 0, - failNum: 0, - stopNum: 0, - cancelNum: 0, + success: 0, + fail: 0, + stop: 0, + cancel: 0, total: 0, groupNameList: [], pieScale: [{ @@ -111,24 +111,24 @@ export default { mounted () { this.$bus.$on('job', (res) => { this.total = 0 - this.successNum = 0 - this.failNum = 0 - this.stopNum = 0 - this.cancelNum = 0 + this.success = 0 + this.fail = 0 + this.stop = 0 + this.cancel = 0 this.rankList = res.data.rankList this.taskList = res.data.taskList res.data.dashboardLineResponseDOList.forEach(res => { - this.successNum += res.success - this.failNum += res.failNum - this.stopNum += res.stopNum - this.cancelNum += res.cancelNum + this.success += res.success + this.fail += res.fail + this.stop += res.stop + this.cancel += res.cancel }) - this.total = this.successNum + this.failNum + this.stopNum + this.cancelNum + this.total = this.success + this.fail + this.stop + this.cancel this.pieData = [ - { value: 'SUCCESS', name: this.successNum, percent: this.successNum / this.total }, - { value: 'FAIL', name: this.failNum, percent: this.failNum / this.total }, - { value: 'STOP', name: this.stopNum, percent: this.stopNum / this.total }, - { value: 'CANCEL', name: this.cancelNum, percent: this.cancelNum / this.total } + { value: 'SUCCESS', name: this.success, percent: this.success / this.total }, + { value: 'FAIL', name: this.fail, percent: this.fail / this.total }, + { value: 'STOP', name: this.stop, percent: this.stop / this.total }, + { value: 'CANCEL', name: this.cancel, percent: this.cancel / this.total } ] }) },