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 81ee7e9..528986d 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 @@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.common.domian.req.NodeAddReq; import com.muyu.common.domian.req.NodeUpdReq; -import com.muyu.common.domian.req.TaskInfoAddReq; import com.muyu.common.domian.resp.NodeResp; -import com.muyu.common.domian.resp.TaskInfoResp; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -56,12 +54,12 @@ public class Node extends BaseEntity { /** * 表字段 */ - private String tableField; + private String tableFieId; /** * 表字段别名 */ - private String tableAsField; + private String tableAsFieId; /** * 字段规则 @@ -76,8 +74,8 @@ public class Node extends BaseEntity { .databaseId(node.databaseId) .tableName(node.tableName) .tableAsName(node.tableAsName) - .tableField(node.tableField) - .tableAsField(node.getTableField()) + .tableFieId(node.tableFieId) + .tableAsFieId(node.getTableFieId()) .fieldAsEngineId(node.fieldAsEngineId) .build(); } @@ -89,8 +87,8 @@ public class Node extends BaseEntity { .databaseId(req.getDatabaseId()) .tableName(req.getTableName()) .tableAsName(req.getTableAsName()) - .tableField(req.getTableField()) - .tableAsField(req.getTableAsField()) + .tableFieId(req.getTableFieId()) + .tableAsFieId(req.getTableAsFieId()) .fieldAsEngineId(req.getFieldAsEngineId()) .build(); } @@ -102,8 +100,8 @@ public class Node extends BaseEntity { .databaseId(req.getDatabaseId()) .tableName(req.getTableName()) .tableAsName(req.getTableAsName()) - .tableField(req.getTableField()) - .tableAsField(req.getTableAsField()) + .tableFieId(req.getTableFieId()) + .tableAsFieId(req.getTableAsFieId()) .fieldAsEngineId(req.getFieldAsEngineId()) .build(); } 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 d3bdb04..04971ac 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 @@ -40,12 +40,12 @@ public class NodeAddReq { /** * 表字段 */ - private String tableField; + private String tableFieId; /** * 表字段别名 */ - private String tableAsField; + private String tableAsFieId; /** * 字段规则 */ 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 66af5bf..7bbc665 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 @@ -40,12 +40,12 @@ public class NodeUpdReq { /** * 表字段 */ - private String tableField; + private String tableFieId; /** * 表字段别名 */ - private String tableAsField; + private String tableAsFieId; /** * 字段规则 */ 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 59d6369..a173873 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 @@ -46,12 +46,12 @@ public class NodeResp { /** * 表字段 */ - private String tableField; + private String tableFieId; /** * 表字段别名 */ - private String tableAsField; + private String tableAsFieId; /** * 字段规则