You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by le...@apache.org on 2021/01/18 10:02:15 UTC
[incubator-dolphinscheduler] branch json_split updated:
[Feature][JsonSplit] ProcessDefinition Entity (#4477)
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch json_split
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/json_split by this push:
new 56b6097 [Feature][JsonSplit] ProcessDefinition Entity (#4477)
56b6097 is described below
commit 56b6097b47d783918b67fd0d887f48d2eefe6fdc
Author: Simon <zh...@cvte.com>
AuthorDate: Mon Jan 18 04:02:02 2021 -0600
[Feature][JsonSplit] ProcessDefinition Entity (#4477)
* modify ProcessDefinition and add ProcessDefinitionLog
* processDefinitionJson
* code style
* code style
* code style
---
.../dao/entity/ProcessDefinition.java | 86 ++++++++----
...ssDefinition.java => ProcessDefinitionLog.java} | 148 +++++++++++----------
2 files changed, 138 insertions(+), 96 deletions(-)
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java
index 56f6cfe..ee8cc98 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java
@@ -49,6 +49,11 @@ public class ProcessDefinition {
private int id;
/**
+ * code
+ */
+ private Long code;
+
+ /**
* name
*/
private String name;
@@ -65,11 +70,18 @@ public class ProcessDefinition {
/**
* project id
+ * TODO: delete
*/
private int projectId;
/**
+ * project code
+ */
+ private Long projectCode;
+
+ /**
* definition json string
+ * TODO: delete
*/
private String processDefinitionJson;
@@ -136,6 +148,7 @@ public class ProcessDefinition {
/**
* connects array for web
+ * TODO: delete
*/
private String connects;
@@ -388,35 +401,52 @@ public class ProcessDefinition {
this.modifyBy = modifyBy;
}
+ public Long getCode() {
+ return code;
+ }
+
+ public void setCode(Long code) {
+ this.code = code;
+ }
+
+ public Long getProjectCode() {
+ return projectCode;
+ }
+
+ public void setProjectCode(Long projectCode) {
+ this.projectCode = projectCode;
+ }
+
@Override
public String toString() {
- return "ProcessDefinition{" +
- "id=" + id +
- ", name='" + name + '\'' +
- ", version=" + version +
- ", releaseState=" + releaseState +
- ", projectId=" + projectId +
- ", processDefinitionJson='" + processDefinitionJson + '\'' +
- ", description='" + description + '\'' +
- ", globalParams='" + globalParams + '\'' +
- ", globalParamList=" + globalParamList +
- ", globalParamMap=" + globalParamMap +
- ", createTime=" + createTime +
- ", updateTime=" + updateTime +
- ", flag=" + flag +
- ", userId=" + userId +
- ", userName='" + userName + '\'' +
- ", projectName='" + projectName + '\'' +
- ", locations='" + locations + '\'' +
- ", connects='" + connects + '\'' +
- ", receivers='" + receivers + '\'' +
- ", receiversCc='" + receiversCc + '\'' +
- ", scheduleReleaseState=" + scheduleReleaseState +
- ", timeout=" + timeout +
- ", tenantId=" + tenantId +
- ", modifyBy='" + modifyBy + '\'' +
- ", resourceIds='" + resourceIds + '\'' +
- '}';
+ return "ProcessDefinition{"
+ + "id=" + id
+ + ", code=" + code
+ + ", name='" + name + '\''
+ + ", version=" + version
+ + ", releaseState=" + releaseState
+ + ", projectId=" + projectId
+ + ", projectCode=" + projectCode
+ + ", processDefinitionJson='" + processDefinitionJson + '\''
+ + ", description='" + description + '\''
+ + ", globalParams='" + globalParams + '\''
+ + ", globalParamList=" + globalParamList
+ + ", globalParamMap=" + globalParamMap
+ + ", createTime=" + createTime
+ + ", updateTime=" + updateTime
+ + ", flag=" + flag
+ + ", userId=" + userId
+ + ", userName='" + userName + '\''
+ + ", projectName='" + projectName + '\''
+ + ", locations='" + locations + '\''
+ + ", connects='" + connects + '\''
+ + ", receivers='" + receivers + '\''
+ + ", receiversCc='" + receiversCc + '\''
+ + ", scheduleReleaseState=" + scheduleReleaseState
+ + ", timeout=" + timeout
+ + ", tenantId=" + tenantId
+ + ", modifyBy='" + modifyBy + '\''
+ + ", resourceIds='" + resourceIds + '\''
+ + '}';
}
-
}
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinitionLog.java
similarity index 77%
copy from dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java
copy to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinitionLog.java
index 56f6cfe..02d03ce 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinitionLog.java
@@ -37,10 +37,10 @@ import com.fasterxml.jackson.annotation.JsonFormat;
/**
- * process definition
+ * process definition log
*/
-@TableName("t_ds_process_definition")
-public class ProcessDefinition {
+@TableName("t_ds_process_definition_log")
+public class ProcessDefinitionLog {
/**
* id
@@ -49,6 +49,11 @@ public class ProcessDefinition {
private int id;
/**
+ * code
+ */
+ private Long code;
+
+ /**
* name
*/
private String name;
@@ -64,14 +69,9 @@ public class ProcessDefinition {
private ReleaseState releaseState;
/**
- * project id
- */
- private int projectId;
-
- /**
- * definition json string
+ * project code
*/
- private String processDefinitionJson;
+ private Long projectCode;
/**
* description
@@ -135,11 +135,6 @@ public class ProcessDefinition {
private String locations;
/**
- * connects array for web
- */
- private String connects;
-
- /**
* receivers
*/
private String receivers;
@@ -175,6 +170,48 @@ public class ProcessDefinition {
*/
private String resourceIds;
+ /**
+ * operator
+ */
+ private int operator;
+
+ /**
+ * operateTime
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date operateTime;
+
+ public int getOperator() {
+ return operator;
+ }
+
+ public void setOperator(int operator) {
+ this.operator = operator;
+ }
+
+ public Date getOperateTime() {
+ return operateTime;
+ }
+
+ public void setOperateTime(Date operateTime) {
+ this.operateTime = operateTime;
+ }
+
+ public Long getCode() {
+ return code;
+ }
+
+ public void setCode(Long code) {
+ this.code = code;
+ }
+
+ public Long getProjectCode() {
+ return projectCode;
+ }
+
+ public void setProjectCode(Long projectCode) {
+ this.projectCode = projectCode;
+ }
public String getName() {
return name;
@@ -208,14 +245,6 @@ public class ProcessDefinition {
this.releaseState = releaseState;
}
- public String getProcessDefinitionJson() {
- return processDefinitionJson;
- }
-
- public void setProcessDefinitionJson(String processDefinitionJson) {
- this.processDefinitionJson = processDefinitionJson;
- }
-
public Date getCreateTime() {
return createTime;
}
@@ -224,14 +253,6 @@ public class ProcessDefinition {
this.createTime = createTime;
}
- public int getProjectId() {
- return projectId;
- }
-
- public void setProjectId(int projectId) {
- this.projectId = projectId;
- }
-
public Date getUpdateTime() {
return updateTime;
}
@@ -272,7 +293,6 @@ public class ProcessDefinition {
this.projectName = projectName;
}
-
public String getGlobalParams() {
return globalParams;
}
@@ -316,14 +336,6 @@ public class ProcessDefinition {
this.locations = locations;
}
- public String getConnects() {
- return connects;
- }
-
- public void setConnects(String connects) {
- this.connects = connects;
- }
-
public String getReceivers() {
return receivers;
}
@@ -390,33 +402,33 @@ public class ProcessDefinition {
@Override
public String toString() {
- return "ProcessDefinition{" +
- "id=" + id +
- ", name='" + name + '\'' +
- ", version=" + version +
- ", releaseState=" + releaseState +
- ", projectId=" + projectId +
- ", processDefinitionJson='" + processDefinitionJson + '\'' +
- ", description='" + description + '\'' +
- ", globalParams='" + globalParams + '\'' +
- ", globalParamList=" + globalParamList +
- ", globalParamMap=" + globalParamMap +
- ", createTime=" + createTime +
- ", updateTime=" + updateTime +
- ", flag=" + flag +
- ", userId=" + userId +
- ", userName='" + userName + '\'' +
- ", projectName='" + projectName + '\'' +
- ", locations='" + locations + '\'' +
- ", connects='" + connects + '\'' +
- ", receivers='" + receivers + '\'' +
- ", receiversCc='" + receiversCc + '\'' +
- ", scheduleReleaseState=" + scheduleReleaseState +
- ", timeout=" + timeout +
- ", tenantId=" + tenantId +
- ", modifyBy='" + modifyBy + '\'' +
- ", resourceIds='" + resourceIds + '\'' +
- '}';
+ return "ProcessDefinitionLog{"
+ + "id=" + id
+ + ", code=" + code
+ + ", name='" + name + '\''
+ + ", version=" + version
+ + ", releaseState=" + releaseState
+ + ", projectCode=" + projectCode
+ + ", description='" + description + '\''
+ + ", globalParams='" + globalParams + '\''
+ + ", globalParamList=" + globalParamList
+ + ", globalParamMap=" + globalParamMap
+ + ", createTime=" + createTime
+ + ", updateTime=" + updateTime
+ + ", flag=" + flag
+ + ", userId=" + userId
+ + ", userName='" + userName + '\''
+ + ", projectName='" + projectName + '\''
+ + ", locations='" + locations + '\''
+ + ", receivers='" + receivers + '\''
+ + ", receiversCc='" + receiversCc + '\''
+ + ", scheduleReleaseState=" + scheduleReleaseState
+ + ", timeout=" + timeout
+ + ", tenantId=" + tenantId
+ + ", modifyBy='" + modifyBy + '\''
+ + ", resourceIds='" + resourceIds + '\''
+ + ", operator=" + operator
+ + ", operateTime=" + operateTime
+ + '}';
}
-
}