From 981f12d4809e1dd3f868847bc9944e864fc13d00 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Tue, 10 Jun 2025 10:28:07 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=BB=E6=95=B0=E6=8D=AE=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5=E6=97=B6=EF=BC=9A=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=BB=E9=94=AE=E3=80=81=E7=B3=BB=E7=BB=9F=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E3=80=81=E7=B3=BB=E7=BB=9F=E5=90=8D=E7=A7=B0=E7=9A=84=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=96=B9=E6=B3=95=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E4=BC=98=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MdmModuleServiceImpl.java | 82 ++- .../entity/MdmModuleDbFiledsEntity.java | 30 +- .../entity/MdmModuleDbFiledsEntity.xml | 664 +++++++++--------- 3 files changed, 426 insertions(+), 350 deletions(-) diff --git a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java index 8ec63458..f79c9b2d 100644 --- a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java +++ b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java @@ -1403,7 +1403,8 @@ public class MdmModuleServiceImpl extends BaseService i MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity(); mdmModuleDbFiledsEntity.setMdmId(entity.getMdmId()); mdmModuleDbFiledsEntity.setSts("Y"); - List mdmModuleDbFiledsEntityList = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity); +// List mdmModuleDbFiledsEntityList = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity); + List 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 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; - return BaseResult.getFailureMessageEntity("系统主键字段已存在，请修改"); - } - if ("Y".equals(dbFiledsEntity.getSysCode())) { -// isSysCode = true; - return BaseResult.getFailureMessageEntity("系统code字段已存在，请修改"); - } - if ("Y".equals(dbFiledsEntity.getSysName())) { -// isSysName = true; - return BaseResult.getFailureMessageEntity("系统name字段已存在，请修改"); + 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"); @@ -1508,6 +1518,42 @@ public class MdmModuleServiceImpl extends BaseService 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 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 mdmModuleDbFiledsEntities = new ArrayList<>(); mdmModuleDbFiledsEntities.add(entity); mdmServiceCache.saveOrUpdateMdmModuleDbFileds(entity.getMdmId(), mdmModuleDbFiledsEntities); diff --git a/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java b/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java index 79092656..d1f1cf45 100644 --- a/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java +++ b/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java @@ -220,38 +220,38 @@ public class MdmModuleDbFiledsEntity extends BaseEntity { /** * 是否sys主键 系统主键（三方系统主键，同步中台之后，该字段作为主键）Y/N */ - private String sysPk; + private String isSysPk; /** * 是否sys编码 系统code（三方系统code，同步中台之后，该字段作为code）Y/N */ - private String sysCode; + private String isSysCode; /** * 是否sys名称 系统name（三方系统name，同步中台之后，该字段作为name）Y/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; } } diff --git a/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml b/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml index 7225c4b7..7f9c3f1f 100644 --- a/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml +++ b/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml @@ -2,36 +2,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + id - ,mdm_id + ,mdm_id ,db_id ,ch_name ,en_name @@ -54,316 +55,345 @@ ,sys_pk ,sys_code ,sys_name - - - + select + + from mdm_module_db_fileds + + and id = #{id} + and mdm_id = #{mdmId} + and db_id = #{dbId} + and ch_name = #{chName} + and en_name = #{enName} + and filed_type = #{filedType} + and add_type = #{addType} + and update_type = #{updateType} + and show_type = #{showType} + and query_type = #{queryType} + and list_type = #{listType} + and view_type = #{viewType} + and filed_length = #{filedLength} + and sorts = #{sorts} + and create_user_id = #{create_user_id} + and create_time = #{create_time} + and modify_user_id = #{modify_user_id} + and modify_time = #{modify_time} + and sts = #{sts} + and org_id = #{org_id} + and company_id = #{companyId} + and sys_pk = #{isSysPk} + and sys_code = #{isSysCode} + and sys_name = #{isSysName} and id in ( select filed_id from mdm_module_db_fileds_rule - where sts='Y' and rule_code = #{roletype} and rule_value = #{roleValue} + where sts='Y' and rule_code = #{roletype} and rule_value = #{roleValue} ) and sts='Y' - - order by sorts asc - order by ${sort} ${order} - - - - + + + - + select + + from mdm_module_db_fileds + + and id like concat('%',#{id},'%') + and mdm_id like concat('%',#{mdmId},'%') + and db_id like concat('%',#{dbId},'%') + and ch_name like concat('%',#{chName},'%') + and en_name like concat('%',#{enName},'%') + and filed_type like concat('%',#{filedType},'%') + and add_type like concat('%',#{addType},'%') + and update_type like concat('%',#{updateType},'%') + and show_type like concat('%',#{showType},'%') + and query_type like concat('%',#{queryType},'%') + and list_type like concat('%',#{listType},'%') + and view_type like concat('%',#{viewType},'%') + and filed_length like concat('%',#{filedLength},'%') + + and sorts like concat('%',#{sorts},'%') + and create_user_id like + concat('%',#{create_user_id},'%') + + and create_time like concat('%',#{create_time},'%') + and modify_user_id like + concat('%',#{modify_user_id},'%') + + and modify_time like concat('%',#{modify_time},'%') + and sts like concat('%',#{sts},'%') + and org_id like concat('%',#{org_id},'%') + and company_id like concat('%',#{companyId},'%') - and sys_pk like concat('%',#{sysPk},'%') - and sys_code like concat('%',#{sysCode},'%') - and sys_name like concat('%',#{sysName},'%') + and sys_pk like concat('%',#{isSysPk},'%') + and sys_code like concat('%',#{isSysCode},'%') + and sys_name like concat('%',#{isSysName},'%') and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - + select + + from mdm_module_db_fileds + + or id = #{id} + or mdm_id = #{mdmId} + or db_id = #{dbId} + or ch_name = #{chName} + or en_name = #{enName} + or filed_type = #{filedType} + or add_type = #{addType} + or update_type = #{updateType} + or show_type = #{showType} + or query_type = #{queryType} + or list_type = #{listType} + or view_type = #{viewType} + or filed_length = #{filedLength} + or sorts = #{sorts} + or create_user_id = #{create_user_id} + or create_time = #{create_time} + or modify_user_id = #{modify_user_id} + or modify_time = #{modify_time} + or sts = #{sts} + or org_id = #{org_id} + or company_id = #{companyId} - or sys_pk = #{sysPk} - or sys_code = #{sysCode} - or sys_name = #{sysName} + or sys_pk = #{isSysPk} + or sys_code = #{isSysCode} + or sys_name = #{isSysName} and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - - insert into mdm_module_db_fileds( - - id , - mdm_id , - db_id , - ch_name , - en_name , - filed_type , - add_type , - update_type , - show_type , - query_type , - list_type , - view_type , - filed_length , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - company_id , - sys_pk , - sys_code , - sys_name , - sts, - - )values( - - #{id} , - #{mdmId} , - #{dbId} , - #{chName} , - #{enName} , - #{filedType} , - #{addType} , - #{updateType} , - #{showType} , - #{queryType} , - #{listType} , - #{viewType} , - #{filedLength} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - #{companyId} , - #{sysPk} , - #{sysCode} , - #{sysName} , - 'Y', - - ) - - - - 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 - - (#{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') - - - - - 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 - - (#{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}) - - on duplicate key update - mdm_id = values(mdm_id), - db_id = values(db_id), - ch_name = values(ch_name), - en_name = values(en_name), - filed_type = values(filed_type), - add_type = values(add_type), - update_type = values(update_type), - show_type = values(show_type), - query_type = values(query_type), - list_type = values(list_type), - view_type = values(view_type), - filed_length = values(filed_length), - create_user_id = values(create_user_id), - create_time = values(create_time), - modify_user_id = values(modify_user_id), - modify_time = values(modify_time), - sts = values(sts), - org_id = values(org_id), - company_id = values(company_id) - - -update mdm_module_db_fileds set - - mdm_id = #{mdmId}, - db_id = #{dbId}, - ch_name = #{chName}, - en_name = #{enName}, - filed_type = #{filedType}, - add_type = #{addType}, - update_type = #{updateType}, - show_type = #{showType}, - query_type = #{queryType}, - list_type = #{listType}, - view_type = #{viewType}, - filed_length = #{filedLength}, - create_user_id = #{create_user_id}, - create_time = #{create_time}, - modify_user_id = #{modify_user_id}, - modify_time = #{modify_time}, - sts = #{sts}, - org_id = #{org_id}, - company_id = #{companyId}, - -where id = #{id} - - - -update mdm_module_db_fileds set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} -where id = #{id} - - - -update mdm_module_db_fileds set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} - - and id = #{id} - and mdm_id = #{mdmId} - and db_id = #{dbId} - and ch_name = #{chName} - and en_name = #{enName} - and filed_type = #{filedType} - and add_type = #{addType} - and update_type = #{updateType} - and show_type = #{showType} - and query_type = #{queryType} - and list_type = #{listType} - and view_type = #{viewType} - and filed_length = #{filedLength} - and sorts = #{sorts} - and sts = #{sts} - and company_id = #{companyId} + + + insert into mdm_module_db_fileds( + + id , + mdm_id , + db_id , + ch_name , + en_name , + filed_type , + add_type , + update_type , + show_type , + query_type , + list_type , + view_type , + filed_length , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sys_pk , + sys_code , + sys_name , + sts, + + )values( + + #{id} , + #{mdmId} , + #{dbId} , + #{chName} , + #{enName} , + #{filedType} , + #{addType} , + #{updateType} , + #{showType} , + #{queryType} , + #{listType} , + #{viewType} , + #{filedLength} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + #{isSysPk} , + #{isSysCode} , + #{isSysName} , + 'Y', + + ) + + + + 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 + + (#{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') + + + + + 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 + + (#{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}) + + on duplicate key update + mdm_id = values(mdm_id), + db_id = values(db_id), + ch_name = values(ch_name), + en_name = values(en_name), + filed_type = values(filed_type), + add_type = values(add_type), + update_type = values(update_type), + show_type = values(show_type), + query_type = values(query_type), + list_type = values(list_type), + view_type = values(view_type), + filed_length = values(filed_length), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + + + update mdm_module_db_fileds set + + mdm_id = #{mdmId}, + db_id = #{dbId}, + ch_name = #{chName}, + en_name = #{enName}, + filed_type = #{filedType}, + add_type = #{addType}, + update_type = #{updateType}, + show_type = #{showType}, + query_type = #{queryType}, + list_type = #{listType}, + view_type = #{viewType}, + filed_length = #{filedLength}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + sys_pk = #{isSysPk}, + sys_pk = null, + sys_code = #{isSysCode}, + sys_code = null, + sys_name = #{isSysName}, + sys_name = null, + + where id = #{id} + + + + update mdm_module_db_fileds + set sts= 'N', + modify_time = #{modify_time}, + modify_user_id = #{modify_user_id} + where id = #{id} + + + + update mdm_module_db_fileds set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and mdm_id = #{mdmId} + and db_id = #{dbId} + and ch_name = #{chName} + and en_name = #{enName} + and filed_type = #{filedType} + and add_type = #{addType} + and update_type = #{updateType} + and show_type = #{showType} + and query_type = #{queryType} + and list_type = #{listType} + and view_type = #{viewType} + and filed_length = #{filedLength} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} and sts='Y' - - - - - delete from mdm_module_db_fileds where id = #{id} - + + + + + delete + from mdm_module_db_fileds + where id = #{id} + - delete from mdm_module_db_fileds where mdm_id = #{mdmId} - + delete + from mdm_module_db_fileds + where mdm_id = #{mdmId} +