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 061af08 [Feature][JsonSplit] Modify Project and ProjectUser Mapper
(#4753)
061af08 is described below
commit 061af0876580ffc897b2d6e7c51ee736d2d32e7c
Author: Simon <[email protected]>
AuthorDate: Thu Feb 11 18:28:54 2021 -0600
[Feature][JsonSplit] Modify Project and ProjectUser Mapper (#4753)
* Modify Project and ProjectUser Mapper
* Modify Project and ProjectUser Mapper
* project_code is bigint(20)
* modify ERROR name
---
.../service/impl/ProcessDefinitionServiceImpl.java | 4 +++
.../api/service/impl/ProjectServiceImpl.java | 2 +-
.../dolphinscheduler/dao/entity/ProjectUser.java | 33 +++++++++++++++-------
.../dolphinscheduler/dao/mapper/ProjectMapper.java | 15 +++++++++-
.../dolphinscheduler/dao/mapper/ProjectMapper.xml | 26 +++++++++++++++--
.../dao/mapper/ProjectUserMapper.xml | 2 +-
sql/dolphinscheduler_mysql.sql | 2 +-
7 files changed, 67 insertions(+), 17 deletions(-)
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
index 575cf19..5679aa2 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
@@ -1505,6 +1505,8 @@ public class ProcessDefinitionServiceImpl extends
BaseService implements
return checkResult;
}
+ // TODO:
+ // Project targetProject =
projectMapper.queryDetailByCode(targetProjectCode);
Project targetProject = projectMapper.queryDetailById(targetProjectId);
if (targetProject == null) {
putMsg(result, Status.PROJECT_NOT_FOUNT, targetProjectId);
@@ -1553,6 +1555,8 @@ public class ProcessDefinitionServiceImpl extends
BaseService implements
return result;
}
+ // TODO :
+ // Project targetProject =
projectMapper.queryDetailByCode(targetProjectCode);
Project targetProject = projectMapper.queryDetailById(targetProjectId);
if (targetProject == null) {
putMsg(result, Status.PROJECT_NOT_FOUNT, targetProjectId);
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
index bca3b8d..89d6787 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
@@ -100,7 +100,7 @@ public class ProjectServiceImpl extends BaseService
implements ProjectService {
.updateTime(now)
.build();
} catch (SnowFlakeException e) {
- putMsg(result, Status.CREATE_PROCESS_DEFINITION);
+ putMsg(result, Status.CREATE_PROJECT_ERROR);
return result;
}
diff --git
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java
index d54f209..f7147c5 100644
---
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java
+++
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java
@@ -37,6 +37,9 @@ public class ProjectUser {
@TableField("project_id")
private int projectId;
+ @TableField("project_code")
+ private int projectCode;
+
/**
* project name
*/
@@ -60,6 +63,14 @@ public class ProjectUser {
@TableField("update_time")
private Date updateTime;
+ public int getProjectCode() {
+ return projectCode;
+ }
+
+ public void setProjectCode(int projectCode) {
+ this.projectCode = projectCode;
+ }
+
public int getId() {
return id;
}
@@ -123,17 +134,19 @@ public class ProjectUser {
public void setPerm(int perm) {
this.perm = perm;
}
+
@Override
public String toString() {
- return "ProjectUser{" +
- "id=" + id +
- ", projectId=" + projectId +
- ", projectName='" + projectName + '\'' +
- ", userId=" + userId +
- ", userName='" + userName + '\'' +
- ", perm=" + perm +
- ", createTime=" + createTime +
- ", updateTime=" + updateTime +
- '}';
+ return "ProjectUser{"
+ + "id=" + id
+ + ", userId=" + userId
+ + ", projectId=" + projectId
+ + ", projectCode=" + projectCode
+ + ", projectName='" + projectName + '\''
+ + ", userName='" + userName + '\''
+ + ", perm=" + perm
+ + ", createTime=" + createTime
+ + ", updateTime=" + updateTime
+ + '}';
}
}
diff --git
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.java
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.java
index 872d53f..ffc45a2 100644
---
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.java
+++
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.java
@@ -31,8 +31,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
* project mapper interface
*/
public interface ProjectMapper extends BaseMapper<Project> {
+ /**
+ * query project detail by code
+ * @param projectCode projectCode
+ * @return project
+ */
+ Project queryByCode(@Param("projectCode") Long projectCode);
/**
+ * TODO: delete
* query project detail by id
* @param projectId projectId
* @return project
@@ -40,6 +47,13 @@ public interface ProjectMapper extends BaseMapper<Project> {
Project queryDetailById(@Param("projectId") int projectId);
/**
+ * query project detail by code
+ * @param projectCode projectCode
+ * @return project
+ */
+ Project queryDetailByCode(@Param("projectCode") Long projectCode);
+
+ /**
* query project by name
* @param projectName projectName
* @return project
@@ -91,5 +105,4 @@ public interface ProjectMapper extends BaseMapper<Project> {
* @return projectName and userName
*/
ProjectUser
queryProjectWithUserByProcessInstanceId(@Param("processInstanceId") int
processInstanceId);
-
}
diff --git
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
index 9def02d..53f0736 100644
---
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
+++
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
@@ -25,6 +25,26 @@
<sql id="baseSqlV2">
${alias}.id, ${alias}.name, ${alias}.code, ${alias}.description,
${alias}.user_id, ${alias}.flag, ${alias}.create_time, ${alias}.update_time
</sql>
+
+ <select id="queryByCode"
resultType="org.apache.dolphinscheduler.dao.entity.Project">
+ select
+ <include refid="baseSql"/>
+ from t_ds_project
+ where code = #{code}
+ </select>
+
+ <select id="queryDetailByCode"
resultType="org.apache.dolphinscheduler.dao.entity.Project">
+ select
+ <include refid="baseSqlV2">
+ <property name="alias" value="p"/>
+ </include>
+ ,
+ u.user_name as user_name
+ from t_ds_project p
+ join t_ds_user u on p.user_id = u.id
+ where p.code = #{projectCode}
+ </select>
+
<select id="queryDetailById"
resultType="org.apache.dolphinscheduler.dao.entity.Project">
select
<include refid="baseSqlV2">
@@ -100,12 +120,12 @@
<select id="queryProjectWithUserByProcessInstanceId"
resultType="org.apache.dolphinscheduler.dao.entity.ProjectUser">
select
- dp.id projectId,
+ dp.code projectCode,
dp.name projectName,
u.user_name userName
from t_ds_process_instance di
- join t_ds_process_definition dpd on di.process_definition_id = dpd.id
- join t_ds_project dp on dpd.project_id = dp.id
+ join t_ds_process_definition dpd on di.process_definition_code =
dpd.code
+ join t_ds_project dp on dpd.project_code = dp.code
join t_ds_user u on dp.user_id = u.id
where di.id = #{processInstanceId};
</select>
diff --git
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.xml
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.xml
index de74d64..8c19ab3 100644
---
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.xml
+++
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.xml
@@ -19,7 +19,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"; >
<mapper namespace="org.apache.dolphinscheduler.dao.mapper.ProjectUserMapper">
<sql id="baseSql">
- id, user_id, project_id, perm, create_time, update_time
+ id, user_id, project_code, perm, create_time, update_time
</sql>
<delete id="deleteProjectRelation">
delete from t_ds_relation_project_user
diff --git a/sql/dolphinscheduler_mysql.sql b/sql/dolphinscheduler_mysql.sql
index 640b55a..d564241 100644
--- a/sql/dolphinscheduler_mysql.sql
+++ b/sql/dolphinscheduler_mysql.sql
@@ -692,7 +692,7 @@ DROP TABLE IF EXISTS `t_ds_relation_project_user`;
CREATE TABLE `t_ds_relation_project_user` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'key',
`user_id` int(11) NOT NULL COMMENT 'user id',
- `project_id` int(11) DEFAULT NULL COMMENT 'project id',
+ `project_code` bigint(20) DEFAULT NULL COMMENT 'project code',
`perm` int(11) DEFAULT '1' COMMENT 'limits of authority',
`create_time` datetime DEFAULT NULL COMMENT 'create time',
`update_time` datetime DEFAULT NULL COMMENT 'update time',
