From 7b40d8c0dc435e139cfce0d31d32e64a09f2d7cf Mon Sep 17 00:00:00 2001 From: yuqh <123456> Date: Mon, 24 Jun 2024 10:30:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?MDM=E5=85=AC=E7=94=A8=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/cfgHome/plugin/masterData/org/pluginCfg.xml | 6 ------ .../masterData/org/spring/spring-buildpackage-dao.xml | 5 ----- .../masterData/org/spring/spring-buildpackage-plugin.xml | 5 ----- .../masterData/org/spring/spring-buildpackage-service.xml | 5 ----- 4 files changed, 21 deletions(-) delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData/org/pluginCfg.xml delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-dao.xml delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-plugin.xml delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-service.xml diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/pluginCfg.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/pluginCfg.xml deleted file mode 100644 index f2f50ef1..00000000 --- a/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/pluginCfg.xml +++ /dev/null @@ -1,6 +0,0 @@ - - -MdmOrgPlugin -MdmOrgPlugin插件 -90000001 - diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-dao.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-dao.xml deleted file mode 100644 index 134e2407..00000000 --- a/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-dao.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-plugin.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-plugin.xml deleted file mode 100644 index a8e39d7b..00000000 --- a/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-plugin.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-service.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-service.xml deleted file mode 100644 index 9cea180a..00000000 --- a/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-service.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - From 7b8ce8e35a6ba09117c2ae1b4c22a10e67a9f34a Mon Sep 17 00:00:00 2001 From: yuqh <123456> Date: Mon, 24 Jun 2024 10:30:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?MDM=E5=85=AC=E7=94=A8=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PayBillServiceImpl.java | 1 - .../bank/dao/IMdmCustomerBankDao.java | 15 - .../bank/dao/impl/MdmCustomerBankDaoImpl.java | 16 - .../bank/entity/MdmCustomerBankEntity.java | 86 ---- .../bank/entity/MdmCustomerBankEntity.xml | 267 ---------- .../MdmCustomerBankPluginInitializer.java | 50 -- .../bank/service/IMdmCustomerBankService.java | 12 - .../impl/MdmCustomerBankServiceImpl.java | 25 - .../customer/dao/IMdmCustomerDao.java | 15 - .../customer/dao/impl/MdmCustomerDaoImpl.java | 16 - .../customer/service/IMdmCustomerService.java | 12 - .../service/impl/MdmCustomerServiceImpl.java | 25 - .../frame/plugin/masterData/dao/IMdmDao.java | 15 + .../masterData/dao/impl/MdmDaoImpl.java | 15 + .../MdmEntity.java} | 4 +- .../MdmEntity.xml} | 20 +- .../plugin/masterData/org/dao/IMdmOrgDao.java | 15 - .../org/dao/impl/MdmOrgDaoImpl.java | 16 - .../masterData/org/entity/MdmOrgEntity.java | 196 -------- .../masterData/org/entity/MdmOrgEntity.xml | 388 -------------- .../org/plugin/MdmOrgPluginInitializer.java | 62 --- .../org/service/IMdmOrgService.java | 13 - .../org/service/impl/MdmOrgServiceImpl.java | 26 - .../MdmPluginInitializer.java} | 17 +- .../project/dao/IMdmProjectDao.java | 16 - .../project/dao/impl/MdmProjectDaoImpl.java | 17 - .../project/entity/MdmProjectEntity.java | 186 ------- .../project/entity/MdmProjectEntity.xml | 377 -------------- .../plugin/MdmProjectPluginInitializer.java | 64 --- .../project/service/IMdmProjectService.java | 13 - .../service/impl/MdmProjectServiceImpl.java | 26 - .../masterData/service/IMdmService.java | 12 + .../service/impl/MdmServiceImpl.java | 24 + .../masterData/user/dao/IMdmUserDao.java | 15 - .../user/dao/impl/MdmUserDaoImpl.java | 15 - .../masterData/user/entity/MdmUserEntity.java | 275 ---------- .../masterData/user/entity/MdmUserEntity.xml | 476 ------------------ .../user/plugin/MdmUserPluginInitializer.java | 61 --- .../user/service/IMdmUserService.java | 13 - .../user/service/impl/MdmUserServiceImpl.java | 23 - .../masterData.customer.bank/pluginCfg.xml | 6 - .../spring/spring-buildpackage-dao.xml | 5 - .../spring/spring-buildpackage-plugin.xml | 5 - .../spring/spring-buildpackage-service.xml | 5 - .../plugin/masterData.customer/pluginCfg.xml | 6 - .../plugin/masterData.project/pluginCfg.xml | 6 - .../spring/spring-buildpackage-dao.xml | 5 - .../spring/spring-buildpackage-plugin.xml | 5 - .../spring/spring-buildpackage-service.xml | 5 - .../spring/spring-buildpackage-dao.xml | 5 - .../spring/spring-buildpackage-plugin.xml | 5 - .../spring/spring-buildpackage-service.xml | 5 - .../pluginCfg.xml | 4 +- .../spring/spring-buildpackage-dao.xml | 2 +- .../spring/spring-buildpackage-plugin.xml | 2 +- .../spring/spring-buildpackage-service.xml | 2 +- 56 files changed, 92 insertions(+), 2921 deletions(-) delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/IMdmCustomerBankDao.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/impl/MdmCustomerBankDaoImpl.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.xml delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/plugin/MdmCustomerBankPluginInitializer.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/IMdmCustomerBankService.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/impl/MdmCustomerBankServiceImpl.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/IMdmCustomerDao.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/impl/MdmCustomerDaoImpl.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/IMdmCustomerService.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/impl/MdmCustomerServiceImpl.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/IMdmDao.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/impl/MdmDaoImpl.java rename buildpackage/src/main/java/com/hzya/frame/plugin/masterData/{customer/entity/MdmCustomerEntity.java => entity/MdmEntity.java} (97%) rename buildpackage/src/main/java/com/hzya/frame/plugin/masterData/{customer/entity/MdmCustomerEntity.xml => entity/MdmEntity.xml} (97%) delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/IMdmOrgDao.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/impl/MdmOrgDaoImpl.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.xml delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/plugin/MdmOrgPluginInitializer.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/IMdmOrgService.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/impl/MdmOrgServiceImpl.java rename buildpackage/src/main/java/com/hzya/frame/plugin/masterData/{customer/plugin/MdmCustomerPluginInitializer.java => plugin/MdmPluginInitializer.java} (68%) delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/impl/MdmProjectDaoImpl.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.xml delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/plugin/MdmProjectPluginInitializer.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/IMdmProjectService.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/impl/MdmProjectServiceImpl.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/IMdmService.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/impl/MdmServiceImpl.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/dao/IMdmUserDao.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/dao/impl/MdmUserDaoImpl.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/entity/MdmUserEntity.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/entity/MdmUserEntity.xml delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/plugin/MdmUserPluginInitializer.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/service/IMdmUserService.java delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/service/impl/MdmUserServiceImpl.java delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/pluginCfg.xml delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-dao.xml delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-plugin.xml delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-service.xml delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/pluginCfg.xml delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.project/pluginCfg.xml delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-dao.xml delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-plugin.xml delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-service.xml delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-dao.xml delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-plugin.xml delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-service.xml rename buildpackage/src/main/resources/cfgHome/plugin/{masterData.user => masterData}/pluginCfg.xml (61%) rename buildpackage/src/main/resources/cfgHome/plugin/{masterData.customer => masterData}/spring/spring-buildpackage-dao.xml (84%) rename buildpackage/src/main/resources/cfgHome/plugin/{masterData.customer => masterData}/spring/spring-buildpackage-plugin.xml (80%) rename buildpackage/src/main/resources/cfgHome/plugin/{masterData.customer => masterData}/spring/spring-buildpackage-service.xml (81%) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/PayBillServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/PayBillServiceImpl.java index 40b189b6..e6375473 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/PayBillServiceImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/PayBillServiceImpl.java @@ -3,7 +3,6 @@ package com.hzya.frame.plugin.a8bill.service.impl; import com.hzya.frame.basedao.service.impl.BaseService; import com.hzya.frame.plugin.a8bill.entity.PayBillEntity; import com.hzya.frame.plugin.a8bill.service.IPayBillService; -import com.hzya.frame.plugin.masterData.org.service.IMdmOrgService; /** * private IMdmOrgDao mdmOrgDao; diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/IMdmCustomerBankDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/IMdmCustomerBankDao.java deleted file mode 100644 index d22d954a..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/IMdmCustomerBankDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzya.frame.plugin.masterData.customer.bank.dao; - -import com.hzya.frame.plugin.masterData.customer.bank.entity.MdmCustomerBankEntity; -import com.hzya.frame.basedao.dao.IBaseDao; - -/** - * 客户银行(mdm_customer_bank: table)表数据库访问层 - * - * @author makejava - * @since 2024-06-21 13:55:55 - */ -public interface IMdmCustomerBankDao extends IBaseDao { - -} - diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/impl/MdmCustomerBankDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/impl/MdmCustomerBankDaoImpl.java deleted file mode 100644 index 78161b29..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/impl/MdmCustomerBankDaoImpl.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hzya.frame.plugin.masterData.customer.bank.dao.impl; - -import com.hzya.frame.plugin.masterData.customer.bank.entity.MdmCustomerBankEntity; -import com.hzya.frame.plugin.masterData.customer.bank.dao.IMdmCustomerBankDao; -import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; -/** - * 客户银行(MdmCustomerBank)表数据库访问层 - * - * @author makejava - * @since 2024-06-21 13:55:55 - */ -public class MdmCustomerBankDaoImpl extends MybatisGenericDao implements IMdmCustomerBankDao{ - -} - diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.java deleted file mode 100644 index 4c389315..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.hzya.frame.plugin.masterData.customer.bank.entity; - -import java.util.Date; -import com.hzya.frame.web.entity.BaseEntity; -/** - * 客户银行(MdmCustomerBank)实体类 - * - * @author makejava - * @since 2024-06-21 13:55:55 - */ -public class MdmCustomerBankEntity extends BaseEntity { - - /** formmain_id */ - private String formmainId; - /** 数据状态 Y正常 N删除 F修改 */ - private String dataStatus; - /** 公司id */ - private String companyId; - /** 银行 */ - private String bank; - /** 开户银行 */ - private String pkBankdoc; - /** 账号 */ - private String accnum; - /** 联行号 */ - private String combinenum; - - - public String getFormmainId() { - return formmainId; - } - - public void setFormmainId(String formmainId) { - this.formmainId = formmainId; - } - - public String getDataStatus() { - return dataStatus; - } - - public void setDataStatus(String dataStatus) { - this.dataStatus = dataStatus; - } - - public String getCompanyId() { - return companyId; - } - - public void setCompanyId(String companyId) { - this.companyId = companyId; - } - - public String getBank() { - return bank; - } - - public void setBank(String bank) { - this.bank = bank; - } - - public String getPkBankdoc() { - return pkBankdoc; - } - - public void setPkBankdoc(String pkBankdoc) { - this.pkBankdoc = pkBankdoc; - } - - public String getAccnum() { - return accnum; - } - - public void setAccnum(String accnum) { - this.accnum = accnum; - } - - public String getCombinenum() { - return combinenum; - } - - public void setCombinenum(String combinenum) { - this.combinenum = combinenum; - } - -} - diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.xml deleted file mode 100644 index 3689e8c9..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.xml +++ /dev/null @@ -1,267 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - id - ,formmain_id - ,data_status - ,sorts - ,create_user_id - ,create_time - ,modify_user_id - ,modify_time - ,sts - ,org_id - ,company_id - ,bank - ,pk_bankdoc - ,accnum - ,combinenum - - - - - - - - - - - - - - - - insert into mdm_customer_bank( - - id , - formmain_id , - data_status , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - company_id , - bank , - pk_bankdoc , - accnum , - combinenum , - sorts, - sts, - - )values( - - #{id} , - #{formmainId} , - #{dataStatus} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - #{companyId} , - #{bank} , - #{pkBankdoc} , - #{accnum} , - #{combinenum} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_customer_bank a WHERE a.sts = 'Y' ), - 'Y', - - ) - - - - insert into mdm_customer_bank(formmain_id, data_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, bank, pk_bankdoc, accnum, combinenum, sts) - values - - (#{entity.formmainId},#{entity.dataStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.bank},#{entity.pkBankdoc},#{entity.accnum},#{entity.combinenum}, 'Y') - - - - - insert into mdm_customer_bank(formmain_id, data_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, bank, pk_bankdoc, accnum, combinenum) - values - - (#{entity.formmainId},#{entity.dataStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.bank},#{entity.pkBankdoc},#{entity.accnum},#{entity.combinenum}) - - on duplicate key update - formmain_id = values(formmain_id), - data_status = values(data_status), - 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), - bank = values(bank), - pk_bankdoc = values(pk_bankdoc), - accnum = values(accnum), - combinenum = values(combinenum) - - -update mdm_customer_bank set - - formmain_id = #{formmainId}, - data_status = #{dataStatus}, - 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}, - bank = #{bank}, - pk_bankdoc = #{pkBankdoc}, - accnum = #{accnum}, - combinenum = #{combinenum}, - -where id = #{id} - - - -update mdm_customer_bank set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} -where id = #{id} - - - -update mdm_customer_bank set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} - - and id = #{id} - and formmain_id = #{formmainId} - and data_status = #{dataStatus} - and sorts = #{sorts} - and sts = #{sts} - and company_id = #{companyId} - and bank = #{bank} - and pk_bankdoc = #{pkBankdoc} - and accnum = #{accnum} - and combinenum = #{combinenum} - and sts='Y' - - - - - delete from mdm_customer_bank where id = #{id} - - - - diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/plugin/MdmCustomerBankPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/plugin/MdmCustomerBankPluginInitializer.java deleted file mode 100644 index e62824b8..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/plugin/MdmCustomerBankPluginInitializer.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.hzya.frame.plugin.masterData.customer.bank.plugin; -import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.base.PluginBaseEntity; -import com.hzya.frame.web.entity.JsonResultEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -/** - * 客户银行(MdmCustomerBank)表服务接口 - * - * @author makejava - * @since 2024-06-21 13:55:55 - */ -public class MdmCustomerBankPluginInitializer extends PluginBaseEntity{ - Logger logger = LoggerFactory.getLogger(MdmCustomerBankPluginInitializer.class); - - @Override - public void initialize() { - logger.info(getPluginLabel() + "執行初始化方法initialize()"); - } - - @Override - public void destroy() { - logger.info(getPluginLabel() + "執行銷毀方法destroy()"); - } - - @Override - public String getPluginId() { - return "MdmCustomerBankPlugin"; - } - - @Override - public String getPluginName() { - return "MdmCustomerBankPlugin插件"; - } - - @Override - public String getPluginLabel() { - return "MdmCustomerBankPlugin"; - } - - @Override - public String getPluginType() { - return "1"; - } - @Override - public JsonResultEntity executeBusiness(JSONObject requestJson) { - logger.info("执行业务代码逻辑"); - return null; - } -} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/IMdmCustomerBankService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/IMdmCustomerBankService.java deleted file mode 100644 index b1be580d..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/IMdmCustomerBankService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hzya.frame.plugin.masterData.customer.bank.service; - -import com.hzya.frame.plugin.masterData.customer.bank.entity.MdmCustomerBankEntity; -import com.hzya.frame.basedao.service.IBaseService; -/** - * 客户银行(MdmCustomerBank)表服务接口 - * - * @author makejava - * @since 2024-06-21 13:55:55 - */ -public interface IMdmCustomerBankService extends IBaseService{ -} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/impl/MdmCustomerBankServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/impl/MdmCustomerBankServiceImpl.java deleted file mode 100644 index 11fe5130..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/impl/MdmCustomerBankServiceImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.hzya.frame.plugin.masterData.customer.bank.service.impl; - -import com.hzya.frame.plugin.masterData.customer.bank.entity.MdmCustomerBankEntity; -import com.hzya.frame.plugin.masterData.customer.bank.dao.IMdmCustomerBankDao; -import com.hzya.frame.plugin.masterData.customer.bank.service.IMdmCustomerBankService; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.Resource; -import com.hzya.frame.basedao.service.impl.BaseService; -/** - * 客户银行(MdmCustomerBank)表服务实现类 - * - * @author makejava - * @since 2024-06-21 13:55:55 - */ -public class MdmCustomerBankServiceImpl extends BaseService implements IMdmCustomerBankService { - - private IMdmCustomerBankDao mdmCustomerBankDao; - - @Autowired - public void setMdmCustomerBankDao(IMdmCustomerBankDao dao) { - this.mdmCustomerBankDao = dao; - this.dao = dao; - } -} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/IMdmCustomerDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/IMdmCustomerDao.java deleted file mode 100644 index 8b8ae96e..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/IMdmCustomerDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzya.frame.plugin.masterData.customer.dao; - -import com.hzya.frame.plugin.masterData.customer.entity.MdmCustomerEntity; -import com.hzya.frame.basedao.dao.IBaseDao; - -/** - * 客户档案(mdm_customer: table)表数据库访问层 - * - * @author makejava - * @since 2024-06-21 13:52:35 - */ -public interface IMdmCustomerDao extends IBaseDao { - -} - diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/impl/MdmCustomerDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/impl/MdmCustomerDaoImpl.java deleted file mode 100644 index 8899979b..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/impl/MdmCustomerDaoImpl.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hzya.frame.plugin.masterData.customer.dao.impl; - -import com.hzya.frame.plugin.masterData.customer.entity.MdmCustomerEntity; -import com.hzya.frame.plugin.masterData.customer.dao.IMdmCustomerDao; -import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; -/** - * 客户档案(MdmCustomer)表数据库访问层 - * - * @author makejava - * @since 2024-06-21 13:52:35 - */ -public class MdmCustomerDaoImpl extends MybatisGenericDao implements IMdmCustomerDao{ - -} - diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/IMdmCustomerService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/IMdmCustomerService.java deleted file mode 100644 index 83ea4dfe..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/IMdmCustomerService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hzya.frame.plugin.masterData.customer.service; - -import com.hzya.frame.plugin.masterData.customer.entity.MdmCustomerEntity; -import com.hzya.frame.basedao.service.IBaseService; -/** - * 客户档案(MdmCustomer)表服务接口 - * - * @author makejava - * @since 2024-06-21 13:52:35 - */ -public interface IMdmCustomerService extends IBaseService{ -} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/impl/MdmCustomerServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/impl/MdmCustomerServiceImpl.java deleted file mode 100644 index 6e48b6d1..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/impl/MdmCustomerServiceImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.hzya.frame.plugin.masterData.customer.service.impl; - -import com.hzya.frame.plugin.masterData.customer.entity.MdmCustomerEntity; -import com.hzya.frame.plugin.masterData.customer.dao.IMdmCustomerDao; -import com.hzya.frame.plugin.masterData.customer.service.IMdmCustomerService; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.Resource; -import com.hzya.frame.basedao.service.impl.BaseService; -/** - * 客户档案(MdmCustomer)表服务实现类 - * - * @author makejava - * @since 2024-06-21 13:52:35 - */ -public class MdmCustomerServiceImpl extends BaseService implements IMdmCustomerService { - - private IMdmCustomerDao mdmCustomerDao; - - @Autowired - public void setMdmCustomerDao(IMdmCustomerDao dao) { - this.mdmCustomerDao = dao; - this.dao = dao; - } -} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/IMdmDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/IMdmDao.java new file mode 100644 index 00000000..b69adb80 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/IMdmDao.java @@ -0,0 +1,15 @@ +package com.hzya.frame.plugin.masterData.dao; + +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.plugin.masterData.entity.MdmEntity; + +/** + * 客户档案(mdm_customer: table)表数据库访问层 + * + * @author makejava + * @since 2024-06-21 13:52:35 + */ +public interface IMdmDao extends IBaseDao { + +} + diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/impl/MdmDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/impl/MdmDaoImpl.java new file mode 100644 index 00000000..05e95b1e --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/impl/MdmDaoImpl.java @@ -0,0 +1,15 @@ +package com.hzya.frame.plugin.masterData.dao.impl; + +import com.hzya.frame.plugin.masterData.entity.MdmEntity; +import com.hzya.frame.plugin.masterData.dao.IMdmDao; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * 客户档案(MdmCustomer)表数据库访问层 + * + * @author makejava + * @since 2024-06-21 13:52:35 + */ +public class MdmDaoImpl extends MybatisGenericDao implements IMdmDao { + +} + diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/entity/MdmCustomerEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.java similarity index 97% rename from buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/entity/MdmCustomerEntity.java rename to buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.java index 7e61cc1c..e8d7f6f9 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/entity/MdmCustomerEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.java @@ -1,4 +1,4 @@ -package com.hzya.frame.plugin.masterData.customer.entity; +package com.hzya.frame.plugin.masterData.entity; import java.util.Date; import com.hzya.frame.web.entity.BaseEntity; @@ -8,7 +8,7 @@ import com.hzya.frame.web.entity.BaseEntity; * @author makejava * @since 2024-06-21 13:52:35 */ -public class MdmCustomerEntity extends BaseEntity { +public class MdmEntity extends BaseEntity { /** 单据规则 */ private String documentRule; diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/entity/MdmCustomerEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.xml similarity index 97% rename from buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/entity/MdmCustomerEntity.xml rename to buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.xml index 41c3a4ff..245f4a02 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/entity/MdmCustomerEntity.xml +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.xml @@ -1,8 +1,8 @@ - + - + @@ -58,7 +58,7 @@ ,taxpayerid - select from mdm_customer @@ -95,7 +95,7 @@ - select count(1) from mdm_customer and id = #{id} @@ -130,7 +130,7 @@ - select from mdm_customer @@ -167,7 +167,7 @@ - select from mdm_customer @@ -204,7 +204,7 @@ - + insert into mdm_customer( id , @@ -307,7 +307,7 @@ pk_org = values(pk_org), taxpayerid = values(taxpayerid) - + update mdm_customer set document_rule = #{documentRule}, @@ -337,12 +337,12 @@ update mdm_customer set where id = #{id} - + update mdm_customer set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - + update mdm_customer set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/IMdmOrgDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/IMdmOrgDao.java deleted file mode 100644 index bfe0e1cd..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/IMdmOrgDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzya.frame.plugin.masterData.org.dao; - -import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity; - -/** - * 组织档案(mdm_org: table)表数据库访问层 - * - * @author makejava - * @since 2024-06-07 18:30:04 - */ -public interface IMdmOrgDao extends IBaseDao { - -} - diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/impl/MdmOrgDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/impl/MdmOrgDaoImpl.java deleted file mode 100644 index dc0271b5..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/impl/MdmOrgDaoImpl.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hzya.frame.plugin.masterData.org.dao.impl; - -import com.hzya.frame.plugin.masterData.org.dao.IMdmOrgDao; -import com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity; -import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; -/** - * 组织档案(MdmOrg)表数据库访问层 - * - * @author makejava - * @since 2024-06-07 18:30:04 - */ -public class MdmOrgDaoImpl extends MybatisGenericDao implements IMdmOrgDao { - -} - diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.java deleted file mode 100644 index 55aa6f31..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.java +++ /dev/null @@ -1,196 +0,0 @@ -package com.hzya.frame.plugin.masterData.org.entity; - -import java.util.Date; -import com.hzya.frame.web.entity.BaseEntity; -/** - * 组织档案(MdmOrg)实体类 - * - * @author makejava - * @since 2024-06-07 18:30:04 - */ -public class MdmOrgEntity extends BaseEntity { - - /** 单据规则 */ - private String documentRule; - /** 单据规则流水号 */ - private Long documentRuleNum; - /** 组织编码 */ - private String orgCode; - /** 组织名称 */ - private String orgName; - /** 地址 */ - private String orgAddress; - /** 国家地区 */ - private String orgCountryzone; - /** 内部编码 */ - private String orgInnercode; - /** 说明 */ - private String orgMemo; - /** 助记码 */ - private String orgMnecode; - /** 所属行业 */ - private String orgNcindustry; - /** 上级业务单元 */ - private String orgFatherorg; - /** 负责人 */ - private String orgPrincipal; - /** 电话 */ - private String orgTel; - /** 数据状态 Y正常 N删除 F修改 */ - private String dataStatus; - /** 新增数据状态 0待下发 1已下发 */ - private String addStatus; - /** 修改数据状态 0待下发 1已下发 */ - private String updateStatus; - /** 删除数据状态 0待下发 1已下发 */ - private String deleteStatus; - /** 公司id */ - private String companyId; - - - public String getDocumentRule() { - return documentRule; - } - - public void setDocumentRule(String documentRule) { - this.documentRule = documentRule; - } - - public Long getDocumentRuleNum() { - return documentRuleNum; - } - - public void setDocumentRuleNum(Long documentRuleNum) { - this.documentRuleNum = documentRuleNum; - } - - public String getOrgCode() { - return orgCode; - } - - public void setOrgCode(String orgCode) { - this.orgCode = orgCode; - } - - public String getOrgName() { - return orgName; - } - - public void setOrgName(String orgName) { - this.orgName = orgName; - } - - public String getOrgAddress() { - return orgAddress; - } - - public void setOrgAddress(String orgAddress) { - this.orgAddress = orgAddress; - } - - public String getOrgCountryzone() { - return orgCountryzone; - } - - public void setOrgCountryzone(String orgCountryzone) { - this.orgCountryzone = orgCountryzone; - } - - public String getOrgInnercode() { - return orgInnercode; - } - - public void setOrgInnercode(String orgInnercode) { - this.orgInnercode = orgInnercode; - } - - public String getOrgMemo() { - return orgMemo; - } - - public void setOrgMemo(String orgMemo) { - this.orgMemo = orgMemo; - } - - public String getOrgMnecode() { - return orgMnecode; - } - - public void setOrgMnecode(String orgMnecode) { - this.orgMnecode = orgMnecode; - } - - public String getOrgNcindustry() { - return orgNcindustry; - } - - public void setOrgNcindustry(String orgNcindustry) { - this.orgNcindustry = orgNcindustry; - } - - public String getOrgFatherorg() { - return orgFatherorg; - } - - public void setOrgFatherorg(String orgFatherorg) { - this.orgFatherorg = orgFatherorg; - } - - public String getOrgPrincipal() { - return orgPrincipal; - } - - public void setOrgPrincipal(String orgPrincipal) { - this.orgPrincipal = orgPrincipal; - } - - public String getOrgTel() { - return orgTel; - } - - public void setOrgTel(String orgTel) { - this.orgTel = orgTel; - } - - public String getDataStatus() { - return dataStatus; - } - - public void setDataStatus(String dataStatus) { - this.dataStatus = dataStatus; - } - - public String getAddStatus() { - return addStatus; - } - - public void setAddStatus(String addStatus) { - this.addStatus = addStatus; - } - - public String getUpdateStatus() { - return updateStatus; - } - - public void setUpdateStatus(String updateStatus) { - this.updateStatus = updateStatus; - } - - public String getDeleteStatus() { - return deleteStatus; - } - - public void setDeleteStatus(String deleteStatus) { - this.deleteStatus = deleteStatus; - } - - public String getCompanyId() { - return companyId; - } - - public void setCompanyId(String companyId) { - this.companyId = companyId; - } - -} - diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.xml deleted file mode 100644 index ed02fdf9..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.xml +++ /dev/null @@ -1,388 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id - ,document_rule - ,document_rule_num - ,org_code - ,org_name - ,org_address - ,org_countryzone - ,org_innercode - ,org_memo - ,org_mnecode - ,org_ncindustry - ,org_fatherorg - ,org_principal - ,org_tel - ,data_status - ,add_status - ,update_status - ,delete_status - ,sorts - ,create_user_id - ,create_time - ,modify_user_id - ,modify_time - ,sts - ,org_id - ,company_id - - - - - - - - - - - - - - - - insert into mdm_org( - - id , - document_rule , - document_rule_num , - org_code , - org_name , - org_address , - org_countryzone , - org_innercode , - org_memo , - org_mnecode , - org_ncindustry , - org_fatherorg , - org_principal , - org_tel , - data_status , - add_status , - update_status , - delete_status , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - company_id , - sorts, - sts, - - )values( - - #{id} , - #{documentRule} , - #{documentRuleNum} , - #{orgCode} , - #{orgName} , - #{orgAddress} , - #{orgCountryzone} , - #{orgInnercode} , - #{orgMemo} , - #{orgMnecode} , - #{orgNcindustry} , - #{orgFatherorg} , - #{orgPrincipal} , - #{orgTel} , - #{dataStatus} , - #{addStatus} , - #{updateStatus} , - #{deleteStatus} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - #{companyId} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_org a WHERE a.sts = 'Y' ), - 'Y', - - ) - - - - insert into mdm_org(document_rule, document_rule_num, org_code, org_name, org_address, org_countryzone, org_innercode, org_memo, org_mnecode, org_ncindustry, org_fatherorg, org_principal, org_tel, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) - values - - (#{entity.documentRule},#{entity.documentRuleNum},#{entity.orgCode},#{entity.orgName},#{entity.orgAddress},#{entity.orgCountryzone},#{entity.orgInnercode},#{entity.orgMemo},#{entity.orgMnecode},#{entity.orgNcindustry},#{entity.orgFatherorg},#{entity.orgPrincipal},#{entity.orgTel},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{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_org(document_rule, document_rule_num, org_code, org_name, org_address, org_countryzone, org_innercode, org_memo, org_mnecode, org_ncindustry, org_fatherorg, org_principal, org_tel, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) - values - - (#{entity.documentRule},#{entity.documentRuleNum},#{entity.orgCode},#{entity.orgName},#{entity.orgAddress},#{entity.orgCountryzone},#{entity.orgInnercode},#{entity.orgMemo},#{entity.orgMnecode},#{entity.orgNcindustry},#{entity.orgFatherorg},#{entity.orgPrincipal},#{entity.orgTel},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{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 - document_rule = values(document_rule), - document_rule_num = values(document_rule_num), - org_code = values(org_code), - org_name = values(org_name), - org_address = values(org_address), - org_countryzone = values(org_countryzone), - org_innercode = values(org_innercode), - org_memo = values(org_memo), - org_mnecode = values(org_mnecode), - org_ncindustry = values(org_ncindustry), - org_fatherorg = values(org_fatherorg), - org_principal = values(org_principal), - org_tel = values(org_tel), - data_status = values(data_status), - add_status = values(add_status), - update_status = values(update_status), - delete_status = values(delete_status), - 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_org set - - document_rule = #{documentRule}, - document_rule_num = #{documentRuleNum}, - org_code = #{orgCode}, - org_name = #{orgName}, - org_address = #{orgAddress}, - org_countryzone = #{orgCountryzone}, - org_innercode = #{orgInnercode}, - org_memo = #{orgMemo}, - org_mnecode = #{orgMnecode}, - org_ncindustry = #{orgNcindustry}, - org_fatherorg = #{orgFatherorg}, - org_principal = #{orgPrincipal}, - org_tel = #{orgTel}, - data_status = #{dataStatus}, - add_status = #{addStatus}, - update_status = #{updateStatus}, - delete_status = #{deleteStatus}, - 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_org set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} -where id = #{id} - - - -update mdm_org set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} - - and id = #{id} - and document_rule = #{documentRule} - and document_rule_num = #{documentRuleNum} - and org_code = #{orgCode} - and org_name = #{orgName} - and org_address = #{orgAddress} - and org_countryzone = #{orgCountryzone} - and org_innercode = #{orgInnercode} - and org_memo = #{orgMemo} - and org_mnecode = #{orgMnecode} - and org_ncindustry = #{orgNcindustry} - and org_fatherorg = #{orgFatherorg} - and org_principal = #{orgPrincipal} - and org_tel = #{orgTel} - and data_status = #{dataStatus} - and add_status = #{addStatus} - and update_status = #{updateStatus} - and delete_status = #{deleteStatus} - and sorts = #{sorts} - and sts = #{sts} - and company_id = #{companyId} - and sts='Y' - - - - - delete from mdm_org where id = #{id} - - - - diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/plugin/MdmOrgPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/plugin/MdmOrgPluginInitializer.java deleted file mode 100644 index f4e7c8f6..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/plugin/MdmOrgPluginInitializer.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.hzya.frame.plugin.masterData.org.plugin; - -import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.base.PluginBaseEntity; -import com.hzya.frame.sysnew.comparison.masterData.service.impl.MasterDataOrgsServiceImpl; -import com.hzya.frame.web.entity.JsonResultEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; - -/** - * 组织档案(MdmOrg)表服务接口 - * - * @author makejava - * @since 2024-06-07 18:30:05 - */ -public class MdmOrgPluginInitializer extends PluginBaseEntity{ - Logger logger = LoggerFactory.getLogger(MdmOrgPluginInitializer.class); - @Autowired - private MasterDataOrgsServiceImpl masterDataOrgsService; - - @Override - public void initialize() { - logger.info(getPluginLabel() + "執行初始化方法initialize()"); - } - - @Override - public void destroy() { - logger.info(getPluginLabel() + "執行銷毀方法destroy()"); - } - - @Override - public String getPluginId() { - return "MdmOrgPlugin"; - } - - @Override - public String getPluginName() { - return "MdmOrgPlugin插件"; - } - - @Override - public String getPluginLabel() { - return "MdmOrgPlugin"; - } - - @Override - public String getPluginType() { - return "1"; - } - @Override - public JsonResultEntity executeBusiness(JSONObject requestJson) { - try { - logger.info("======开始执行主数据档案组织档案同步========"); - return masterDataOrgsService.queryOrgsArchives(requestJson); - }catch (Exception e){ - logger.info("======执行主数据档案组织档案同步失败:{}========",e.getMessage()); - e.printStackTrace(); - } - return null; - } -} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/IMdmOrgService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/IMdmOrgService.java deleted file mode 100644 index fa37d8cd..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/IMdmOrgService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hzya.frame.plugin.masterData.org.service; - -import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity; - -/** - * 组织档案(MdmOrg)表服务接口 - * - * @author makejava - * @since 2024-06-07 18:30:05 - */ -public interface IMdmOrgService extends IBaseService{ -} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/impl/MdmOrgServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/impl/MdmOrgServiceImpl.java deleted file mode 100644 index f4f543ee..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/impl/MdmOrgServiceImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzya.frame.plugin.masterData.org.service.impl; - - -import com.hzya.frame.plugin.masterData.org.dao.IMdmOrgDao; -import com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity; -import com.hzya.frame.plugin.masterData.org.service.IMdmOrgService; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.Resource; -import com.hzya.frame.basedao.service.impl.BaseService; -/** - * 组织档案(MdmOrg)表服务实现类 - * - * @author makejava - * @since 2024-06-07 18:30:05 - */ -public class MdmOrgServiceImpl extends BaseService implements IMdmOrgService { - - private IMdmOrgDao mdmOrgDao; - - @Autowired - public void setMdmOrgDao(IMdmOrgDao dao) { - this.mdmOrgDao = dao; - this.dao = dao; - } -} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/plugin/MdmCustomerPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/plugin/MdmPluginInitializer.java similarity index 68% rename from buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/plugin/MdmCustomerPluginInitializer.java rename to buildpackage/src/main/java/com/hzya/frame/plugin/masterData/plugin/MdmPluginInitializer.java index 5b3a3d22..298019eb 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/plugin/MdmCustomerPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/plugin/MdmPluginInitializer.java @@ -1,22 +1,23 @@ -package com.hzya.frame.plugin.masterData.customer.plugin; +package com.hzya.frame.plugin.masterData.plugin; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.base.PluginBaseEntity; import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataCustoMermanageService; +import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataService; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; /** - * 客户档案(MdmCustomer)表服务接口 + * 主数据同步 * * @author makejava * @since 2024-06-21 13:52:35 */ -public class MdmCustomerPluginInitializer extends PluginBaseEntity{ - Logger logger = LoggerFactory.getLogger(MdmCustomerPluginInitializer.class); +public class MdmPluginInitializer extends PluginBaseEntity{ + Logger logger = LoggerFactory.getLogger(MdmPluginInitializer.class); @Autowired - private IMasterDataCustoMermanageService masterDataCustoMermanageService; + private IMasterDataService masterDataService; @Override public void initialize() { @@ -50,10 +51,10 @@ public class MdmCustomerPluginInitializer extends PluginBaseEntity{ @Override public JsonResultEntity executeBusiness(JSONObject requestJson) { try { - logger.info("======开始执行客户信息同步========"); - return masterDataCustoMermanageService.queryCustoMermanageArchives(requestJson); + logger.info("======开始执行主数据信息同步========"); + return masterDataService.queryArchives(requestJson); }catch (Exception e){ - logger.info("======执行客户同步失败:{}========",e.getMessage()); + logger.info("======执行主数据同步失败:{}========",e.getMessage()); e.printStackTrace(); } return null; diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java deleted file mode 100644 index 8b130a7f..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hzya.frame.plugin.masterData.project.dao; - - -import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity; - -/** - * 项目档案(mdm_project: table)表数据库访问层 - * - * @author makejava - * @since 2024-06-07 18:29:23 - */ -public interface IMdmProjectDao extends IBaseDao { - -} - diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/impl/MdmProjectDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/impl/MdmProjectDaoImpl.java deleted file mode 100644 index ae270f7d..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/impl/MdmProjectDaoImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzya.frame.plugin.masterData.project.dao.impl; - - -import com.hzya.frame.plugin.masterData.project.dao.IMdmProjectDao; -import com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity; -import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; -/** - * 项目档案(MdmProject)表数据库访问层 - * - * @author makejava - * @since 2024-06-07 18:29:23 - */ -public class MdmProjectDaoImpl extends MybatisGenericDao implements IMdmProjectDao { - -} - diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.java deleted file mode 100644 index fba1cf1c..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.java +++ /dev/null @@ -1,186 +0,0 @@ -package com.hzya.frame.plugin.masterData.project.entity; - -import java.util.Date; -import com.hzya.frame.web.entity.BaseEntity; -/** - * 项目档案(MdmProject)实体类 - * - * @author makejava - * @since 2024-06-07 18:29:23 - */ -public class MdmProjectEntity extends BaseEntity { - - /** 单据规则 */ - private String documentRule; - /** 单据规则流水号 */ - private Long documentRuleNum; - /** 项目编码 */ - private String projectCode; - /** 项目名称 */ - private String projectName; - /** 单据类型 */ - private String projectBillType; - /** 备注 */ - private String projectMemo; - /** 币种 */ - private String projectCurrtype; - /** 责任人 */ - private String projectDutier; - /** 责任部门 */ - private String projectDutyDept; - /** 管理组织 */ - private String projectOrg; - /** 父项目 */ - private String projectParentpro; - /** 项目简称 */ - private String projectShName; - /** 数据状态 Y正常 N删除 F修改 */ - private String dataStatus; - /** 新增数据状态 0待下发 1已下发 */ - private String addStatus; - /** 修改数据状态 0待下发 1已下发 */ - private String updateStatus; - /** 删除数据状态 0待下发 1已下发 */ - private String deleteStatus; - /** 公司id */ - private String companyId; - - - public String getDocumentRule() { - return documentRule; - } - - public void setDocumentRule(String documentRule) { - this.documentRule = documentRule; - } - - public Long getDocumentRuleNum() { - return documentRuleNum; - } - - public void setDocumentRuleNum(Long documentRuleNum) { - this.documentRuleNum = documentRuleNum; - } - - public String getProjectCode() { - return projectCode; - } - - public void setProjectCode(String projectCode) { - this.projectCode = projectCode; - } - - public String getProjectName() { - return projectName; - } - - public void setProjectName(String projectName) { - this.projectName = projectName; - } - - public String getProjectBillType() { - return projectBillType; - } - - public void setProjectBillType(String projectBillType) { - this.projectBillType = projectBillType; - } - - public String getProjectMemo() { - return projectMemo; - } - - public void setProjectMemo(String projectMemo) { - this.projectMemo = projectMemo; - } - - public String getProjectCurrtype() { - return projectCurrtype; - } - - public void setProjectCurrtype(String projectCurrtype) { - this.projectCurrtype = projectCurrtype; - } - - public String getProjectDutier() { - return projectDutier; - } - - public void setProjectDutier(String projectDutier) { - this.projectDutier = projectDutier; - } - - public String getProjectDutyDept() { - return projectDutyDept; - } - - public void setProjectDutyDept(String projectDutyDept) { - this.projectDutyDept = projectDutyDept; - } - - public String getProjectOrg() { - return projectOrg; - } - - public void setProjectOrg(String projectOrg) { - this.projectOrg = projectOrg; - } - - public String getProjectParentpro() { - return projectParentpro; - } - - public void setProjectParentpro(String projectParentpro) { - this.projectParentpro = projectParentpro; - } - - public String getProjectShName() { - return projectShName; - } - - public void setProjectShName(String projectShName) { - this.projectShName = projectShName; - } - - public String getDataStatus() { - return dataStatus; - } - - public void setDataStatus(String dataStatus) { - this.dataStatus = dataStatus; - } - - public String getAddStatus() { - return addStatus; - } - - public void setAddStatus(String addStatus) { - this.addStatus = addStatus; - } - - public String getUpdateStatus() { - return updateStatus; - } - - public void setUpdateStatus(String updateStatus) { - this.updateStatus = updateStatus; - } - - public String getDeleteStatus() { - return deleteStatus; - } - - public void setDeleteStatus(String deleteStatus) { - this.deleteStatus = deleteStatus; - } - - public String getCompanyId() { - return companyId; - } - - public void setCompanyId(String companyId) { - this.companyId = companyId; - } - -} - diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.xml deleted file mode 100644 index 467882e1..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.xml +++ /dev/null @@ -1,377 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id - ,document_rule - ,document_rule_num - ,project_code - ,project_name - ,project_bill_type - ,project_memo - ,project_currtype - ,project_dutier - ,project_duty_dept - ,project_org - ,project_parentpro - ,project_sh_name - ,data_status - ,add_status - ,update_status - ,delete_status - ,sorts - ,create_user_id - ,create_time - ,modify_user_id - ,modify_time - ,sts - ,org_id - ,company_id - - - - - - - - - - - - - - - - insert into mdm_project( - - id , - document_rule , - document_rule_num , - project_code , - project_name , - project_bill_type , - project_memo , - project_currtype , - project_dutier , - project_duty_dept , - project_org , - project_parentpro , - project_sh_name , - data_status , - add_status , - update_status , - delete_status , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - company_id , - sorts, - sts, - - )values( - - #{id} , - #{documentRule} , - #{documentRuleNum} , - #{projectCode} , - #{projectName} , - #{projectBillType} , - #{projectMemo} , - #{projectCurrtype} , - #{projectDutier} , - #{projectDutyDept} , - #{projectOrg} , - #{projectParentpro} , - #{projectShName} , - #{dataStatus} , - #{addStatus} , - #{updateStatus} , - #{deleteStatus} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - #{companyId} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_project a WHERE a.sts = 'Y' ), - 'Y', - - ) - - - - insert into mdm_project(document_rule, document_rule_num, project_code, project_name, project_bill_type, project_memo, project_currtype, project_dutier, project_duty_dept, project_org, project_parentpro, project_sh_name, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) - values - - (#{entity.documentRule},#{entity.documentRuleNum},#{entity.projectCode},#{entity.projectName},#{entity.projectBillType},#{entity.projectMemo},#{entity.projectCurrtype},#{entity.projectDutier},#{entity.projectDutyDept},#{entity.projectOrg},#{entity.projectParentpro},#{entity.projectShName},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{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_project(document_rule, document_rule_num, project_code, project_name, project_bill_type, project_memo, project_currtype, project_dutier, project_duty_dept, project_org, project_parentpro, project_sh_name, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) - values - - (#{entity.documentRule},#{entity.documentRuleNum},#{entity.projectCode},#{entity.projectName},#{entity.projectBillType},#{entity.projectMemo},#{entity.projectCurrtype},#{entity.projectDutier},#{entity.projectDutyDept},#{entity.projectOrg},#{entity.projectParentpro},#{entity.projectShName},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{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 - document_rule = values(document_rule), - document_rule_num = values(document_rule_num), - project_code = values(project_code), - project_name = values(project_name), - project_bill_type = values(project_bill_type), - project_memo = values(project_memo), - project_currtype = values(project_currtype), - project_dutier = values(project_dutier), - project_duty_dept = values(project_duty_dept), - project_org = values(project_org), - project_parentpro = values(project_parentpro), - project_sh_name = values(project_sh_name), - data_status = values(data_status), - add_status = values(add_status), - update_status = values(update_status), - delete_status = values(delete_status), - 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_project set - - document_rule = #{documentRule}, - document_rule_num = #{documentRuleNum}, - project_code = #{projectCode}, - project_name = #{projectName}, - project_bill_type = #{projectBillType}, - project_memo = #{projectMemo}, - project_currtype = #{projectCurrtype}, - project_dutier = #{projectDutier}, - project_duty_dept = #{projectDutyDept}, - project_org = #{projectOrg}, - project_parentpro = #{projectParentpro}, - project_sh_name = #{projectShName}, - data_status = #{dataStatus}, - add_status = #{addStatus}, - update_status = #{updateStatus}, - delete_status = #{deleteStatus}, - 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_project set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} -where id = #{id} - - - -update mdm_project set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} - - and id = #{id} - and document_rule = #{documentRule} - and document_rule_num = #{documentRuleNum} - and project_code = #{projectCode} - and project_name = #{projectName} - and project_bill_type = #{projectBillType} - and project_memo = #{projectMemo} - and project_currtype = #{projectCurrtype} - and project_dutier = #{projectDutier} - and project_duty_dept = #{projectDutyDept} - and project_org = #{projectOrg} - and project_parentpro = #{projectParentpro} - and project_sh_name = #{projectShName} - and data_status = #{dataStatus} - and add_status = #{addStatus} - and update_status = #{updateStatus} - and delete_status = #{deleteStatus} - and sorts = #{sorts} - and sts = #{sts} - and company_id = #{companyId} - and sts='Y' - - - - - delete from mdm_project where id = #{id} - - - - diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/plugin/MdmProjectPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/plugin/MdmProjectPluginInitializer.java deleted file mode 100644 index 0a554a69..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/plugin/MdmProjectPluginInitializer.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.hzya.frame.plugin.masterData.project.plugin; - -import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.base.PluginBaseEntity; -import com.hzya.frame.sysnew.comparison.masterData.service.impl.MasterDataProjectServiceImpl; -import com.hzya.frame.web.entity.JsonResultEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; - -/** - * 项目档案(MdmProject)表服务接口 - * - * @author makejava - * @since 2024-06-07 18:29:23 - */ -public class MdmProjectPluginInitializer extends PluginBaseEntity{ - Logger logger = LoggerFactory.getLogger(MdmProjectPluginInitializer.class); - - @Autowired - private MasterDataProjectServiceImpl masterDataProjectService; - - @Override - public void initialize() { - logger.info(getPluginLabel() + "執行初始化方法initialize()"); - } - - @Override - public void destroy() { - logger.info(getPluginLabel() + "執行銷毀方法destroy()"); - } - - @Override - public String getPluginId() { - return "MdmProjectPlugin"; - } - - @Override - public String getPluginName() { - return "MdmProjectPlugin插件"; - } - - @Override - public String getPluginLabel() { - return "MdmProjectPlugin"; - } - - @Override - public String getPluginType() { - return "1"; - } - @Override - public JsonResultEntity executeBusiness(JSONObject requestJson) { - try { - logger.info("=====开始执行主数据档案项目档案同步======="); - JsonResultEntity jsonResultEntity = masterDataProjectService.queryProjectArchives(requestJson); - return jsonResultEntity; - }catch (Exception e){ - logger.info("======执行主数据档案项目档案同步失败:{}",e.getMessage()); - e.printStackTrace(); - } - return null; - } -} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/IMdmProjectService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/IMdmProjectService.java deleted file mode 100644 index f35a9209..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/IMdmProjectService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hzya.frame.plugin.masterData.project.service; - -import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity; - -/** - * 项目档案(MdmProject)表服务接口 - * - * @author makejava - * @since 2024-06-07 18:29:23 - */ -public interface IMdmProjectService extends IBaseService{ -} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/impl/MdmProjectServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/impl/MdmProjectServiceImpl.java deleted file mode 100644 index 0284f229..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/impl/MdmProjectServiceImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzya.frame.plugin.masterData.project.service.impl; - - -import com.hzya.frame.plugin.masterData.project.dao.IMdmProjectDao; -import com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity; -import com.hzya.frame.plugin.masterData.project.service.IMdmProjectService; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.Resource; -import com.hzya.frame.basedao.service.impl.BaseService; -/** - * 项目档案(MdmProject)表服务实现类 - * - * @author makejava - * @since 2024-06-07 18:29:23 - */ -public class MdmProjectServiceImpl extends BaseService implements IMdmProjectService { - - private IMdmProjectDao mdmProjectDao; - - @Autowired - public void setMdmProjectDao(IMdmProjectDao dao) { - this.mdmProjectDao = dao; - this.dao = dao; - } -} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/IMdmService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/IMdmService.java new file mode 100644 index 00000000..175d0616 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/IMdmService.java @@ -0,0 +1,12 @@ +package com.hzya.frame.plugin.masterData.service; + +import com.hzya.frame.plugin.masterData.entity.MdmEntity; +import com.hzya.frame.basedao.service.IBaseService; +/** + * 客户档案(MdmCustomer)表服务接口 + * + * @author makejava + * @since 2024-06-21 13:52:35 + */ +public interface IMdmService extends IBaseService{ +} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/impl/MdmServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/impl/MdmServiceImpl.java new file mode 100644 index 00000000..e1016019 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/impl/MdmServiceImpl.java @@ -0,0 +1,24 @@ +package com.hzya.frame.plugin.masterData.service.impl; + +import com.hzya.frame.plugin.masterData.entity.MdmEntity; +import com.hzya.frame.plugin.masterData.dao.IMdmDao; +import com.hzya.frame.plugin.masterData.service.IMdmService; +import com.hzya.frame.plugin.masterData.service.IMdmService; +import org.springframework.beans.factory.annotation.Autowired; +import com.hzya.frame.basedao.service.impl.BaseService; +/** + * 客户档案(MdmCustomer)表服务实现类 + * + * @author makejava + * @since 2024-06-21 13:52:35 + */ +public class MdmServiceImpl extends BaseService implements IMdmService { + + private IMdmDao mdmCustomerDao; + + @Autowired + public void setMdmCustomerDao(IMdmDao dao) { + this.mdmCustomerDao = dao; + this.dao = dao; + } +} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/dao/IMdmUserDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/dao/IMdmUserDao.java deleted file mode 100644 index 1556e191..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/dao/IMdmUserDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzya.frame.plugin.masterData.user.dao; - -import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.plugin.masterData.user.entity.MdmUserEntity; - -/** - * 用户档案(mdm_user: table)表数据库访问层 - * - * @author makejava - * @since 2024-06-17 14:52:30 - */ -public interface IMdmUserDao extends IBaseDao { - -} - diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/dao/impl/MdmUserDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/dao/impl/MdmUserDaoImpl.java deleted file mode 100644 index e8d048ea..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/dao/impl/MdmUserDaoImpl.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzya.frame.plugin.masterData.user.dao.impl; - -import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.plugin.masterData.user.dao.IMdmUserDao; -import com.hzya.frame.plugin.masterData.user.entity.MdmUserEntity; -/** - * 用户档案(MdmUser)表数据库访问层 - * - * @author makejava - * @since 2024-06-17 14:52:30 - */ -public class MdmUserDaoImpl extends MybatisGenericDao implements IMdmUserDao { - -} - diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/entity/MdmUserEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/entity/MdmUserEntity.java deleted file mode 100644 index 5a89edcf..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/entity/MdmUserEntity.java +++ /dev/null @@ -1,275 +0,0 @@ -package com.hzya.frame.plugin.masterData.user.entity; - -import com.hzya.frame.web.entity.BaseEntity; -/** - * 用户档案(MdmUser)实体类 - * - * @author makejava - * @since 2024-06-17 14:52:30 - */ -public class MdmUserEntity extends BaseEntity { - - /** 单据规则 */ - private String documentRule; - /** 单据规则流水号 */ - private Long documentRuleNum; - /** 数据状态 Y正常 N删除 F修改 */ - private String dataStatus; - /** 新增数据状态 0待下发 1已下发 */ - private String addStatus; - /** 修改数据状态 0待下发 1已下发 */ - private String updateStatus; - /** 删除数据状态 0待下发 1已下发 */ - private String deleteStatus; - /** 公司id */ - private String companyId; - /** 用户名称 */ - private String userName; - /** 用户编码 */ - private String userCode; - /** 用户密码 */ - private String userPassword; - /** 密码安全级别 */ - private String pwdlevelcode; - /** 密码参数 */ - private String pwdparam; - /** 备注 */ - private String userNote; - /** 生效日期 */ - private String abledate; - /** 失效日期 */ - private String disabledate; - /** 锁定 */ - private String islocked; - /** 用户类型 */ - private String userType; - /** 身份类型 */ - private String baseDocType; - /** 身份 */ - private String pkBaseDoc; - /** 认证类型 */ - private String identityverifycode; - /** 所属组织 */ - private String pkOrg; - /** 数据格式 */ - private String format; - /** CA用户 */ - private String isca; - /** 启用状态 */ - private String enablestate; - /** 内容语种 */ - private String contentlang; - /** 用户编码 */ - private String userCodeQ; - - - public String getDocumentRule() { - return documentRule; - } - - public void setDocumentRule(String documentRule) { - this.documentRule = documentRule; - } - - public Long getDocumentRuleNum() { - return documentRuleNum; - } - - public void setDocumentRuleNum(Long documentRuleNum) { - this.documentRuleNum = documentRuleNum; - } - - public String getDataStatus() { - return dataStatus; - } - - public void setDataStatus(String dataStatus) { - this.dataStatus = dataStatus; - } - - public String getAddStatus() { - return addStatus; - } - - public void setAddStatus(String addStatus) { - this.addStatus = addStatus; - } - - public String getUpdateStatus() { - return updateStatus; - } - - public void setUpdateStatus(String updateStatus) { - this.updateStatus = updateStatus; - } - - public String getDeleteStatus() { - return deleteStatus; - } - - public void setDeleteStatus(String deleteStatus) { - this.deleteStatus = deleteStatus; - } - - public String getCompanyId() { - return companyId; - } - - public void setCompanyId(String companyId) { - this.companyId = companyId; - } - - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - - public String getUserCode() { - return userCode; - } - - public void setUserCode(String userCode) { - this.userCode = userCode; - } - - public String getUserPassword() { - return userPassword; - } - - public void setUserPassword(String userPassword) { - this.userPassword = userPassword; - } - - public String getPwdlevelcode() { - return pwdlevelcode; - } - - public void setPwdlevelcode(String pwdlevelcode) { - this.pwdlevelcode = pwdlevelcode; - } - - public String getPwdparam() { - return pwdparam; - } - - public void setPwdparam(String pwdparam) { - this.pwdparam = pwdparam; - } - - public String getUserNote() { - return userNote; - } - - public void setUserNote(String userNote) { - this.userNote = userNote; - } - - public String getAbledate() { - return abledate; - } - - public void setAbledate(String abledate) { - this.abledate = abledate; - } - - public String getDisabledate() { - return disabledate; - } - - public void setDisabledate(String disabledate) { - this.disabledate = disabledate; - } - - public String getIslocked() { - return islocked; - } - - public void setIslocked(String islocked) { - this.islocked = islocked; - } - - public String getUserType() { - return userType; - } - - public void setUserType(String userType) { - this.userType = userType; - } - - public String getBaseDocType() { - return baseDocType; - } - - public void setBaseDocType(String baseDocType) { - this.baseDocType = baseDocType; - } - - public String getPkBaseDoc() { - return pkBaseDoc; - } - - public void setPkBaseDoc(String pkBaseDoc) { - this.pkBaseDoc = pkBaseDoc; - } - - public String getIdentityverifycode() { - return identityverifycode; - } - - public void setIdentityverifycode(String identityverifycode) { - this.identityverifycode = identityverifycode; - } - - public String getPkOrg() { - return pkOrg; - } - - public void setPkOrg(String pkOrg) { - this.pkOrg = pkOrg; - } - - public String getFormat() { - return format; - } - - public void setFormat(String format) { - this.format = format; - } - - public String getIsca() { - return isca; - } - - public void setIsca(String isca) { - this.isca = isca; - } - - public String getEnablestate() { - return enablestate; - } - - public void setEnablestate(String enablestate) { - this.enablestate = enablestate; - } - - public String getContentlang() { - return contentlang; - } - - public void setContentlang(String contentlang) { - this.contentlang = contentlang; - } - - public String getUserCodeQ() { - return userCodeQ; - } - - public void setUserCodeQ(String userCodeQ) { - this.userCodeQ = userCodeQ; - } - -} - diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/entity/MdmUserEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/entity/MdmUserEntity.xml deleted file mode 100644 index b594d94b..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/entity/MdmUserEntity.xml +++ /dev/null @@ -1,476 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id - ,document_rule - ,document_rule_num - ,data_status - ,add_status - ,update_status - ,delete_status - ,sorts - ,create_user_id - ,create_time - ,modify_user_id - ,modify_time - ,sts - ,org_id - ,company_id - ,user_name - ,user_code - ,user_password - ,pwdlevelcode - ,pwdparam - ,user_note - ,abledate - ,disabledate - ,islocked - ,user_type - ,base_doc_type - ,pk_base_doc - ,identityverifycode - ,pk_org - ,format - ,isca - ,enablestate - ,contentlang - ,user_code_q - - - - - - - - - - - - - - - - insert into mdm_user( - - id , - document_rule , - document_rule_num , - data_status , - add_status , - update_status , - delete_status , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - company_id , - user_name , - user_code , - user_password , - pwdlevelcode , - pwdparam , - user_note , - abledate , - disabledate , - islocked , - user_type , - base_doc_type , - pk_base_doc , - identityverifycode , - pk_org , - format , - isca , - enablestate , - contentlang , - user_code_q , - sorts, - sts, - - )values( - - #{id} , - #{documentRule} , - #{documentRuleNum} , - #{dataStatus} , - #{addStatus} , - #{updateStatus} , - #{deleteStatus} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - #{companyId} , - #{userName} , - #{userCode} , - #{userPassword} , - #{pwdlevelcode} , - #{pwdparam} , - #{userNote} , - #{abledate} , - #{disabledate} , - #{islocked} , - #{userType} , - #{baseDocType} , - #{pkBaseDoc} , - #{identityverifycode} , - #{pkOrg} , - #{format} , - #{isca} , - #{enablestate} , - #{contentlang} , - #{userCodeQ} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_user a WHERE a.sts = 'Y' ), - 'Y', - - ) - - - - insert into mdm_user(document_rule, document_rule_num, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, user_name, user_code, user_password, pwdlevelcode, pwdparam, user_note, abledate, disabledate, islocked, user_type, base_doc_type, pk_base_doc, identityverifycode, pk_org, format, isca, enablestate, contentlang, user_code_q, sts) - values - - (#{entity.documentRule},#{entity.documentRuleNum},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.userName},#{entity.userCode},#{entity.userPassword},#{entity.pwdlevelcode},#{entity.pwdparam},#{entity.userNote},#{entity.abledate},#{entity.disabledate},#{entity.islocked},#{entity.userType},#{entity.baseDocType},#{entity.pkBaseDoc},#{entity.identityverifycode},#{entity.pkOrg},#{entity.format},#{entity.isca},#{entity.enablestate},#{entity.contentlang},#{entity.userCodeQ}, 'Y') - - - - - insert into mdm_user(document_rule, document_rule_num, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, user_name, user_code, user_password, pwdlevelcode, pwdparam, user_note, abledate, disabledate, islocked, user_type, base_doc_type, pk_base_doc, identityverifycode, pk_org, format, isca, enablestate, contentlang, user_code_q) - values - - (#{entity.documentRule},#{entity.documentRuleNum},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.userName},#{entity.userCode},#{entity.userPassword},#{entity.pwdlevelcode},#{entity.pwdparam},#{entity.userNote},#{entity.abledate},#{entity.disabledate},#{entity.islocked},#{entity.userType},#{entity.baseDocType},#{entity.pkBaseDoc},#{entity.identityverifycode},#{entity.pkOrg},#{entity.format},#{entity.isca},#{entity.enablestate},#{entity.contentlang},#{entity.userCodeQ}) - - on duplicate key update - document_rule = values(document_rule), - document_rule_num = values(document_rule_num), - data_status = values(data_status), - add_status = values(add_status), - update_status = values(update_status), - delete_status = values(delete_status), - 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), - user_name = values(user_name), - user_code = values(user_code), - user_password = values(user_password), - pwdlevelcode = values(pwdlevelcode), - pwdparam = values(pwdparam), - user_note = values(user_note), - abledate = values(abledate), - disabledate = values(disabledate), - islocked = values(islocked), - user_type = values(user_type), - base_doc_type = values(base_doc_type), - pk_base_doc = values(pk_base_doc), - identityverifycode = values(identityverifycode), - pk_org = values(pk_org), - format = values(format), - isca = values(isca), - enablestate = values(enablestate), - contentlang = values(contentlang), - user_code_q = values(user_code_q) - - -update mdm_user set - - document_rule = #{documentRule}, - document_rule_num = #{documentRuleNum}, - data_status = #{dataStatus}, - add_status = #{addStatus}, - update_status = #{updateStatus}, - delete_status = #{deleteStatus}, - 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}, - user_name = #{userName}, - user_code = #{userCode}, - user_password = #{userPassword}, - pwdlevelcode = #{pwdlevelcode}, - pwdparam = #{pwdparam}, - user_note = #{userNote}, - abledate = #{abledate}, - disabledate = #{disabledate}, - islocked = #{islocked}, - user_type = #{userType}, - base_doc_type = #{baseDocType}, - pk_base_doc = #{pkBaseDoc}, - identityverifycode = #{identityverifycode}, - pk_org = #{pkOrg}, - format = #{format}, - isca = #{isca}, - enablestate = #{enablestate}, - contentlang = #{contentlang}, - user_code_q = #{userCodeQ}, - -where id = #{id} - - - -update mdm_user set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} -where id = #{id} - - - -update mdm_user set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} - - and id = #{id} - and document_rule = #{documentRule} - and document_rule_num = #{documentRuleNum} - and data_status = #{dataStatus} - and add_status = #{addStatus} - and update_status = #{updateStatus} - and delete_status = #{deleteStatus} - and sorts = #{sorts} - and sts = #{sts} - and company_id = #{companyId} - and user_name = #{userName} - and user_code = #{userCode} - and user_password = #{userPassword} - and pwdlevelcode = #{pwdlevelcode} - and pwdparam = #{pwdparam} - and user_note = #{userNote} - and abledate = #{abledate} - and disabledate = #{disabledate} - and islocked = #{islocked} - and user_type = #{userType} - and base_doc_type = #{baseDocType} - and pk_base_doc = #{pkBaseDoc} - and identityverifycode = #{identityverifycode} - and pk_org = #{pkOrg} - and format = #{format} - and isca = #{isca} - and enablestate = #{enablestate} - and contentlang = #{contentlang} - and user_code_q = #{userCodeQ} - and sts='Y' - - - - - delete from mdm_user where id = #{id} - - - - diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/plugin/MdmUserPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/plugin/MdmUserPluginInitializer.java deleted file mode 100644 index 4eaf8f41..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/plugin/MdmUserPluginInitializer.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hzya.frame.plugin.masterData.user.plugin; -import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.base.PluginBaseEntity; -import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataMemberService; -import com.hzya.frame.web.entity.JsonResultEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; - -/** - * 用户档案(MdmUser)表服务接口 - * - * @author makejava - * @since 2024-06-17 14:52:30 - */ -public class MdmUserPluginInitializer extends PluginBaseEntity{ - Logger logger = LoggerFactory.getLogger(MdmUserPluginInitializer.class); - @Autowired - private IMasterDataMemberService masterDataMemberService; - - @Override - public void initialize() { - logger.info(getPluginLabel() + "執行初始化方法initialize()"); - } - - @Override - public void destroy() { - logger.info(getPluginLabel() + "執行銷毀方法destroy()"); - } - - @Override - public String getPluginId() { - return "MdmUserPlugin"; - } - - @Override - public String getPluginName() { - return "MdmUserPlugin插件"; - } - - @Override - public String getPluginLabel() { - return "MdmUserPlugin"; - } - - @Override - public String getPluginType() { - return "1"; - } - @Override - public JsonResultEntity executeBusiness(JSONObject requestJson) { - try { - logger.info("======开始执行用户信息同步========"); - return masterDataMemberService.queryMemberArchives(requestJson); - }catch (Exception e){ - logger.info("======执行用户同步失败:{}========",e.getMessage()); - e.printStackTrace(); - } - return null; - } -} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/service/IMdmUserService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/service/IMdmUserService.java deleted file mode 100644 index e7f984eb..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/service/IMdmUserService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hzya.frame.plugin.masterData.user.service; - -import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.plugin.masterData.user.entity.MdmUserEntity; - -/** - * 用户档案(MdmUser)表服务接口 - * - * @author makejava - * @since 2024-06-17 14:52:30 - */ -public interface IMdmUserService extends IBaseService{ -} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/service/impl/MdmUserServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/service/impl/MdmUserServiceImpl.java deleted file mode 100644 index 3f88a2d2..00000000 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/service/impl/MdmUserServiceImpl.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.hzya.frame.plugin.masterData.user.service.impl; - -import com.hzya.frame.basedao.service.impl.BaseService; -import com.hzya.frame.plugin.masterData.user.dao.IMdmUserDao; -import com.hzya.frame.plugin.masterData.user.entity.MdmUserEntity; -import com.hzya.frame.plugin.masterData.user.service.IMdmUserService; -import org.springframework.beans.factory.annotation.Autowired; -/** - * 用户档案(MdmUser)表服务实现类 - * - * @author makejava - * @since 2024-06-17 14:52:30 - */ -public class MdmUserServiceImpl extends BaseService implements IMdmUserService { - - private IMdmUserDao mdmUserDao; - - @Autowired - public void setMdmUserDao(IMdmUserDao dao) { - this.mdmUserDao = dao; - this.dao = dao; - } -} diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/pluginCfg.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/pluginCfg.xml deleted file mode 100644 index 5543d57a..00000000 --- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/pluginCfg.xml +++ /dev/null @@ -1,6 +0,0 @@ - - -MdmCustomerBankPlugin -MdmCustomerBankPlugin插件 -90000001 - diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-dao.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-dao.xml deleted file mode 100644 index d3358861..00000000 --- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-dao.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-plugin.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-plugin.xml deleted file mode 100644 index d99236a7..00000000 --- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-plugin.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-service.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-service.xml deleted file mode 100644 index 5fe75f54..00000000 --- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-service.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/pluginCfg.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/pluginCfg.xml deleted file mode 100644 index df03dbcd..00000000 --- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/pluginCfg.xml +++ /dev/null @@ -1,6 +0,0 @@ - - -MdmCustomerPlugin -MdmCustomerPlugin插件 -90000001 - diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/pluginCfg.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/pluginCfg.xml deleted file mode 100644 index e6a21caa..00000000 --- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/pluginCfg.xml +++ /dev/null @@ -1,6 +0,0 @@ - - -MdmProjectPlugin -MdmProjectPlugin插件 -90000001 - diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-dao.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-dao.xml deleted file mode 100644 index 4b2b24ab..00000000 --- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-dao.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-plugin.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-plugin.xml deleted file mode 100644 index 272d01ca..00000000 --- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-plugin.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-service.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-service.xml deleted file mode 100644 index 5b26e6ed..00000000 --- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-service.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-dao.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-dao.xml deleted file mode 100644 index 08c20d5f..00000000 --- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-dao.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-plugin.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-plugin.xml deleted file mode 100644 index a9e42b61..00000000 --- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-plugin.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-service.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-service.xml deleted file mode 100644 index 0b5dc5ca..00000000 --- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-service.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/pluginCfg.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData/pluginCfg.xml similarity index 61% rename from buildpackage/src/main/resources/cfgHome/plugin/masterData.user/pluginCfg.xml rename to buildpackage/src/main/resources/cfgHome/plugin/masterData/pluginCfg.xml index b7b315a4..e9adf11a 100644 --- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/pluginCfg.xml +++ b/buildpackage/src/main/resources/cfgHome/plugin/masterData/pluginCfg.xml @@ -1,6 +1,6 @@ -MdmUserPlugin -MdmUserPlugin插件 +MdmPlugin +MdmPlugin插件 90000001 diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-dao.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-dao.xml similarity index 84% rename from buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-dao.xml rename to buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-dao.xml index 62161706..471dd4a6 100644 --- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-dao.xml +++ b/buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-dao.xml @@ -1,5 +1,5 @@ - + diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-plugin.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-plugin.xml similarity index 80% rename from buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-plugin.xml rename to buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-plugin.xml index 41c79445..6943ad23 100644 --- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-plugin.xml +++ b/buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-plugin.xml @@ -1,5 +1,5 @@ - + diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-service.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-service.xml similarity index 81% rename from buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-service.xml rename to buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-service.xml index cdbf695b..c642948f 100644 --- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-service.xml +++ b/buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-service.xml @@ -1,5 +1,5 @@ - + From 5dfcb9037f1275e3c037c65ecd812eee622d8962 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Mon, 24 Jun 2024 11:54:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=EF=BC=8C=E9=87=8D=E6=96=B0=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java b/service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java index b88c5880..3db99c32 100644 --- a/service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java +++ b/service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java @@ -147,6 +147,8 @@ public class DsDataSourceUtil { driveClass = DataSourceUtilProperties.SQL2000DRIVER; } else if ("2".equalsIgnoreCase(dataSourceEntity.getSourceType())) { driveClass = DataSourceUtilProperties.SQL2005DRIVER; + } else if ("4".equalsIgnoreCase(dataSourceEntity.getSourceType())) { + driveClass = DataSourceUtilProperties.dm; } try { //测试连接 From 2a3a1520f7fa5d9e391014f57b2d72e57305e841 Mon Sep 17 00:00:00 2001 From: yuqh <123456> Date: Mon, 24 Jun 2024 14:34:28 +0800 Subject: [PATCH 4/4] =?UTF-8?q?MDM=E5=85=AC=E7=94=A8=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/MdmModuleSourceEntity.java | 18 +++++ .../entity/MdmModuleSourceEntity.xml | 65 ++++++++++++------- 2 files changed, 61 insertions(+), 22 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java index 51182979..1267d9b6 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java @@ -33,6 +33,24 @@ public class MdmModuleSourceEntity extends BaseEntity { private String pluginCode;//插件编码 private String appType;//应用类型 private String dbCode;//数据源编码 + private String appName;//应用名称 + private String mdmCode;//主数据编码 + + public String getAppName() { + return appName; + } + + public void setAppName(String appName) { + this.appName = appName; + } + + public String getMdmCode() { + return mdmCode; + } + + public void setMdmCode(String mdmCode) { + this.mdmCode = mdmCode; + } public String getAppType() { return appType; diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml index cb0fc7ce..e30101f1 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml @@ -23,6 +23,8 @@ + + @@ -172,24 +174,24 @@ @@ -329,10 +331,29 @@ update mdm_module_source set sts= 'N' ,modify_time = #{modify_time},modify_user