From d19ee1a9ff0ffca6ada6f781ed1bd10274c42d9c Mon Sep 17 00:00:00 2001 From: Cui YongXing <2835316714@qq.com> Date: Sun, 25 Aug 2024 19:10:04 +0800 Subject: [PATCH] =?UTF-8?q?Node=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/muyu/common/domian/Node.java | 9 ++++++++- .../main/java/com/muyu/common/domian/req/NodeAddReq.java | 6 ++++++ .../main/java/com/muyu/common/domian/req/NodeUpdReq.java | 5 +++++ .../main/java/com/muyu/common/domian/resp/NodeResp.java | 6 +++++- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/cloud-task-common/src/main/java/com/muyu/common/domian/Node.java b/cloud-task-common/src/main/java/com/muyu/common/domian/Node.java index 528986d..7136b79 100644 --- a/cloud-task-common/src/main/java/com/muyu/common/domian/Node.java +++ b/cloud-task-common/src/main/java/com/muyu/common/domian/Node.java @@ -22,9 +22,13 @@ import java.util.function.Supplier; public class Node extends BaseEntity { /** - * 节点id + * id */ private Integer id; + /** + * 节点id + */ + private Integer nodeId; /** * 节点名称 @@ -69,6 +73,7 @@ public class Node extends BaseEntity { public static NodeResp build(Node node) { return NodeResp.builder() .id(node.id) + .nodeId(node.nodeId) .nodeName(node.nodeName) .taskId(node.taskId) .databaseId(node.databaseId) @@ -82,6 +87,7 @@ public class Node extends BaseEntity { public static Node addBuild(NodeAddReq req) { return Node.builder() + .nodeId(req.getNodeId()) .nodeName(req.getNodeName()) .taskId(req.getTaskId()) .databaseId(req.getDatabaseId()) @@ -95,6 +101,7 @@ public class Node extends BaseEntity { public static Node updBuild(NodeUpdReq req, Supplier id) { return Node.builder() .id(id.get()) + .nodeId(req.getNodeId()) .nodeName(req.getNodeName()) .taskId(req.getTaskId()) .databaseId(req.getDatabaseId()) diff --git a/cloud-task-common/src/main/java/com/muyu/common/domian/req/NodeAddReq.java b/cloud-task-common/src/main/java/com/muyu/common/domian/req/NodeAddReq.java index 04971ac..8716cdb 100644 --- a/cloud-task-common/src/main/java/com/muyu/common/domian/req/NodeAddReq.java +++ b/cloud-task-common/src/main/java/com/muyu/common/domian/req/NodeAddReq.java @@ -12,6 +12,12 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @Tag(name = "节点添加请求对象" ) public class NodeAddReq { + + /** + * 节点id + */ + private Integer nodeId; + /** * 节点名称 */ diff --git a/cloud-task-common/src/main/java/com/muyu/common/domian/req/NodeUpdReq.java b/cloud-task-common/src/main/java/com/muyu/common/domian/req/NodeUpdReq.java index 7bbc665..245610c 100644 --- a/cloud-task-common/src/main/java/com/muyu/common/domian/req/NodeUpdReq.java +++ b/cloud-task-common/src/main/java/com/muyu/common/domian/req/NodeUpdReq.java @@ -12,6 +12,11 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @Tag(name = "节点添加请求对象" ) public class NodeUpdReq { + /** + * 节点id + */ + private Integer nodeId; + /** * 节点名称 */ diff --git a/cloud-task-common/src/main/java/com/muyu/common/domian/resp/NodeResp.java b/cloud-task-common/src/main/java/com/muyu/common/domian/resp/NodeResp.java index a173873..b6d961d 100644 --- a/cloud-task-common/src/main/java/com/muyu/common/domian/resp/NodeResp.java +++ b/cloud-task-common/src/main/java/com/muyu/common/domian/resp/NodeResp.java @@ -14,9 +14,13 @@ import lombok.NoArgsConstructor; public class NodeResp { /** - * 节点id + * id */ private Integer id; + /** + * 节点id + */ + private Integer nodeId; /** * 节点名称