2.0.0项目初始化

datax-common/datax-common-core/src/main/java/cn/datax/common/base/DataScopeBaseEntity.java

+package cn.datax.common.base;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+@Data
+public abstract class DataScopeBaseEntity extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 创建人所属部门
+     */
+    @TableField(value = "dept_id", fill = FieldFill.INSERT)
+    private String deptId;
+}

datax-modules/data-factory-service-parent/data-factory-service-api/src/main/java/cn/datax/service/data/factory/api/dto/DataSourceDto.java

@@ -33,7 +33,7 @@ public class DataSourceDto implements Serializable {
     private String sourceName;
     @ApiModelProperty(value = "数据源描述")
     @NotBlank(message = "数据源描述不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
-    private String sourceDesc;
+    private String remark;
     @ApiModelProperty(value = "数据源连接信息")
     @Valid
     private DbSchemaDto dbSchema;

datax-modules/data-factory-service-parent/data-factory-service-api/src/main/java/cn/datax/service/data/factory/api/entity/DataSourceEntity.java

 package cn.datax.service.data.factory.api.entity;
 
+import cn.datax.common.base.DataScopeBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import cn.datax.common.base.BaseEntity;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName(value = "data_source", autoResultMap = true)
-public class DataSourceEntity extends BaseEntity {
+public class DataSourceEntity extends DataScopeBaseEntity {
 
     private static final long serialVersionUID=1L;
 
@@ -37,7 +37,7 @@ public class DataSourceEntity extends BaseEntity {
     /**
      * 数据源描述
      */
-    private String sourceDesc;
+    private String remark;
 
     /**
      * 数据源连接信息

datax-modules/data-factory-service-parent/data-factory-service-api/src/main/java/cn/datax/service/data/factory/api/vo/DataSourceVo.java

@@ -26,6 +26,6 @@ public class DataSourceVo implements Serializable {
     private LocalDateTime createTime;
     private String dbType;
     private String sourceName;
-    private String sourceDesc;
+    private String remark;
     private DbSchema dbSchema;
 }

datax-modules/data-factory-service-parent/data-factory-service/src/main/resources/mapper/DataSourceMapper.xml

@@ -8,11 +8,12 @@
         <result column="status" property="status" />
         <result column="create_by" property="createBy" />
         <result column="create_time" property="createTime" />
+        <result column="dept_id" property="deptId" />
         <result column="update_by" property="updateBy" />
         <result column="update_time" property="updateTime" />
         <result column="db_type" property="dbType" />
         <result column="source_name" property="sourceName" />
-        <result column="source_desc" property="sourceDesc" />
+        <result column="remark" property="remark" />
         <result column="db_schema" property="dbSchema" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" />
     </resultMap>
 
@@ -22,6 +23,7 @@
         status,
         create_by,
         create_time,
+        dept_id,
         update_by,
         update_time,
         db_type, source_name, source_desc, db_schema