项目初始化

datax-modules/codegen-service-parent/codegen-service-api/src/main/java/cn/datax/service/codegen/api/dto/GenColumnDto.java

@@ -28,27 +28,31 @@ public class GenColumnDto implements Serializable {
     @ApiModelProperty(value = "JAVA字段名")
     @NotBlank(message = "JAVA字段名不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
     private String javaField;
+    @ApiModelProperty(value = "列长度")
+    private String columnLength;
+    @ApiModelProperty(value = "列小数位数")
+    private String columnScale;
     @ApiModelProperty(value = "是否主键（0否1是）")
     @NotNull(message = "是否主键不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
-    private Integer isPk;
+    private String isPk;
     @ApiModelProperty(value = "是否自增（0否1是）")
     @NotNull(message = "是否自增不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
-    private Integer isIncrement;
+    private String isIncrement;
     @ApiModelProperty(value = "是否必填（0否1是）")
     @NotNull(message = "是否必填不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
-    private Integer isRequired;
+    private String isRequired;
     @ApiModelProperty(value = "是否为插入字段（0否1是）")
     @NotNull(message = "是否为插入字段不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
-    private Integer isInsert;
+    private String isInsert;
     @ApiModelProperty(value = "是否编辑字段（0否1是）")
     @NotNull(message = "是否编辑字段不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
-    private Integer isEdit;
+    private String isEdit;
     @ApiModelProperty(value = "是否列表字段（0否1是）")
     @NotNull(message = "是否列表字段不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
-    private Integer isList;
+    private String isList;
     @ApiModelProperty(value = "是否查询字段（0否1是）")
     @NotNull(message = "是否查询字段不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
-    private Integer isQuery;
+    private String isQuery;
     @ApiModelProperty(value = "查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围）")
     @NotBlank(message = "查询方式不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
     private String queryType;

datax-modules/data-market-service-parent/data-market-service/src/main/java/cn/datax/service/data/market/controller/ApiMaskController.java

 package cn.datax.service.data.market.controller;
 
 import cn.datax.common.base.BaseController;
-import cn.datax.common.core.DataConstant;
 import cn.datax.common.core.JsonPage;
 import cn.datax.common.core.R;
 import cn.datax.common.validate.ValidationGroups;
@@ -73,16 +72,6 @@ public class ApiMaskController extends BaseController {
         return R.ok().setData(apiMaskMapper.toVO(apiMaskEntity));
     }
 
-    @ApiOperation(value = "获取列表", notes = "")
-    @GetMapping("/list")
-    public R getApiMaskList() {
-        QueryWrapper<ApiMaskEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("status", DataConstant.EnableState.ENABLE.getKey());
-        List<ApiMaskEntity> list = apiMaskService.list(queryWrapper);
-        List<ApiMaskVo> collect = list.stream().map(apiMaskMapper::toVO).collect(Collectors.toList());
-        return R.ok().setData(collect);
-    }
-
     /**
      * 分页查询信息
      *

datax-modules/data-market-service-parent/data-market-service/src/main/java/cn/datax/service/data/market/controller/DataApiController.java

@@ -91,7 +91,6 @@ public class DataApiController extends BaseController {
     public R getDataApiPage(DataApiQuery dataApiQuery) {
         QueryWrapper<DataApiEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StrUtil.isNotBlank(dataApiQuery.getApiName()), "api_name", dataApiQuery.getApiName());
-        queryWrapper.select("id", "status", "create_time", "api_name", "api_version", "api_url", "req_method", "res_type", "remark");
         IPage<DataApiEntity> page = dataApiService.page(new Page<>(dataApiQuery.getPageNum(), dataApiQuery.getPageSize()), queryWrapper);
         List<DataApiVo> collect = page.getRecords().stream().map(dataApiMapper::toVO).collect(Collectors.toList());
         JsonPage<DataApiVo> jsonPage = new JsonPage<>(page.getCurrent(), page.getSize(), page.getTotal(), collect);

datax-modules/data-market-service-parent/data-market-service/src/main/java/cn/datax/service/data/market/dao/ApiMaskDao.java

@@ -2,7 +2,13 @@ package cn.datax.service.data.market.dao;
 
 import cn.datax.common.base.BaseDao;
 import cn.datax.service.data.market.api.entity.ApiMaskEntity;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.io.Serializable;
 
 /**
  * <p>
@@ -15,4 +21,9 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ApiMaskDao extends BaseDao<ApiMaskEntity> {
 
+    @Override
+    ApiMaskEntity selectById(Serializable id);
+
+    @Override
+    <E extends IPage<ApiMaskEntity>> E selectPage(E page, @Param(Constants.WRAPPER) Wrapper<ApiMaskEntity> queryWrapper);
 }

datax-modules/data-market-service-parent/data-market-service/src/main/java/cn/datax/service/data/market/dao/DataApiDao.java

@@ -2,7 +2,14 @@ package cn.datax.service.data.market.dao;
 
 import cn.datax.common.base.BaseDao;
 import cn.datax.service.data.market.api.entity.DataApiEntity;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +22,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface DataApiDao extends BaseDao<DataApiEntity> {
 
+    @Override
+    DataApiEntity selectById(Serializable id);
+
+    @Override
+    List<DataApiEntity> selectList(@Param(Constants.WRAPPER) Wrapper<DataApiEntity> queryWrapper);
+
+    @Override
+    <E extends IPage<DataApiEntity>> E selectPage(E page, @Param(Constants.WRAPPER) Wrapper<DataApiEntity> queryWrapper);
 }

datax-modules/data-market-service-parent/data-market-service/src/main/resources/mapper/ApiMaskMapper.xml

@@ -14,6 +14,9 @@
         <result column="api_id" property="apiId" />
         <result column="mask_name" property="maskName" />
         <result column="remark" property="remark" />
+    </resultMap>
+
+    <resultMap id="ExtendResultMap" type="cn.datax.service.data.market.api.entity.ApiMaskEntity" extends="BaseResultMap">
         <result column="config_json" property="rules" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
     </resultMap>
 
@@ -29,4 +32,18 @@
         api_id, mask_name, remark, config_json
     </sql>
 
+    <select id="selectById" resultMap="ExtendResultMap">
+        SELECT
+        <include refid="Base_Column_List"></include>
+        FROM market_api_mask
+        WHERE 1=1 AND id = #{id}
+    </select>
+
+    <select id="selectPage" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"></include>
+        FROM market_api_mask
+        ${ew.customSqlSegment}
+    </select>
+
 </mapper>

datax-modules/data-market-service-parent/data-market-service/src/main/resources/mapper/DataApiMapper.xml

@@ -18,9 +18,9 @@
         <result column="req_method" property="reqMethod" />
         <result column="res_type" property="resType" />
         <result column="deny" property="deny" />
-<!--        <result column="rate_limit" property="rateLimit" />-->
-<!--        <result column="times" property="times" />-->
-<!--        <result column="seconds" property="seconds" />-->
+    </resultMap>
+
+    <resultMap id="ExtendResultMap" type="cn.datax.service.data.market.api.entity.DataApiEntity" extends="BaseResultMap">
         <result column="limit_json" property="rateLimit" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result column="config_json" property="executeConfig" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result column="req_json" property="reqParams" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
@@ -38,5 +38,25 @@
         update_time,
         api_name, api_version, api_url, remark, req_method, res_type, deny, limit_json, config_json, req_json, res_json
     </sql>
+    <select id="selectById" resultMap="ExtendResultMap">
+        SELECT
+        <include refid="Base_Column_List"></include>
+        FROM market_api
+        WHERE 1=1 AND id = #{id}
+    </select>
+
+    <select id="selectList" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"></include>
+        FROM market_api
+        ${ew.customSqlSegment}
+    </select>
+
+    <select id="selectPage" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"></include>
+        FROM market_api
+        ${ew.customSqlSegment}
+    </select>
 
 </mapper>

datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/dto/ModelColumnDto.java

+package cn.datax.service.data.masterdata.api.dto;
+
+import cn.datax.common.validate.ValidationGroups;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+/**
+ * <p>
+ * 主数据模型列信息表 实体DTO
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-26
+ */
+@ApiModel(value = "主数据模型列信息表Model")
+@Data
+public class ModelColumnDto implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键ID")
+    @NotBlank(message = "主键ID不能为空", groups = {ValidationGroups.Update.class})
+    private String id;
+    @ApiModelProperty(value = "模型表主键")
+    private String modelId;
+    @ApiModelProperty(value = "列名称")
+    @NotBlank(message = "列名称不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    private String columnName;
+    @ApiModelProperty(value = "列描述")
+    @NotBlank(message = "列描述不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    private String columnComment;
+    @ApiModelProperty(value = "列类型")
+    @NotBlank(message = "列类型不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    private String columnType;
+    @ApiModelProperty(value = "列长度")
+    private String columnLength;
+    @ApiModelProperty(value = "列小数位数")
+    private String columnScale;
+    @ApiModelProperty(value = "是否主键（0否，1是）")
+    private String isPk;
+    @ApiModelProperty(value = "是否必填（0否，1是）")
+    private String isRequired;
+    @ApiModelProperty(value = "是否为插入字段（0否，1是）")
+    private String isInsert;
+    @ApiModelProperty(value = "是否编辑字段（0否，1是）")
+    private String isEdit;
+    @ApiModelProperty(value = "是否列表字段（0否，1是）")
+    private String isList;
+    @ApiModelProperty(value = "是否查询字段（0否，1是）")
+    private String isQuery;
+    @ApiModelProperty(value = "查询方式（EQ等于、NE不等于、GT大于、GE大于等于、LT小于、LE小于等于、LIKE模糊、BETWEEN范围）")
+    private String queryType;
+    @ApiModelProperty(value = "是否绑定数据标准（0否，1是）")
+    private String isBindDict;
+    @ApiModelProperty(value = "绑定数据标准类别")
+    private String bindDictTypeId;
+    @ApiModelProperty(value = "绑定数据标准字典字段（GB_CODE，GB_NAME）")
+    private String bindDictColumn;
+    @ApiModelProperty(value = "显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件）")
+    private String htmlType;
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+    @ApiModelProperty(value = "状态")
+    @NotNull(message = "状态不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    private String status;
+    @ApiModelProperty(value = "备注")
+    private String remark;
+}

datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/dto/ModelDto.java

+package cn.datax.service.data.masterdata.api.dto;
+
+import cn.datax.common.validate.ValidationGroups;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 主数据模型表 实体DTO
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-26
+ */
+@ApiModel(value = "主数据模型表Model")
+@Data
+public class ModelDto implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键ID")
+    @NotBlank(message = "主键ID不能为空", groups = {ValidationGroups.Update.class})
+    private String id;
+    @ApiModelProperty(value = "模型名称")
+    @NotBlank(message = "模型名称不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    private String modelName;
+    @ApiModelProperty(value = "模型编码")
+    @NotBlank(message = "模型编码不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    private String modelCode;
+    @ApiModelProperty(value = "模型列信息")
+    @Valid
+    @NotEmpty(message = "模型列信息不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    @Size(min = 1, message="模型列信息长度不能少于{min}位")
+    private List<ModelColumnDto> modelColumns;
+    @ApiModelProperty(value = "状态")
+    @NotNull(message = "状态不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    private String status;
+    @ApiModelProperty(value = "备注")
+    private String remark;
+}

datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/entity/ModelColumnEntity.java

+package cn.datax.service.data.masterdata.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import cn.datax.common.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 主数据模型列信息表
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("masterdata_model_column")
+public class ModelColumnEntity extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 模型表主键
+     */
+    private String modelId;
+
+    /**
+     * 列名称
+     */
+    private String columnName;
+
+    /**
+     * 列描述
+     */
+    private String columnComment;
+
+    /**
+     * 列类型
+     */
+    private String columnType;
+
+    /**
+     * 列长度
+     */
+    private String columnLength;
+
+    /**
+     * 列小数位数
+     */
+    private String columnScale;
+
+    /**
+     * 是否主键（0否，1是）
+     */
+    private String isPk;
+
+    /**
+     * 是否必填（0否，1是）
+     */
+    private String isRequired;
+
+    /**
+     * 是否为插入字段（0否，1是）
+     */
+    private String isInsert;
+
+    /**
+     * 是否编辑字段（0否，1是）
+     */
+    private String isEdit;
+
+    /**
+     * 是否列表字段（0否，1是）
+     */
+    private String isList;
+
+    /**
+     * 是否查询字段（0否，1是）
+     */
+    private String isQuery;
+
+    /**
+     * 查询方式（EQ等于、NE不等于、GT大于、GE大于等于、LT小于、LE小于等于、LIKE模糊、BETWEEN范围）
+     */
+    private String queryType;
+
+    /**
+     * 是否绑定数据标准（0否，1是）
+     */
+    private String isBindDict;
+
+    /**
+     * 绑定数据标准类别
+     */
+    private String bindDictTypeId;
+
+    /**
+     * 绑定数据标准字典字段（GB_CODE，GB_NAME）
+     */
+    private String bindDictColumn;
+
+    /**
+     * 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件）
+     */
+    private String htmlType;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+}

datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/entity/ModelEntity.java

+package cn.datax.service.data.masterdata.api.entity;
+
+import cn.datax.common.base.DataScopeBaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 主数据模型表
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("masterdata_model")
+public class ModelEntity extends DataScopeBaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 模型编码
+     */
+    private String modelCode;
+
+    /**
+     * 模型数据库表
+     */
+    private String modelTable;
+
+    @TableField(exist = false)
+    private List<ModelColumnEntity> modelColumns;
+}

datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/query/ModelColumnQuery.java

+package cn.datax.service.data.masterdata.api.query;
+
+import cn.datax.common.base.BaseQueryParams;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 主数据模型列信息表 查询实体
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ModelColumnQuery extends BaseQueryParams {
+
+    private static final long serialVersionUID=1L;
+
+    private String modelId;
+    private String columnName;
+}

datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/query/ModelQuery.java

+package cn.datax.service.data.masterdata.api.query;
+
+import cn.datax.common.base.BaseQueryParams;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 主数据模型表 查询实体
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ModelQuery extends BaseQueryParams {
+
+    private static final long serialVersionUID=1L;
+
+    private String modelName;
+}

datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/vo/ModelColumnVo.java

+package cn.datax.service.data.masterdata.api.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 主数据模型列信息表 实体VO
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-26
+ */
+@Data
+public class ModelColumnVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    private String id;
+    private String status;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
+    private String modelId;
+    private String columnName;
+    private String columnComment;
+    private String columnType;
+    private String columnLength;
+    private String columnScale;
+    private String isPk;
+    private String isRequired;
+    private String isInsert;
+    private String isEdit;
+    private String isList;
+    private String isQuery;
+    private String queryType;
+    private String isBindDict;
+    private String bindDictTypeId;
+    private String bindDictColumn;
+    private String htmlType;
+    private Integer sort;
+}

datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/vo/ModelVo.java

+package cn.datax.service.data.masterdata.api.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 主数据模型表 实体VO
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-26
+ */
+@Data
+public class ModelVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    private String id;
+    private String status;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
+    private String modelName;
+    private String modelCode;
+    private String modelTable;
+    private List<ModelColumnVo> modelColumns;
+}

datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/java/cn/datax/service/data/masterdata/controller/InnerController.java

+package cn.datax.service.data.masterdata.controller;
+
+import cn.datax.common.base.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/inner")
+public class InnerController extends BaseController {
+
+}

datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/java/cn/datax/service/data/masterdata/controller/ModelColumnController.java

+package cn.datax.service.data.masterdata.controller;
+
+import cn.datax.common.core.JsonPage;
+import cn.datax.common.core.R;
+import cn.datax.common.validate.ValidationGroups;
+import cn.datax.service.data.masterdata.api.dto.ModelColumnDto;
+import cn.datax.service.data.masterdata.api.entity.ModelColumnEntity;
+import cn.datax.service.data.masterdata.api.vo.ModelColumnVo;
+import cn.datax.service.data.masterdata.api.query.ModelColumnQuery;
+import cn.datax.service.data.masterdata.mapstruct.ModelColumnMapper;
+import cn.datax.service.data.masterdata.service.ModelColumnService;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import cn.datax.common.base.BaseController;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 主数据模型列信息表 前端控制器
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-26
+ */
+@Api(tags = {"主数据模型列信息表"})
+@RestController
+@RequestMapping("/columns")
+public class ModelColumnController extends BaseController {
+
+    @Autowired
+    private ModelColumnService modelColumnService;
+
+    @Autowired
+    private ModelColumnMapper modelColumnMapper;
+
+    /**
+     * 通过ID查询信息
+     *
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "获取详细信息", notes = "根据url的id来获取详细信息")
+    @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String", paramType = "path")
+    @GetMapping("/{id}")
+    public R getModelColumnById(@PathVariable String id) {
+        ModelColumnEntity modelColumnEntity = modelColumnService.getModelColumnById(id);
+        return R.ok().setData(modelColumnMapper.toVO(modelColumnEntity));
+    }
+
+    /**
+     * 分页查询信息
+     *
+     * @param modelColumnQuery
+     * @return
+     */
+    @ApiOperation(value = "分页查询", notes = "")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "modelColumnQuery", value = "查询实体modelColumnQuery", required = true, dataTypeClass = ModelColumnQuery.class)
+    })
+    @GetMapping("/page")
+    public R getModelColumnPage(ModelColumnQuery modelColumnQuery) {
+        QueryWrapper<ModelColumnEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StrUtil.isNotBlank(modelColumnQuery.getModelId()), "model_id", modelColumnQuery.getModelId());
+        queryWrapper.like(StrUtil.isNotBlank(modelColumnQuery.getColumnName()), "column_name", modelColumnQuery.getColumnName());
+        IPage<ModelColumnEntity> page = modelColumnService.page(new Page<>(modelColumnQuery.getPageNum(), modelColumnQuery.getPageSize()), queryWrapper);
+        List<ModelColumnVo> collect = page.getRecords().stream().map(modelColumnMapper::toVO).collect(Collectors.toList());
+        JsonPage<ModelColumnVo> jsonPage = new JsonPage<>(page.getCurrent(), page.getSize(), page.getTotal(), collect);
+        return R.ok().setData(jsonPage);
+    }
+
+    /**
+     * 添加
+     * @param modelColumn
+     * @return
+     */
+    @ApiOperation(value = "添加信息", notes = "根据modelColumn对象添加信息")
+    @ApiImplicitParam(name = "modelColumn", value = "详细实体modelColumn", required = true, dataType = "ModelColumnDto")
+    @PostMapping()
+    public R saveModelColumn(@RequestBody @Validated({ValidationGroups.Insert.class}) ModelColumnDto modelColumn) {
+        ModelColumnEntity modelColumnEntity = modelColumnService.saveModelColumn(modelColumn);
+        return R.ok().setData(modelColumnMapper.toVO(modelColumnEntity));
+    }
+
+    /**
+     * 修改
+     * @param modelColumn
+     * @return
+     */
+    @ApiOperation(value = "修改信息", notes = "根据url的id来指定修改对象，并根据传过来的信息来修改详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String", paramType = "path"),
+            @ApiImplicitParam(name = "modelColumn", value = "详细实体modelColumn", required = true, dataType = "ModelColumnDto")
+    })
+    @PutMapping("/{id}")
+    public R updateModelColumn(@PathVariable String id, @RequestBody @Validated({ValidationGroups.Update.class}) ModelColumnDto modelColumn) {
+        ModelColumnEntity modelColumnEntity = modelColumnService.updateModelColumn(modelColumn);
+        return R.ok().setData(modelColumnMapper.toVO(modelColumnEntity));
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "删除", notes = "根据url的id来指定删除对象")
+    @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String", paramType = "path")
+    @DeleteMapping("/{id}")
+    public R deleteModelColumnById(@PathVariable String id) {
+        modelColumnService.deleteModelColumnById(id);
+        return R.ok();
+    }
+
+    /**
+     * 批量删除
+     * @param ids
+     * @return
+     */
+    @ApiOperation(value = "批量删除角色", notes = "根据url的ids来批量删除对象")
+    @ApiImplicitParam(name = "ids", value = "ID集合", required = true, dataType = "List", paramType = "path")
+    @DeleteMapping("/batch/{ids}")
+    public R deleteModelColumnBatch(@PathVariable List<String> ids) {
+        modelColumnService.deleteModelColumnBatch(ids);
+        return R.ok();
+    }
+}

datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/java/cn/datax/service/data/masterdata/controller/ModelController.java

+package cn.datax.service.data.masterdata.controller;
+
+import cn.datax.common.core.JsonPage;
+import cn.datax.common.core.R;
+import cn.datax.common.validate.ValidationGroups;
+import cn.datax.service.data.masterdata.api.dto.ModelDto;
+import cn.datax.service.data.masterdata.api.entity.ModelEntity;
+import cn.datax.service.data.masterdata.api.vo.ModelVo;
+import cn.datax.service.data.masterdata.api.query.ModelQuery;
+import cn.datax.service.data.masterdata.mapstruct.ModelMapper;
+import cn.datax.service.data.masterdata.service.ModelService;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import cn.datax.common.base.BaseController;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 主数据模型表 前端控制器
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-26
+ */
+@Api(tags = {"主数据模型表"})
+@RestController
+@RequestMapping("/models")
+public class ModelController extends BaseController {
+
+    @Autowired
+    private ModelService modelService;
+
+    @Autowired
+    private ModelMapper modelMapper;
+
+    /**
+     * 通过ID查询信息
+     *
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "获取详细信息", notes = "根据url的id来获取详细信息")
+    @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String", paramType = "path")
+    @GetMapping("/{id}")
+    public R getModelById(@PathVariable String id) {
+        ModelEntity modelEntity = modelService.getModelById(id);
+        return R.ok().setData(modelMapper.toVO(modelEntity));
+    }
+
+    /**
+     * 分页查询信息
+     *
+     * @param modelQuery
+     * @return
+     */
+    @ApiOperation(value = "分页查询", notes = "")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "modelQuery", value = "查询实体modelQuery", required = true, dataTypeClass = ModelQuery.class)
+    })
+    @GetMapping("/page")
+    public R getModelPage(ModelQuery modelQuery) {
+        QueryWrapper<ModelEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StrUtil.isNotBlank(modelQuery.getModelName()), "model_name", modelQuery.getModelName());
+        IPage<ModelEntity> page = modelService.page(new Page<>(modelQuery.getPageNum(), modelQuery.getPageSize()), queryWrapper);
+        List<ModelVo> collect = page.getRecords().stream().map(modelMapper::toVO).collect(Collectors.toList());
+        JsonPage<ModelVo> jsonPage = new JsonPage<>(page.getCurrent(), page.getSize(), page.getTotal(), collect);
+        return R.ok().setData(jsonPage);
+    }
+
+    /**
+     * 添加
+     * @param model
+     * @return
+     */
+    @ApiOperation(value = "添加信息", notes = "根据model对象添加信息")
+    @ApiImplicitParam(name = "model", value = "详细实体model", required = true, dataType = "ModelDto")
+    @PostMapping()
+    public R saveModel(@RequestBody @Validated({ValidationGroups.Insert.class}) ModelDto model) {
+        ModelEntity modelEntity = modelService.saveModel(model);
+        return R.ok().setData(modelMapper.toVO(modelEntity));
+    }
+
+    /**
+     * 修改
+     * @param model
+     * @return
+     */
+    @ApiOperation(value = "修改信息", notes = "根据url的id来指定修改对象，并根据传过来的信息来修改详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String", paramType = "path"),
+            @ApiImplicitParam(name = "model", value = "详细实体model", required = true, dataType = "ModelDto")
+    })
+    @PutMapping("/{id}")
+    public R updateModel(@PathVariable String id, @RequestBody @Validated({ValidationGroups.Update.class}) ModelDto model) {
+        ModelEntity modelEntity = modelService.updateModel(model);
+        return R.ok().setData(modelMapper.toVO(modelEntity));
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "删除", notes = "根据url的id来指定删除对象")
+    @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String", paramType = "path")
+    @DeleteMapping("/{id}")
+    public R deleteModelById(@PathVariable String id) {
+        modelService.deleteModelById(id);
+        return R.ok();
+    }
+
+    /**
+     * 批量删除
+     * @param ids
+     * @return
+     */
+    @ApiOperation(value = "批量删除角色", notes = "根据url的ids来批量删除对象")
+    @ApiImplicitParam(name = "ids", value = "ID集合", required = true, dataType = "List", paramType = "path")
+    @DeleteMapping("/batch/{ids}")
+    public R deleteModelBatch(@PathVariable List<String> ids) {
+        modelService.deleteModelBatch(ids);
+        return R.ok();
+    }
+}

datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/java/cn/datax/service/data/masterdata/dao/ModelColumnDao.java

+package cn.datax.service.data.masterdata.dao;
+
+import cn.datax.common.base.BaseDao;
+import cn.datax.service.data.masterdata.api.entity.ModelColumnEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 主数据模型列信息表 Mapper 接口
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-26
+ */
+@Mapper
+public interface ModelColumnDao extends BaseDao<ModelColumnEntity> {
+
+}

datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/java/cn/datax/service/data/masterdata/dao/ModelDao.java

+package cn.datax.service.data.masterdata.dao;
+
+import cn.datax.common.base.BaseDao;
+import cn.datax.service.data.masterdata.api.entity.ModelEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 主数据模型表 Mapper 接口
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-26
+ */
+@Mapper
+public interface ModelDao extends BaseDao<ModelEntity> {
+
+    @Override
+    ModelEntity selectById(Serializable id);
+}

datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/java/cn/datax/service/data/masterdata/mapstruct/ModelColumnMapper.java

+package cn.datax.service.data.masterdata.mapstruct;
+
+import cn.datax.common.mapstruct.EntityMapper;
+import cn.datax.service.data.masterdata.api.dto.ModelColumnDto;
+import cn.datax.service.data.masterdata.api.entity.ModelColumnEntity;
+import cn.datax.service.data.masterdata.api.vo.ModelColumnVo;
+import org.mapstruct.Mapper;
+
+/**
+ * <p>
+ * 主数据模型列信息表 Mapper 实体映射
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-26
+ */
+@Mapper(componentModel = "spring")
+public interface ModelColumnMapper extends EntityMapper<ModelColumnDto, ModelColumnEntity, ModelColumnVo> {
+
+}

datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/java/cn/datax/service/data/masterdata/mapstruct/ModelMapper.java

+package cn.datax.service.data.masterdata.mapstruct;
+
+import cn.datax.common.mapstruct.EntityMapper;
+import cn.datax.service.data.masterdata.api.dto.ModelDto;
+import cn.datax.service.data.masterdata.api.entity.ModelEntity;
+import cn.datax.service.data.masterdata.api.vo.ModelVo;
+import org.mapstruct.Mapper;
+
+/**
+ * <p>
+ * 主数据模型表 Mapper 实体映射
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-26
+ */
+@Mapper(componentModel = "spring")
+public interface ModelMapper extends EntityMapper<ModelDto, ModelEntity, ModelVo> {
+
+}

datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/java/cn/datax/service/data/masterdata/service/ModelColumnService.java

+package cn.datax.service.data.masterdata.service;
+
+import cn.datax.service.data.masterdata.api.entity.ModelColumnEntity;
+import cn.datax.service.data.masterdata.api.dto.ModelColumnDto;
+import cn.datax.common.base.BaseService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 主数据模型列信息表 服务类
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-26
+ */
+public interface ModelColumnService extends BaseService<ModelColumnEntity> {
+
+    ModelColumnEntity saveModelColumn(ModelColumnDto modelColumn);
+
+    ModelColumnEntity updateModelColumn(ModelColumnDto modelColumn);
+
+    ModelColumnEntity getModelColumnById(String id);
+
+    void deleteModelColumnById(String id);
+
+    void deleteModelColumnBatch(List<String> ids);
+}

datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/java/cn/datax/service/data/masterdata/service/ModelService.java

+package cn.datax.service.data.masterdata.service;
+
+import cn.datax.service.data.masterdata.api.entity.ModelEntity;
+import cn.datax.service.data.masterdata.api.dto.ModelDto;
+import cn.datax.common.base.BaseService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 主数据模型表 服务类
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-26
+ */
+public interface ModelService extends BaseService<ModelEntity> {
+
+    ModelEntity saveModel(ModelDto model);
+
+    ModelEntity updateModel(ModelDto model);
+
+    ModelEntity getModelById(String id);
+
+    void deleteModelById(String id);
+
+    void deleteModelBatch(List<String> ids);
+}

datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/java/cn/datax/service/data/masterdata/service/impl/ModelColumnServiceImpl.java

+package cn.datax.service.data.masterdata.service.impl;
+
+import cn.datax.service.data.masterdata.api.entity.ModelColumnEntity;
+import cn.datax.service.data.masterdata.api.dto.ModelColumnDto;
+import cn.datax.service.data.masterdata.service.ModelColumnService;
+import cn.datax.service.data.masterdata.mapstruct.ModelColumnMapper;
+import cn.datax.service.data.masterdata.dao.ModelColumnDao;
+import cn.datax.common.base.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 主数据模型列信息表 服务实现类
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-26
+ */
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+public class ModelColumnServiceImpl extends BaseServiceImpl<ModelColumnDao, ModelColumnEntity> implements ModelColumnService {
+
+    @Autowired
+    private ModelColumnDao modelColumnDao;
+
+    @Autowired
+    private ModelColumnMapper modelColumnMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ModelColumnEntity saveModelColumn(ModelColumnDto modelColumnDto) {
+        ModelColumnEntity modelColumn = modelColumnMapper.toEntity(modelColumnDto);
+        modelColumnDao.insert(modelColumn);
+        return modelColumn;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ModelColumnEntity updateModelColumn(ModelColumnDto modelColumnDto) {
+        ModelColumnEntity modelColumn = modelColumnMapper.toEntity(modelColumnDto);
+        modelColumnDao.updateById(modelColumn);
+        return modelColumn;
+    }
+
+    @Override
+    public ModelColumnEntity getModelColumnById(String id) {
+        ModelColumnEntity modelColumnEntity = super.getById(id);
+        return modelColumnEntity;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteModelColumnById(String id) {
+        modelColumnDao.deleteById(id);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteModelColumnBatch(List<String> ids) {
+        modelColumnDao.deleteBatchIds(ids);
+    }
+}

datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/java/cn/datax/service/data/masterdata/service/impl/ModelServiceImpl.java

+package cn.datax.service.data.masterdata.service.impl;
+
+import cn.datax.service.data.masterdata.api.entity.ModelColumnEntity;
+import cn.datax.service.data.masterdata.api.entity.ModelEntity;
+import cn.datax.service.data.masterdata.api.dto.ModelDto;
+import cn.datax.service.data.masterdata.dao.ModelColumnDao;
+import cn.datax.service.data.masterdata.service.ModelService;
+import cn.datax.service.data.masterdata.mapstruct.ModelMapper;
+import cn.datax.service.data.masterdata.dao.ModelDao;
+import cn.datax.common.base.BaseServiceImpl;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 主数据模型表 服务实现类
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-26
+ */
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+public class ModelServiceImpl extends BaseServiceImpl<ModelDao, ModelEntity> implements ModelService {
+
+    @Autowired
+    private ModelDao modelDao;
+
+    @Autowired
+    private ModelMapper modelMapper;
+
+    @Autowired
+    private ModelColumnDao modelColumnDao;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ModelEntity saveModel(ModelDto modelDto) {
+        ModelEntity model = modelMapper.toEntity(modelDto);
+        modelDao.insert(model);
+        String modelId = model.getId();
+        List<ModelColumnEntity> modelColumns = model.getModelColumns();
+        if(CollUtil.isNotEmpty(modelColumns)){
+            modelColumns.stream().forEach(c -> {
+                c.setModelId(modelId);
+                modelColumnDao.insert(c);
+            });
+        }
+        return model;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ModelEntity updateModel(ModelDto modelDto) {
+        ModelEntity model = modelMapper.toEntity(modelDto);
+        modelDao.updateById(model);
+        String modelId = model.getId();
+        modelColumnDao.delete(Wrappers.<ModelColumnEntity>lambdaQuery()
+                .eq(ModelColumnEntity::getModelId, modelId));
+        List<ModelColumnEntity> modelColumns = model.getModelColumns();
+        if(CollUtil.isNotEmpty(modelColumns)){
+            modelColumns.stream().forEach(c -> {
+                c.setModelId(modelId);
+                modelColumnDao.insert(c);
+            });
+        }
+        return model;
+    }
+
+    @Override
+    public ModelEntity getModelById(String id) {
+        ModelEntity modelEntity = super.getById(id);
+        return modelEntity;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteModelById(String id) {
+        modelColumnDao.delete(Wrappers.<ModelColumnEntity>lambdaQuery()
+                .eq(ModelColumnEntity::getModelId, id));
+        modelDao.deleteById(id);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteModelBatch(List<String> ids) {
+        modelColumnDao.delete(Wrappers.<ModelColumnEntity>lambdaQuery()
+                .in(ModelColumnEntity::getModelId, ids));
+        modelDao.deleteBatchIds(ids);
+    }
+}

datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/resources/mapper/ModelColumnMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.datax.service.data.masterdata.dao.ModelColumnDao">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.datax.service.data.masterdata.api.entity.ModelColumnEntity">
+        <result column="id" property="id" />
+        <result column="status" property="status" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="remark" property="remark" />
+        <result column="model_id" property="modelId" />
+        <result column="column_name" property="columnName" />
+        <result column="column_comment" property="columnComment" />
+        <result column="column_type" property="columnType" />
+        <result column="column_length" property="columnLength" />
+        <result column="column_scale" property="columnScale" />
+        <result column="is_pk" property="isPk" />
+        <result column="is_required" property="isRequired" />
+        <result column="is_insert" property="isInsert" />
+        <result column="is_edit" property="isEdit" />
+        <result column="is_list" property="isList" />
+        <result column="is_query" property="isQuery" />
+        <result column="query_type" property="queryType" />
+        <result column="is_bind_dict" property="isBindDict" />
+        <result column="bind_dict_type_id" property="bindDictTypeId" />
+        <result column="bind_dict_column" property="bindDictColumn" />
+        <result column="html_type" property="htmlType" />
+        <result column="sort" property="sort" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        status,
+        create_by,
+        create_time,
+        update_by,
+        update_time,
+        remark,
+        model_id, column_name, column_comment, column_type, column_length, column_scale, is_pk, is_required, is_insert, is_edit, is_list, is_query, query_type, is_bind_dict, bind_dict_type_id, bind_dict_column, html_type, sort
+    </sql>
+
+</mapper>

datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/resources/mapper/ModelMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.datax.service.data.masterdata.dao.ModelDao">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.datax.service.data.masterdata.api.entity.ModelEntity">
+        <result column="id" property="id" />
+        <result column="status" property="status" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="create_dept" property="createDept" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="remark" property="remark" />
+        <result column="model_name" property="modelName" />
+        <result column="model_code" property="modelCode" />
+        <result column="model_table" property="modelTable" />
+
+        <collection property="modelColumns" column="{modelId=id}" select="getModelColumnList"></collection>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        status,
+        create_by,
+        create_time,
+        create_dept,
+        update_by,
+        update_time,
+        remark,
+        model_name, model_code, model_table
+    </sql>
+
+    <select id="getModelColumnList" resultType="cn.datax.service.data.masterdata.api.entity.ModelColumnEntity">
+        SELECT
+        <include refid="cn.datax.service.data.masterdata.dao.ModelColumnDao.Base_Column_List"></include>
+        FROM masterdata_model_column
+        WHERE 1 = 1
+        <if test="modelId != null and modelId != ''">
+            AND model_id = #{modelId}
+        </if>
+    </select>
+
+    <select id="selectById" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"></include>
+        FROM masterdata_model
+        WHERE 1 = 1 AND id = #{id}
+    </select>
+
+</mapper>

datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/dto/DictDto.java

@@ -10,13 +10,13 @@ import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 /**
  * <p>
- * 标准信息表 实体DTO
+ * 数据标准字典表 实体DTO
  * </p>
  *
  * @author yuwei
  * @since 2020-08-26
  */
-@ApiModel(value = "标准信息表Model")
+@ApiModel(value = "数据标准字典表Model")
 @Data
 public class DictDto implements Serializable {
 

datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/dto/TypeDto.java

@@ -10,13 +10,13 @@ import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 /**
  * <p>
- * 标准类别信息表 实体DTO
+ * 数据标准类别表 实体DTO
  * </p>
  *
  * @author yuwei
  * @since 2020-08-26
  */
-@ApiModel(value = "标准类别信息表Model")
+@ApiModel(value = "数据标准类别表Model")
 @Data
 public class TypeDto implements Serializable {
 

datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/entity/DictEntity.java

@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 标准信息表
+ * 数据标准字典表
  * </p>
  *
  * @author yuwei

datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/entity/TypeEntity.java

@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 标准类别信息表
+ * 数据标准类别表
  * </p>
  *
  * @author yuwei

datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/query/DictQuery.java

@@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode;
 
 /**
  * <p>
- * 标准信息表 查询实体
+ * 数据标准字典表 查询实体
  * </p>
  *
  * @author yuwei

datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/query/TypeQuery.java

@@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode;
 
 /**
  * <p>
- * 标准类别信息表 查询实体
+ * 数据标准类别表 查询实体
  * </p>
  *
  * @author yuwei

datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/vo/DictVo.java

@@ -8,7 +8,7 @@ import java.time.LocalDateTime;
 
 /**
  * <p>
- * 标准信息表 实体VO
+ * 数据标准字典表 实体VO
  * </p>
  *
  * @author yuwei

datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/vo/TypeVo.java

@@ -8,7 +8,7 @@ import java.time.LocalDateTime;
 
 /**
  * <p>
- * 标准类别信息表 实体VO
+ * 数据标准类别表 实体VO
  * </p>
  *
  * @author yuwei

datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/controller/DictController.java

@@ -28,13 +28,13 @@ import java.util.stream.Collectors;
 
 /**
  * <p>
- * 标准信息表 前端控制器
+ * 数据标准字典表 前端控制器
  * </p>
  *
  * @author yuwei
  * @since 2020-08-26
  */
-@Api(tags = {"标准信息表"})
+@Api(tags = {"数据标准字典表"})
 @RestController
 @RequestMapping("/dicts")
 public class DictController extends BaseController {

datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/controller/TypeController.java

@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
 
 /**
  * <p>
- * 标准类别信息表 前端控制器
+ * 数据标准类别表 前端控制器
  * </p>
  *
  * @author yuwei

datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/dao/DictDao.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
 
 /**
  * <p>
- * 标准信息表 Mapper 接口
+ * 数据标准字典表 Mapper 接口
  * </p>
  *
  * @author yuwei

datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/dao/TypeDao.java

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
- * 标准类别信息表 Mapper 接口
+ * 数据标准类别表 Mapper 接口
  * </p>
  *
  * @author yuwei

datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/mapstruct/DictMapper.java

@@ -8,7 +8,7 @@ import org.mapstruct.Mapper;
 
 /**
  * <p>
- * 标准信息表 Mapper 实体映射
+ * 数据标准字典表 Mapper 实体映射
  * </p>
  *
  * @author yuwei

datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/mapstruct/TypeMapper.java

@@ -8,7 +8,7 @@ import org.mapstruct.Mapper;
 
 /**
  * <p>
- * 标准类别信息表 Mapper 实体映射
+ * 数据标准类别表 Mapper 实体映射
  * </p>
  *
  * @author yuwei

datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/service/DictService.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 /**
  * <p>
- * 标准信息表 服务类
+ * 数据标准字典表 服务类
  * </p>
  *
  * @author yuwei

datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/service/TypeService.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 /**
  * <p>
- * 标准类别信息表 服务类
+ * 数据标准类别表 服务类
  * </p>
  *
  * @author yuwei

datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/service/impl/DictServiceImpl.java

@@ -15,7 +15,7 @@ import java.util.List;
 
 /**
  * <p>
- * 标准信息表 服务实现类
+ * 数据标准字典表 服务实现类
  * </p>
  *
  * @author yuwei

datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/service/impl/TypeServiceImpl.java

@@ -15,7 +15,7 @@ import java.util.List;
 
 /**
  * <p>
- * 标准类别信息表 服务实现类
+ * 数据标准类别表 服务实现类
  * </p>
  *
  * @author yuwei

datax-modules/data-standard-service-parent/data-standard-service/src/main/resources/mapper/DictMapper.xml

@@ -8,10 +8,10 @@
         <result column="status" property="status" />
         <result column="create_by" property="createBy" />
         <result column="create_time" property="createTime" />
+        <result column="create_dept" property="createDept" />
         <result column="update_by" property="updateBy" />
         <result column="update_time" property="updateTime" />
         <result column="remark" property="remark" />
-        <result column="create_dept" property="createDept" />
         <result column="type_id" property="typeId" />
         <result column="gb_code" property="gbCode" />
         <result column="gb_name" property="gbName" />

datax-ui/src/api/market/apimask.js

 import request from '@/utils/request'
 
-export function listApiMask (data) {
-  return request({
-    url: '/data/market/apiMasks/list',
-    method: 'get',
-    params: data
-  })
-}
-
 export function pageApiMask (data) {
   return request({
     url: '/data/market/apiMasks/page',