feat:2.4.0

1. 修复查询重试日志重复问题
This commit is contained in:
byteblogs168 2023-11-09 23:50:33 +08:00
parent fd15f76f16
commit 1ceeb56113
54 changed files with 71 additions and 68 deletions

View File

@ -98,7 +98,7 @@ public abstract class AbstractScanGroup extends AbstractActor {
AtomicInteger count = new AtomicInteger(0);
long total = PartitionTaskUtils.process(
startId -> listAvailableTasks(groupName, startId, taskActuatorScene().getTaskType().getType()),
partitionTasks -> processRetryPartitionTasks(partitionTasks), partitionTasks -> {
this::processRetryPartitionTasks, partitionTasks -> {
if (CollectionUtils.isEmpty(partitionTasks)) {
putLastId(scanTask.getGroupName(), 0L);
return Boolean.TRUE;
@ -159,7 +159,8 @@ public abstract class AbstractScanGroup extends AbstractActor {
.listPage(groupName, new PageDTO<>(0, systemProperties.getRetryPullPageSize()),
new LambdaQueryWrapper<RetryTask>()
.eq(RetryTask::getRetryStatus, RetryStatusEnum.RUNNING.getStatus())
.eq(RetryTask::getGroupName, groupName).eq(RetryTask::getTaskType, taskType)
.eq(RetryTask::getGroupName, groupName)
.eq(RetryTask::getTaskType, taskType)
.le(RetryTask::getNextTriggerAt, LocalDateTime.now().plusSeconds(SystemConstants.SCHEDULE_PERIOD))
.gt(RetryTask::getId, lastId)
.orderByAsc(RetryTask::getId))

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-251479d0"],{"339f":function(t,e,r){"use strict";var a=function(){var t=this,e=t._self._c;return e("div",[e("div",{staticStyle:{margin:"20px 0","border-left":"#f5222d 5px solid","font-size":"medium","font-weight":"bold"}},[t._v("    调用日志详情 (总调度次数: "+t._s(t.total)+") ")]),e("a-card",[e("s-table",{ref:"table",attrs:{size:"default",rowKey:"key",columns:t.columns,data:t.loadData},scopedSlots:t._u([{key:"serial",fn:function(r,a){return e("span",{},[t._v(" "+t._s(a.id)+" ")])}},{key:"clientInfo",fn:function(r){return e("span",{},[t._v(" "+t._s(r?r.split("@")[1]:"无")+" ")])}}])})],1)],1)},s=[],n=r("c1df"),o=r.n(n),i=r("0fea"),l=r("2af9"),d={name:"RetryTaskLogMessageList",components:{STable:l["j"]},data:function(){var t=this;return{columns:[{title:"#",scopedSlots:{customRender:"serial"},width:"10%"},{title:"信息",dataIndex:"message",width:"50%"},{title:"地址",dataIndex:"clientInfo",scopedSlots:{customRender:"clientInfo"},width:"10%"},{title:"触发时间",dataIndex:"createDt",sorter:!0,customRender:function(t){return o()(t).format("YYYY-MM-DD HH:mm:ss")},width:"10%"}],queryParam:{},loadData:function(e){if(t.queryParam["groupName"])return Object(i["s"])(Object.assign(e,t.queryParam)).then((function(e){return t.total=e.total,e}))},total:0}},methods:{refreshTable:function(t){this.queryParam=t,this.$refs.table.refresh(!0)}}},c=d,u=r("2877"),f=Object(u["a"])(c,a,s,!1,null,"24548855",null);e["a"]=f.exports},"5fe2":function(t,e,r){"use strict";r.r(e);r("b0c0");var a=function(){var t=this,e=t._self._c;return e("div",[e("page-header-wrapper",{staticStyle:{margin:"-24px -1px 0"},on:{back:function(){return t.$router.go(-1)}}},[e("div")]),e("a-card",{attrs:{bordered:!1}},[null!==t.retryInfo?e("a-descriptions",{attrs:{title:"",bordered:""}},[e("a-descriptions-item",{attrs:{label:"组名称"}},[t._v(" "+t._s(t.retryInfo.groupName)+" ")]),e("a-descriptions-item",{attrs:{label:"场景名称"}},[t._v(" "+t._s(t.retryInfo.sceneName)+" ")]),e("a-descriptions-item",{attrs:{label:"唯一id"}},[t._v(" "+t._s(t.retryInfo.uniqueId)+" ")]),e("a-descriptions-item",{attrs:{label:"幂等id",span:2}},[t._v(" "+t._s(t.retryInfo.idempotentId)+" ")]),e("a-descriptions-item",{attrs:{label:"业务编号"}},[t._v(" "+t._s(t.retryInfo.bizNo)+" ")]),e("a-descriptions-item",{attrs:{label:"当前重试状态 | 数据类型"}},[e("a-tag",{attrs:{color:"red"}},[t._v(" "+t._s(t.retryStatus[t.retryInfo.retryStatus])+" ")]),e("a-divider",{attrs:{type:"vertical"}}),e("a-tag",{attrs:{color:t.taskType[t.retryInfo.taskType].color}},[t._v(" "+t._s(t.taskType[t.retryInfo.taskType].name)+" ")])],1),e("a-descriptions-item",{attrs:{label:"创建时间"}},[t._v(" "+t._s(t.retryInfo.createDt)+" ")]),e("a-descriptions-item",{attrs:{label:"执行器名称",span:3}},[t._v(" "+t._s(t.retryInfo.executorName)+" ")]),e("a-descriptions-item",{attrs:{label:"参数",span:3}},[t._v(" "+t._s(t.retryInfo.argsStr)+" ")]),e("a-descriptions-item",{attrs:{label:"扩展参数",span:3}},[t._v(" "+t._s(t.retryInfo.extAttrs)+" ")])],1):t._e()],1),e("RetryTaskLogMessageList",{ref:"retryTaskLogMessageListRef"})],1)},s=[],n=r("0fea"),o=r("c1df"),i=r.n(o),l=r("2af9"),d=r("339f"),c={name:"RetryLogInfo",components:{RetryTaskLogMessageList:d["a"],STable:l["j"]},data:function(){return{retryInfo:null,retryStatus:{0:"处理中",1:"处理成功",2:"最大次数"},taskType:{1:{name:"重试数据",color:"#d06892"},2:{name:"回调数据",color:"#f5a22d"}}}},created:function(){var t=this,e=this.$route.query.id;e&&Object(n["r"])(e).then((function(e){t.retryInfo=e.data,t.queryParam={groupName:t.retryInfo.groupName,uniqueId:t.retryInfo.uniqueId},t.$refs.retryTaskLogMessageListRef.refreshTable(t.queryParam)}))},methods:{parseDate:function(t){return i()(t).format("YYYY-MM-DD HH:mm:ss")}}},u=c,f=r("2877"),m=Object(f["a"])(u,a,s,!1,null,"29057338",null);e["default"]=m.exports}}]);

View File

@ -1 +0,0 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-251479d0"],{"339f":function(t,e,r){"use strict";var a=function(){var t=this,e=t._self._c;return e("div",[e("div",{staticStyle:{margin:"20px 0","border-left":"#f5222d 5px solid","font-size":"medium","font-weight":"bold"}},[t._v("    调用日志详情 (总调度次数: "+t._s(t.total)+") ")]),e("a-card",[e("s-table",{ref:"table",attrs:{size:"default",rowKey:"key",columns:t.columns,data:t.loadData},scopedSlots:t._u([{key:"serial",fn:function(r,a){return e("span",{},[t._v(" "+t._s(a.id)+" ")])}},{key:"clientInfo",fn:function(r){return e("span",{},[t._v(" "+t._s(r?r.split("@")[1]:"无")+" ")])}}])})],1)],1)},s=[],n=r("c1df"),o=r.n(n),i=r("0fea"),l=r("2af9"),d={name:"RetryTaskLogMessageList",components:{STable:l["j"]},data:function(){var t=this;return{columns:[{title:"#",scopedSlots:{customRender:"serial"},width:"10%"},{title:"信息",dataIndex:"message",width:"50%"},{title:"地址",dataIndex:"clientInfo",scopedSlots:{customRender:"clientInfo"},width:"10%"},{title:"触发时间",dataIndex:"createDt",sorter:!0,customRender:function(t){return o()(t).format("YYYY-MM-DD HH:mm:ss")},width:"10%"}],queryParam:{},loadData:function(e){return Object(i["s"])(Object.assign(e,t.queryParam)).then((function(e){return t.total=e.total,e}))},total:0}},methods:{refreshTable:function(t){this.queryParam=t,this.$refs.table.refresh(!0)}}},c=d,f=r("2877"),u=Object(f["a"])(c,a,s,!1,null,"ea1f0aa8",null);e["a"]=u.exports},"5fe2":function(t,e,r){"use strict";r.r(e);r("b0c0");var a=function(){var t=this,e=t._self._c;return e("div",[e("page-header-wrapper",{staticStyle:{margin:"-24px -1px 0"},on:{back:function(){return t.$router.go(-1)}}},[e("div")]),e("a-card",{attrs:{bordered:!1}},[null!==t.retryInfo?e("a-descriptions",{attrs:{title:"",bordered:""}},[e("a-descriptions-item",{attrs:{label:"组名称"}},[t._v(" "+t._s(t.retryInfo.groupName)+" ")]),e("a-descriptions-item",{attrs:{label:"场景名称"}},[t._v(" "+t._s(t.retryInfo.sceneName)+" ")]),e("a-descriptions-item",{attrs:{label:"唯一id"}},[t._v(" "+t._s(t.retryInfo.uniqueId)+" ")]),e("a-descriptions-item",{attrs:{label:"幂等id",span:2}},[t._v(" "+t._s(t.retryInfo.idempotentId)+" ")]),e("a-descriptions-item",{attrs:{label:"业务编号"}},[t._v(" "+t._s(t.retryInfo.bizNo)+" ")]),e("a-descriptions-item",{attrs:{label:"当前重试状态 | 数据类型"}},[e("a-tag",{attrs:{color:"red"}},[t._v(" "+t._s(t.retryStatus[t.retryInfo.retryStatus])+" ")]),e("a-divider",{attrs:{type:"vertical"}}),e("a-tag",{attrs:{color:t.taskType[t.retryInfo.taskType].color}},[t._v(" "+t._s(t.taskType[t.retryInfo.taskType].name)+" ")])],1),e("a-descriptions-item",{attrs:{label:"创建时间"}},[t._v(" "+t._s(t.retryInfo.createDt)+" ")]),e("a-descriptions-item",{attrs:{label:"执行器名称",span:3}},[t._v(" "+t._s(t.retryInfo.executorName)+" ")]),e("a-descriptions-item",{attrs:{label:"参数",span:3}},[t._v(" "+t._s(t.retryInfo.argsStr)+" ")]),e("a-descriptions-item",{attrs:{label:"扩展参数",span:3}},[t._v(" "+t._s(t.retryInfo.extAttrs)+" ")])],1):t._e()],1),e("RetryTaskLogMessageList",{ref:"retryTaskLogMessageListRef"})],1)},s=[],n=r("0fea"),o=r("c1df"),i=r.n(o),l=r("2af9"),d=r("339f"),c={name:"RetryLogInfo",components:{RetryTaskLogMessageList:d["a"],STable:l["j"]},data:function(){return{retryInfo:null,retryStatus:{0:"处理中",1:"处理成功",2:"最大次数"},taskType:{1:{name:"重试数据",color:"#d06892"},2:{name:"回调数据",color:"#f5a22d"}}}},created:function(){var t=this,e=this.$route.query.id;e&&Object(n["r"])(e).then((function(e){t.retryInfo=e.data,t.queryParam={groupName:t.retryInfo.groupName,uniqueId:t.retryInfo.uniqueId},t.$refs.retryTaskLogMessageListRef.refreshTable(t.queryParam)}))},methods:{parseDate:function(t){return i()(t).format("YYYY-MM-DD HH:mm:ss")}}},f=c,u=r("2877"),p=Object(u["a"])(f,a,s,!1,null,"29057338",null);e["default"]=p.exports}}]);

View File

@ -0,0 +1 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0aa660"],{"119c":function(t,a,e){"use strict";e.r(a);e("b0c0");var o=function(){var t=this,a=t._self._c;return a("div",[a("page-header-wrapper",{staticStyle:{margin:"-24px -1px 0"},on:{back:function(){return t.$router.go(-1)}}},[a("div")]),null!==t.jobBatchInfo?a("a-card",{attrs:{bordered:!1}},[a("a-descriptions",{attrs:{title:"",column:3,bordered:""}},[a("a-descriptions-item",{attrs:{label:"组名称"}},[t._v(" "+t._s(t.jobBatchInfo.groupName)+" ")]),a("a-descriptions-item",{attrs:{label:"任务名称"}},[t._v(" "+t._s(t.jobBatchInfo.jobName)+" ")]),a("a-descriptions-item",{attrs:{label:"状态"}},[a("a-tag",{attrs:{color:t.taskBatchStatus[t.jobBatchInfo.taskBatchStatus].color}},[t._v(" "+t._s(t.taskBatchStatus[t.jobBatchInfo.taskBatchStatus].name)+" ")])],1),a("a-descriptions-item",{attrs:{label:"执行器类型"}},[a("a-tag",{attrs:{color:t.executorType[t.jobBatchInfo.executorType].color}},[t._v(" "+t._s(t.executorType[t.jobBatchInfo.executorType].name)+" ")])],1),a("a-descriptions-item",{attrs:{label:"操作原因"}},[a("a-tag",{attrs:{color:t.operationReason[t.jobBatchInfo.operationReason].color}},[t._v(" "+t._s(t.operationReason[t.jobBatchInfo.operationReason].name)+" ")])],1),a("a-descriptions-item",{attrs:{label:"开始执行时间"}},[t._v(" "+t._s(t.jobBatchInfo.executionAt)+" ")]),a("a-descriptions-item",{attrs:{label:"执行器名称",span:"4"}},[t._v(" "+t._s(t.jobBatchInfo.executorInfo)+" ")]),a("a-descriptions-item",{attrs:{label:"创建时间"}},[t._v(" "+t._s(t.jobBatchInfo.createDt)+" ")])],1)],1):t._e(),a("div",{staticStyle:{margin:"20px 0","border-left":"#f5222d 5px solid","font-size":"medium","font-weight":"bold"}},[t._v("    任务项列表 ")]),a("JobTaskList",{ref:"JobTaskListRef"})],1)},r=[],s=e("3b7a"),n=e("c1df"),c=e.n(n),i=e("38b7"),u=e.n(i),p=e("36e8"),b={name:"JobInfo",components:{JobTaskList:p["default"]},data:function(){return{jobBatchInfo:null,taskBatchStatus:u.a.taskBatchStatus,operationReason:u.a.operationReason,taskType:u.a.taskType,triggerType:u.a.triggerType,blockStrategy:u.a.blockStrategy,executorType:u.a.executorType}},created:function(){var t=this,a=this.$route.query.id,e=this.$route.query.groupName;a&&e?Object(s["d"])(a).then((function(e){t.jobBatchInfo=e.data,t.queryParam={groupName:t.jobBatchInfo.groupName,taskBatchId:a},t.$refs.JobTaskListRef.refreshTable(t.queryParam)})):this.$router.push({path:"/404"})},methods:{jobTaskList:s["h"],parseDate:function(t){return c()(t).format("YYYY-MM-DD HH:mm:ss")}}},l=b,f=e("2877"),h=Object(f["a"])(l,o,r,!1,null,"1a941578",null);a["default"]=h.exports}}]);

File diff suppressed because one or more lines are too long

View File

@ -1 +0,0 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-35f76107"],{"339f":function(t,e,a){"use strict";var r=function(){var t=this,e=t._self._c;return e("div",[e("div",{staticStyle:{margin:"20px 0","border-left":"#f5222d 5px solid","font-size":"medium","font-weight":"bold"}},[t._v("    调用日志详情 (总调度次数: "+t._s(t.total)+") ")]),e("a-card",[e("s-table",{ref:"table",attrs:{size:"default",rowKey:"key",columns:t.columns,data:t.loadData},scopedSlots:t._u([{key:"serial",fn:function(a,r){return e("span",{},[t._v(" "+t._s(r.id)+" ")])}},{key:"clientInfo",fn:function(a){return e("span",{},[t._v(" "+t._s(a?a.split("@")[1]:"无")+" ")])}}])})],1)],1)},s=[],n=a("c1df"),o=a.n(n),i=a("0fea"),l=a("2af9"),d={name:"RetryTaskLogMessageList",components:{STable:l["j"]},data:function(){var t=this;return{columns:[{title:"#",scopedSlots:{customRender:"serial"},width:"10%"},{title:"信息",dataIndex:"message",width:"50%"},{title:"地址",dataIndex:"clientInfo",scopedSlots:{customRender:"clientInfo"},width:"10%"},{title:"触发时间",dataIndex:"createDt",sorter:!0,customRender:function(t){return o()(t).format("YYYY-MM-DD HH:mm:ss")},width:"10%"}],queryParam:{},loadData:function(e){return Object(i["s"])(Object.assign(e,t.queryParam)).then((function(e){return t.total=e.total,e}))},total:0}},methods:{refreshTable:function(t){this.queryParam=t,this.$refs.table.refresh(!0)}}},c=d,u=a("2877"),f=Object(u["a"])(c,r,s,!1,null,"ea1f0aa8",null);e["a"]=f.exports},"99f5":function(t,e,a){"use strict";a.r(e);a("b0c0");var r=function(){var t=this,e=t._self._c;return e("div",[e("page-header-wrapper",{staticStyle:{margin:"-24px -1px 0"},on:{back:function(){return t.$router.go(-1)}}},[e("div")]),null!==t.retryTaskInfo?e("a-card",{attrs:{bordered:!1}},[e("a-descriptions",{attrs:{title:"",bordered:""}},[e("a-descriptions-item",{attrs:{label:"组名称"}},[t._v(" "+t._s(t.retryTaskInfo.groupName)+" ")]),e("a-descriptions-item",{attrs:{label:"场景名称"}},[t._v(" "+t._s(t.retryTaskInfo.sceneName)+" ")]),e("a-descriptions-item",{attrs:{label:"幂等id"}},[t._v(" "+t._s(t.retryTaskInfo.idempotentId)+" ")]),e("a-descriptions-item",{attrs:{label:"唯一id"}},[t._v(" "+t._s(t.retryTaskInfo.uniqueId)+" ")]),e("a-descriptions-item",{attrs:{label:"业务编号"}},[t._v(" "+t._s(t.retryTaskInfo.bizNo)+" ")]),e("a-descriptions-item",{attrs:{label:"重试次数"}},[t._v(" "+t._s(t.retryTaskInfo.retryCount)+" ")]),e("a-descriptions-item",{attrs:{label:"重试状态 | 数据类型"}},[e("a-tag",{attrs:{color:"red"}},[t._v(" "+t._s(t.retryStatus[t.retryTaskInfo.retryStatus])+" ")]),e("a-divider",{attrs:{type:"vertical"}}),e("a-tag",{attrs:{color:t.taskType[t.retryTaskInfo.taskType].color}},[t._v(" "+t._s(t.taskType[t.retryTaskInfo.taskType].name)+" ")])],1),e("a-descriptions-item",{attrs:{label:"下次触发时间"}},[t._v(" "+t._s(t.retryTaskInfo.nextTriggerAt)+" ")]),e("a-descriptions-item",{attrs:{label:"更新时间"}},[t._v(" "+t._s(t.retryTaskInfo.updateDt)+" ")]),e("a-descriptions-item",{attrs:{label:"执行器名称",span:"3"}},[t._v(" "+t._s(t.retryTaskInfo.executorName)+" ")]),e("a-descriptions-item",{attrs:{label:"参数",span:"3"}},[t._v(" "+t._s(t.retryTaskInfo.argsStr)+" ")]),e("a-descriptions-item",{attrs:{label:"扩展参数",span:"3"}},[t._v(" "+t._s(t.retryTaskInfo.extAttrs)+" ")])],1)],1):t._e(),e("RetryTaskLogMessageList",{ref:"retryTaskLogMessageListRef"})],1)},s=[],n=a("0fea"),o=a("c1df"),i=a.n(o),l=a("339f"),d={name:"RetryTaskInfo",components:{RetryTaskLogMessageList:l["a"]},data:function(){return{retryTaskInfo:null,retryStatus:{0:"处理中",1:"处理成功",2:"最大次数",3:"暂停"},taskType:{1:{name:"重试数据",color:"#d06892"},2:{name:"回调数据",color:"#f5a22d"}}}},created:function(){var t=this,e=this.$route.query.id,a=this.$route.query.groupName;e&&a&&Object(n["q"])(e,{groupName:a}).then((function(e){t.retryTaskInfo=e.data,t.queryParam={groupName:t.retryTaskInfo.groupName,uniqueId:t.retryTaskInfo.uniqueId},t.$refs.retryTaskLogMessageListRef.refreshTable(t.queryParam)}))},methods:{parseDate:function(t){return i()(t).format("YYYY-MM-DD HH:mm:ss")}}},c=d,u=a("2877"),f=Object(u["a"])(c,r,s,!1,null,"7dc5d024",null);e["default"]=f.exports}}]);

View File

@ -0,0 +1 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-35f76107"],{"339f":function(t,e,r){"use strict";var a=function(){var t=this,e=t._self._c;return e("div",[e("div",{staticStyle:{margin:"20px 0","border-left":"#f5222d 5px solid","font-size":"medium","font-weight":"bold"}},[t._v("    调用日志详情 (总调度次数: "+t._s(t.total)+") ")]),e("a-card",[e("s-table",{ref:"table",attrs:{size:"default",rowKey:"key",columns:t.columns,data:t.loadData},scopedSlots:t._u([{key:"serial",fn:function(r,a){return e("span",{},[t._v(" "+t._s(a.id)+" ")])}},{key:"clientInfo",fn:function(r){return e("span",{},[t._v(" "+t._s(r?r.split("@")[1]:"无")+" ")])}}])})],1)],1)},s=[],n=r("c1df"),o=r.n(n),i=r("0fea"),l=r("2af9"),u={name:"RetryTaskLogMessageList",components:{STable:l["j"]},data:function(){var t=this;return{columns:[{title:"#",scopedSlots:{customRender:"serial"},width:"10%"},{title:"信息",dataIndex:"message",width:"50%"},{title:"地址",dataIndex:"clientInfo",scopedSlots:{customRender:"clientInfo"},width:"10%"},{title:"触发时间",dataIndex:"createDt",sorter:!0,customRender:function(t){return o()(t).format("YYYY-MM-DD HH:mm:ss")},width:"10%"}],queryParam:{},loadData:function(e){if(t.queryParam["groupName"])return Object(i["s"])(Object.assign(e,t.queryParam)).then((function(e){return t.total=e.total,e}))},total:0}},methods:{refreshTable:function(t){this.queryParam=t,this.$refs.table.refresh(!0)}}},d=u,c=r("2877"),f=Object(c["a"])(d,a,s,!1,null,"24548855",null);e["a"]=f.exports},"99f5":function(t,e,r){"use strict";r.r(e);r("b0c0");var a=function(){var t=this,e=t._self._c;return e("div",[e("page-header-wrapper",{staticStyle:{margin:"-24px -1px 0"},on:{back:function(){return t.$router.go(-1)}}},[e("div")]),null!==t.retryTaskInfo?e("a-card",{attrs:{bordered:!1}},[e("a-descriptions",{attrs:{title:"",bordered:""}},[e("a-descriptions-item",{attrs:{label:"组名称"}},[t._v(" "+t._s(t.retryTaskInfo.groupName)+" ")]),e("a-descriptions-item",{attrs:{label:"场景名称"}},[t._v(" "+t._s(t.retryTaskInfo.sceneName)+" ")]),e("a-descriptions-item",{attrs:{label:"幂等id"}},[t._v(" "+t._s(t.retryTaskInfo.idempotentId)+" ")]),e("a-descriptions-item",{attrs:{label:"唯一id"}},[t._v(" "+t._s(t.retryTaskInfo.uniqueId)+" ")]),e("a-descriptions-item",{attrs:{label:"业务编号"}},[t._v(" "+t._s(t.retryTaskInfo.bizNo)+" ")]),e("a-descriptions-item",{attrs:{label:"重试次数"}},[t._v(" "+t._s(t.retryTaskInfo.retryCount)+" ")]),e("a-descriptions-item",{attrs:{label:"重试状态 | 数据类型"}},[e("a-tag",{attrs:{color:"red"}},[t._v(" "+t._s(t.retryStatus[t.retryTaskInfo.retryStatus])+" ")]),e("a-divider",{attrs:{type:"vertical"}}),e("a-tag",{attrs:{color:t.taskType[t.retryTaskInfo.taskType].color}},[t._v(" "+t._s(t.taskType[t.retryTaskInfo.taskType].name)+" ")])],1),e("a-descriptions-item",{attrs:{label:"下次触发时间"}},[t._v(" "+t._s(t.retryTaskInfo.nextTriggerAt)+" ")]),e("a-descriptions-item",{attrs:{label:"更新时间"}},[t._v(" "+t._s(t.retryTaskInfo.updateDt)+" ")]),e("a-descriptions-item",{attrs:{label:"执行器名称",span:"3"}},[t._v(" "+t._s(t.retryTaskInfo.executorName)+" ")]),e("a-descriptions-item",{attrs:{label:"参数",span:"3"}},[t._v(" "+t._s(t.retryTaskInfo.argsStr)+" ")]),e("a-descriptions-item",{attrs:{label:"扩展参数",span:"3"}},[t._v(" "+t._s(t.retryTaskInfo.extAttrs)+" ")])],1)],1):t._e(),e("RetryTaskLogMessageList",{ref:"retryTaskLogMessageListRef"})],1)},s=[],n=r("0fea"),o=r("c1df"),i=r.n(o),l=r("339f"),u={name:"RetryTaskInfo",components:{RetryTaskLogMessageList:l["a"]},data:function(){return{retryTaskInfo:null,retryStatus:{0:"处理中",1:"处理成功",2:"最大次数",3:"暂停"},taskType:{1:{name:"重试数据",color:"#d06892"},2:{name:"回调数据",color:"#f5a22d"}}}},created:function(){var t=this,e=this.$route.query.id,r=this.$route.query.groupName;e&&r&&Object(n["q"])(e,{groupName:r}).then((function(e){t.retryTaskInfo=e.data,t.queryParam={groupName:t.retryTaskInfo.groupName,uniqueId:t.retryTaskInfo.uniqueId},t.$refs.retryTaskLogMessageListRef.refreshTable(t.queryParam)}))},methods:{parseDate:function(t){return i()(t).format("YYYY-MM-DD HH:mm:ss")}}},d=u,c=r("2877"),f=Object(c["a"])(d,a,s,!1,null,"42a9fca1",null);e["default"]=f.exports}}]);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -85,7 +85,6 @@ export default {
}
},
created () {
console.log('111')
const id = this.$route.query.id
const groupName = this.$route.query.groupName
if (id && groupName) {

View File

@ -225,7 +225,7 @@ export default {
{
title: 'UniqueId',
dataIndex: 'uniqueId',
width: '10%'
width: '9%'
},
{
title: '组名称',

View File

@ -64,6 +64,11 @@ export default {
queryParam: {},
// Promise
loadData: parameter => {
console.log(this.queryParam)
if (!this.queryParam['groupName']) {
return
}
return getRetryTaskLogMessagePage(Object.assign(parameter, this.queryParam))
.then(res => {
this.total = res.total