From e5da8ce5c5df140056d1e5e552e201d43cebe174 Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Thu, 28 Dec 2023 23:36:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=202.6.0=201.=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=97=A5=E5=BF=97=202.=20=E6=B7=BB=E5=8A=A0=E9=98=BB=E5=A1=9E?= =?UTF-8?q?=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../retry/server/web/model/request/WorkflowRequestVO.java | 4 ++-- .../retry/server/web/service/impl/WorkflowServiceImpl.java | 5 ++++- frontend/src/views/job/WorkflowList.vue | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/WorkflowRequestVO.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/WorkflowRequestVO.java index e56e96b4..c96bd914 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/WorkflowRequestVO.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/WorkflowRequestVO.java @@ -35,8 +35,8 @@ public class WorkflowRequestVO { @NotNull(message = "执行超时时间不能为空") private Integer executorTimeout; -// @NotNull(message = "阻塞策略不能为空") -// private Integer blockStrategy; + @NotNull(message = "阻塞策略不能为空") + private Integer blockStrategy; /** * 0、关闭、1、开启 diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/WorkflowServiceImpl.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/WorkflowServiceImpl.java index 8b2b30ea..775a46a0 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/WorkflowServiceImpl.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/WorkflowServiceImpl.java @@ -138,7 +138,7 @@ public class WorkflowServiceImpl implements WorkflowService { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Workflow::getDeleted, StatusEnum.NO.getStatus()); queryWrapper.eq(Workflow::getNamespaceId, userSessionVO.getNamespaceId()); - + queryWrapper.orderByDesc(Workflow::getId); PageDTO page = workflowMapper.selectPage(pageDTO, queryWrapper); List jobResponseList = WorkflowConverter.INSTANCE.toWorkflowResponseVO(page.getRecords()); @@ -236,6 +236,7 @@ public class WorkflowServiceImpl implements WorkflowService { if (WorkflowNodeTypeEnum.CONDITION.getType() == nodeConfig.getNodeType()) { workflowNode.setJobId(SystemConstants.CONDITION_JOB_ID); } + Assert.isTrue(1 == workflowNodeMapper.insert(workflowNode), () -> new EasyRetryServerException("新增工作流节点失败")); // 添加节点 graph.addNode(workflowNode.getId()); @@ -244,6 +245,8 @@ public class WorkflowServiceImpl implements WorkflowService { graph.putEdge(parentId, workflowNode.getId()); } parentIds1.add(workflowNode.getId()); + log.warn("workflowNodeId:[{}] parentIds1: [{}] parentIds:[{}]", + workflowNode.getId(), JsonUtil.toJsonString(parentIds1),JsonUtil.toJsonString(parentIds)); buildGraph(Lists.newArrayList(workflowNode.getId()), groupName, workflowId, nodeInfo.getChildNode(), graph); } } diff --git a/frontend/src/views/job/WorkflowList.vue b/frontend/src/views/job/WorkflowList.vue index 0cd1b375..913b33d9 100644 --- a/frontend/src/views/job/WorkflowList.vue +++ b/frontend/src/views/job/WorkflowList.vue @@ -69,7 +69,7 @@ {{ text }} - + {{ workflowStatus[text].name }}