base-service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java

@@ -1403,8 +1403,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity();
         mdmModuleDbFiledsEntity.setMdmId(entity.getMdmId());
         mdmModuleDbFiledsEntity.setSts("Y");
-//        List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity);
+        List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity);
-        List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList = mdmModuleDbFiledsDao.query(mdmModuleDbFiledsEntity);
         if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
             for (int i = 0; i < mdmModuleDbFiledsEntityList.size(); i++) {
                 if (entity.getDbId().equals(mdmModuleDbFiledsEntityList.get(i).getDbId()) && entity.getEnName().equals(mdmModuleDbFiledsEntityList.get(i).getEnName())) {
@@ -1412,35 +1411,6 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
                 }
             }
         }
-        //新增时：查询sysPk,sysCode,sysName段是否存在 add by zyd 2025-06-09
-        boolean isSysPk = false;
-        boolean isSysCode = false;
-        boolean isSysName = false;
-        for (MdmModuleDbFiledsEntity dbFiledsEntity : mdmModuleDbFiledsEntityList) {
-            if (entity.getDbId().equals(dbFiledsEntity.getDbId())) {
-                if (entity.getDbId().equals(dbFiledsEntity.getDbId())) {
-                    if ("Y".equals(dbFiledsEntity.getIsSysPk())) {
-                        isSysPk = true;
-                    }
-                    if ("Y".equals(dbFiledsEntity.getIsSysCode())) {
-                        isSysCode = true;
-                    }
-                    if ("Y".equals(dbFiledsEntity.getIsSysName())) {
-                        isSysName = true;
-                    }
-                }
-            }
-        }
-        //判端该字段是不是sysPk,sysCode,sysName=true
-        if ("Y".equals(entity.getIsSysPk()) && isSysPk) {
-            return BaseResult.getFailureMessageEntity("系统主键字段已存在，请修改");
-        }
-        if ("Y".equals(entity.getIsSysCode()) && isSysCode) {
-            return BaseResult.getFailureMessageEntity("系统code字段已存在，请修改");
-        }
-        if ("Y".equals(entity.getIsSysName()) && isSysName) {
-            return BaseResult.getFailureMessageEntity("系统name字段已存在，请修改");
-        }
         entity.setCreate();
         if ("1".equals(entity.getDbType())) {
             entity.setAddType("1");
@@ -1518,42 +1488,6 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         } catch (Exception e) {
             throw new BaseSystemException("表字段类型，修改失败，请联系管理员");
         }
-
-        //查询sysPk,sysCode,sysName段是否存在 add by zyd 2025-06-09
-        MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity();
-        mdmModuleDbFiledsEntity.setDbId(entity.getDbId());
-        mdmModuleDbFiledsEntity.setMdmId(entity.getMdmId());
-        mdmModuleDbFiledsEntity.setSts("Y");
-        List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList = mdmModuleDbFiledsDao.query(mdmModuleDbFiledsEntity);
-        boolean isSysPk = false;
-        boolean isSysCode = false;
-        boolean isSysName = false;
-        for (MdmModuleDbFiledsEntity dbFiledsEntity : mdmModuleDbFiledsEntityList) {
-            if (entity.getDbId().equals(dbFiledsEntity.getDbId())) {
-                if (entity.getDbId().equals(dbFiledsEntity.getDbId())) {
-                    if ("Y".equals(dbFiledsEntity.getIsSysPk())) {
-                        isSysPk = true;
-                    }
-                    if ("Y".equals(dbFiledsEntity.getIsSysCode())) {
-                        isSysCode = true;
-                    }
-                    if ("Y".equals(dbFiledsEntity.getIsSysName())) {
-                        isSysName = true;
-                    }
-                }
-            }
-        }
-        //判端该字段是不是sysPk,sysCode,sysName=true
-        if ("Y".equals(entity.getIsSysPk()) && isSysPk) {
-            return BaseResult.getFailureMessageEntity("系统主键字段已存在，请修改");
-        }
-        if ("Y".equals(entity.getIsSysCode()) && isSysCode) {
-            return BaseResult.getFailureMessageEntity("系统code字段已存在，请修改");
-        }
-        if ("Y".equals(entity.getIsSysName()) && isSysName) {
-            return BaseResult.getFailureMessageEntity("系统name字段已存在，请修改");
-        }
-
         List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntities = new ArrayList<>();
         mdmModuleDbFiledsEntities.add(entity);
         mdmServiceCache.saveOrUpdateMdmModuleDbFileds(entity.getMdmId(), mdmModuleDbFiledsEntities);

base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java

@@ -216,42 +216,5 @@ public class MdmModuleDbFiledsEntity extends BaseEntity {
     public void setDbType(String dbType) {
         this.dbType = dbType;
     }
-
-    /**
-     * 是否sys主键 系统主键（三方系统主键，同步中台之后，该字段作为主键）Y/N
-     */
-    private String isSysPk;
-    /**
-     * 是否sys编码 系统code（三方系统code，同步中台之后，该字段作为code）Y/N
-     */
-    private String isSysCode;
-    /**
-     * 是否sys名称 系统name（三方系统name，同步中台之后，该字段作为name）Y/N
-     */
-    private String isSysName;
-
-    public String getIsSysPk() {
-        return isSysPk;
-    }
-
-    public void setIsSysPk(String isSysPk) {
-        this.isSysPk = isSysPk;
-    }
-
-    public String getIsSysCode() {
-        return isSysCode;
-    }
-
-    public void setIsSysCode(String isSysCode) {
-        this.isSysCode = isSysCode;
-    }
-
-    public String getIsSysName() {
-        return isSysName;
-    }
-
-    public void setIsSysName(String isSysName) {
-        this.isSysName = isSysName;
-    }
 }
 

base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml

@@ -2,8 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzya.frame.mdm.mdmModuleDbFileds.dao.impl.MdmModuleDbFiledsDaoImpl">
 
-    <resultMap id="get-MdmModuleDbFiledsEntity-result"
+    <resultMap id="get-MdmModuleDbFiledsEntity-result" type="com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity" >
-               type="com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
        <result property="id" column="id" jdbcType="VARCHAR"/>
            <result property="mdmId" column="mdm_id" jdbcType="VARCHAR"/>
            <result property="dbId" column="db_id" jdbcType="VARCHAR"/>
@@ -25,9 +24,6 @@
            <result property="sts" column="sts" jdbcType="VARCHAR"/>
            <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
            <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
-        <result property="isSysPk" column="sys_pk" jdbcType="VARCHAR"/>
-        <result property="isSysCode" column="sys_code" jdbcType="VARCHAR"/>
-        <result property="isSysName" column="sys_name" jdbcType="VARCHAR"/>
         </resultMap>
     <!-- 查询的字段-->
     <sql id = "MdmModuleDbFiledsEntity_Base_Column_List">
@@ -52,13 +48,9 @@
         ,sts 
         ,org_id 
         ,company_id 
-        ,sys_pk
-        ,sys_code
-        ,sys_name
      </sql>
  <!-- 查询 采用==查询 -->
-    <select id="entity_list_base" resultMap="get-MdmModuleDbFiledsEntity-result"
+ <select id="entity_list_base" resultMap="get-MdmModuleDbFiledsEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
-            parameterType="com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
     select
     <include refid="MdmModuleDbFiledsEntity_Base_Column_List" />
     from mdm_module_db_fileds
@@ -84,9 +76,6 @@
             <if test="sts != null and sts != ''"> and sts = #{sts} </if>
             <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
             <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
-            <if test="isSysPk != null and isSysPk != ''">and sys_pk = #{isSysPk}</if>
-            <if test="isSysCode != null and isSysCode != ''">and sys_code = #{isSysCode}</if>
-            <if test="isSysName != null and isSysName != ''">and sys_name = #{isSysName}</if>
             <if test="roletype != null and roletype != ''">
                 and id in (
                 select
@@ -102,8 +91,7 @@
 </select>
     
 <!-- 查询符合条件的数量 -->
-    <select id="entity_count" resultType="Integer"
+<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
-            parameterType="com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
         select  count(1)   from mdm_module_db_fileds
     <trim prefix="where" prefixOverrides="and"> 
         <if test="id != null and id != ''"> and id = #{id} </if>
@@ -127,9 +115,6 @@
             <if test="sts != null and sts != ''"> and sts = #{sts} </if>
             <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
             <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
-            <if test="isSysPk != null and isSysPk != ''">and sys_pk = #{isSysPk}</if>
-            <if test="isSysCode != null and isSysCode != ''">and sys_code = #{isSysCode}</if>
-            <if test="isSysName != null and isSysName != ''">and sys_name = #{isSysName}</if>
             and sts='Y'
     </trim>
     <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
@@ -137,8 +122,7 @@
     </select>
 
     <!-- 分页查询列表 采用like格式 -->
-    <select id="entity_list_like" resultMap="get-MdmModuleDbFiledsEntity-result"
+<select id="entity_list_like" resultMap="get-MdmModuleDbFiledsEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
-            parameterType="com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
     select
     <include refid="MdmModuleDbFiledsEntity_Base_Column_List" />
     from mdm_module_db_fileds
@@ -155,24 +139,15 @@
             <if test="queryType != null and queryType != ''"> and query_type like concat('%',#{queryType},'%') </if>
             <if test="listType != null and listType != ''"> and list_type like concat('%',#{listType},'%') </if>
             <if test="viewType != null and viewType != ''"> and view_type like concat('%',#{viewType},'%') </if>
-            <if test="filedLength != null and filedLength != ''">and filed_length like concat('%',#{filedLength},'%')
+            <if test="filedLength != null and filedLength != ''"> and filed_length like concat('%',#{filedLength},'%') </if>
-            </if>
             <if test="sorts != null"> and sorts like concat('%',#{sorts},'%') </if>
-            <if test="create_user_id != null and create_user_id != ''">and create_user_id like
+            <if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
-                concat('%',#{create_user_id},'%')
-            </if>
             <if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
-            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id like
+            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id like concat('%',#{modify_user_id},'%') </if>
-                concat('%',#{modify_user_id},'%')
-            </if>
             <if test="modify_time != null"> and modify_time like concat('%',#{modify_time},'%') </if>
             <if test="sts != null and sts != ''"> and sts like concat('%',#{sts},'%') </if>
             <if test="org_id != null and org_id != ''"> and org_id like concat('%',#{org_id},'%') </if>
             <if test="companyId != null and companyId != ''"> and company_id like concat('%',#{companyId},'%') </if>
-
-            <if test="isSysPk != null and isSysPk != ''">and sys_pk like concat('%',#{isSysPk},'%')</if>
-            <if test="isSysCode != null and isSysCode != ''">and sys_code like concat('%',#{isSysCode},'%')</if>
-            <if test="isSysName != null and isSysName != ''">and sys_name like concat('%',#{isSysName},'%')</if>
             and sts='Y'
     </trim>
     <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
@@ -180,8 +155,7 @@
 </select>
 
 <!-- 查询列表 字段采用or格式 -->
-    <select id="MdmModuleDbFiledsentity_list_or" resultMap="get-MdmModuleDbFiledsEntity-result"
+<select id="MdmModuleDbFiledsentity_list_or" resultMap="get-MdmModuleDbFiledsEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
-            parameterType="com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
     select
     <include refid="MdmModuleDbFiledsEntity_Base_Column_List" />
     from mdm_module_db_fileds
@@ -207,11 +181,6 @@
               <if test="sts != null and sts != ''"> or sts = #{sts} </if>
              <if test="org_id != null and org_id != ''"> or org_id = #{org_id} </if>
               <if test="companyId != null and companyId != ''"> or company_id = #{companyId} </if>
-
-            <if test="isSysPk != null and isSysPk != ''">or sys_pk = #{isSysPk}</if>
-            <if test="isSysCode != null and isSysCode != ''">or sys_code = #{isSysCode}</if>
-            <if test="isSysName != null and isSysName != ''">or sys_name = #{isSysName}</if>
-
             and sts='Y'
     </trim>
     <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>
@@ -243,9 +212,6 @@
             <if test="sts != null and sts != ''"> sts , </if>
             <if test="org_id != null and org_id != ''"> org_id , </if>
             <if test="companyId != null and companyId != ''"> company_id , </if>
-            <if test="isSysPk != null and isSysPk != ''">sys_pk ,</if>
-            <if test="isSysCode != null and isSysCode != ''">sys_code ,</if>
-            <if test="isSysName != null and isSysName != ''">sys_name ,</if>
     <if test="sts == null ">sts,</if>
   </trim>
   )values(
@@ -271,29 +237,21 @@
             <if test="sts != null and sts != ''"> #{sts} ,</if>
             <if test="org_id != null and org_id != ''"> #{org_id} ,</if>
             <if test="companyId != null and companyId != ''"> #{companyId} ,</if>
-            <if test="isSysPk != null and isSysPk != ''">#{isSysPk} ,</if>
-            <if test="isSysCode != null and isSysCode != ''">#{isSysCode} ,</if>
-            <if test="isSysName != null and isSysName != ''">#{isSysName} ,</if>
     <if test="sts == null ">'Y',</if>
   </trim>
   )  
 </insert>
 <!-- 批量新增 -->
 <insert id="entityInsertBatch"  >
-        insert into mdm_module_db_fileds(mdm_id, db_id, ch_name, en_name, filed_type, add_type, update_type, show_type,
+  insert into mdm_module_db_fileds(mdm_id, db_id, ch_name, en_name, filed_type, add_type, update_type, show_type, query_type, list_type, view_type, filed_length, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id,  sts) 
-        query_type, list_type, view_type, filed_length, create_user_id, create_time, modify_user_id, modify_time, sts,
-        org_id, company_id, sts)
     values
     <foreach collection="entities" item="entity" separator=",">
-            (#{entity.mdmId},#{entity.dbId},#{entity.chName},#{entity.enName},#{entity.filedType},#{entity.addType},#{entity.updateType},#{entity.showType},#{entity.queryType},#{entity.listType},#{entity.viewType},#{entity.filedLength},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},
+    (#{entity.mdmId},#{entity.dbId},#{entity.chName},#{entity.enName},#{entity.filedType},#{entity.addType},#{entity.updateType},#{entity.showType},#{entity.queryType},#{entity.listType},#{entity.viewType},#{entity.filedLength},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y')
-            'Y')
     </foreach>
 </insert>
 <!-- 批量新增或者修改-->
 <insert id="entityInsertOrUpdateBatch"  >
-        insert into mdm_module_db_fileds(mdm_id, db_id, ch_name, en_name, filed_type, add_type, update_type, show_type,
+    insert into mdm_module_db_fileds(mdm_id, db_id, ch_name, en_name, filed_type, add_type, update_type, show_type, query_type, list_type, view_type, filed_length, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id)
-        query_type, list_type, view_type, filed_length, create_user_id, create_time, modify_user_id, modify_time, sts,
-        org_id, company_id)
     values
     <foreach collection="entities" item="entity" separator=",">
     (#{entity.mdmId},#{entity.dbId},#{entity.chName},#{entity.enName},#{entity.filedType},#{entity.addType},#{entity.updateType},#{entity.showType},#{entity.queryType},#{entity.listType},#{entity.viewType},#{entity.filedLength},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId})
@@ -317,8 +275,7 @@
     modify_time = values(modify_time),
     sts = values(sts),
     org_id = values(org_id),
-        company_id = values(company_id)
+    company_id = values(company_id)</insert>
-    </insert>
 <!--通过主键修改方法-->
 <update id="entity_update" parameterType = "com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity" >
 update mdm_module_db_fileds  set
@@ -342,26 +299,16 @@
     <if test="sts != null and sts != ''"> sts = #{sts},</if>
   <if test="org_id != null and org_id != ''"> org_id = #{org_id},</if>
     <if test="companyId != null and companyId != ''"> company_id = #{companyId},</if>
-            <if test="isSysPk != null and isSysPk != ''">sys_pk = #{isSysPk},</if>
-            <if test="isSysPk == null ">sys_pk = null,</if>
-            <if test="isSysCode != null and isSysCode != ''">sys_code = #{isSysCode},</if>
-            <if test="isSysCode == null ">sys_code = null,</if>
-            <if test="isSysName != null and isSysName != ''">sys_name = #{isSysName},</if>
-            <if test="isSysName == null ">sys_name = null,</if>
 </trim>
 where id = #{id}
 </update>
 <!-- 逻辑删除 -->
 <update id="entity_logicDelete" parameterType = "com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity" >
-        update mdm_module_db_fileds
+update mdm_module_db_fileds  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
-        set sts= 'N',
-            modify_time = #{modify_time},
-            modify_user_id = #{modify_user_id}
 where id = #{id}
 </update>
 <!-- 多条件逻辑删除 -->
-    <update id="entity_logicDelete_Multi_Condition"
+<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity" >
-            parameterType="com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
 update mdm_module_db_fileds  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
  <trim prefix="where" prefixOverrides="and"> 
         <if test="id != null and id != ''"> and id = #{id} </if>
@@ -385,15 +332,11 @@
 </update>
 <!--通过主键删除-->
 <delete id="entity_delete">
-        delete
+    delete from mdm_module_db_fileds where id = #{id}
-        from mdm_module_db_fileds
-        where id = #{id}
 </delete>
     <!--通过mdmCode删除-->
     <delete id="deleteMdmModuleDbFileds" parameterType="com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity">
-        delete
+    delete from mdm_module_db_fileds where  mdm_id = #{mdmId}
-        from mdm_module_db_fileds
-        where mdm_id = #{mdmId}
 </delete>
 </mapper>