From 8ab6b88fb0286da1fd6077176de9cdb559a9cf35 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Fri, 21 Jun 2024 11:37:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E8=BF=94=E5=9B=9E=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ComparisonServiceImpl.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java index 6e3226f4..4de0f073 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java @@ -93,20 +93,25 @@ public class ComparisonServiceImpl extends BaseService } comparisonEntity.setMap(map); try { + List list=new ArrayList<>(); + //查询主表数据 List> comparisonEntitiePages = comparisonDao.queryComparisonPage(comparisonEntity); - JSONArray jsonArray=new JSONArray(); if(CollectionUtils.isNotEmpty(comparisonEntitiePages)){ for (Map comparisonEntitiePage : comparisonEntitiePages) { + JSONObject jsonObjects=new JSONObject(); + jsonObjects.put(comparisonEntity.getDbName(),comparisonEntitiePage); comparisonDetailsEntity.setFormmainId(String.valueOf(comparisonEntitiePage.get("id"))); + //查询明细表数据 List> maps = comparisonDetailsDao.queryComparisonDetailsPage(comparisonDetailsEntity); - jsonArray.add(maps); + if(CollectionUtils.isNotEmpty(maps)){ + jsonObjects.put(comparisonDetailsEntity.getDbName(),maps); + }else { + jsonObjects.put(comparisonDetailsEntity.getDbName(),new JSONArray()); + } + list.add(jsonObjects); } } - JSONObject jsonObjects=new JSONObject(); - jsonObjects.put("main",comparisonEntitiePages); - jsonObjects.put("details",jsonArray); - List jsonObjects1 = JSON.parseArray(jsonObjects.toJSONString(), JSONObject.class); - PageInfo pageInfo = new PageInfo(jsonObjects1); + PageInfo pageInfo = new PageInfo(list); return BaseResult.getSuccessMessageEntity("查询成功", pageInfo); } catch (Exception e) { logger.info("查询通用数据错误:{}", e.getMessage()); From 6b39d8b54dd965ecce3d0d6b63325a560dd7ec69 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Fri, 21 Jun 2024 11:41:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=BE=97=E6=93=8D=E4=BD=9C=E4=BF=9D=E5=AD=98=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sysnew/comparison/service/impl/ComparisonServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java index 4de0f073..0045280f 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java @@ -318,7 +318,7 @@ public class ComparisonServiceImpl extends BaseService comparisonDetailsEntity.setMapDetails(mapDetails); comparisonDetailsDao.updateComparisonDetailsByType(comparisonDetailsEntity); //保存操作日志 - controlsLogDaoimpl.saveControlsLog(comparisonDetailsEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口更新",jsonObject.getString("optionName"),comparisonDetailsEntity.getDbName()+"_option_log"); + // controlsLogDaoimpl.saveControlsLog(comparisonDetailsEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口更新",jsonObject.getString("optionName"),comparisonDetailsEntity.getDbName()+"_option_log"); } //保存操作日志 controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口更新",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); @@ -390,7 +390,7 @@ public class ComparisonServiceImpl extends BaseService comparisonDetailsEntity.setFormmainId(jsonObjectMain.getString("id")); comparisonDetailsEntity.setModify_user_id("c796fd9ba4c9f5ff3cc2fa41a040e443"); comparisonDetailsDao.deleteComparisonDetails(comparisonDetailsEntity); - controlsLogDaoimpl.saveControlsLog(comparisonDetailsEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口删除",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); + // controlsLogDaoimpl.saveControlsLog(comparisonDetailsEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口删除",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); } controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口删除",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); return BaseResult.getSuccessMessageEntity("删除成功",integer); From e1adda59aeb1d29e30178535f5dd982239b8f698 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Fri, 21 Jun 2024 13:59:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=BB=A5=E5=8F=8A=E6=98=8E=E7=BB=86=E6=8F=92?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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/entity/MdmCustomerEntity.java | 186 +++++++++ .../customer/entity/MdmCustomerEntity.xml | 377 ++++++++++++++++++ .../plugin/MdmCustomerPluginInitializer.java | 50 +++ .../customer/service/IMdmCustomerService.java | 12 + .../service/impl/MdmCustomerServiceImpl.java | 25 ++ .../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 + .../spring/spring-buildpackage-dao.xml | 5 + .../spring/spring-buildpackage-plugin.xml | 5 + .../spring/spring-buildpackage-service.xml | 5 + 22 files changed, 1194 insertions(+) create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/IMdmCustomerBankDao.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/impl/MdmCustomerBankDaoImpl.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.xml create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/plugin/MdmCustomerBankPluginInitializer.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/IMdmCustomerBankService.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/impl/MdmCustomerBankServiceImpl.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/IMdmCustomerDao.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/impl/MdmCustomerDaoImpl.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/entity/MdmCustomerEntity.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/entity/MdmCustomerEntity.xml create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/plugin/MdmCustomerPluginInitializer.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/IMdmCustomerService.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/impl/MdmCustomerServiceImpl.java create mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/pluginCfg.xml create mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-dao.xml create mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-plugin.xml create mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-service.xml create mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/pluginCfg.xml create mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-dao.xml create mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-plugin.xml create mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-service.xml 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 new file mode 100644 index 00000000..d22d954a --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/IMdmCustomerBankDao.java @@ -0,0 +1,15 @@ +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 new file mode 100644 index 00000000..78161b29 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/impl/MdmCustomerBankDaoImpl.java @@ -0,0 +1,16 @@ +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 new file mode 100644 index 00000000..4c389315 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.java @@ -0,0 +1,86 @@ +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 new file mode 100644 index 00000000..3689e8c9 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.xml @@ -0,0 +1,267 @@ + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 00000000..e62824b8 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/plugin/MdmCustomerBankPluginInitializer.java @@ -0,0 +1,50 @@ +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 new file mode 100644 index 00000000..b1be580d --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/IMdmCustomerBankService.java @@ -0,0 +1,12 @@ +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 new file mode 100644 index 00000000..11fe5130 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/impl/MdmCustomerBankServiceImpl.java @@ -0,0 +1,25 @@ +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 new file mode 100644 index 00000000..8b8ae96e --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/IMdmCustomerDao.java @@ -0,0 +1,15 @@ +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 new file mode 100644 index 00000000..8899979b --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/impl/MdmCustomerDaoImpl.java @@ -0,0 +1,16 @@ +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/entity/MdmCustomerEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/entity/MdmCustomerEntity.java new file mode 100644 index 00000000..7e61cc1c --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/entity/MdmCustomerEntity.java @@ -0,0 +1,186 @@ +package com.hzya.frame.plugin.masterData.customer.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 客户档案(MdmCustomer)实体类 + * + * @author makejava + * @since 2024-06-21 13:52:35 + */ +public class MdmCustomerEntity 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 code; + /** 客户类型 */ + private String custprop; + /** 客户状态 */ + private String custstate; + /** 启用状态 */ + private String enablestate; + /** 客户名称 */ + private String name; + /** 国家/地区 */ + private String pkCountry; + /** 客户基本分类 */ + private String pkCustclass; + /** 所属集团 */ + private String pkGroup; + /** 所属组织 */ + private String pkOrg; + /** 纳税人登记号 */ + private String taxpayerid; + + + 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 getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getCustprop() { + return custprop; + } + + public void setCustprop(String custprop) { + this.custprop = custprop; + } + + public String getCuststate() { + return custstate; + } + + public void setCuststate(String custstate) { + this.custstate = custstate; + } + + public String getEnablestate() { + return enablestate; + } + + public void setEnablestate(String enablestate) { + this.enablestate = enablestate; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPkCountry() { + return pkCountry; + } + + public void setPkCountry(String pkCountry) { + this.pkCountry = pkCountry; + } + + public String getPkCustclass() { + return pkCustclass; + } + + public void setPkCustclass(String pkCustclass) { + this.pkCustclass = pkCustclass; + } + + public String getPkGroup() { + return pkGroup; + } + + public void setPkGroup(String pkGroup) { + this.pkGroup = pkGroup; + } + + public String getPkOrg() { + return pkOrg; + } + + public void setPkOrg(String pkOrg) { + this.pkOrg = pkOrg; + } + + public String getTaxpayerid() { + return taxpayerid; + } + + public void setTaxpayerid(String taxpayerid) { + this.taxpayerid = taxpayerid; + } + +} + 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/customer/entity/MdmCustomerEntity.xml new file mode 100644 index 00000000..41c3a4ff --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/entity/MdmCustomerEntity.xml @@ -0,0 +1,377 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + ,code + ,custprop + ,custstate + ,enablestate + ,name + ,pk_country + ,pk_custclass + ,pk_group + ,pk_org + ,taxpayerid + + + + + + + + + + + + + + + + insert into mdm_customer( + + 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 , + code , + custprop , + custstate , + enablestate , + name , + pk_country , + pk_custclass , + pk_group , + pk_org , + taxpayerid , + 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} , + #{code} , + #{custprop} , + #{custstate} , + #{enablestate} , + #{name} , + #{pkCountry} , + #{pkCustclass} , + #{pkGroup} , + #{pkOrg} , + #{taxpayerid} , + (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_customer a WHERE a.sts = 'Y' ), + 'Y', + + ) + + + + insert into mdm_customer(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, code, custprop, custstate, enablestate, name, pk_country, pk_custclass, pk_group, pk_org, taxpayerid, 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.code},#{entity.custprop},#{entity.custstate},#{entity.enablestate},#{entity.name},#{entity.pkCountry},#{entity.pkCustclass},#{entity.pkGroup},#{entity.pkOrg},#{entity.taxpayerid}, 'Y') + + + + + insert into mdm_customer(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, code, custprop, custstate, enablestate, name, pk_country, pk_custclass, pk_group, pk_org, taxpayerid) + 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.code},#{entity.custprop},#{entity.custstate},#{entity.enablestate},#{entity.name},#{entity.pkCountry},#{entity.pkCustclass},#{entity.pkGroup},#{entity.pkOrg},#{entity.taxpayerid}) + + 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), + code = values(code), + custprop = values(custprop), + custstate = values(custstate), + enablestate = values(enablestate), + name = values(name), + pk_country = values(pk_country), + pk_custclass = values(pk_custclass), + pk_group = values(pk_group), + pk_org = values(pk_org), + taxpayerid = values(taxpayerid) + + +update mdm_customer 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}, + code = #{code}, + custprop = #{custprop}, + custstate = #{custstate}, + enablestate = #{enablestate}, + name = #{name}, + pk_country = #{pkCountry}, + pk_custclass = #{pkCustclass}, + pk_group = #{pkGroup}, + pk_org = #{pkOrg}, + taxpayerid = #{taxpayerid}, + +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} + 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 code = #{code} + and custprop = #{custprop} + and custstate = #{custstate} + and enablestate = #{enablestate} + and name = #{name} + and pk_country = #{pkCountry} + and pk_custclass = #{pkCustclass} + and pk_group = #{pkGroup} + and pk_org = #{pkOrg} + and taxpayerid = #{taxpayerid} + and sts='Y' + + + + + delete from mdm_customer where id = #{id} + + + + 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/customer/plugin/MdmCustomerPluginInitializer.java new file mode 100644 index 00000000..a1eb009e --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/plugin/MdmCustomerPluginInitializer.java @@ -0,0 +1,50 @@ +package com.hzya.frame.plugin.masterData.customer.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; +/** + * 客户档案(MdmCustomer)表服务接口 + * + * @author makejava + * @since 2024-06-21 13:52:35 + */ +public class MdmCustomerPluginInitializer extends PluginBaseEntity{ + Logger logger = LoggerFactory.getLogger(MdmCustomerPluginInitializer.class); + + @Override + public void initialize() { + logger.info(getPluginLabel() + "執行初始化方法initialize()"); + } + + @Override + public void destroy() { + logger.info(getPluginLabel() + "執行銷毀方法destroy()"); + } + + @Override + public String getPluginId() { + return "MdmCustomerPlugin"; + } + + @Override + public String getPluginName() { + return "MdmCustomerPlugin插件"; + } + + @Override + public String getPluginLabel() { + return "MdmCustomerPlugin"; + } + + @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/service/IMdmCustomerService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/IMdmCustomerService.java new file mode 100644 index 00000000..83ea4dfe --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/IMdmCustomerService.java @@ -0,0 +1,12 @@ +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 new file mode 100644 index 00000000..6e48b6d1 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/impl/MdmCustomerServiceImpl.java @@ -0,0 +1,25 @@ +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/resources/cfgHome/plugin/masterData.customer.bank/pluginCfg.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/pluginCfg.xml new file mode 100644 index 00000000..5543d57a --- /dev/null +++ b/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/pluginCfg.xml @@ -0,0 +1,6 @@ + + +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 new file mode 100644 index 00000000..d3358861 --- /dev/null +++ b/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-dao.xml @@ -0,0 +1,5 @@ + + + + + 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 new file mode 100644 index 00000000..d99236a7 --- /dev/null +++ b/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-plugin.xml @@ -0,0 +1,5 @@ + + + + + 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 new file mode 100644 index 00000000..5fe75f54 --- /dev/null +++ b/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-service.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/pluginCfg.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/pluginCfg.xml new file mode 100644 index 00000000..df03dbcd --- /dev/null +++ b/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/pluginCfg.xml @@ -0,0 +1,6 @@ + + +MdmCustomerPlugin +MdmCustomerPlugin插件 +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.customer/spring/spring-buildpackage-dao.xml new file mode 100644 index 00000000..62161706 --- /dev/null +++ b/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-dao.xml @@ -0,0 +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.customer/spring/spring-buildpackage-plugin.xml new file mode 100644 index 00000000..41c79445 --- /dev/null +++ b/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-plugin.xml @@ -0,0 +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.customer/spring/spring-buildpackage-service.xml new file mode 100644 index 00000000..cdbf695b --- /dev/null +++ b/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-service.xml @@ -0,0 +1,5 @@ + + + + +