update

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/MdDataFieldController.java

@@ -92,7 +92,6 @@ public class MdDataFieldController extends BaseController
     {
         List<MdDataField> collect = mdDataFields.stream()
                 .filter(item -> StringUtils.isNotNull(item.getDcCode()))
-                .filter(item -> StringUtils.isNotNull(item.getMetaTable()))
                 .filter(item -> StringUtils.isNotNull(item.getFieldCode())).collect(Collectors.toList());
         if (StringUtils.isEmpty(collect)) {
             return AjaxResult.error();

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/domain/MdDataField.java

@@ -7,295 +7,300 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 数据集字段对象 md_data_field
- * 
+ *
  * @author ruoyi
  * @date 2025-07-30
  */
-public class MdDataField extends BaseEntity
-{
+public class MdDataField extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 数据集标识 */
+    /**
+     * 数据集标识
+     */
     private String dcCode;
 
-    /** 表编码 */
-    private String metaTable;
 
-    /** 字段编码 */
+    /**
+     * 字段编码
+     */
     private String fieldCode;
 
-    /** 字段中文名 */
+    /**
+     * 字段中文名
+     */
     @Excel(name = "字段中文名")
     private String fieldName;
 
-    /** 字段类型 */
+    /**
+     * 字段类型
+     */
     @Excel(name = "字段类型")
     private String fieldType;
 
-    /** 字段长度 */
+    /**
+     * 字段长度
+     */
     @Excel(name = "字段长度")
     private String fieldLength;
 
-    /** 字段精度 */
+    /**
+     * 字段精度
+     */
     @Excel(name = "字段精度")
     private String fieldPrecision;
 
-    /** 是否为主键 */
+    /**
+     * 是否为主键
+     */
     @Excel(name = "是否为主键")
     private String fieldIspri;
 
-    /** 是否允许为空 */
+    /**
+     * 是否允许为空
+     */
     @Excel(name = "是否允许为空")
     private String fieldIsnullable;
 
-    /** 默认值 */
+    /**
+     * 默认值
+     */
     @Excel(name = "默认值")
     private String fieldDefault;
 
-    /** 描述 */
+    /**
+     * 描述
+     */
     @Excel(name = "描述")
     private String fieldDesc;
 
-    /** 字段状态 */
+    /**
+     * 字段状态
+     */
     @Excel(name = "字段状态")
     private String fieldStatus;
 
-    /** 字段顺序 */
+    /**
+     * 字段顺序
+     */
     @Excel(name = "字段顺序")
     private Long fieldOrder;
 
-    /** 字段扩展 */
+    /**
+     * 字段扩展
+     */
     @Excel(name = "字段扩展")
     private String fieldExtend;
 
-    /** 字段扩展表 */
+    /**
+     * 字段扩展表
+     */
     @Excel(name = "字段扩展表")
     private String fieldExtendTable;
 
-    /** 字段输入类型 */
+    /**
+     * 字段输入类型
+     */
     @Excel(name = "字段输入类型")
     private String fieldInputType;
 
-    /** 字段输入格式 */
+    /**
+     * 字段输入格式
+     */
     @Excel(name = "字段输入格式")
     private String fieldInputFormat;
 
-    /** 字段输入默认值 */
+    /**
+     * 字段输入默认值
+     */
     @Excel(name = "字段输入默认值")
     private String fieldInputDefault;
 
-    /** 字段显示类型 */
+    /**
+     * 字段显示类型
+     */
     @Excel(name = "字段显示类型")
     private String fieldViewType;
 
-    /** 字段字典 */
+    /**
+     * 字段字典
+     */
     @Excel(name = "字段字典")
     private String fieldDict;
 
-    public void setDcCode(String dcCode)
-    {
+    public void setDcCode(String dcCode) {
         this.dcCode = dcCode;
     }
 
-    public String getDcCode()
-    {
+    public String getDcCode() {
         return dcCode;
     }
-    public void setMetaTable(String metaTable) 
-    {
-        this.metaTable = metaTable;
-    }
 
-    public String getMetaTable() 
-    {
-        return metaTable;
-    }
-    public void setFieldCode(String fieldCode) 
-    {
+    public void setFieldCode(String fieldCode) {
         this.fieldCode = fieldCode;
     }
 
-    public String getFieldCode() 
-    {
+    public String getFieldCode() {
         return fieldCode;
     }
-    public void setFieldName(String fieldName) 
-    {
+
+    public void setFieldName(String fieldName) {
         this.fieldName = fieldName;
     }
 
-    public String getFieldName() 
-    {
+    public String getFieldName() {
         return fieldName;
     }
-    public void setFieldType(String fieldType) 
-    {
+
+    public void setFieldType(String fieldType) {
         this.fieldType = fieldType;
     }
 
-    public String getFieldType() 
-    {
+    public String getFieldType() {
         return fieldType;
     }
-    public void setFieldLength(String fieldLength) 
-    {
+
+    public void setFieldLength(String fieldLength) {
         this.fieldLength = fieldLength;
     }
 
-    public String getFieldLength() 
-    {
+    public String getFieldLength() {
         return fieldLength;
     }
-    public void setFieldPrecision(String fieldPrecision) 
-    {
+
+    public void setFieldPrecision(String fieldPrecision) {
         this.fieldPrecision = fieldPrecision;
     }
 
-    public String getFieldPrecision() 
-    {
+    public String getFieldPrecision() {
         return fieldPrecision;
     }
-    public void setFieldIspri(String fieldIspri) 
-    {
+
+    public void setFieldIspri(String fieldIspri) {
         this.fieldIspri = fieldIspri;
     }
 
-    public String getFieldIspri() 
-    {
+    public String getFieldIspri() {
         return fieldIspri;
     }
-    public void setFieldIsnullable(String fieldIsnullable) 
-    {
+
+    public void setFieldIsnullable(String fieldIsnullable) {
         this.fieldIsnullable = fieldIsnullable;
     }
 
-    public String getFieldIsnullable() 
-    {
+    public String getFieldIsnullable() {
         return fieldIsnullable;
     }
-    public void setFieldDefault(String fieldDefault) 
-    {
+
+    public void setFieldDefault(String fieldDefault) {
         this.fieldDefault = fieldDefault;
     }
 
-    public String getFieldDefault() 
-    {
+    public String getFieldDefault() {
         return fieldDefault;
     }
-    public void setFieldDesc(String fieldDesc) 
-    {
+
+    public void setFieldDesc(String fieldDesc) {
         this.fieldDesc = fieldDesc;
     }
 
-    public String getFieldDesc() 
-    {
+    public String getFieldDesc() {
         return fieldDesc;
     }
-    public void setFieldStatus(String fieldStatus) 
-    {
+
+    public void setFieldStatus(String fieldStatus) {
         this.fieldStatus = fieldStatus;
     }
 
-    public String getFieldStatus() 
-    {
+    public String getFieldStatus() {
         return fieldStatus;
     }
-    public void setFieldOrder(Long fieldOrder) 
-    {
+
+    public void setFieldOrder(Long fieldOrder) {
         this.fieldOrder = fieldOrder;
     }
 
-    public Long getFieldOrder() 
-    {
+    public Long getFieldOrder() {
         return fieldOrder;
     }
-    public void setFieldExtend(String fieldExtend) 
-    {
+
+    public void setFieldExtend(String fieldExtend) {
         this.fieldExtend = fieldExtend;
     }
 
-    public String getFieldExtend() 
-    {
+    public String getFieldExtend() {
         return fieldExtend;
     }
-    public void setFieldExtendTable(String fieldExtendTable) 
-    {
+
+    public void setFieldExtendTable(String fieldExtendTable) {
         this.fieldExtendTable = fieldExtendTable;
     }
 
-    public String getFieldExtendTable() 
-    {
+    public String getFieldExtendTable() {
         return fieldExtendTable;
     }
-    public void setFieldInputType(String fieldInputType) 
-    {
+
+    public void setFieldInputType(String fieldInputType) {
         this.fieldInputType = fieldInputType;
     }
 
-    public String getFieldInputType() 
-    {
+    public String getFieldInputType() {
         return fieldInputType;
     }
-    public void setFieldInputFormat(String fieldInputFormat) 
-    {
+
+    public void setFieldInputFormat(String fieldInputFormat) {
         this.fieldInputFormat = fieldInputFormat;
     }
 
-    public String getFieldInputFormat() 
-    {
+    public String getFieldInputFormat() {
         return fieldInputFormat;
     }
-    public void setFieldInputDefault(String fieldInputDefault) 
-    {
+
+    public void setFieldInputDefault(String fieldInputDefault) {
         this.fieldInputDefault = fieldInputDefault;
     }
 
-    public String getFieldInputDefault() 
-    {
+    public String getFieldInputDefault() {
         return fieldInputDefault;
     }
-    public void setFieldViewType(String fieldViewType) 
-    {
+
+    public void setFieldViewType(String fieldViewType) {
         this.fieldViewType = fieldViewType;
     }
 
-    public String getFieldViewType() 
-    {
+    public String getFieldViewType() {
         return fieldViewType;
     }
-    public void setFieldDict(String fieldDict) 
-    {
+
+    public void setFieldDict(String fieldDict) {
         this.fieldDict = fieldDict;
     }
 
-    public String getFieldDict() 
-    {
+    public String getFieldDict() {
         return fieldDict;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("dsCode", getDcCode())
-            .append("metaTable", getMetaTable())
-            .append("fieldCode", getFieldCode())
-            .append("fieldName", getFieldName())
-            .append("fieldType", getFieldType())
-            .append("fieldLength", getFieldLength())
-            .append("fieldPrecision", getFieldPrecision())
-            .append("fieldIspri", getFieldIspri())
-            .append("fieldIsnullable", getFieldIsnullable())
-            .append("fieldDefault", getFieldDefault())
-            .append("fieldDesc", getFieldDesc())
-            .append("fieldStatus", getFieldStatus())
-            .append("fieldOrder", getFieldOrder())
-            .append("fieldExtend", getFieldExtend())
-            .append("fieldExtendTable", getFieldExtendTable())
-            .append("fieldInputType", getFieldInputType())
-            .append("fieldInputFormat", getFieldInputFormat())
-            .append("fieldInputDefault", getFieldInputDefault())
-            .append("fieldViewType", getFieldViewType())
-            .append("fieldDict", getFieldDict())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("dsCode", getDcCode())
+                .append("fieldCode", getFieldCode())
+                .append("fieldName", getFieldName())
+                .append("fieldType", getFieldType())
+                .append("fieldLength", getFieldLength())
+                .append("fieldPrecision", getFieldPrecision())
+                .append("fieldIspri", getFieldIspri())
+                .append("fieldIsnullable", getFieldIsnullable())
+                .append("fieldDefault", getFieldDefault())
+                .append("fieldDesc", getFieldDesc())
+                .append("fieldStatus", getFieldStatus())
+                .append("fieldOrder", getFieldOrder())
+                .append("fieldExtend", getFieldExtend())
+                .append("fieldExtendTable", getFieldExtendTable())
+                .append("fieldInputType", getFieldInputType())
+                .append("fieldInputFormat", getFieldInputFormat())
+                .append("fieldInputDefault", getFieldInputDefault())
+                .append("fieldViewType", getFieldViewType())
+                .append("fieldDict", getFieldDict())
+                .toString();
     }
 }

ruoyi-api-patform/src/main/resources/mapper/interfaces/MdDataFieldMapper.xml

@@ -5,8 +5,7 @@
 <mapper namespace="com.ruoyi.interfaces.mapper.MdDataFieldMapper">
 
     <resultMap type="com.ruoyi.interfaces.domain.MdDataField" id="MdDataFieldResult">
-        <result property="dsCode"    column="DS_CODE"    />
-        <result property="metaTable"    column="META_TABLE"    />
+        <result property="dcCode"    column="DC_CODE"    />
         <result property="fieldCode"    column="FIELD_CODE"    />
         <result property="fieldName"    column="FIELD_NAME"    />
         <result property="fieldType"    column="FIELD_TYPE"    />
@@ -28,7 +27,7 @@
     </resultMap>
 
     <sql id="selectMdDataFieldVo">
-        select DS_CODE, META_TABLE, FIELD_CODE, FIELD_NAME, FIELD_TYPE, FIELD_LENGTH, FIELD_PRECISION, FIELD_ISPRI, FIELD_ISNULLABLE, FIELD_DEFAULT, FIELD_DESC, FIELD_STATUS, FIELD_ORDER, FIELD_EXTEND, FIELD_EXTEND_TABLE, FIELD_INPUT_TYPE, FIELD_INPUT_FORMAT, FIELD_INPUT_DEFAULT, FIELD_VIEW_TYPE, FIELD_DICT from md_data_field
+        select DC_CODE, META_TABLE, FIELD_CODE, FIELD_NAME, FIELD_TYPE, FIELD_LENGTH, FIELD_PRECISION, FIELD_ISPRI, FIELD_ISNULLABLE, FIELD_DEFAULT, FIELD_DESC, FIELD_STATUS, FIELD_ORDER, FIELD_EXTEND, FIELD_EXTEND_TABLE, FIELD_INPUT_TYPE, FIELD_INPUT_FORMAT, FIELD_INPUT_DEFAULT, FIELD_VIEW_TYPE, FIELD_DICT from md_data_field
     </sql>
 
     <select id="selectMdDataFieldList" parameterType="com.ruoyi.interfaces.domain.MdDataField" resultMap="MdDataFieldResult">
@@ -57,14 +56,13 @@
 
     <select id="selectMdDataFieldByDsCode" parameterType="String" resultMap="MdDataFieldResult">
         <include refid="selectMdDataFieldVo"/>
-        where DS_CODE = #{dsCode}
+        where DC_CODE = #{dcCode}
     </select>
 
     <insert id="insertMdDataField" parameterType="com.ruoyi.interfaces.domain.MdDataField">
         insert into md_data_field
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="dsCode != null">DS_CODE,</if>
-            <if test="metaTable != null">META_TABLE,</if>
+            <if test="dcCode != null">DC_CODE,</if>
             <if test="fieldCode != null">FIELD_CODE,</if>
             <if test="fieldName != null">FIELD_NAME,</if>
             <if test="fieldType != null">FIELD_TYPE,</if>
@@ -85,8 +83,7 @@
             <if test="fieldDict != null">FIELD_DICT,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="dsCode != null">#{dsCode},</if>
-            <if test="metaTable != null">#{metaTable},</if>
+            <if test="dcCode != null">#{dcCode},</if>
             <if test="fieldCode != null">#{fieldCode},</if>
             <if test="fieldName != null">#{fieldName},</if>
             <if test="fieldType != null">#{fieldType},</if>
@@ -130,26 +127,24 @@
             <if test="fieldViewType != null">FIELD_VIEW_TYPE = #{fieldViewType},</if>
             <if test="fieldDict != null">FIELD_DICT = #{fieldDict},</if>
         </trim>
-        where DS_CODE = #{dsCode} and
-        META_TABLE = #{metaTable} and
+        where DC_CODE = #{dcCode} and
         FIELD_CODE = #{fieldCode}
     </update>
 
     <delete id="deleteMdDataFieldByDsCode" parameterType="String">
-        delete from md_data_field where DS_CODE = #{dsCode}
+        delete from md_data_field where DC_CODE = #{dcCode}
     </delete>
 
     <delete id="deleteMdDataFieldByDsCodes" parameterType="String">
-        delete from md_data_field where DS_CODE in
-        <foreach item="dsCode" collection="array" open="(" separator="," close=")">
-            #{dsCode}
+        delete from md_data_field where DC_CODE in
+        <foreach item="dcCode" collection="array" open="(" separator="," close=")">
+            #{dcCode}
         </foreach>
     </delete>
     <delete id="deleteMdDataFieldOne">
         delete
         from md_data_field
-        where DS_CODE = #{dsCode}
-          and meta_Table = #{metaTable}
+        where DC_CODE = #{dcCode}
           and field_Code = #{fieldCode}
     </delete>
 </mapper>