1、主数据新增字段时:系统主键、系统编码、系统名称的新增方法,修改方法优化。

This commit is contained in:
zhengyf 2025-06-10 10:28:07 +08:00
parent 8f20dc7668
commit 981f12d480
3 changed files with 426 additions and 350 deletions

View File

@ -1403,7 +1403,8 @@ 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())) {
@ -1411,26 +1412,35 @@ 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;
//新增时查询sysPk,sysCode,sysName段是否存在 add by zyd 2025-06-09
boolean isSysPk = false;
boolean isSysCode = false;
boolean isSysName = false;
for (MdmModuleDbFiledsEntity dbFiledsEntity : mdmModuleDbFiledsEntityList) {
if ("Y".equals(dbFiledsEntity.getSysPk())) {
// isSysPk = true;
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(dbFiledsEntity.getSysCode())) {
// isSysCode = true;
if ("Y".equals(entity.getIsSysCode()) && isSysCode) {
return BaseResult.getFailureMessageEntity("系统code字段已存在请修改");
}
if ("Y".equals(dbFiledsEntity.getSysName())) {
// isSysName = true;
if ("Y".equals(entity.getIsSysName()) && isSysName) {
return BaseResult.getFailureMessageEntity("系统name字段已存在请修改");
}
}
entity.setCreate();
if ("1".equals(entity.getDbType())) {
entity.setAddType("1");
@ -1508,6 +1518,42 @@ 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);

View File

@ -220,38 +220,38 @@ public class MdmModuleDbFiledsEntity extends BaseEntity {
/**
* 是否sys主键 系统主键三方系统主键同步中台之后该字段作为主键Y/N
*/
private String sysPk;
private String isSysPk;
/**
* 是否sys编码 系统code三方系统code同步中台之后该字段作为codeY/N
*/
private String sysCode;
private String isSysCode;
/**
* 是否sys名称 系统name三方系统name同步中台之后该字段作为nameY/N
*/
private String sysName;
private String isSysName;
public String getSysPk() {
return sysPk;
public String getIsSysPk() {
return isSysPk;
}
public void setSysPk(String sysPk) {
this.sysPk = sysPk;
public void setIsSysPk(String isSysPk) {
this.isSysPk = isSysPk;
}
public String getSysCode() {
return sysCode;
public String getIsSysCode() {
return isSysCode;
}
public void setSysCode(String sysCode) {
this.sysCode = sysCode;
public void setIsSysCode(String isSysCode) {
this.isSysCode = isSysCode;
}
public String getSysName() {
return sysName;
public String getIsSysName() {
return isSysName;
}
public void setSysName(String sysName) {
this.sysName = sysName;
public void setIsSysName(String isSysName) {
this.isSysName = isSysName;
}
}

View File

@ -2,7 +2,8 @@
<!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" type="com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity" >
<resultMap id="get-MdmModuleDbFiledsEntity-result"
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"/>
@ -24,9 +25,9 @@
<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="sysPk" column="sys_pk" jdbcType="VARCHAR"/>
<result property="sysCode" column="sys_code" jdbcType="VARCHAR"/>
<result property="sysName" column="sys_name" 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">
@ -56,7 +57,8 @@
,sys_name
</sql>
<!-- 查询 采用==查询 -->
<select id="entity_list_base" resultMap="get-MdmModuleDbFiledsEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
<select id="entity_list_base" resultMap="get-MdmModuleDbFiledsEntity-result"
parameterType="com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
select
<include refid="MdmModuleDbFiledsEntity_Base_Column_List"/>
from mdm_module_db_fileds
@ -82,9 +84,9 @@
<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="sysPk != null and sysPk != ''"> and sys_pk = #{sysPk} </if>
<if test="sysCode != null and sysCode != ''"> and sys_code = #{sysCode} </if>
<if test="sysName != null and sysName != ''"> and sys_name = #{sysName} </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
@ -100,7 +102,8 @@
</select>
<!-- 查询符合条件的数量 -->
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
<select id="entity_count" resultType="Integer"
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>
@ -124,9 +127,9 @@
<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="sysPk != null and sysPk != ''"> and sys_pk = #{sysPk} </if>
<if test="sysCode != null and sysCode != ''"> and sys_code = #{sysCode} </if>
<if test="sysName != null and sysName != ''"> and sys_name = #{sysName} </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>
@ -134,7 +137,8 @@
</select>
<!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-MdmModuleDbFiledsEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
<select id="entity_list_like" resultMap="get-MdmModuleDbFiledsEntity-result"
parameterType="com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
select
<include refid="MdmModuleDbFiledsEntity_Base_Column_List"/>
from mdm_module_db_fileds
@ -151,19 +155,24 @@
<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>
<if test="filedLength != null and filedLength != ''">and filed_length like concat('%',#{filedLength},'%')
</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 concat('%',#{create_user_id},'%') </if>
<if test="create_user_id != null and create_user_id != ''">and create_user_id like
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 concat('%',#{modify_user_id},'%') </if>
<if test="modify_user_id != null and modify_user_id != ''">and modify_user_id like
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="sysPk != null and sysPk != ''"> and sys_pk like concat('%',#{sysPk},'%') </if>
<if test="sysCode != null and sysCode != ''"> and sys_code like concat('%',#{sysCode},'%') </if>
<if test="sysName != null and sysName != ''"> and sys_name like concat('%',#{sysName},'%') </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>
@ -171,7 +180,8 @@
</select>
<!-- 查询列表 字段采用or格式 -->
<select id="MdmModuleDbFiledsentity_list_or" resultMap="get-MdmModuleDbFiledsEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
<select id="MdmModuleDbFiledsentity_list_or" resultMap="get-MdmModuleDbFiledsEntity-result"
parameterType="com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
select
<include refid="MdmModuleDbFiledsEntity_Base_Column_List"/>
from mdm_module_db_fileds
@ -198,9 +208,9 @@
<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="sysPk != null and sysPk != ''"> or sys_pk = #{sysPk} </if>
<if test="sysCode != null and sysCode != ''"> or sys_code = #{sysCode} </if>
<if test="sysName != null and sysName != ''"> or sys_name = #{sysName} </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>
@ -233,9 +243,9 @@
<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="sysPk != null and sysPk != ''"> sys_pk , </if>
<if test="sysCode != null and sysCode != ''"> sys_code , </if>
<if test="sysName != null and sysName != ''"> sys_name , </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(
@ -261,24 +271,29 @@
<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="sysPk != null and sysPk != ''"> #{sysPk} ,</if>
<if test="sysCode != null and sysCode != ''"> #{sysCode} ,</if>
<if test="sysName != null and sysName != ''"> #{sysName} ,</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, query_type, list_type, view_type, filed_length, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts)
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)
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}, 'Y')
(#{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')
</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, query_type, list_type, view_type, filed_length, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id)
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)
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})
@ -302,7 +317,8 @@
modify_time = values(modify_time),
sts = values(sts),
org_id = values(org_id),
company_id = values(company_id)</insert>
company_id = values(company_id)
</insert>
<!--通过主键修改方法-->
<update id="entity_update" parameterType="com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
update mdm_module_db_fileds set
@ -326,16 +342,26 @@ update mdm_module_db_fileds set
<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 set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
update mdm_module_db_fileds
set sts= 'N',
modify_time = #{modify_time},
modify_user_id = #{modify_user_id}
where id = #{id}
</update>
<!-- 多条件逻辑删除 -->
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity" >
<update id="entity_logicDelete_Multi_Condition"
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>
@ -359,11 +385,15 @@ update mdm_module_db_fileds set sts= 'N' ,modify_time = #{modify_time},modify_u
</update>
<!--通过主键删除-->
<delete id="entity_delete">
delete from mdm_module_db_fileds where id = #{id}
delete
from mdm_module_db_fileds
where id = #{id}
</delete>
<!--通过mdmCode删除-->
<delete id="deleteMdmModuleDbFileds" parameterType="com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity">
delete from mdm_module_db_fileds where mdm_id = #{mdmId}
delete
from mdm_module_db_fileds
where mdm_id = #{mdmId}
</delete>
</mapper>