change mybatisplus version to 3.2.0 (#1110)

* update english documents * refactor zk client * update documents * update zkclient * update zkclient * update documents * add architecture-design * change i18n * update i18n * update english documents * add architecture-design * update english documents * update en-US documents * add architecture-design * update demo site * add mybatis plus model * modify mybatisplus * modify mybatisplus * change interface by mybatisplus * add unit test * refactor dao interface. * add unit test for dao... * add unit test for dao... * add unit test for dao... * Merge remote-tracking branch 'upstream/dev-db' into dev-db # Conflicts: # dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml # dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml # escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml # escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml # escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java * Merge remote-tracking branch 'upstream/dev-db' into dev-db # Conflicts: # dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml # dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml # escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml # escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml # escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java * Merge remote-tracking branch 'upstream/dev-db' into dev-db # Conflicts: # dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml # dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml # dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml * update some dao bugs * update for some bugs * update some bugs * Merge remote-tracking branch 'upstream/dev-db' into dev-db # Conflicts: # dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml # dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml # dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml * update * update * add multiply settings for application.yml * add multiply settings for application.yml * revert * update configuration settings in task record dao... * change application_master to application-master * change application_master to application-master * update application.yml to application.properties * revert * revert * add properties * add properties * revert * revert * add api start up.. add alert send try catch * update dao info level * fix bug: task cannot submit when recovery failover * fix bug: task cannot submit when recovery failover * merge from dev-db * revert * revert * fix bug: get process definition list failed. * fix bug: process instance interval is error * revert * revert * update * support stop submit success tasks * update kill process * update for stop process * update for stop process * add some logs for stop process * update for small bug. * add check strategy before submit task * revert * update * update * revert * wait task instance exists if null. * revert * update * change desc to description. * add check user and definitions function when delete tenant * update * change desc to description. * change desc to description. * change desc to description. * remove check resources when delete tenant * change desc to description. * change mybatisplus version to 3.2.0 * update
5 years ago · 2c35dcf6ef
25 changed files with 318 additions and 35 deletions
--- a/dolphinscheduler-common/pom.xml
+++ b/dolphinscheduler-common/pom.xml
@ -576,6 +576,18 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-annotation</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
 	</dependencies>


--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertStatus.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertStatus.java
@ -16,12 +16,28 @@
 */
 package org.apache.dolphinscheduler.common.enums;

+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
 /**
 * alert status
 */
+@Getter
 public enum AlertStatus {
    /**
     * 0 waiting executed; 1 execute successfully，2 execute failed
     */
-    WAIT_EXECUTION,EXECUTION_SUCCESS,EXECUTION_FAILURE
+    WAIT_EXECUTION(0, "waiting executed"),
+    EXECUTION_SUCCESS(1, "execute successfully"),
+    EXECUTION_FAILURE(2, "execute failed");
+
+
+    AlertStatus(int code, String descp){
+        this.code = code;
+        this.descp = descp;
+    }
+
+    @EnumValue
+    private final int code;
+    private final String descp;
 }
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertType.java
@ -16,12 +16,27 @@
 */
 package org.apache.dolphinscheduler.common.enums;

+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
 /**
 * warning message notification method
 */
+@Getter
 public enum AlertType {
    /**
     * 0 email; 1 SMS
     */
-    EMAIL,SMS
+    EMAIL(0, "email"),
+    SMS(1, "SMS");
+
+
+    AlertType(int code, String descp){
+        this.code = code;
+        this.descp = descp;
+    }
+
+    @EnumValue
+    private final int code;
+    private final String descp;
 }
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java
@ -16,9 +16,13 @@
 */
 package org.apache.dolphinscheduler.common.enums;

+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
 /**
 * command types
 */
+@Getter
 public enum CommandType {

    /**
@ -35,6 +39,24 @@ public enum CommandType {
     * 9 stop a process
     * 10 recover waiting thread
     */
-    START_PROCESS, START_CURRENT_TASK_PROCESS, RECOVER_TOLERANCE_FAULT_PROCESS, RECOVER_SUSPENDED_PROCESS,
-    START_FAILURE_TASK_PROCESS,COMPLEMENT_DATA,SCHEDULER, REPEAT_RUNNING,PAUSE,STOP,RECOVER_WAITTING_THREAD;
+    START_PROCESS(0, "start a new process"),
+    START_CURRENT_TASK_PROCESS(1, "start a new process from current nodes"),
+    RECOVER_TOLERANCE_FAULT_PROCESS(2, "recover tolerance fault work flow"),
+    RECOVER_SUSPENDED_PROCESS(3, "start process from paused task nodes"),
+    START_FAILURE_TASK_PROCESS(4, "start a new process"),
+    COMPLEMENT_DATA(5, "complement data"),
+    SCHEDULER(6, "start a new process from scheduler"),
+    REPEAT_RUNNING(7, "start a new process"),
+    PAUSE(8, "start a new process"),
+    STOP(9, "start a new process"),
+    RECOVER_WAITTING_THREAD(10, "start a new process");
+
+    CommandType(int code, String descp){
+        this.code = code;
+        this.descp = descp;
+    }
+
+    @EnumValue
+    private final int code;
+    private final String descp;
 }
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DbType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DbType.java
@ -16,9 +16,13 @@
 */
 package org.apache.dolphinscheduler.common.enums;

+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
 /**
 * data base types
 */
+@Getter
 public enum DbType {
  /**
   * 0 mysql
@ -29,5 +33,20 @@ public enum DbType {
   * 5 oracle
   * 6 sqlserver
   */
-  MYSQL, POSTGRESQL, HIVE, SPARK, CLICKHOUSE, ORACLE, SQLSERVER
+  MYSQL(0, "mysql"),
+  POSTGRESQL(1, "postgresql"),
+  HIVE(2, "hive"),
+  SPARK(3, "spark"),
+  CLICKHOUSE(4, "clickhouse"),
+  ORACLE(5, "oracle"),
+  SQLSERVER(6, "sqlserver");
+
+  DbType(int code, String descp){
+    this.code = code;
+    this.descp = descp;
+  }
+
+  @EnumValue
+  private final int code;
+  private final String descp;
 }
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java
@ -17,10 +17,14 @@
 package org.apache.dolphinscheduler.common.enums;


+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
 /**
 * runing status for workflow and task nodes
 *
 */
+@Getter
 public enum ExecutionStatus {

    /**
@ -38,8 +42,27 @@ public enum ExecutionStatus {
     * 10 waiting thread
     * 11 waiting depend node complete
     */
-    SUBMITTED_SUCCESS,RUNNING_EXEUTION,READY_PAUSE,PAUSE,READY_STOP,STOP,FAILURE,SUCCESS,
-    NEED_FAULT_TOLERANCE,KILL,WAITTING_THREAD,WAITTING_DEPEND;
+    SUBMITTED_SUCCESS(0, "submit success"),
+    RUNNING_EXEUTION(1, "running"),
+    READY_PAUSE(2, "ready pause"),
+    PAUSE(3, "pause"),
+    READY_STOP(4, "ready stop"),
+    STOP(5, "stop"),
+    FAILURE(6, "failure"),
+    SUCCESS(7, "success"),
+    NEED_FAULT_TOLERANCE(8, "need fault tolerance"),
+    KILL(9, "kill"),
+    WAITTING_THREAD(10, "waiting thread"),
+    WAITTING_DEPEND(11, "waiting depend node complete");
+
+    ExecutionStatus(int code, String descp){
+        this.code = code;
+        this.descp = descp;
+    }
+
+    @EnumValue
+    private final int code;
+    private final String descp;


 /**
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/FailureStrategy.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/FailureStrategy.java
@ -16,15 +16,28 @@
 */
 package org.apache.dolphinscheduler.common.enums;

+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
 /**
 * failure policy when some task node failed.
 */
+@Getter
 public enum FailureStrategy {

  /**
   * 0 ending process when some tasks failed.
   * 1 continue running when some tasks failed.
   **/
-  END, CONTINUE;
+  END(0, "end"),
+  CONTINUE(1, "continue");
+
+  FailureStrategy(int code, String descp){
+    this.code = code;
+    this.descp = descp;
+  }

+  @EnumValue
+  private final int code;
+  private final String descp;
 }
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java
@ -16,6 +16,9 @@
 */
 package org.apache.dolphinscheduler.common.enums;

+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
 /**
 * have_script
 * have_file
@ -24,10 +27,22 @@ package org.apache.dolphinscheduler.common.enums;
 * have_map_variables
 * have_alert
 */
+@Getter
 public enum Flag {
    /**
     * 0 no
     * 1 yes
     */
-    NO,YES
+    NO(0, "no"),
+    YES(1, "yes");
+
+
+    Flag(int code, String descp){
+        this.code = code;
+        this.descp = descp;
+    }
+
+    @EnumValue
+    private final int code;
+    private final String descp;
 }
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Priority.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Priority.java
@ -16,9 +16,13 @@
 */
 package org.apache.dolphinscheduler.common.enums;

+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
 /**
 *  define process and task priority
 */
+@Getter
 public enum Priority {
    /**
     * 0 highest priority
@ -27,5 +31,19 @@ public enum Priority {
     * 3 lower priority
     * 4 lowest priority
     */
-    HIGHEST,HIGH,MEDIUM,LOW,LOWEST
+    HIGHEST(0, "highest"),
+    HIGH(1, "high"),
+    MEDIUM(2, "medium"),
+    LOW(3, "low"),
+    LOWEST(4, "lowest");
+
+    Priority(int code, String descp){
+        this.code = code;
+        this.descp = descp;
+    }
+
+    @EnumValue
+    private final int code;
+    private final String descp;
+
 }
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ReleaseState.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ReleaseState.java
@ -16,17 +16,30 @@
 */
 package org.apache.dolphinscheduler.common.enums;

+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
 /**
 * process define release state
 */
+@Getter
 public enum ReleaseState {

    /**
     * 0 offline
     * 1 on line
     */
-    OFFLINE,ONLINE;
+    OFFLINE(0, "offline"),
+    ONLINE(1, "online");
+
+    ReleaseState(int code, String descp){
+        this.code = code;
+        this.descp = descp;
+    }

+    @EnumValue
+    private final int code;
+    private final String descp;

    public static ReleaseState getEnum(int value){
        for (ReleaseState e:ReleaseState.values()) {
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ResourceType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ResourceType.java
@ -16,12 +16,27 @@
 */
 package org.apache.dolphinscheduler.common.enums;

+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
 /**
 * resource type
 */
+@Getter
 public enum  ResourceType {
    /**
     * 0 file, 1 udf
     */
-    FILE,UDF
+    FILE(0, "file"),
+    UDF(1, "udf");
+
+
+    ResourceType(int code, String descp){
+        this.code = code;
+        this.descp = descp;
+    }
+
+    @EnumValue
+    private final int code;
+    private final String descp;
 }
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/RunMode.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/RunMode.java
@ -16,13 +16,27 @@
 */
 package org.apache.dolphinscheduler.common.enums;

+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
 /**
 * complement data run mode
 */
+@Getter
 public enum  RunMode {
    /**
     * 0 serial run
     * 1 parallel run
     * */
-    RUN_MODE_SERIAL, RUN_MODE_PARALLEL
+    RUN_MODE_SERIAL(0, "serial run"),
+    RUN_MODE_PARALLEL(1, "parallel run");
+
+    RunMode(int code, String descp){
+        this.code = code;
+        this.descp = descp;
+    }
+
+    @EnumValue
+    private final int code;
+    private final String descp;
 }
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ShowType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ShowType.java
@ -16,9 +16,13 @@
 */
 package org.apache.dolphinscheduler.common.enums;

+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
 /**
 * show type for email
 */
+@Getter
 public enum ShowType {
    /**
     * 0 TABLE;
@ -26,9 +30,18 @@ public enum ShowType {
     * 2 attachment;
     * 3 TABLE+attachment;
     */
-    TABLE,
-    TEXT,
-    ATTACHMENT,
-    TABLEATTACHMENT
+    TABLE(0, "table"),
+    TEXT(1, "text"),
+    ATTACHMENT(2, "attachment"),
+    TABLEATTACHMENT(3, "table attachment");
+
+
+    ShowType(int code, String descp){
+        this.code = code;
+        this.descp = descp;
+    }

+    @EnumValue
+    private final int code;
+    private final String descp;
 }
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskDependType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskDependType.java
@ -16,15 +16,29 @@
 */
 package org.apache.dolphinscheduler.common.enums;

+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
 /**
 * task node depend type
 */
+@Getter
 public enum TaskDependType {
  /**
   * 0 run current tasks only
   * 1 run current tasks and previous tasks
   * 2 run current tasks and the other tasks that depend on current tasks;
   */
-  TASK_ONLY, TASK_PRE, TASK_POST;
+  TASK_ONLY(0, "task only"),
+  TASK_PRE(1, "task pre"),
+  TASK_POST(2, "task post");
+
+  TaskDependType(int code, String descp){
+    this.code = code;
+    this.descp = descp;
+  }

+  @EnumValue
+  private final int code;
+  private final String descp;
 }
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskStateType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskStateType.java
@ -29,7 +29,6 @@ public enum TaskStateType {
     */
    WAITTING, RUNNING, FINISH, FAILED, SUCCESS;

-
    /**
     * convert task state to execute status integer array ;
     * @param taskStateType
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskType.java
@ -16,9 +16,13 @@
 */
 package org.apache.dolphinscheduler.common.enums;

+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
 /**
 * task node type
 */
+@Getter
 public enum TaskType {
    /**
     * 0 SHELL
@ -32,7 +36,25 @@ public enum TaskType {
     * 8 FLINK
     * 9 HTTP
     */
-    SHELL,SQL, SUB_PROCESS,PROCEDURE,MR,SPARK,PYTHON,DEPENDENT,FLINK,HTTP;
+    SHELL(0, "shell"),
+    SQL(1, "sql"),
+    SUB_PROCESS(2, "sub process"),
+    PROCEDURE(3, "procedure"),
+    MR(4, "mr"),
+    SPARK(5, "spark"),
+    PYTHON(6, "python"),
+    DEPENDENT(7, "dependent"),
+    FLINK(8, "flink"),
+    HTTP(9, "http");
+
+    TaskType(int code, String descp){
+        this.code = code;
+        this.descp = descp;
+    }
+
+    @EnumValue
+    private final int code;
+    private final String descp;

    public static boolean typeIsNormalTask(String typeName) {
        TaskType taskType = TaskType.valueOf(typeName);
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UdfType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UdfType.java
@ -16,12 +16,26 @@
 */
 package org.apache.dolphinscheduler.common.enums;

+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
 /**
 * UDF type
 */
+@Getter
 public enum UdfType {
    /**
     * 0 hive; 1 spark
     */
-  HIVE, SPARK
+  HIVE(0, "hive"),
+  SPARK(1, "spark");
+
+    UdfType(int code, String descp){
+        this.code = code;
+        this.descp = descp;
+    }
+
+    @EnumValue
+    private final int code;
+    private final String descp;
 }
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UserType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UserType.java
@ -16,13 +16,28 @@
 */
 package org.apache.dolphinscheduler.common.enums;

+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
 /**
 * user type
 */
+@Getter
 public enum UserType {
    /**
     * 0 admin user; 1 general user
     */
-    ADMIN_USER,
-    GENERAL_USER
+    ADMIN_USER(0, "admin user"),
+    GENERAL_USER(1, "general user");
+
+
+    UserType(int code, String descp){
+        this.code = code;
+        this.descp = descp;
+    }
+
+    @EnumValue
+    private final int code;
+    private final String descp;
 }
+
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WarningType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WarningType.java
@ -16,9 +16,13 @@
 */
 package org.apache.dolphinscheduler.common.enums;

+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
 /**
 * types for whether to send warning when process ending;
 */
+@Getter
 public enum WarningType {
  /**
   * 0 do not send warning;
@ -26,6 +30,18 @@ public enum WarningType {
   * 2 send if process failed;
   * 3 send if process ending;
   */
-  NONE, SUCCESS, FAILURE, ALL;
+  NONE(0, "none"),
+  SUCCESS(1, "success"),
+  FAILURE(2, "failure"),
+  ALL(3, "all");
+
+
+  WarningType(int code, String descp){
+    this.code = code;
+    this.descp = descp;
+  }

+  @EnumValue
+  private final int code;
+  private final String descp;
 }
--- a/dolphinscheduler-dao/pom.xml
+++ b/dolphinscheduler-dao/pom.xml
@ -28,11 +28,6 @@
 			<artifactId>mybatis-plus-boot-starter</artifactId>
 			<version>${mybatis-plus.version}</version>
 		</dependency>
-		<!--<dependency>-->
-			<!--<groupId>com.baomidou</groupId>-->
-			<!--<artifactId>mybatis-plus-dts</artifactId>-->
-		<!--</dependency>-->
-
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java
@ -114,7 +114,7 @@ public class Command {
    /**
     *
     */
-    @TableField("worker_group_id;")
+    @TableField("worker_group_id")
    private int workerGroupId;


--- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapperTest.java
+++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapperTest.java
@ -57,8 +57,8 @@ public class WorkerGroupMapperTest {
        //update
        workerGroup.setName("workerGroup11");
        int update = workerGroupMapper.updateById(workerGroup);
-        Assert.assertEquals(update, 1);
        workerGroupMapper.deleteById(workerGroup.getId());
+        Assert.assertEquals(update, 1);
    }

    @Test
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@ -466,7 +466,7 @@ export default {
  'Pre Statement': 'Pre Statement',
  'Post Statement': 'Post Statement',
  'Statement cannot be empty': 'Statement cannot be empty',
-  'Process Define Count': 'Process Define Count',
+  'Process Define Count': 'Work flow Define Count',
  'Process Instance Running Count': 'Process Instance Running Count',
  'command number of waiting for running': 'command number of waiting for running',
  'failure command number': 'failure command number',
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@ -466,8 +466,8 @@ export default {
  'Pre Statement': '前置sql',
  'Post Statement': '后置sql',
  'Statement cannot be empty': '语句不能为空',
-  'Process Define Count': '流程定义个数',
-  'Process Instance Running Count': '运行流程实例个数',
+  'Process Define Count': '工作流定义数',
+  'Process Instance Running Count': '正在运行的流程数',
  'Please select a queue': '请选择队列',
  'command number of waiting for running': '待执行的命令数',
  'failure command number': '执行失败的命令数',
--- a/pom.xml
+++ b/pom.xml
@ -25,7 +25,7 @@
 		<hadoop.version>2.7.3</hadoop.version>
 		<quartz.version>2.2.3</quartz.version>
 		<jackson.version>2.9.8</jackson.version>
-		<mybatis-plus.version>3.0.7.1</mybatis-plus.version>
+		<mybatis-plus.version>3.2.0</mybatis-plus.version>
 		<lombok.version>1.18.4</lombok.version>
 		<mybatis.spring.version>2.0.1</mybatis.spring.version>
 		<cron.utils.version>5.0.5</cron.utils.version>