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 new file mode 100644 index 00000000..7f9d06c5 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/IMdmOrgDao.java @@ -0,0 +1,15 @@ +package masterData.dao; + +import masterData.entity.MdmOrgEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 组织档案(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 new file mode 100644 index 00000000..3648d6b9 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/impl/MdmOrgDaoImpl.java @@ -0,0 +1,16 @@ +package masterData.dao.impl; + +import masterData.entity.MdmOrgEntity; +import masterData.dao.IMdmOrgDao; +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 new file mode 100644 index 00000000..8d502635 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.java @@ -0,0 +1,196 @@ +package masterData.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 new file mode 100644 index 00000000..c14c6a01 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.xml @@ -0,0 +1,388 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 00000000..f4e7c8f6 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/plugin/MdmOrgPluginInitializer.java @@ -0,0 +1,62 @@ +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 new file mode 100644 index 00000000..fe82b199 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/IMdmOrgService.java @@ -0,0 +1,12 @@ +package masterData.service; + +import masterData.entity.MdmOrgEntity; +import com.hzya.frame.basedao.service.IBaseService; +/** + * 组织档案(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 new file mode 100644 index 00000000..700a73ce --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/impl/MdmOrgServiceImpl.java @@ -0,0 +1,25 @@ +package masterData.service.impl; + +import masterData.entity.MdmOrgEntity; +import masterData.dao.IMdmOrgDao; +import masterData.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/project/dao/IMdmProjectDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java new file mode 100644 index 00000000..7389b3cc --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java @@ -0,0 +1,15 @@ +package masterData.dao; + +import masterData.entity.MdmProjectEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 项目档案(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 new file mode 100644 index 00000000..3da10ccc --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/impl/MdmProjectDaoImpl.java @@ -0,0 +1,16 @@ +package masterData.dao.impl; + +import masterData.entity.MdmProjectEntity; +import masterData.dao.IMdmProjectDao; +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 new file mode 100644 index 00000000..958d6fc5 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.java @@ -0,0 +1,186 @@ +package masterData.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 new file mode 100644 index 00000000..6003878f --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.xml @@ -0,0 +1,377 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 00000000..0a554a69 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/plugin/MdmProjectPluginInitializer.java @@ -0,0 +1,64 @@ +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 new file mode 100644 index 00000000..58e801b2 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/IMdmProjectService.java @@ -0,0 +1,12 @@ +package masterData.service; + +import masterData.entity.MdmProjectEntity; +import com.hzya.frame.basedao.service.IBaseService; +/** + * 项目档案(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 new file mode 100644 index 00000000..4dc5e249 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/impl/MdmProjectServiceImpl.java @@ -0,0 +1,25 @@ +package masterData.service.impl; + +import masterData.entity.MdmProjectEntity; +import masterData.dao.IMdmProjectDao; +import masterData.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/resources/application-hclocal.yml b/buildpackage/src/main/resources/application-hclocal.yml index 5d960999..b88db817 100644 --- a/buildpackage/src/main/resources/application-hclocal.yml +++ b/buildpackage/src/main/resources/application-hclocal.yml @@ -6,18 +6,22 @@ logging: encodings: UTF-8 file: # 日志保存路径 - path: /Users/apple/Desktop/log/local + path: D:\yongansystem\kangarooDataCenter\v3\logs spring: datasource: dynamic: datasource: master: - url: jdbc:mysql://hzya.ufyct.com:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true - username: root - password: bd993088e8a7c3dc5f44441617f9b4bf - driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 +# url: jdbc:mysql://hzya.ufyct.com:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true +# username: root +# password: bd993088e8a7c3dc5f44441617f9b4bf +# driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 + url: jdbc:mysql://hzya.ufyct.com:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true + username: root + password: 62e4295b615a30dbf3b8ee96f41c820b + driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 savefile: # 文件保存路径 - path: /Users/apple/Desktop/log/local + path: D:\yongansystem\kangarooDataCenter\v3\logs ax: url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface \ No newline at end of file diff --git a/buildpackage/src/main/resources/flyway/V3.0.3__mdm_add_updateApi_and_enabledState.sql b/buildpackage/src/main/resources/flyway/V3.0.3__mdm_add_updateApi_and_enabledState.sql new file mode 100644 index 00000000..393f0fdc --- /dev/null +++ b/buildpackage/src/main/resources/flyway/V3.0.3__mdm_add_updateApi_and_enabledState.sql @@ -0,0 +1,3 @@ +ALTER TABLE mdm_module_distribute ADD COLUMN update_api VARCHAR(50) DEFAULT NULL COMMENT '修改接口'; +ALTER TABLE mdm_module_distribute ADD COLUMN enabled_state CHAR(1) DEFAULT NULL COMMENT '启用停用 0、停用1、启用'; +COMMIT; \ No newline at end of file diff --git a/common/src/main/java/com/hzya/frame/execsql/service/ExecSqlServiceImpl.java b/common/src/main/java/com/hzya/frame/execsql/service/ExecSqlServiceImpl.java index 468e0c3c..ff02bcc4 100644 --- a/common/src/main/java/com/hzya/frame/execsql/service/ExecSqlServiceImpl.java +++ b/common/src/main/java/com/hzya/frame/execsql/service/ExecSqlServiceImpl.java @@ -53,7 +53,7 @@ public class ExecSqlServiceImpl implements IExecSqlService { public List> execSelectSql(ExecSqlEntity entity) throws RuntimeException { List> list = new ArrayList<>(); logger.info("=============进入execSelectSql方法============"); - if (null != entity && ObjectUtils.isEmpty(entity.getSql())) { + if (null != entity && null!=entity.getSql()) { //sqlsession // SqlSession sqlSession = getSqlSession(entity.getDatasource_code()); // SqlSession sqlSession = new DataSourceUtil().getDefaultSqlSession(); @@ -61,7 +61,7 @@ public class ExecSqlServiceImpl implements IExecSqlService { logger.info("=============execSelectSql方法要执行的sql：============" + select_sql); if (!select_sql.contains("update") && !select_sql.contains("delete") && !select_sql.contains("insert") && !select_sql.contains("create")) { - list = sqlSession.selectList("com.hzya.frame.sysnew.execsql.entity.ExecSqlEntity.ExecSqlEntity_execsql", entity); + list = sqlSession.selectList("com.hzya.frame.execsql.entity.ExecSqlEntity.ExecSqlEntity_execsql", entity); logger.info("===========execSelectSql方法返回的结果条数=============" + list.size()); } //sqlSession.close(); diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/DbFiledsDto.java b/service/src/main/java/com/hzya/frame/mdm/entity/DbFiledsDto.java index ae094e16..e0f5e05b 100644 --- a/service/src/main/java/com/hzya/frame/mdm/entity/DbFiledsDto.java +++ b/service/src/main/java/com/hzya/frame/mdm/entity/DbFiledsDto.java @@ -8,7 +8,7 @@ import java.util.List; public class DbFiledsDto { /** - * 1\修改 2、新增 + * 1新增 2、修改 */ private String dataType; diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDbFiledVo.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDbFiledVo.java index 70da08eb..921f2e8b 100644 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDbFiledVo.java +++ b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDbFiledVo.java @@ -1,10 +1,5 @@ package com.hzya.frame.mdm.entity; -import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; -import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity; -import com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.entity.MdmModuleDbFiledsRuleFilesEntity; - -import java.util.List; public class MdmDbFiledVo { private String id; diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDbVo.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDbVo.java index ed01bc0b..4062fd9d 100644 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDbVo.java +++ b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDbVo.java @@ -1,25 +1,19 @@ package com.hzya.frame.mdm.entity; -import com.fasterxml.jackson.annotation.JsonFormat; import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; -import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity; -import com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.entity.MdmModuleDbFiledsRuleFilesEntity; import com.hzya.frame.mdm.mdmTableCodeRule.entity.MdmTableCodeRuleEntity; -import org.springframework.format.annotation.DateTimeFormat; -import java.util.Date; import java.util.List; public class MdmDbVo { + //单据编码规则 + private List mdmTableCodeRuleEntityList; //主数据主表 private MdmModuleDbEntity mainMdmModuleDb; //主数据子表 private List sublistMdmModuleDb; - //控件字段规则属性 - private List moduleDbFiledsRuleFiles; - //单据编码规则 - private List mdmTableCodeRuleEntityList; + public List getMdmTableCodeRuleEntityList() { @@ -30,14 +24,6 @@ public class MdmDbVo { this.mdmTableCodeRuleEntityList = mdmTableCodeRuleEntityList; } - public List getModuleDbFiledsRuleFiles() { - return moduleDbFiledsRuleFiles; - } - - public void setModuleDbFiledsRuleFiles(List moduleDbFiledsRuleFiles) { - this.moduleDbFiledsRuleFiles = moduleDbFiledsRuleFiles; - } - public MdmModuleDbEntity getMainMdmModuleDb() { return mainMdmModuleDb; } diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDistributeDto.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDistributeDto.java index d27cc712..57b97fdc 100644 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDistributeDto.java +++ b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDistributeDto.java @@ -2,16 +2,13 @@ package com.hzya.frame.mdm.entity; import com.hzya.frame.mdm.mdmModuleDistribute.entity.MdmModuleDistributeEntity; -import com.hzya.frame.mdm.mdmModuleRole.entity.MdmModuleRoleEntity; - import java.util.List; public class MdmDistributeDto { - //id - private String id; - + //主数据编码 + private Long mdmCode; private List mdmModuleDistributeEntities; @@ -23,12 +20,12 @@ public class MdmDistributeDto { this.mdmModuleDistributeEntities = mdmModuleDistributeEntities; } - public String getId() { - return id; + public Long getMdmCode() { + return mdmCode; } - public void setId(String id) { - this.id = id; + public void setMdmCode(Long mdmCode) { + this.mdmCode = mdmCode; } } diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDistributeEntity.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDistributeEntity.java deleted file mode 100644 index 1511ea4f..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDistributeEntity.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.hzya.frame.mdm.entity; - -import com.hzya.frame.web.entity.BaseEntity; - -public class MdmDistributeEntity extends BaseEntity { - - private String tableName; - private String formmainId; - private String appId; - private String status;//1、发送成功 2、发送中 3、发送失败 4、未发送 - private String msg; - - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } - - public String getFormmainId() { - return formmainId; - } - - public void setFormmainId(String formmainId) { - this.formmainId = formmainId; - } - - public String getAppId() { - return appId; - } - - public void setAppId(String appId) { - this.appId = appId; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getMsg() { - return msg; - } - - public void setMsg(String msg) { - this.msg = msg; - } -} - diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDistributeVo.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDistributeVo.java deleted file mode 100644 index dcf828ec..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDistributeVo.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.hzya.frame.mdm.entity; - -public class MdmDistributeVo { - - /** - * 数据 - */ - private String formmainId; - - /** - * 应用id - */ - private String appId; - /** - * 状态 1、发送成功 2、发送中 3、发送失败 4、未发送 - */ - private String status; - /** - *描述 - */ - private String msg; - - public String getFormmainId() { - return formmainId; - } - - public void setFormmainId(String formmainId) { - this.formmainId = formmainId; - } - - public String getAppId() { - return appId; - } - - public void setAppId(String appId) { - this.appId = appId; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getMsg() { - return msg; - } - - public void setMsg(String msg) { - this.msg = msg; - } -} - diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDto.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDto.java index 762303a8..ae393466 100644 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDto.java +++ b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDto.java @@ -2,13 +2,22 @@ package com.hzya.frame.mdm.entity; import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; -import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity; import com.hzya.frame.mdm.mdmTableCodeRule.entity.MdmTableCodeRuleEntity; import java.util.List; public class MdmDto { + //主数据编码 + private Long mdmCode; + //单据编码规则 + private List mdmTableCodeRuleEntityList; + //主数据主表 + private MdmModuleDbEntity mainMdmModuleDb; + //主数据子表 + private List sublistMdmModuleDb; + + //id private String id; //3、新增4、修改 5、查看 @@ -26,20 +35,12 @@ public class MdmDto { private String upIdFiled; //主数据名称 private String mdmName; - //主数据编码 - private Integer mdmCode; //主数据类型 private String mdmType; //描述 private String remark; //描述 private String[] ids; - //单据编码规则 - private List mdmTableCodeRuleEntityList; - //主数据主表 - private MdmModuleDbEntity mainMdmModuleDb; - //主数据子表 - private List sublistMdmModuleDb; private String tableName; private String value; @@ -49,21 +50,20 @@ public class MdmDto { private String upId; - - public String getLableValue() { - return lableValue; + public Long getMdmCode() { + return mdmCode; } - public void setLableValue(String lableValue) { - this.lableValue = lableValue; + public void setMdmCode(Long mdmCode) { + this.mdmCode = mdmCode; } - public String getValue() { - return value; + public List getMdmTableCodeRuleEntityList() { + return mdmTableCodeRuleEntityList; } - public void setValue(String value) { - this.value = value; + public void setMdmTableCodeRuleEntityList(List mdmTableCodeRuleEntityList) { + this.mdmTableCodeRuleEntityList = mdmTableCodeRuleEntityList; } public MdmModuleDbEntity getMainMdmModuleDb() { @@ -82,30 +82,6 @@ public class MdmDto { this.sublistMdmModuleDb = sublistMdmModuleDb; } - public String getMdmName() { - return mdmName; - } - - public void setMdmName(String mdmName) { - this.mdmName = mdmName; - } - - public Integer getMdmCode() { - return mdmCode; - } - - public void setMdmCode(Integer mdmCode) { - this.mdmCode = mdmCode; - } - - public String getMdmType() { - return mdmType; - } - - public void setMdmType(String mdmType) { - this.mdmType = mdmType; - } - public String getId() { return id; } @@ -114,6 +90,14 @@ public class MdmDto { this.id = id; } + public String getShowType() { + return showType; + } + + public void setShowType(String showType) { + this.showType = showType; + } + public Integer getPageNum() { return pageNum; } @@ -130,30 +114,6 @@ public class MdmDto { this.pageSize = pageSize; } - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getShowType() { - return showType; - } - - public void setShowType(String showType) { - this.showType = showType; - } - - public List getMdmTableCodeRuleEntityList() { - return mdmTableCodeRuleEntityList; - } - - public void setMdmTableCodeRuleEntityList(List mdmTableCodeRuleEntityList) { - this.mdmTableCodeRuleEntityList = mdmTableCodeRuleEntityList; - } - public String getViewFiled() { return viewFiled; } @@ -170,6 +130,38 @@ public class MdmDto { this.upIdFiled = upIdFiled; } + public String getMdmName() { + return mdmName; + } + + public void setMdmName(String mdmName) { + this.mdmName = mdmName; + } + + public String getMdmType() { + return mdmType; + } + + public void setMdmType(String mdmType) { + this.mdmType = mdmType; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String[] getIds() { + return ids; + } + + public void setIds(String[] ids) { + this.ids = ids; + } + public String getTableName() { return tableName; } @@ -178,6 +170,14 @@ public class MdmDto { this.tableName = tableName; } + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + public String getLabel() { return label; } @@ -186,6 +186,14 @@ public class MdmDto { this.label = label; } + public String getLableValue() { + return lableValue; + } + + public void setLableValue(String lableValue) { + this.lableValue = lableValue; + } + public String getUpId() { return upId; } @@ -193,13 +201,5 @@ public class MdmDto { public void setUpId(String upId) { this.upId = upId; } - - public String[] getIds() { - return ids; - } - - public void setIds(String[] ids) { - this.ids = ids; - } } diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmModuleViewDto.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmModuleViewDto.java index 4386ac8c..047809ee 100644 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmModuleViewDto.java +++ b/service/src/main/java/com/hzya/frame/mdm/entity/MdmModuleViewDto.java @@ -1,14 +1,14 @@ package com.hzya.frame.mdm.entity; import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity; +import com.hzya.frame.mdm.mdmModuleViewButton.entity.MdmModuleViewButtonEntity; import com.hzya.frame.mdm.mdmModuleViewDetail.entity.MdmModuleViewDetailEntity; import java.util.List; public class MdmModuleViewDto { - //id - private String id; + private Long mdmCode; //模版 private MdmModuleViewEntity mdmModuleViewEntity; //新增 @@ -21,6 +21,8 @@ public class MdmModuleViewDto { private List queryFiled; //列表 private List listFiled; + //按钮 + private List dbButtonFiled; public MdmModuleViewEntity getMdmModuleViewEntity() { return mdmModuleViewEntity; @@ -70,12 +72,20 @@ public class MdmModuleViewDto { this.listFiled = listFiled; } - public String getId() { - return id; + public Long getMdmCode() { + return mdmCode; } - public void setId(String id) { - this.id = id; + public void setMdmCode(Long mdmCode) { + this.mdmCode = mdmCode; + } + + public List getDbButtonFiled() { + return dbButtonFiled; + } + + public void setDbButtonFiled(List dbButtonFiled) { + this.dbButtonFiled = dbButtonFiled; } } diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmModuleViewVo.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmModuleViewVo.java index e41fc9ae..67429ac6 100644 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmModuleViewVo.java +++ b/service/src/main/java/com/hzya/frame/mdm/entity/MdmModuleViewVo.java @@ -1,6 +1,7 @@ package com.hzya.frame.mdm.entity; import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity; +import com.hzya.frame.mdm.mdmModuleViewButton.entity.MdmModuleViewButtonEntity; import com.hzya.frame.mdm.mdmModuleViewDetail.entity.MdmModuleViewDetailEntity; import java.util.List; @@ -31,6 +32,8 @@ public class MdmModuleViewVo { private List dbQueryFiled; //列表 private List dbListFiled; + //按钮 + private List dbButtonFiled; public List getAddFiled() { return addFiled; @@ -119,5 +122,15 @@ public class MdmModuleViewVo { public void setDbListFiled(List dbListFiled) { this.dbListFiled = dbListFiled; } + + public List getDbButtonFiled() { + return dbButtonFiled; + } + + public void setDbButtonFiled(List dbButtonFiled) { + this.dbButtonFiled = dbButtonFiled; + } + + } diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmRoleDto.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmRoleDto.java deleted file mode 100644 index 1a235852..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmRoleDto.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hzya.frame.mdm.entity; - - -import com.hzya.frame.mdm.mdmModuleRole.entity.MdmModuleRoleEntity; - -import java.util.List; - -public class MdmRoleDto { - - //id - private String id; - - - private List mdmModuleRoleEntities; - - public List getMdmModuleRoleEntities() { - return mdmModuleRoleEntities; - } - - public void setMdmModuleRoleEntities(List mdmModuleRoleEntities) { - this.mdmModuleRoleEntities = mdmModuleRoleEntities; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } -} - diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmSourceDto.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmSourceDto.java new file mode 100644 index 00000000..e00af986 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/entity/MdmSourceDto.java @@ -0,0 +1,34 @@ +package com.hzya.frame.mdm.entity; + + +import com.hzya.frame.mdm.mdmModuleDistribute.entity.MdmModuleDistributeEntity; +import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; + +import java.util.List; + +public class MdmSourceDto { + + + //主数据编码 + private Long mdmCode; + + private List mdmModuleSourceEntities; + + + public List getMdmModuleSourceEntities() { + return mdmModuleSourceEntities; + } + + public void setMdmModuleSourceEntities(List mdmModuleSourceEntities) { + this.mdmModuleSourceEntities = mdmModuleSourceEntities; + } + + public Long getMdmCode() { + return mdmCode; + } + + public void setMdmCode(Long mdmCode) { + this.mdmCode = mdmCode; + } +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmViewButtonVo.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmViewButtonVo.java deleted file mode 100644 index 4722a7b8..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmViewButtonVo.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.hzya.frame.mdm.entity; - -public class MdmViewButtonVo { - - //按钮类型 - private String buttonType; - //按钮名 - private String buttonName; - - public String getButtonType() { - return buttonType; - } - - public void setButtonType(String buttonType) { - this.buttonType = buttonType; - } - - public String getButtonName() { - return buttonName; - } - - public void setButtonName(String buttonName) { - this.buttonName = buttonName; - } - - public MdmViewButtonVo() { - } - - public MdmViewButtonVo(String buttonType, String buttonName) { - this.buttonType = buttonType; - this.buttonName = buttonName; - } -} - diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmViewVo.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmViewVo.java index 25749a1b..8630811e 100644 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmViewVo.java +++ b/service/src/main/java/com/hzya/frame/mdm/entity/MdmViewVo.java @@ -19,8 +19,6 @@ public class MdmViewVo { private List queryList; //列表 private List listList; - //按钮 - private List buttonList; public List getQueryList() { return queryList; @@ -38,13 +36,6 @@ public class MdmViewVo { this.listList = listList; } - public List getButtonList() { - return buttonList; - } - - public void setButtonList(List buttonList) { - this.buttonList = buttonList; - } public String getId() { return id; diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmVo.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmVo.java deleted file mode 100644 index a382ed00..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmVo.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.hzya.frame.mdm.entity; - -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -public class MdmVo { - - //id - private String id; - //主数据名称 - private String mdmName; - //主数据编码 - private String mdmCode; - //主数据类型 1、档案 2、单据 - private String mdmType; - //主数据类型 1、档案 2、单据 - private String mdmTypeName; - //描述 - private String remark; - - /** logo（地址或者id） */ - private String mdmLogo; - private String createUserId; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; - private String modifyUserId; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date modifyTime; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getMdmName() { - return mdmName; - } - - public void setMdmName(String mdmName) { - this.mdmName = mdmName; - } - - public String getMdmCode() { - return mdmCode; - } - - public void setMdmCode(String mdmCode) { - this.mdmCode = mdmCode; - } - - public String getMdmType() { - return mdmType; - } - - public void setMdmType(String mdmType) { - this.mdmType = mdmType; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getMdmTypeName() { - return mdmTypeName; - } - - public void setMdmTypeName(String mdmTypeName) { - this.mdmTypeName = mdmTypeName; - } - - public String getCreateUserId() { - return createUserId; - } - - public void setCreateUserId(String createUserId) { - this.createUserId = createUserId; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public String getModifyUserId() { - return modifyUserId; - } - - public void setModifyUserId(String modifyUserId) { - this.modifyUserId = modifyUserId; - } - - public Date getModifyTime() { - return modifyTime; - } - - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; - } - - public String getMdmLogo() { - return mdmLogo; - } - - public void setMdmLogo(String mdmLogo) { - this.mdmLogo = mdmLogo; - } -} - diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java index 5dbd47ec..8854d3e8 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java @@ -1,14 +1,11 @@ package com.hzya.frame.mdm.mdmModule.dao; import com.hzya.frame.mdm.entity.MdmDataDto; -import com.hzya.frame.mdm.entity.MdmDistributeEntity; import com.hzya.frame.mdm.entity.MdmDto; import com.hzya.frame.mdm.entity.MdmQuery; -import com.hzya.frame.mdm.entity.MdmVo; import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; import com.hzya.frame.basedao.dao.IBaseDao; import com.hzya.frame.sys.entity.FormmainDeleteDto; -import com.hzya.frame.sys.entity.ModuleDto; import java.util.HashMap; import java.util.List; @@ -18,41 +15,29 @@ import java.util.Map; * 主数据模版(mdm_module: table)表数据库访问层 * * @author makejava - * @since 2023-10-17 15:25:41 + * @since 2024-06-03 08:46:29 */ public interface IMdmModuleDao extends IBaseDao { - List queryMdm(MdmDto entity); + List queryMdm(MdmModuleEntity entity); + + MdmModuleEntity getByMdmCode(Long mdmCode); Integer checkTable(Map maps); - Integer createTable(Map maps); - Integer createTableDistribute(Map maps); Integer alterTable(Map maps); Integer alterTableName(Map maps); - List> queryMdmShowData(MdmQuery entity); - + List> queryTemplateDataMore(MdmDto entity); + HashMap queryTemplateDataOne(MdmDto entity); Integer checkData(Map map); - Integer updateForm(MdmDataDto mdmDataDto); Integer saveForm(MdmDataDto mdmDataDto); - Integer deleteTemplateById(FormmainDeleteDto formmainDeleteDto); + Integer deleteChilder(FormmainDeleteDto formmainDeleteDto); + List> querySelectData(MdmDto entity); List> queryDataAll(MdmDto entity); - List> queryTemplateData(ModuleDto entity); - - HashMap queryTemplateDataOne(MdmDto entity); - - List> queryTemplateDataMore(MdmDto entity); - List> querySelectData(MdmDto entity); - - Integer deleteChilder(FormmainDeleteDto formmainDeleteDto); - - Integer saveDistribute(MdmDistributeEntity mdmDistributeEntity); - - Integer updateDistribute(MdmDistributeEntity mdmDistributeEntity); } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java index 0870dac6..9fab50aa 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java @@ -1,14 +1,11 @@ package com.hzya.frame.mdm.mdmModule.dao.impl; import com.hzya.frame.mdm.entity.MdmDataDto; -import com.hzya.frame.mdm.entity.MdmDistributeEntity; import com.hzya.frame.mdm.entity.MdmDto; import com.hzya.frame.mdm.entity.MdmQuery; -import com.hzya.frame.mdm.entity.MdmVo; import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; import com.hzya.frame.mdm.mdmModule.dao.IMdmModuleDao; import com.hzya.frame.sys.entity.FormmainDeleteDto; -import com.hzya.frame.sys.entity.ModuleDto; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; @@ -20,34 +17,94 @@ import java.util.Map; * 主数据模版(MdmModule)表数据库访问层 * * @author makejava - * @since 2023-10-17 15:25:42 + * @since 2024-06-03 08:46:29 */ @Repository(value = "MdmModuleDaoImpl") -public class MdmModuleDaoImpl extends MybatisGenericDao implements IMdmModuleDao { +public class MdmModuleDaoImpl extends MybatisGenericDao implements IMdmModuleDao{ @Override - public List queryMdm(MdmDto entity) { - List o = (List) super.selectList(getSqlIdPrifx() + "queryMdm", entity); + public List queryMdm(MdmModuleEntity entity) { + List o = (List) super.selectList(getSqlIdPrifx() + "queryMdm", entity); return o; } + @Override + public MdmModuleEntity getByMdmCode(Long mdmCode) { + MdmModuleEntity mdmModuleEntity = (MdmModuleEntity) super.selectOne(getSqlIdPrifx() + "getByMdmCode",mdmCode); + return mdmModuleEntity; + } + @Override public Integer checkTable(Map maps) { Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "checkTable", maps); return o; } - @Override - public Integer createTable(Map maps) { - Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "createTable", maps); + public List> queryDataAll(MdmDto entity) { + List> o = (List>) super.selectList(getSqlIdPrifx() + "queryDataAll", entity); return o; } @Override - public Integer createTableDistribute(Map maps) { - Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "createTableDistribute", maps); + public Integer checkData(Map maps) { + Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "checkData", maps); + return o; + + } + @Override + public Integer updateForm(MdmDataDto mdmDataDto) { + Integer o = super.update(getSqlIdPrifx() + "updateForm", mdmDataDto); + return o; + + } + @Override + public List> querySelectData(MdmDto entity) { + List> o = (List>) super.selectList(getSqlIdPrifx() + "querySelectData", entity); + return o; + + } + @Override + public Integer deleteChilder(FormmainDeleteDto entity) { + Integer o = super.delete(getSqlIdPrifx() + "deleteChilder", entity); + return o; + + } + @Override + public Integer deleteTemplateById(FormmainDeleteDto entity) { + Integer o = super.delete(getSqlIdPrifx() + "deleteTemplateById", entity); + return o; + + } + @Override + public Integer saveForm(MdmDataDto mdmDataDto) { + Integer o = super.update(getSqlIdPrifx() + "saveForm", mdmDataDto); + return o; + + } + @Override + public List> queryTemplateDataMore(MdmDto entity) { + List> o = (List>) super.selectList(getSqlIdPrifx() + "queryTemplateDataMore", entity); + return o; + + } + + @Override + public HashMap queryTemplateDataOne(MdmDto entity) { + HashMap o = (HashMap) super.selectOne(getSqlIdPrifx() + "queryTemplateDataOne", entity); + return o; + + } + + @Override + public List> queryMdmShowData(MdmQuery entity) { + List> o = (List>) super.selectList(getSqlIdPrifx() + "queryMdmShowData", entity); + return o; + } + @Override + public Integer createTable(Map maps) { + Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "createTable", maps); return o; } @Override @@ -62,86 +119,5 @@ public class MdmModuleDaoImpl extends MybatisGenericDao return o; } - @Override - public Integer checkData(Map maps) { - Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "checkData", maps); - return o; - - } - @Override - public List> querySelectData(MdmDto entity) { - List> o = (List>) super.selectList(getSqlIdPrifx() + "querySelectData", entity); - return o; - - } - - @Override - public List> queryTemplateDataMore(MdmDto entity) { - List> o = (List>) super.selectList(getSqlIdPrifx() + "queryTemplateDataMore", entity); - return o; - - } - - @Override - public List> queryMdmShowData(MdmQuery entity) { - List> o = (List>) super.selectList(getSqlIdPrifx() + "queryMdmShowData", entity); - return o; - } - @Override - public List> queryDataAll(MdmDto entity) { - List> o = (List>) super.selectList(getSqlIdPrifx() + "queryDataAll", entity); - return o; - } - - @Override - public List> queryTemplateData(ModuleDto entity) { - List> o = (List>) super.selectList(getSqlIdPrifx() + "queryTemplateData", entity); - return o; - - } - @Override - public Integer updateForm(MdmDataDto mdmDataDto) { - Integer o = super.update(getSqlIdPrifx() + "updateForm", mdmDataDto); - return o; - - } - @Override - public Integer saveForm(MdmDataDto mdmDataDto) { - Integer o = super.update(getSqlIdPrifx() + "saveForm", mdmDataDto); - return o; - - } - - @Override - public Integer deleteTemplateById(FormmainDeleteDto entity) { - Integer o = super.delete(getSqlIdPrifx() + "deleteTemplateById", entity); - return o; - - } - - @Override - public Integer deleteChilder(FormmainDeleteDto entity) { - Integer o = super.delete(getSqlIdPrifx() + "deleteChilder", entity); - return o; - - } - - @Override - public Integer saveDistribute(MdmDistributeEntity mdmDistributeEntity) { - Integer o = super.insert(getSqlIdPrifx() + "saveDistribute", mdmDistributeEntity); - return o; - } - @Override - public Integer updateDistribute(MdmDistributeEntity mdmDistributeEntity) { - Integer o = super.update(getSqlIdPrifx() + "updateDistribute", mdmDistributeEntity); - return o; - } - - @Override - public HashMap queryTemplateDataOne(MdmDto entity) { - HashMap o = (HashMap) super.selectOne(getSqlIdPrifx() + "queryTemplateDataOne", entity); - return o; - - } } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.java index 021797ed..ab16aca7 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.java @@ -1,36 +1,31 @@ package com.hzya.frame.mdm.mdmModule.entity; import java.util.Date; - import com.hzya.frame.web.entity.BaseEntity; - /** * 主数据模版(MdmModule)实体类 * * @author makejava - * @since 2023-10-17 15:25:42 + * @since 2024-06-03 08:46:29 */ public class MdmModuleEntity extends BaseEntity { - - - /** logo（地址或者id） */ - private String mdmLogo; - /** - * 主数据名称 - */ - private String mdmName; - /** - * 主数据编码 - */ - private Integer mdmCode; - /** - * 主数据类型 1、档案 2、单据 - */ - private String mdmType; - /** - * 描述 - */ - private String remark; + + /** 主数据名称 */ + private String mdmName; + /** logo */ + private String mdmLogo; + /** 主数据编码 */ + private Long mdmCode; + /** 主数据类型 1、档案 2、单据 */ + private String mdmType; + /** 描述 */ + private String remark; + /** 公司id */ + private String companyId; + //创建人 + private String createUser; + //修改人 + private String modifyUser; public String getMdmName() { @@ -41,11 +36,19 @@ public class MdmModuleEntity extends BaseEntity { this.mdmName = mdmName; } - public Integer getMdmCode() { + public String getMdmLogo() { + return mdmLogo; + } + + public void setMdmLogo(String mdmLogo) { + this.mdmLogo = mdmLogo; + } + + public Long getMdmCode() { return mdmCode; } - public void setMdmCode(Integer mdmCode) { + public void setMdmCode(Long mdmCode) { this.mdmCode = mdmCode; } @@ -65,12 +68,28 @@ public class MdmModuleEntity extends BaseEntity { this.remark = remark; } - public String getMdmLogo() { - return mdmLogo; + public String getCompanyId() { + return companyId; } - public void setMdmLogo(String mdmLogo) { - this.mdmLogo = mdmLogo; + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public String getModifyUser() { + return modifyUser; + } + + public void setModifyUser(String modifyUser) { + this.modifyUser = modifyUser; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; } } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml index 1da23211..4e94d665 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml @@ -2,27 +2,30 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + id ,mdm_name - ,mdm_logo - ,mdm_code + ,mdm_logo + ,mdm_code ,mdm_type ,remark ,sorts @@ -32,252 +35,245 @@ ,modify_time ,sts ,org_id + ,company_id - - + select + + from mdm_module + + and id = #{id} + and mdm_name = #{mdmName} + and mdm_logo = #{mdmLogo} + and mdm_code = #{mdmCode} + and mdm_type = #{mdmType} + and remark = #{remark} + and sorts = #{sorts} + and create_user_id = #{create_user_id} + and create_time = #{create_time} + and modify_user_id = #{modify_user_id} + and modify_time = #{modify_time} + and sts = #{sts} + and org_id = #{org_id} + and company_id = #{companyId} and sts='Y' - - order by sorts asc - order by ${sort} ${order} - - - - + + + - + select + + from mdm_module + + and id like concat('%',#{id},'%') + and mdm_name like concat('%',#{mdmName},'%') + and mdm_logo like concat('%',#{mdmLogo},'%') + and mdm_code like concat('%',#{mdmCode},'%') + and mdm_type like concat('%',#{mdmType},'%') + and remark like concat('%',#{remark},'%') + and sorts like concat('%',#{sorts},'%') + and create_user_id like concat('%',#{create_user_id},'%') + and create_time like concat('%',#{create_time},'%') + and modify_user_id like concat('%',#{modify_user_id},'%') + and modify_time like concat('%',#{modify_time},'%') + and sts like concat('%',#{sts},'%') + and org_id like concat('%',#{org_id},'%') + and company_id like concat('%',#{companyId},'%') and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - + select + + from mdm_module + + or id = #{id} + or mdm_name = #{mdmName} + or mdm_logo = #{mdmLogo} + or mdm_code = #{mdmCode} + or mdm_type = #{mdmType} + or remark = #{remark} + or sorts = #{sorts} + or create_user_id = #{create_user_id} + or create_time = #{create_time} + or modify_user_id = #{modify_user_id} + or modify_time = #{modify_time} + or sts = #{sts} + or org_id = #{org_id} + or company_id = #{companyId} and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - - insert into mdm_module( - - id , - mdm_name , - mdm_logo , - mdm_code , - mdm_code , - mdm_type , - remark , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - sts, - - )values( - - #{id} , - #{mdmName} , - #{mdmLogo} , - #{mdmCode} , + + + insert into mdm_module( + + id , + mdm_name , + mdm_logo , + mdm_code , + mdm_code , + mdm_type , + remark , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sts, + + )values( + + #{id} , + #{mdmName} , + #{mdmLogo} , + #{mdmCode} , (SELECT IFNULL(MAX(b.mdm_code)+1,10001) AS mdmCode FROM mdm_module b ), - #{mdmType} , - #{remark} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - 'Y', - - ) - - - - insert into mdm_module(mdm_name,mdm_logo, mdm_code, mdm_type, remark, sorts, create_user_id, create_time, modify_user_id, - modify_time, sts, org_id, sts) - values - - (#{entity.mdmName},#{entity.mdmLogo},#{entity.mdmCode},#{entity.mdmType},#{entity.remark},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}, - 'Y') - - - - - insert into mdm_module(mdm_name, mdm_logo, mdm_code, mdm_type, remark, sorts, create_user_id, create_time, modify_user_id, - modify_time, sts, org_id) - values - - (#{entity.mdmName},#{entity.mdmLogo},#{entity.mdmCode},#{entity.mdmType},#{entity.remark},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}) - - on duplicate key update - mdm_name = values(mdm_name), - mdm_logo = values(mdm_logo), - mdm_code = values(mdm_code), - mdm_type = values(mdm_type), - remark = values(remark), - sorts = values(sorts), - 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) - - - - update mdm_module set - - mdm_name = #{mdmName}, - mdm_logo = #{mdmLogo}, - mdm_code = #{mdmCode}, - mdm_type = #{mdmType}, - remark = #{remark}, - sorts = #{sorts}, - 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}, - - where id = #{id} - - - + #{mdmType} , + #{remark} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + 'Y', + + ) + + + + insert into mdm_module(mdm_name, mdm_logo, mdm_code, mdm_type, remark, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.mdmName},#{entity.mdmLogo},#{entity.mdmCode},#{entity.mdmType},#{entity.remark},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + + + + + insert into mdm_module(mdm_name, mdm_logo, mdm_code, mdm_type, remark, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.mdmName},#{entity.mdmLogo},#{entity.mdmCode},#{entity.mdmType},#{entity.remark},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + mdm_name = values(mdm_name), + mdm_logo = values(mdm_logo), + mdm_code = values(mdm_code), + mdm_type = values(mdm_type), + remark = values(remark), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + +update mdm_module set + + mdm_name = #{mdmName}, + mdm_logo = #{mdmLogo}, + mdm_code = #{mdmCode}, + mdm_type = #{mdmType}, + remark = #{remark}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + +where id = #{id} + + + update mdm_module set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - - - update mdm_module set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} - - and id = #{id} - and mdm_name = #{mdmName} - and mdm_logo = #{mdmLogo} - and mdm_code = #{mdmCode} - and mdm_type = #{mdmType} - and remark = #{remark} - and sorts = #{sorts} - and sts = #{sts} + + +update mdm_module set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and mdm_name = #{mdmName} + and mdm_logo = #{mdmLogo} + and mdm_code = #{mdmCode} + and mdm_type = #{mdmType} + and remark = #{remark} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} and sts='Y' - - - - + + + + delete from mdm_module where id = #{id} - - - select a.id as id, - a.mdm_name as mdmName, - a.mdm_logo as mdmLogo, - a.mdm_code as mdmCode, - a.mdm_type as mdmType, - sd.column_content as mdmTypeName, + a.mdm_name as mdm_name, + a.mdm_logo as mdm_logo, + a.mdm_code as mdm_code, + a.mdm_type as mdm_type, a.remark as remark, - a.create_time as createTime, - a.modify_time as modifyTime, - d.person_name as createUserId, - n.person_name as modifyUserId + a.create_time as create_time, + a.modify_time as modify_time, + d.person_name as createUser, + n.person_name as modifyUser from mdm_module a - LEFT JOIN sys_dictionaryshop_new sd on sd.column_value = a.mdm_type and sd.tab_name = 'mdm' and sd.column_name = 'mdm_type' and sd.used_sts = '1' LEFT JOIN sys_user c on c.id = a.create_user_id and c.sts = 'Y' LEFT JOIN sys_person d on d.id = c.person_id and d.sts = 'Y' LEFT JOIN sys_user m on m.id = a.modify_user_id and m.sts = 'Y' @@ -293,6 +289,12 @@ where id = #{id} order by a.sorts asc + + + + - + ALTER TABLE ${tableName} COMMENT = #{tableRemark} - - + + + + + + + + + + update ${tableName} set + + + + + ${item.filedsName} = #{item.filedsValue}, + + + modify_user_id = #{item.filedsValue}, + + + + modify_time = now(), + + where id = #{id} + insert into ${tableName}( @@ -497,7 +542,6 @@ where id = #{id} - sorts, create_time, modify_time, sts, @@ -520,8 +564,7 @@ where id = #{id} - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from ${tableName} a WHERE - a.sts = 'Y' ), + now(), now(), 'Y', @@ -578,24 +621,6 @@ where id = #{id} ) - - update ${tableName} set - - - - - ${item.filedsName} = #{item.filedsValue}, - - - modify_user_id = #{item.filedsValue}, - - - - modify_time = now(), - - where id = #{id} - - update ${tableName} set sts='N',modify_time = now(),modify_user_id = #{loginId} @@ -606,82 +631,17 @@ where id = #{id} - update ${tableName} set sts='N',modify_time = now(),modify_user_id = #{loginId} - and ${upIdFiled} like concat(#{upIdFiledValue},'%') + and ${upIdFiled} like concat(#{upIdFiledValue},'%') and sts='Y' - - - - - - - - - - - - - - insert into ${tableName}( - - id , - formmain_id , - app_id , - status , - msg , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - company_id , - sts, - - )values( - - #{id} , - #{formmainId} , - #{appId} , - #{status} , - #{msg} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - #{companyId} , - 'Y', - - ) - - - - update ${tableName} set - - formmain_id = #{formmainId}, - app_id = #{appId}, - status = #{status}, - msg = #{msg}, - modify_user_id = #{modify_user_id}, - modify_time = #{modify_time}, - sts = #{sts}, - org_id = #{org_id}, - - where id = #{id} - diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/IMdmModuleService.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/IMdmModuleService.java index 837cb3e4..02372e74 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/IMdmModuleService.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/IMdmModuleService.java @@ -2,12 +2,11 @@ package com.hzya.frame.mdm.mdmModule.service; import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; import com.hzya.frame.basedao.service.IBaseService; - /** * 主数据模版(MdmModule)表服务接口 * * @author makejava - * @since 2023-10-17 15:25:44 + * @since 2024-06-03 08:46:29 */ -public interface IMdmModuleService extends IBaseService { +public interface IMdmModuleService extends IBaseService{ } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java index b82af615..a47b3505 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java @@ -3,27 +3,24 @@ package com.hzya.frame.mdm.mdmModule.service.impl; import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; import com.hzya.frame.mdm.mdmModule.dao.IMdmModuleDao; import com.hzya.frame.mdm.mdmModule.service.IMdmModuleService; -import org.springframework.stereotype.Service; +import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; - import javax.annotation.Resource; - import com.hzya.frame.basedao.service.impl.BaseService; - /** * 主数据模版(MdmModule)表服务实现类 * * @author makejava - * @since 2023-10-17 15:25:44 + * @since 2024-06-03 08:46:29 */ @Service(value = "mdmModuleService") public class MdmModuleServiceImpl extends BaseService implements IMdmModuleService { - + private IMdmModuleDao mdmModuleDao; - + @Autowired - public void setMdmModuleDao(IMdmModuleDao dao) { - this.mdmModuleDao = dao; - this.dao = dao; - } + public void setMdmModuleDao(IMdmModuleDao dao) { + this.mdmModuleDao = dao; + this.dao = dao; + } } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/IMdmModuleDbDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/IMdmModuleDbDao.java index b2a48a17..89849461 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/IMdmModuleDbDao.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/IMdmModuleDbDao.java @@ -1,10 +1,7 @@ package com.hzya.frame.mdm.mdmModuleDb.dao; -import com.hzya.frame.mdm.entity.MdmDistributeVo; -import com.hzya.frame.mdm.entity.MdmDto; import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.sys.entity.ModuleDto; import java.util.HashMap; import java.util.List; @@ -14,16 +11,11 @@ import java.util.Map; * 模版数据库表(mdm_module_db: table)表数据库访问层 * * @author makejava - * @since 2023-10-17 15:26:49 + * @since 2024-06-03 08:46:48 */ public interface IMdmModuleDbDao extends IBaseDao { - HashMap getServiceDataById(Map queryData); - List> getServiceByFormmainId(Map queryData); List> getServiceByDistributeId(Map queryData); - List getServiceByDistributeIdNoCase(Map queryData); - - } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/impl/MdmModuleDbDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/impl/MdmModuleDbDaoImpl.java index 76eeaf7e..8bf06ee1 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/impl/MdmModuleDbDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/impl/MdmModuleDbDaoImpl.java @@ -1,10 +1,7 @@ package com.hzya.frame.mdm.mdmModuleDb.dao.impl; -import com.hzya.frame.mdm.entity.MdmDistributeVo; -import com.hzya.frame.mdm.entity.MdmDto; import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; import com.hzya.frame.mdm.mdmModuleDb.dao.IMdmModuleDbDao; -import com.hzya.frame.sys.entity.ModuleDto; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; @@ -16,11 +13,10 @@ import java.util.Map; * 模版数据库表(MdmModuleDb)表数据库访问层 * * @author makejava - * @since 2023-10-17 15:26:49 + * @since 2024-06-03 08:46:50 */ @Repository(value = "MdmModuleDbDaoImpl") -public class MdmModuleDbDaoImpl extends MybatisGenericDao implements IMdmModuleDbDao { - +public class MdmModuleDbDaoImpl extends MybatisGenericDao implements IMdmModuleDbDao{ @Override public HashMap getServiceDataById(Map maps) { HashMap o = (HashMap) super.selectOne(getSqlIdPrifx() + "getServiceDataById", maps); @@ -40,12 +36,6 @@ public class MdmModuleDbDaoImpl extends MybatisGenericDao getServiceByDistributeIdNoCase(Map maps) { - List o = (List) super.selectList(getSqlIdPrifx() + "getServiceByDistributeIdNoCase", maps); - return o; - - } } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.java index 9d50b509..71ad1ac2 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.java @@ -4,36 +4,31 @@ import java.util.Date; import java.util.List; import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity; +import com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity; import com.hzya.frame.web.entity.BaseEntity; - /** * 模版数据库表(MdmModuleDb)实体类 * * @author makejava - * @since 2023-10-17 15:26:49 + * @since 2024-06-03 08:46:50 */ public class MdmModuleDbEntity extends BaseEntity { - - /** - * 主数据模版ID - */ - private String mdmId; - /** - * 表名 - */ - private String dbName; - /** - * 类型 1、主表 2、明细 - */ - private String dbType; - /** - * 备注 - */ - private String remark; - - //主数据子表字段 + + /** 主数据模版ID */ + private String mdmId; + /** 表名 */ + private String dbName; + /** 类型 1、主表 2、明细 3、操作日志 4、下发日志 */ + private String dbType; + /** 备注 */ + private String remark; + /** 公司id */ + private String companyId; + /** 数据类型 1、新增 2、修改 */ + private String dataType; private List sublistMdmModuleDbFileds; + public String getMdmId() { return mdmId; } @@ -66,6 +61,14 @@ public class MdmModuleDbEntity extends BaseEntity { this.remark = remark; } + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + public List getSublistMdmModuleDbFileds() { return sublistMdmModuleDbFileds; } @@ -73,5 +76,13 @@ public class MdmModuleDbEntity extends BaseEntity { public void setSublistMdmModuleDbFileds(List sublistMdmModuleDbFileds) { this.sublistMdmModuleDbFileds = sublistMdmModuleDbFileds; } + + public String getDataType() { + return dataType; + } + + public void setDataType(String dataType) { + this.dataType = dataType; + } } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml index f6e61edf..2340cbcd 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml @@ -2,22 +2,23 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + id ,mdm_id ,db_name @@ -30,217 +31,211 @@ ,modify_time ,sts ,org_id + ,company_id - - + select + + from mdm_module_db + + and id = #{id} + and mdm_id = #{mdmId} + and db_name = #{dbName} + and db_type = #{dbType} + and remark = #{remark} + and sorts = #{sorts} + and create_user_id = #{create_user_id} + and create_time = #{create_time} + and modify_user_id = #{modify_user_id} + and modify_time = #{modify_time} + and sts = #{sts} + and org_id = #{org_id} + and company_id = #{companyId} and sts='Y' - - order by sorts asc - order by ${sort} ${order} - - - - + + + - + select + + from mdm_module_db + + and id like concat('%',#{id},'%') + and mdm_id like concat('%',#{mdmId},'%') + and db_name like concat('%',#{dbName},'%') + and db_type like concat('%',#{dbType},'%') + and remark like concat('%',#{remark},'%') + and sorts like concat('%',#{sorts},'%') + and create_user_id like concat('%',#{create_user_id},'%') + and create_time like concat('%',#{create_time},'%') + and modify_user_id like concat('%',#{modify_user_id},'%') + and modify_time like concat('%',#{modify_time},'%') + and sts like concat('%',#{sts},'%') + and org_id like concat('%',#{org_id},'%') + and company_id like concat('%',#{companyId},'%') and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - + select + + from mdm_module_db + + or id = #{id} + or mdm_id = #{mdmId} + or db_name = #{dbName} + or db_type = #{dbType} + or remark = #{remark} + or sorts = #{sorts} + or create_user_id = #{create_user_id} + or create_time = #{create_time} + or modify_user_id = #{modify_user_id} + or modify_time = #{modify_time} + or sts = #{sts} + or org_id = #{org_id} + or company_id = #{companyId} and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - - insert into mdm_module_db( - - id , - mdm_id , - db_name , - db_type , - remark , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - sts, - - )values( - - #{id} , - #{mdmId} , - #{dbName} , - #{dbType} , - #{remark} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - - 'Y', - - ) - - - - insert into mdm_module_db(mdm_id, db_name, db_type, remark, sorts, create_user_id, create_time, modify_user_id, - modify_time, sts, org_id, sts) - values - - (#{entity.mdmId},#{entity.dbName},#{entity.dbType},#{entity.remark},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}, - 'Y') - - - - - insert into mdm_module_db(mdm_id, db_name, db_type, remark, sorts, create_user_id, create_time, modify_user_id, - modify_time, sts, org_id) - values - - (#{entity.mdmId},#{entity.dbName},#{entity.dbType},#{entity.remark},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}) - - on duplicate key update - mdm_id = values(mdm_id), - db_name = values(db_name), - db_type = values(db_type), - remark = values(remark), - sorts = values(sorts), - 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) - - - - update mdm_module_db set - - mdm_id = #{mdmId}, - db_name = #{dbName}, - db_type = #{dbType}, - remark = #{remark}, - sorts = #{sorts}, - 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}, - - where id = #{id} - - - + + + insert into mdm_module_db( + + id , + mdm_id , + db_name , + db_type , + remark , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sts, + + )values( + + #{id} , + #{mdmId} , + #{dbName} , + #{dbType} , + #{remark} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + 'Y', + + ) + + + + insert into mdm_module_db(mdm_id, db_name, db_type, remark, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.mdmId},#{entity.dbName},#{entity.dbType},#{entity.remark},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + + + + + insert into mdm_module_db(mdm_id, db_name, db_type, remark, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.mdmId},#{entity.dbName},#{entity.dbType},#{entity.remark},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + mdm_id = values(mdm_id), + db_name = values(db_name), + db_type = values(db_type), + remark = values(remark), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + +update mdm_module_db set + + mdm_id = #{mdmId}, + db_name = #{dbName}, + db_type = #{dbType}, + remark = #{remark}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + +where id = #{id} + + + update mdm_module_db set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - - - update mdm_module_db set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} - - and id = #{id} - and mdm_id = #{mdmId} - and db_name = #{dbName} - and db_type = #{dbType} - and remark = #{remark} - and sorts = #{sorts} - and sts = #{sts} + + +update mdm_module_db set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and mdm_id = #{mdmId} + and db_name = #{dbName} + and db_type = #{dbType} + and remark = #{remark} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} and sts='Y' - - - - + + + + delete from mdm_module_db where id = #{id} - - diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/service/IMdmModuleDbService.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/service/IMdmModuleDbService.java index c041826d..7104bf51 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/service/IMdmModuleDbService.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/service/IMdmModuleDbService.java @@ -2,12 +2,11 @@ package com.hzya.frame.mdm.mdmModuleDb.service; import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; import com.hzya.frame.basedao.service.IBaseService; - /** * 模版数据库表(MdmModuleDb)表服务接口 * * @author makejava - * @since 2023-10-17 15:26:51 + * @since 2024-06-03 08:46:51 */ -public interface IMdmModuleDbService extends IBaseService { +public interface IMdmModuleDbService extends IBaseService{ } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/service/impl/MdmModuleDbServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/service/impl/MdmModuleDbServiceImpl.java index b017b6a0..511df1b4 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/service/impl/MdmModuleDbServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/service/impl/MdmModuleDbServiceImpl.java @@ -3,27 +3,24 @@ package com.hzya.frame.mdm.mdmModuleDb.service.impl; import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; import com.hzya.frame.mdm.mdmModuleDb.dao.IMdmModuleDbDao; import com.hzya.frame.mdm.mdmModuleDb.service.IMdmModuleDbService; -import org.springframework.stereotype.Service; +import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; - import javax.annotation.Resource; - import com.hzya.frame.basedao.service.impl.BaseService; - /** * 模版数据库表(MdmModuleDb)表服务实现类 * * @author makejava - * @since 2023-10-17 15:26:51 + * @since 2024-06-03 08:46:52 */ @Service(value = "mdmModuleDbService") public class MdmModuleDbServiceImpl extends BaseService implements IMdmModuleDbService { - + private IMdmModuleDbDao mdmModuleDbDao; - + @Autowired - public void setMdmModuleDbDao(IMdmModuleDbDao dao) { - this.mdmModuleDbDao = dao; - this.dao = dao; - } + public void setMdmModuleDbDao(IMdmModuleDbDao dao) { + this.mdmModuleDbDao = dao; + this.dao = dao; + } } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/dao/IMdmModuleDbFiledsDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/dao/IMdmModuleDbFiledsDao.java index 174e6a09..9bbd8915 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/dao/IMdmModuleDbFiledsDao.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/dao/IMdmModuleDbFiledsDao.java @@ -1,13 +1,13 @@ package com.hzya.frame.mdm.mdmModuleDbFileds.dao; import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity; -import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.basedao.dao.IBaseDao; /** * 模版数据库字段表(mdm_module_db_fileds: table)表数据库访问层 * * @author makejava - * @since 2023-10-17 15:28:06 + * @since 2024-06-03 08:47:01 */ public interface IMdmModuleDbFiledsDao extends IBaseDao { diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/dao/impl/MdmModuleDbFiledsDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/dao/impl/MdmModuleDbFiledsDaoImpl.java index 362f1f76..1e32d5a9 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/dao/impl/MdmModuleDbFiledsDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/dao/impl/MdmModuleDbFiledsDaoImpl.java @@ -4,15 +4,14 @@ import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity; import com.hzya.frame.mdm.mdmModuleDbFileds.dao.IMdmModuleDbFiledsDao; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; - /** * 模版数据库字段表(MdmModuleDbFileds)表数据库访问层 * * @author makejava - * @since 2023-10-17 15:28:07 + * @since 2024-06-03 08:47:01 */ @Repository(value = "MdmModuleDbFiledsDaoImpl") -public class MdmModuleDbFiledsDaoImpl extends MybatisGenericDao implements IMdmModuleDbFiledsDao { - +public class MdmModuleDbFiledsDaoImpl extends MybatisGenericDao implements IMdmModuleDbFiledsDao{ + } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java index 998924ea..abb89344 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java @@ -5,39 +5,42 @@ import java.util.List; import com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity; import com.hzya.frame.web.entity.BaseEntity; - /** * 模版数据库字段表(MdmModuleDbFileds)实体类 * * @author makejava - * @since 2023-10-17 15:28:07 + * @since 2024-06-03 08:47:01 */ public class MdmModuleDbFiledsEntity extends BaseEntity { - - /** - * 主数据模版ID - */ - private String mdmId; - /** - * 模版数据库id - */ - private String dbId; - /** - * 中文名 - */ - private String chName; - /** - * 英文名 - */ - private String enName; - /** - * 字段类型 1、BIGINT 2、DECIMAL 3、VARCHAR 4、DATETIME - */ - private String filedType; - /** - * 长度 - */ - private String filedLength; + + /** 主数据模版ID */ + private String mdmId; + /** 模版数据库id */ + private String dbId; + /** 中文名 */ + private String chName; + /** 英文名 */ + private String enName; + /** 字段类型 1、BIGINT 2、DECIMAL 3、VARCHAR 4、DATETIME */ + private String filedType; + /** 显示类型：新增 */ + private String addType; + /** 显示类型：修改 */ + private String updateType; + /** 显示类型：查看 */ + private String showType; + /** 显示类型：查询 */ + private String queryType; + /** 显示类型：列表 */ + private String listType; + /** 显示类型：显示 */ + private String viewType; + /** 长度 */ + private String filedLength; + /** 公司id */ + private String companyId; + /** 数据类型 1、新增 2、修改 */ + private String dataType; /** * roletype */ @@ -46,16 +49,7 @@ public class MdmModuleDbFiledsEntity extends BaseEntity { * roletype */ private String roleValue; - //字段规则 - private List mdmModuleDbFiledsRules; - - public List getMdmModuleDbFiledsRules() { - return mdmModuleDbFiledsRules; - } - - public void setMdmModuleDbFiledsRules(List mdmModuleDbFiledsRules) { - this.mdmModuleDbFiledsRules = mdmModuleDbFiledsRules; - } + private List mdmModuleDbFiledsRules; public String getMdmId() { return mdmId; @@ -97,6 +91,54 @@ public class MdmModuleDbFiledsEntity extends BaseEntity { this.filedType = filedType; } + public String getAddType() { + return addType; + } + + public void setAddType(String addType) { + this.addType = addType; + } + + public String getUpdateType() { + return updateType; + } + + public void setUpdateType(String updateType) { + this.updateType = updateType; + } + + public String getShowType() { + return showType; + } + + public void setShowType(String showType) { + this.showType = showType; + } + + public String getQueryType() { + return queryType; + } + + public void setQueryType(String queryType) { + this.queryType = queryType; + } + + public String getListType() { + return listType; + } + + public void setListType(String listType) { + this.listType = listType; + } + + public String getViewType() { + return viewType; + } + + public void setViewType(String viewType) { + this.viewType = viewType; + } + public String getFiledLength() { return filedLength; } @@ -105,6 +147,30 @@ public class MdmModuleDbFiledsEntity extends BaseEntity { this.filedLength = filedLength; } + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public List getMdmModuleDbFiledsRules() { + return mdmModuleDbFiledsRules; + } + + public void setMdmModuleDbFiledsRules(List mdmModuleDbFiledsRules) { + this.mdmModuleDbFiledsRules = mdmModuleDbFiledsRules; + } + + public String getDataType() { + return dataType; + } + + public void setDataType(String dataType) { + this.dataType = dataType; + } + public String getRoletype() { return roletype; } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml index 80a7af17..8e4d37a4 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml @@ -2,31 +2,43 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + id ,mdm_id ,db_id ,ch_name ,en_name ,filed_type + ,add_type + ,update_type + ,show_type + ,query_type + ,list_type + ,view_type ,filed_length ,sorts ,create_user_id @@ -35,245 +47,283 @@ ,modify_time ,sts ,org_id + ,company_id - - + select + + from mdm_module_db_fileds + + and id = #{id} + and mdm_id = #{mdmId} + and db_id = #{dbId} + and ch_name = #{chName} + and en_name = #{enName} + and filed_type = #{filedType} + and add_type = #{addType} + and update_type = #{updateType} + and show_type = #{showType} + and query_type = #{queryType} + and list_type = #{listType} + and view_type = #{viewType} + and filed_length = #{filedLength} + and sorts = #{sorts} + and create_user_id = #{create_user_id} + and create_time = #{create_time} + and modify_user_id = #{modify_user_id} + and modify_time = #{modify_time} + and sts = #{sts} + and org_id = #{org_id} + and company_id = #{companyId} and sts='Y' - - order by sorts asc - order by ${sort} ${order} - - - - + + + - + select + + from mdm_module_db_fileds + + and id like concat('%',#{id},'%') + and mdm_id like concat('%',#{mdmId},'%') + and db_id like concat('%',#{dbId},'%') + and ch_name like concat('%',#{chName},'%') + and en_name like concat('%',#{enName},'%') + and filed_type like concat('%',#{filedType},'%') + and add_type like concat('%',#{addType},'%') + and update_type like concat('%',#{updateType},'%') + and show_type like concat('%',#{showType},'%') + and query_type like concat('%',#{queryType},'%') + and list_type like concat('%',#{listType},'%') + and view_type like concat('%',#{viewType},'%') + and filed_length like concat('%',#{filedLength},'%') + and sorts like concat('%',#{sorts},'%') + and create_user_id like concat('%',#{create_user_id},'%') + and create_time like concat('%',#{create_time},'%') + and modify_user_id like concat('%',#{modify_user_id},'%') + and modify_time like concat('%',#{modify_time},'%') + and sts like concat('%',#{sts},'%') + and org_id like concat('%',#{org_id},'%') + and company_id like concat('%',#{companyId},'%') and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - + select + + from mdm_module_db_fileds + + or id = #{id} + or mdm_id = #{mdmId} + or db_id = #{dbId} + or ch_name = #{chName} + or en_name = #{enName} + or filed_type = #{filedType} + or add_type = #{addType} + or update_type = #{updateType} + or show_type = #{showType} + or query_type = #{queryType} + or list_type = #{listType} + or view_type = #{viewType} + or filed_length = #{filedLength} + or sorts = #{sorts} + or create_user_id = #{create_user_id} + or create_time = #{create_time} + or modify_user_id = #{modify_user_id} + or modify_time = #{modify_time} + or sts = #{sts} + or org_id = #{org_id} + or company_id = #{companyId} and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - - insert into mdm_module_db_fileds( - - id , - mdm_id , - db_id , - ch_name , - en_name , - filed_type , - filed_length , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - sts, - - )values( - - #{id} , - #{mdmId} , - #{dbId} , - #{chName} , - #{enName} , - #{filedType} , - #{filedLength} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - - 'Y', - - ) - - - - insert into mdm_module_db_fileds(mdm_id, db_id, ch_name, en_name, filed_type, filed_length, sorts, - create_user_id, create_time, modify_user_id, modify_time, sts, org_id, sts) - values - - (#{entity.mdmId},#{entity.dbId},#{entity.chName},#{entity.enName},#{entity.filedType},#{entity.filedLength},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}, - 'Y') - - - - - insert into mdm_module_db_fileds(mdm_id, db_id, ch_name, en_name, filed_type, filed_length, sorts, - create_user_id, create_time, modify_user_id, modify_time, sts, org_id) - values - - (#{entity.mdmId},#{entity.dbId},#{entity.chName},#{entity.enName},#{entity.filedType},#{entity.filedLength},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}) - - on duplicate key update - mdm_id = values(mdm_id), - db_id = values(db_id), - ch_name = values(ch_name), - en_name = values(en_name), - filed_type = values(filed_type), - filed_length = values(filed_length), - sorts = values(sorts), - 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) - - - - update mdm_module_db_fileds set - - mdm_id = #{mdmId}, - db_id = #{dbId}, - ch_name = #{chName}, - en_name = #{enName}, - filed_type = #{filedType}, - filed_length = #{filedLength}, - sorts = #{sorts}, - 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}, - - where id = #{id} - - - + + + insert into mdm_module_db_fileds( + + id , + mdm_id , + db_id , + ch_name , + en_name , + filed_type , + add_type , + update_type , + show_type , + query_type , + list_type , + view_type , + filed_length , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sts, + + )values( + + #{id} , + #{mdmId} , + #{dbId} , + #{chName} , + #{enName} , + #{filedType} , + #{addType} , + #{updateType} , + #{showType} , + #{queryType} , + #{listType} , + #{viewType} , + #{filedLength} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + 'Y', + + ) + + + + insert into mdm_module_db_fileds(mdm_id, db_id, ch_name, en_name, filed_type, add_type, update_type, show_type, query_type, list_type, view_type, filed_length, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.mdmId},#{entity.dbId},#{entity.chName},#{entity.enName},#{entity.filedType},#{entity.addType},#{entity.updateType},#{entity.showType},#{entity.queryType},#{entity.listType},#{entity.viewType},#{entity.filedLength},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + + + + + insert into mdm_module_db_fileds(mdm_id, db_id, ch_name, en_name, filed_type, add_type, update_type, show_type, query_type, list_type, view_type, filed_length, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.mdmId},#{entity.dbId},#{entity.chName},#{entity.enName},#{entity.filedType},#{entity.addType},#{entity.updateType},#{entity.showType},#{entity.queryType},#{entity.listType},#{entity.viewType},#{entity.filedLength},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + mdm_id = values(mdm_id), + db_id = values(db_id), + ch_name = values(ch_name), + en_name = values(en_name), + filed_type = values(filed_type), + add_type = values(add_type), + update_type = values(update_type), + show_type = values(show_type), + query_type = values(query_type), + list_type = values(list_type), + view_type = values(view_type), + filed_length = values(filed_length), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + +update mdm_module_db_fileds set + + mdm_id = #{mdmId}, + db_id = #{dbId}, + ch_name = #{chName}, + en_name = #{enName}, + filed_type = #{filedType}, + add_type = #{addType}, + update_type = #{updateType}, + show_type = #{showType}, + query_type = #{queryType}, + list_type = #{listType}, + view_type = #{viewType}, + filed_length = #{filedLength}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + +where id = #{id} + + + update mdm_module_db_fileds set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - - - update mdm_module_db_fileds set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} - - and id = #{id} - and mdm_id = #{mdmId} - and db_id = #{dbId} - and ch_name = #{chName} - and en_name = #{enName} - and filed_type = #{filedType} - and filed_length = #{filedLength} - and sorts = #{sorts} - and sts = #{sts} + + +update mdm_module_db_fileds set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and mdm_id = #{mdmId} + and db_id = #{dbId} + and ch_name = #{chName} + and en_name = #{enName} + and filed_type = #{filedType} + and add_type = #{addType} + and update_type = #{updateType} + and show_type = #{showType} + and query_type = #{queryType} + and list_type = #{listType} + and view_type = #{viewType} + and filed_length = #{filedLength} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} and sts='Y' - - - - + + + + delete from mdm_module_db_fileds where id = #{id} diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/service/IMdmModuleDbFiledsService.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/service/IMdmModuleDbFiledsService.java index 78f21fbb..e08b44aa 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/service/IMdmModuleDbFiledsService.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/service/IMdmModuleDbFiledsService.java @@ -2,12 +2,11 @@ package com.hzya.frame.mdm.mdmModuleDbFileds.service; import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity; import com.hzya.frame.basedao.service.IBaseService; - /** * 模版数据库字段表(MdmModuleDbFileds)表服务接口 * * @author makejava - * @since 2023-10-17 15:28:09 + * @since 2024-06-03 08:47:01 */ -public interface IMdmModuleDbFiledsService extends IBaseService { +public interface IMdmModuleDbFiledsService extends IBaseService{ } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/service/impl/MdmModuleDbFiledsServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/service/impl/MdmModuleDbFiledsServiceImpl.java index 016eea5e..82ecb3f0 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/service/impl/MdmModuleDbFiledsServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/service/impl/MdmModuleDbFiledsServiceImpl.java @@ -3,27 +3,24 @@ package com.hzya.frame.mdm.mdmModuleDbFileds.service.impl; import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity; import com.hzya.frame.mdm.mdmModuleDbFileds.dao.IMdmModuleDbFiledsDao; import com.hzya.frame.mdm.mdmModuleDbFileds.service.IMdmModuleDbFiledsService; -import org.springframework.stereotype.Service; +import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; - import javax.annotation.Resource; - import com.hzya.frame.basedao.service.impl.BaseService; - /** * 模版数据库字段表(MdmModuleDbFileds)表服务实现类 * * @author makejava - * @since 2023-10-17 15:28:09 + * @since 2024-06-03 08:47:01 */ @Service(value = "mdmModuleDbFiledsService") public class MdmModuleDbFiledsServiceImpl extends BaseService implements IMdmModuleDbFiledsService { - + private IMdmModuleDbFiledsDao mdmModuleDbFiledsDao; - + @Autowired - public void setMdmModuleDbFiledsDao(IMdmModuleDbFiledsDao dao) { - this.mdmModuleDbFiledsDao = dao; - this.dao = dao; - } + public void setMdmModuleDbFiledsDao(IMdmModuleDbFiledsDao dao) { + this.mdmModuleDbFiledsDao = dao; + this.dao = dao; + } } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/IMdmModuleDbFiledsRuleDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/IMdmModuleDbFiledsRuleDao.java index 7b81046f..7e29594b 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/IMdmModuleDbFiledsRuleDao.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/IMdmModuleDbFiledsRuleDao.java @@ -7,7 +7,7 @@ import com.hzya.frame.basedao.dao.IBaseDao; * 模版数据库字段规则表(mdm_module_db_fileds_rule: table)表数据库访问层 * * @author makejava - * @since 2023-11-04 11:16:44 + * @since 2024-06-03 08:47:10 */ public interface IMdmModuleDbFiledsRuleDao extends IBaseDao { diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/impl/MdmModuleDbFiledsRuleDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/impl/MdmModuleDbFiledsRuleDaoImpl.java index 1a0d4f6b..d3c4f630 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/impl/MdmModuleDbFiledsRuleDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/impl/MdmModuleDbFiledsRuleDaoImpl.java @@ -8,7 +8,7 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao; * 模版数据库字段规则表(MdmModuleDbFiledsRule)表数据库访问层 * * @author makejava - * @since 2023-11-04 11:16:44 + * @since 2024-06-03 08:47:10 */ @Repository(value = "MdmModuleDbFiledsRuleDaoImpl") public class MdmModuleDbFiledsRuleDaoImpl extends MybatisGenericDao implements IMdmModuleDbFiledsRuleDao{ diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.java index 8d71cc18..e0031f98 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.java @@ -6,7 +6,7 @@ import com.hzya.frame.web.entity.BaseEntity; * 模版数据库字段规则表(MdmModuleDbFiledsRule)实体类 * * @author makejava - * @since 2023-11-04 11:16:44 + * @since 2024-06-03 08:47:10 */ public class MdmModuleDbFiledsRuleEntity extends BaseEntity { @@ -26,7 +26,10 @@ public class MdmModuleDbFiledsRuleEntity extends BaseEntity { private String ruleValue; /** 规则类型1、表单属性 2、控件属性 */ private String ruleType; - + /** 公司id */ + private String companyId; + /** 数据类型 1、新增 2、修改 */ + private String dataType; public String getMdmId() { return mdmId; @@ -92,5 +95,20 @@ public class MdmModuleDbFiledsRuleEntity extends BaseEntity { this.ruleType = ruleType; } + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public String getDataType() { + return dataType; + } + + public void setDataType(String dataType) { + this.dataType = dataType; + } } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.xml index 81a375a2..2d1e1e9f 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.xml @@ -19,6 +19,7 @@ + @@ -38,6 +39,7 @@ ,modify_time ,sts ,org_id + ,company_id - + insert into mdm_module_db_fileds_rule( id , @@ -169,6 +175,7 @@ modify_time , sts , org_id , + company_id , sts, )values( @@ -189,24 +196,25 @@ #{modify_time} , #{sts} , #{org_id} , + #{companyId} , 'Y', ) - - insert into mdm_module_db_fileds_rule(mdm_id, form_name, db_id, filed_id, rule_name, rule_code, rule_value, rule_type, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, sts) + + insert into mdm_module_db_fileds_rule(mdm_id, form_name, db_id, filed_id, rule_name, rule_code, rule_value, rule_type, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) values - (#{entity.mdmId},#{entity.formName},#{entity.dbId},#{entity.filedId},#{entity.ruleName},#{entity.ruleCode},#{entity.ruleValue},#{entity.ruleType},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}, 'Y') + (#{entity.mdmId},#{entity.formName},#{entity.dbId},#{entity.filedId},#{entity.ruleName},#{entity.ruleCode},#{entity.ruleValue},#{entity.ruleType},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') - - insert into mdm_module_db_fileds_rule(mdm_id, form_name, db_id, filed_id, rule_name, rule_code, rule_value, rule_type, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id) + + insert into mdm_module_db_fileds_rule(mdm_id, form_name, db_id, filed_id, rule_name, rule_code, rule_value, rule_type, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) values - (#{entity.mdmId},#{entity.formName},#{entity.dbId},#{entity.filedId},#{entity.ruleName},#{entity.ruleCode},#{entity.ruleValue},#{entity.ruleType},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}) + (#{entity.mdmId},#{entity.formName},#{entity.dbId},#{entity.filedId},#{entity.ruleName},#{entity.ruleCode},#{entity.ruleValue},#{entity.ruleType},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) on duplicate key update mdm_id = values(mdm_id), @@ -217,13 +225,13 @@ rule_code = values(rule_code), rule_value = values(rule_value), rule_type = values(rule_type), - sorts = values(sorts), 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) + org_id = values(org_id), + company_id = values(company_id) update mdm_module_db_fileds_rule set @@ -236,14 +244,14 @@ update mdm_module_db_fileds_rule set rule_code = #{ruleCode}, rule_value = #{ruleValue}, rule_type = #{ruleType}, - sorts = #{sorts}, 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} @@ -266,7 +274,8 @@ update mdm_module_db_fileds_rule set sts= 'N' ,modify_time = #{modify_time},mod and rule_type = #{ruleType} and sorts = #{sorts} and sts = #{sts} - and sts='Y' + and company_id = #{companyId} + and sts='Y' diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/service/IMdmModuleDbFiledsRuleService.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/service/IMdmModuleDbFiledsRuleService.java index b679d0d3..710c7f0a 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/service/IMdmModuleDbFiledsRuleService.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/service/IMdmModuleDbFiledsRuleService.java @@ -6,7 +6,7 @@ import com.hzya.frame.basedao.service.IBaseService; * 模版数据库字段规则表(MdmModuleDbFiledsRule)表服务接口 * * @author makejava - * @since 2023-11-04 11:16:44 + * @since 2024-06-03 08:47:10 */ public interface IMdmModuleDbFiledsRuleService extends IBaseService{ } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/service/impl/MdmModuleDbFiledsRuleServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/service/impl/MdmModuleDbFiledsRuleServiceImpl.java index 941a5171..8b987300 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/service/impl/MdmModuleDbFiledsRuleServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/service/impl/MdmModuleDbFiledsRuleServiceImpl.java @@ -11,7 +11,7 @@ import com.hzya.frame.basedao.service.impl.BaseService; * 模版数据库字段规则表(MdmModuleDbFiledsRule)表服务实现类 * * @author makejava - * @since 2023-11-04 11:16:44 + * @since 2024-06-03 08:47:10 */ @Service(value = "mdmModuleDbFiledsRuleService") public class MdmModuleDbFiledsRuleServiceImpl extends BaseService implements IMdmModuleDbFiledsRuleService { diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/dao/IMdmModuleDbFiledsRuleFilesDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/dao/IMdmModuleDbFiledsRuleFilesDao.java deleted file mode 100644 index 8335ffae..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/dao/IMdmModuleDbFiledsRuleFilesDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.dao; - -import com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.entity.MdmModuleDbFiledsRuleFilesEntity; -import com.hzya.frame.basedao.dao.IBaseDao; - -/** - * 模版数据库字段规则档案表(mdm_module_db_fileds_rule_files: table)表数据库访问层 - * - * @author makejava - * @since 2023-10-17 15:30:12 - */ -public interface IMdmModuleDbFiledsRuleFilesDao extends IBaseDao { - -} - diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/dao/impl/MdmModuleDbFiledsRuleFilesDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/dao/impl/MdmModuleDbFiledsRuleFilesDaoImpl.java deleted file mode 100644 index f5f0d497..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/dao/impl/MdmModuleDbFiledsRuleFilesDaoImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.dao.impl; - -import com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.entity.MdmModuleDbFiledsRuleFilesEntity; -import com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.dao.IMdmModuleDbFiledsRuleFilesDao; -import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; - -/** - * 模版数据库字段规则档案表(MdmModuleDbFiledsRuleFiles)表数据库访问层 - * - * @author makejava - * @since 2023-10-17 15:30:12 - */ -@Repository(value = "MdmModuleDbFiledsRuleFilesDaoImpl") -public class MdmModuleDbFiledsRuleFilesDaoImpl extends MybatisGenericDao implements IMdmModuleDbFiledsRuleFilesDao { - -} - diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/entity/MdmModuleDbFiledsRuleFilesEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/entity/MdmModuleDbFiledsRuleFilesEntity.java deleted file mode 100644 index 7f9bf614..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/entity/MdmModuleDbFiledsRuleFilesEntity.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.entity; - -import java.util.Date; - -import com.hzya.frame.web.entity.BaseEntity; - -/** - * 模版数据库字段规则档案表(MdmModuleDbFiledsRuleFiles)实体类 - * - * @author makejava - * @since 2023-10-17 15:30:13 - */ -public class MdmModuleDbFiledsRuleFilesEntity extends BaseEntity { - - /** - * 规则名称 - */ - private String ruleName; - /** - * 规则编码 - */ - private String ruleCode; - /** - * 规则类型 1、表单属性 2、控件属性 - */ - private String ruleType; - /** - * 规则值 - */ - private String ruleValue; - - - public String getRuleName() { - return ruleName; - } - - public void setRuleName(String ruleName) { - this.ruleName = ruleName; - } - - public String getRuleCode() { - return ruleCode; - } - - public void setRuleCode(String ruleCode) { - this.ruleCode = ruleCode; - } - - public String getRuleType() { - return ruleType; - } - - public void setRuleType(String ruleType) { - this.ruleType = ruleType; - } - - public String getRuleValue() { - return ruleValue; - } - - public void setRuleValue(String ruleValue) { - this.ruleValue = ruleValue; - } - -} - diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/entity/MdmModuleDbFiledsRuleFilesEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/entity/MdmModuleDbFiledsRuleFilesEntity.xml deleted file mode 100644 index cdcf8eec..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/entity/MdmModuleDbFiledsRuleFilesEntity.xml +++ /dev/null @@ -1,254 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - id - ,rule_name - ,rule_code - ,rule_type - ,rule_value - ,sorts - ,create_user_id - ,create_time - ,modify_user_id - ,modify_time - ,sts - ,org_id - - - - - - - - - - - - - - - - insert into mdm_module_db_fileds_rule_files( - - id , - rule_name , - rule_code , - rule_type , - rule_value , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - sts, - - )values( - - #{id} , - #{ruleName} , - #{ruleCode} , - #{ruleType} , - #{ruleValue} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - - 'Y', - - ) - - - - insert into mdm_module_db_fileds_rule_files(rule_name, rule_code, rule_type, rule_value, sorts, create_user_id, - create_time, modify_user_id, modify_time, sts, org_id, sts) - values - - (#{entity.ruleName},#{entity.ruleCode},#{entity.ruleType},#{entity.ruleValue},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}, - 'Y') - - - - - insert into mdm_module_db_fileds_rule_files(rule_name, rule_code, rule_type, rule_value, sorts, create_user_id, - create_time, modify_user_id, modify_time, sts, org_id) - values - - (#{entity.ruleName},#{entity.ruleCode},#{entity.ruleType},#{entity.ruleValue},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}) - - on duplicate key update - rule_name = values(rule_name), - rule_code = values(rule_code), - rule_type = values(rule_type), - rule_value = values(rule_value), - sorts = values(sorts), - 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) - - - - update mdm_module_db_fileds_rule_files set - - rule_name = #{ruleName}, - rule_code = #{ruleCode}, - rule_type = #{ruleType}, - rule_value = #{ruleValue}, - sorts = #{sorts}, - 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}, - - where id = #{id} - - - -update mdm_module_db_fileds_rule_files set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} -where id = #{id} - - - - update mdm_module_db_fileds_rule_files set sts= 'N' ,modify_time = #{modify_time},modify_user_id = - #{modify_user_id} - - and id = #{id} - and rule_name = #{ruleName} - and rule_code = #{ruleCode} - and rule_type = #{ruleType} - and rule_value = #{ruleValue} - and sorts = #{sorts} - and sts = #{sts} - and sts='Y' - - - - - delete from mdm_module_db_fileds_rule_files where id = #{id} - - - - diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/service/IMdmModuleDbFiledsRuleFilesService.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/service/IMdmModuleDbFiledsRuleFilesService.java deleted file mode 100644 index 75e81394..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/service/IMdmModuleDbFiledsRuleFilesService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.service; - -import com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.entity.MdmModuleDbFiledsRuleFilesEntity; -import com.hzya.frame.basedao.service.IBaseService; - -/** - * 模版数据库字段规则档案表(MdmModuleDbFiledsRuleFiles)表服务接口 - * - * @author makejava - * @since 2023-10-17 15:30:14 - */ -public interface IMdmModuleDbFiledsRuleFilesService extends IBaseService { -} diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/service/impl/MdmModuleDbFiledsRuleFilesServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/service/impl/MdmModuleDbFiledsRuleFilesServiceImpl.java deleted file mode 100644 index c056dd51..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/service/impl/MdmModuleDbFiledsRuleFilesServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.service.impl; - -import com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.entity.MdmModuleDbFiledsRuleFilesEntity; -import com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.dao.IMdmModuleDbFiledsRuleFilesDao; -import com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.service.IMdmModuleDbFiledsRuleFilesService; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; - -import javax.annotation.Resource; - -import com.hzya.frame.basedao.service.impl.BaseService; - -/** - * 模版数据库字段规则档案表(MdmModuleDbFiledsRuleFiles)表服务实现类 - * - * @author makejava - * @since 2023-10-17 15:30:15 - */ -@Service(value = "mdmModuleDbFiledsRuleFilesService") -public class MdmModuleDbFiledsRuleFilesServiceImpl extends BaseService implements IMdmModuleDbFiledsRuleFilesService { - - private IMdmModuleDbFiledsRuleFilesDao mdmModuleDbFiledsRuleFilesDao; - - @Autowired - public void setMdmModuleDbFiledsRuleFilesDao(IMdmModuleDbFiledsRuleFilesDao dao) { - this.mdmModuleDbFiledsRuleFilesDao = dao; - this.dao = dao; - } -} diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/IMdmModuleDistributeDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/IMdmModuleDistributeDao.java index 1bb97fe8..2e2f90f5 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/IMdmModuleDistributeDao.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/IMdmModuleDistributeDao.java @@ -7,7 +7,7 @@ import com.hzya.frame.basedao.dao.IBaseDao; * 主数据功能应用分发表(mdm_module_distribute: table)表数据库访问层 * * @author makejava - * @since 2023-11-06 15:27:41 + * @since 2024-06-03 08:47:33 */ public interface IMdmModuleDistributeDao extends IBaseDao { diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/impl/MdmModuleDistributeDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/impl/MdmModuleDistributeDaoImpl.java index e4070581..3318c2c2 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/impl/MdmModuleDistributeDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/impl/MdmModuleDistributeDaoImpl.java @@ -8,7 +8,7 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao; * 主数据功能应用分发表(MdmModuleDistribute)表数据库访问层 * * @author makejava - * @since 2023-11-06 15:27:42 + * @since 2024-06-03 08:47:33 */ @Repository(value = "MdmModuleDistributeDaoImpl") public class MdmModuleDistributeDaoImpl extends MybatisGenericDao implements IMdmModuleDistributeDao{ diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java index d65a44eb..0ce7e336 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java @@ -9,7 +9,7 @@ import com.hzya.frame.web.entity.BaseEntity; * 主数据功能应用分发表(MdmModuleDistribute)实体类 * * @author makejava - * @since 2023-11-06 15:27:42 + * @since 2024-06-03 08:47:33 */ public class MdmModuleDistributeEntity extends BaseEntity { @@ -17,36 +17,17 @@ public class MdmModuleDistributeEntity extends BaseEntity { private String mdmId; /** 应用id */ private String appId; + /** 修改接口 */ + private String updateApi; /** 新增接口 */ private String addApi; /** 删除接口 */ private String deleteApi; - /** 新增使用类型 */ - private String addType; - /** 删除使用类型 */ - private String deleteType; - /** 新增插件 */ - private String addPlug; - /** 删除插件 */ - private String deletePlug; - private List addList; - private List deleteList; - - public List getAddList() { - return addList; - } - - public void setAddList(List addList) { - this.addList = addList; - } - - public List getDeleteList() { - return deleteList; - } - - public void setDeleteList(List deleteList) { - this.deleteList = deleteList; - } + /** 启用停用 0、停用1、启用 */ + private String enabledState; + /** 公司id */ + private String companyId; + private List mdmModuleDistributeDetailEntities; public String getMdmId() { return mdmId; @@ -64,6 +45,14 @@ public class MdmModuleDistributeEntity extends BaseEntity { this.appId = appId; } + public String getUpdateApi() { + return updateApi; + } + + public void setUpdateApi(String updateApi) { + this.updateApi = updateApi; + } + public String getAddApi() { return addApi; } @@ -80,37 +69,28 @@ public class MdmModuleDistributeEntity extends BaseEntity { this.deleteApi = deleteApi; } - public String getAddType() { - return addType; + public String getEnabledState() { + return enabledState; } - public void setAddType(String addType) { - this.addType = addType; + public void setEnabledState(String enabledState) { + this.enabledState = enabledState; } - public String getDeleteType() { - return deleteType; + public String getCompanyId() { + return companyId; } - public void setDeleteType(String deleteType) { - this.deleteType = deleteType; + public void setCompanyId(String companyId) { + this.companyId = companyId; } - public String getAddPlug() { - return addPlug; + public List getMdmModuleDistributeDetailEntities() { + return mdmModuleDistributeDetailEntities; } - public void setAddPlug(String addPlug) { - this.addPlug = addPlug; + public void setMdmModuleDistributeDetailEntities(List mdmModuleDistributeDetailEntities) { + this.mdmModuleDistributeDetailEntities = mdmModuleDistributeDetailEntities; } - - public String getDeletePlug() { - return deletePlug; - } - - public void setDeletePlug(String deletePlug) { - this.deletePlug = deletePlug; - } - } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.xml index 24b315ff..82243342 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.xml @@ -6,10 +6,10 @@ + - - + @@ -17,18 +17,17 @@ - - + id ,mdm_id ,app_id + ,update_api ,add_api ,delete_api - ,add_type - ,delete_type + ,enabled_state ,sorts ,create_user_id ,create_time @@ -36,8 +35,7 @@ ,modify_time ,sts ,org_id - ,add_plug - ,delete_plug + ,company_id - + insert into mdm_module_distribute( id , mdm_id , app_id , + update_api , add_api , delete_api , - add_type , - delete_type , + enabled_state , sorts , create_user_id , create_time , @@ -167,8 +161,7 @@ modify_time , sts , org_id , - add_plug , - delete_plug , + company_id , sts, )values( @@ -176,10 +169,10 @@ #{id} , #{mdmId} , #{appId} , + #{updateApi} , #{addApi} , #{deleteApi} , - #{addType} , - #{deleteType} , + #{enabledState} , #{sorts} , #{create_user_id} , #{create_time} , @@ -187,62 +180,57 @@ #{modify_time} , #{sts} , #{org_id} , - #{addPlug} , - #{deletePlug} , + #{companyId} , 'Y', ) - - insert into mdm_module_distribute(mdm_id, app_id, add_api, delete_api, add_type, delete_type, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, add_plug, delete_plug, sts) + + insert into mdm_module_distribute(mdm_id, app_id, update_api, add_api, delete_api, enabled_state, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) values - (#{entity.mdmId},#{entity.appId},#{entity.addApi},#{entity.deleteApi},#{entity.addType},#{entity.deleteType},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.addPlug},#{entity.deletePlug}, 'Y') + (#{entity.mdmId},#{entity.appId},#{entity.updateApi},#{entity.addApi},#{entity.deleteApi},#{entity.enabledState},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') - - insert into mdm_module_distribute(mdm_id, app_id, add_api, delete_api, add_type, delete_type, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, add_plug, delete_plug) + + insert into mdm_module_distribute(mdm_id, app_id, update_api, add_api, delete_api, enabled_state, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) values - (#{entity.mdmId},#{entity.appId},#{entity.addApi},#{entity.deleteApi},#{entity.addType},#{entity.deleteType},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.addPlug},#{entity.deletePlug}) + (#{entity.mdmId},#{entity.appId},#{entity.updateApi},#{entity.addApi},#{entity.deleteApi},#{entity.enabledState},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) on duplicate key update mdm_id = values(mdm_id), app_id = values(app_id), + update_api = values(update_api), add_api = values(add_api), delete_api = values(delete_api), - add_type = values(add_type), - delete_type = values(delete_type), - sorts = values(sorts), + enabled_state = values(enabled_state), 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), - add_plug = values(add_plug), - delete_plug = values(delete_plug) + company_id = values(company_id) update mdm_module_distribute set mdm_id = #{mdmId}, app_id = #{appId}, + update_api = #{updateApi}, add_api = #{addApi}, delete_api = #{deleteApi}, - add_type = #{addType}, - delete_type = #{deleteType}, - sorts = #{sorts}, + enabled_state = #{enabledState}, 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}, - add_plug = #{addPlug}, - delete_plug = #{deletePlug}, + company_id = #{companyId}, where id = #{id} @@ -258,14 +246,13 @@ update mdm_module_distribute set sts= 'N' ,modify_time = #{modify_time},modify_ and id = #{id} and mdm_id = #{mdmId} and app_id = #{appId} + and update_api = #{updateApi} and add_api = #{addApi} and delete_api = #{deleteApi} - and add_type = #{addType} - and delete_type = #{deleteType} + and enabled_state = #{enabledState} and sorts = #{sorts} and sts = #{sts} - and add_plug = #{addPlug} - and delete_plug = #{deletePlug} + and company_id = #{companyId} and sts='Y' diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/IMdmModuleDistributeService.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/IMdmModuleDistributeService.java index 474d58c9..577b0e3c 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/IMdmModuleDistributeService.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/IMdmModuleDistributeService.java @@ -6,7 +6,7 @@ import com.hzya.frame.basedao.service.IBaseService; * 主数据功能应用分发表(MdmModuleDistribute)表服务接口 * * @author makejava - * @since 2023-11-06 15:27:42 + * @since 2024-06-03 08:47:33 */ public interface IMdmModuleDistributeService extends IBaseService{ } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/impl/MdmModuleDistributeServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/impl/MdmModuleDistributeServiceImpl.java index 0ccdb809..24fe61e3 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/impl/MdmModuleDistributeServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/impl/MdmModuleDistributeServiceImpl.java @@ -11,7 +11,7 @@ import com.hzya.frame.basedao.service.impl.BaseService; * 主数据功能应用分发表(MdmModuleDistribute)表服务实现类 * * @author makejava - * @since 2023-11-06 15:27:42 + * @since 2024-06-03 08:47:33 */ @Service(value = "mdmModuleDistributeService") public class MdmModuleDistributeServiceImpl extends BaseService implements IMdmModuleDistributeService { diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/dao/IMdmModuleDistributeDetailDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/dao/IMdmModuleDistributeDetailDao.java index 90278a9f..2b55a63a 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/dao/IMdmModuleDistributeDetailDao.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/dao/IMdmModuleDistributeDetailDao.java @@ -7,7 +7,7 @@ import com.hzya.frame.basedao.dao.IBaseDao; * 主数据功能应用分发明细表(mdm_module_distribute_detail: table)表数据库访问层 * * @author makejava - * @since 2023-11-07 09:11:31 + * @since 2024-06-03 08:48:18 */ public interface IMdmModuleDistributeDetailDao extends IBaseDao { diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/dao/impl/MdmModuleDistributeDetailDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/dao/impl/MdmModuleDistributeDetailDaoImpl.java index daeb3dc5..68878631 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/dao/impl/MdmModuleDistributeDetailDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/dao/impl/MdmModuleDistributeDetailDaoImpl.java @@ -8,7 +8,7 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao; * 主数据功能应用分发明细表(MdmModuleDistributeDetail)表数据库访问层 * * @author makejava - * @since 2023-11-07 09:11:31 + * @since 2024-06-03 08:48:18 */ @Repository(value = "MdmModuleDistributeDetailDaoImpl") public class MdmModuleDistributeDetailDaoImpl extends MybatisGenericDao implements IMdmModuleDistributeDetailDao{ diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/entity/MdmModuleDistributeDetailEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/entity/MdmModuleDistributeDetailEntity.java index 89f45fe7..b0438ba8 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/entity/MdmModuleDistributeDetailEntity.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/entity/MdmModuleDistributeDetailEntity.java @@ -6,7 +6,7 @@ import com.hzya.frame.web.entity.BaseEntity; * 主数据功能应用分发明细表(MdmModuleDistributeDetail)实体类 * * @author makejava - * @since 2023-11-07 09:11:31 + * @since 2024-06-03 08:48:18 */ public class MdmModuleDistributeDetailEntity extends BaseEntity { @@ -16,24 +16,16 @@ public class MdmModuleDistributeDetailEntity extends BaseEntity { private String distributeId; /** 接口id */ private String apiId; - /** 源API字段 */ - private String sourceField; - /** 源API字段名 */ - private String sourceName; - /** 目标API字段 */ - private String targetField; - /** 目标API字段名 */ - private String targetName; + /** 数据类型 1、新增2、修改3、删除 */ + private String dataType; + /** 字段名 */ + private String filedName; + /** 对比类型 1、等于 */ + private String compareType; /** 目标API字段默认值 */ - private String defaultVaule; - /** 源字段层级 */ - private String sourceFieldPath; - /** 目标字段层级 */ - private String targetFieldPath; - private String targetPath; - private String sourcePath; - /** 连线信息 */ - private String coordinate; + private String filedVaule; + /** 公司id */ + private String companyId; public String getMdmId() { @@ -60,84 +52,44 @@ public class MdmModuleDistributeDetailEntity extends BaseEntity { this.apiId = apiId; } - public String getSourceField() { - return sourceField; + public String getDataType() { + return dataType; } - public void setSourceField(String sourceField) { - this.sourceField = sourceField; + public void setDataType(String dataType) { + this.dataType = dataType; } - public String getSourceName() { - return sourceName; + public String getFiledName() { + return filedName; } - public void setSourceName(String sourceName) { - this.sourceName = sourceName; + public void setFiledName(String filedName) { + this.filedName = filedName; } - public String getTargetField() { - return targetField; + public String getCompareType() { + return compareType; } - public void setTargetField(String targetField) { - this.targetField = targetField; + public void setCompareType(String compareType) { + this.compareType = compareType; } - public String getTargetName() { - return targetName; + public String getFiledVaule() { + return filedVaule; } - public void setTargetName(String targetName) { - this.targetName = targetName; + public void setFiledVaule(String filedVaule) { + this.filedVaule = filedVaule; } - public String getDefaultVaule() { - return defaultVaule; + public String getCompanyId() { + return companyId; } - public void setDefaultVaule(String defaultVaule) { - this.defaultVaule = defaultVaule; - } - - public String getSourceFieldPath() { - return sourceFieldPath; - } - - public void setSourceFieldPath(String sourceFieldPath) { - this.sourceFieldPath = sourceFieldPath; - } - - public String getTargetFieldPath() { - return targetFieldPath; - } - - public void setTargetFieldPath(String targetFieldPath) { - this.targetFieldPath = targetFieldPath; - } - - public String getTargetPath() { - return targetPath; - } - - public void setTargetPath(String targetPath) { - this.targetPath = targetPath; - } - - public String getSourcePath() { - return sourcePath; - } - - public void setSourcePath(String sourcePath) { - this.sourcePath = sourcePath; - } - - public String getCoordinate() { - return coordinate; - } - - public void setCoordinate(String coordinate) { - this.coordinate = coordinate; + public void setCompanyId(String companyId) { + this.companyId = companyId; } } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/entity/MdmModuleDistributeDetailEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/entity/MdmModuleDistributeDetailEntity.xml index a3b4dfe7..15113e4f 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/entity/MdmModuleDistributeDetailEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/entity/MdmModuleDistributeDetailEntity.xml @@ -7,15 +7,10 @@ - - - - - - - - - + + + + @@ -23,7 +18,7 @@ - + @@ -31,15 +26,10 @@ ,mdm_id ,distribute_id ,api_id - ,source_field - ,source_name - ,target_field - ,target_name - ,default_vaule - ,source_field_path - ,target_field_path - ,target_path - ,source_path + ,data_type + ,filed_name + ,compare_type + ,filed_vaule ,sorts ,create_user_id ,create_time @@ -47,7 +37,7 @@ ,modify_time ,sts ,org_id - ,coordinate + ,company_id - + insert into mdm_module_distribute_detail( id , mdm_id , distribute_id , api_id , - source_field , - source_name , - target_field , - target_name , - default_vaule , - source_field_path , - target_field_path , - target_path , - source_path , + data_type , + filed_name , + compare_type , + filed_vaule , sorts , create_user_id , create_time , @@ -203,7 +168,7 @@ modify_time , sts , org_id , - coordinate , + company_id , sts, )values( @@ -212,15 +177,10 @@ #{mdmId} , #{distributeId} , #{apiId} , - #{sourceField} , - #{sourceName} , - #{targetField} , - #{targetName} , - #{defaultVaule} , - #{sourceFieldPath} , - #{targetFieldPath} , - #{targetPath} , - #{sourcePath} , + #{dataType} , + #{filedName} , + #{compareType} , + #{filedVaule} , #{sorts} , #{create_user_id} , #{create_time} , @@ -228,47 +188,41 @@ #{modify_time} , #{sts} , #{org_id} , - #{coordinate} , + #{companyId} , 'Y', ) - - insert into mdm_module_distribute_detail(mdm_id, distribute_id, api_id, source_field, source_name, target_field, target_name, default_vaule, source_field_path, target_field_path, target_path, source_path, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, coordinate, sts) + + insert into mdm_module_distribute_detail(mdm_id, distribute_id, api_id, data_type, filed_name, compare_type, filed_vaule, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) values - (#{entity.mdmId},#{entity.distributeId},#{entity.apiId},#{entity.sourceField},#{entity.sourceName},#{entity.targetField},#{entity.targetName},#{entity.defaultVaule},#{entity.sourceFieldPath},#{entity.targetFieldPath},#{entity.targetPath},#{entity.sourcePath},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.coordinate}, 'Y') + (#{entity.mdmId},#{entity.distributeId},#{entity.apiId},#{entity.dataType},#{entity.filedName},#{entity.compareType},#{entity.filedVaule},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') - - insert into mdm_module_distribute_detail(mdm_id, distribute_id, api_id, source_field, source_name, target_field, target_name, default_vaule, source_field_path, target_field_path, target_path, source_path, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, coordinate) + + insert into mdm_module_distribute_detail(mdm_id, distribute_id, api_id, data_type, filed_name, compare_type, filed_vaule, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) values - (#{entity.mdmId},#{entity.distributeId},#{entity.apiId},#{entity.sourceField},#{entity.sourceName},#{entity.targetField},#{entity.targetName},#{entity.defaultVaule},#{entity.sourceFieldPath},#{entity.targetFieldPath},#{entity.targetPath},#{entity.sourcePath},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.coordinate}) + (#{entity.mdmId},#{entity.distributeId},#{entity.apiId},#{entity.dataType},#{entity.filedName},#{entity.compareType},#{entity.filedVaule},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) on duplicate key update mdm_id = values(mdm_id), distribute_id = values(distribute_id), api_id = values(api_id), - source_field = values(source_field), - source_name = values(source_name), - target_field = values(target_field), - target_name = values(target_name), - default_vaule = values(default_vaule), - source_field_path = values(source_field_path), - target_field_path = values(target_field_path), - target_path = values(target_path), - source_path = values(source_path), - sorts = values(sorts), + data_type = values(data_type), + filed_name = values(filed_name), + compare_type = values(compare_type), + filed_vaule = values(filed_vaule), 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), - coordinate = values(coordinate) + company_id = values(company_id) update mdm_module_distribute_detail set @@ -276,23 +230,17 @@ update mdm_module_distribute_detail set mdm_id = #{mdmId}, distribute_id = #{distributeId}, api_id = #{apiId}, - source_field = #{sourceField}, - source_name = #{sourceName}, - target_field = #{targetField}, - target_name = #{targetName}, - default_vaule = #{defaultVaule}, - source_field_path = #{sourceFieldPath}, - target_field_path = #{targetFieldPath}, - target_path = #{targetPath}, - source_path = #{sourcePath}, - sorts = #{sorts}, + data_type = #{dataType}, + filed_name = #{filedName}, + compare_type = #{compareType}, + filed_vaule = #{filedVaule}, 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}, - coordinate = #{coordinate}, + company_id = #{companyId}, where id = #{id} @@ -309,18 +257,13 @@ update mdm_module_distribute_detail set sts= 'N' ,modify_time = #{modify_time}, and mdm_id = #{mdmId} and distribute_id = #{distributeId} and api_id = #{apiId} - and source_field = #{sourceField} - and source_name = #{sourceName} - and target_field = #{targetField} - and target_name = #{targetName} - and default_vaule = #{defaultVaule} - and source_field_path = #{sourceFieldPath} - and target_field_path = #{targetFieldPath} - and target_path = #{targetPath} - and source_path = #{sourcePath} + and data_type = #{dataType} + and filed_name = #{filedName} + and compare_type = #{compareType} + and filed_vaule = #{filedVaule} and sorts = #{sorts} and sts = #{sts} - and coordinate = #{coordinate} + and company_id = #{companyId} and sts='Y' diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/service/IMdmModuleDistributeDetailService.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/service/IMdmModuleDistributeDetailService.java index 1239a232..9b2fb7f8 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/service/IMdmModuleDistributeDetailService.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/service/IMdmModuleDistributeDetailService.java @@ -6,7 +6,7 @@ import com.hzya.frame.basedao.service.IBaseService; * 主数据功能应用分发明细表(MdmModuleDistributeDetail)表服务接口 * * @author makejava - * @since 2023-11-07 09:11:31 + * @since 2024-06-03 08:48:18 */ public interface IMdmModuleDistributeDetailService extends IBaseService{ } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/service/impl/MdmModuleDistributeDetailServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/service/impl/MdmModuleDistributeDetailServiceImpl.java index 71aef349..6dd4b505 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/service/impl/MdmModuleDistributeDetailServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/service/impl/MdmModuleDistributeDetailServiceImpl.java @@ -11,7 +11,7 @@ import com.hzya.frame.basedao.service.impl.BaseService; * 主数据功能应用分发明细表(MdmModuleDistributeDetail)表服务实现类 * * @author makejava - * @since 2023-11-07 09:11:31 + * @since 2024-06-03 08:48:18 */ @Service(value = "mdmModuleDistributeDetailService") public class MdmModuleDistributeDetailServiceImpl extends BaseService implements IMdmModuleDistributeDetailService { diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/dao/IMdmModuleOptionLogDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/dao/IMdmModuleOptionLogDao.java new file mode 100644 index 00000000..a65bb1bc --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/dao/IMdmModuleOptionLogDao.java @@ -0,0 +1,15 @@ +package com.hzya.frame.mdm.mdmModuleOptionLog.dao; + +import com.hzya.frame.mdm.mdmModuleOptionLog.entity.MdmModuleOptionLogEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 主数据模版(mdm_module_option_log: table)表数据库访问层 + * + * @author makejava + * @since 2024-06-05 16:10:31 + */ +public interface IMdmModuleOptionLogDao extends IBaseDao { + +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/dao/impl/MdmModuleOptionLogDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/dao/impl/MdmModuleOptionLogDaoImpl.java new file mode 100644 index 00000000..b0fc4626 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/dao/impl/MdmModuleOptionLogDaoImpl.java @@ -0,0 +1,17 @@ +package com.hzya.frame.mdm.mdmModuleOptionLog.dao.impl; + +import com.hzya.frame.mdm.mdmModuleOptionLog.entity.MdmModuleOptionLogEntity; +import com.hzya.frame.mdm.mdmModuleOptionLog.dao.IMdmModuleOptionLogDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * 主数据模版(MdmModuleOptionLog)表数据库访问层 + * + * @author makejava + * @since 2024-06-05 16:10:31 + */ +@Repository(value = "MdmModuleOptionLogDaoImpl") +public class MdmModuleOptionLogDaoImpl extends MybatisGenericDao implements IMdmModuleOptionLogDao{ + +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/entity/MdmModuleOptionLogEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/entity/MdmModuleOptionLogEntity.java new file mode 100644 index 00000000..d4af3ede --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/entity/MdmModuleOptionLogEntity.java @@ -0,0 +1,104 @@ +package com.hzya.frame.mdm.mdmModuleOptionLog.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 主数据模版(MdmModuleOptionLog)实体类 + * + * @author makejava + * @since 2024-06-05 16:10:32 + */ +public class MdmModuleOptionLogEntity extends BaseEntity { + //主数据表名 + private String tableName; + //主数据编码 + private Long mdmCode; + /** 主表id */ + private String formmainId; + /** 来源名称 */ + private String sourceName; + /** 编码 */ + private String code; + /** source_data */ + private String sourceData; + /** 操作类型 */ + private String optionType; + /** 操作人 */ + private String optionName; + /** 公司id */ + private String companyId; + + + public String getFormmainId() { + return formmainId; + } + + public void setFormmainId(String formmainId) { + this.formmainId = formmainId; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getSourceData() { + return sourceData; + } + + public void setSourceData(String sourceData) { + this.sourceData = sourceData; + } + + public String getOptionType() { + return optionType; + } + + public void setOptionType(String optionType) { + this.optionType = optionType; + } + + public String getOptionName() { + return optionName; + } + + public void setOptionName(String optionName) { + this.optionName = optionName; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public Long getMdmCode() { + return mdmCode; + } + + public void setMdmCode(Long mdmCode) { + this.mdmCode = mdmCode; + } +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/entity/MdmModuleOptionLogEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/entity/MdmModuleOptionLogEntity.xml new file mode 100644 index 00000000..af218694 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/entity/MdmModuleOptionLogEntity.xml @@ -0,0 +1,272 @@ + + + + + + + + + + + + + + + + + + + + + + + + id + ,formmain_id + ,source_name + ,code + ,source_data + ,option_type + ,option_name + ,sorts + ,create_user_id + ,create_time + ,modify_user_id + ,modify_time + ,sts + ,org_id + ,company_id + + + + + + + + + + + + + + + + + insert into ${tableName}( + + id , + formmain_id , + source_name , + code , + source_data , + option_type , + option_name , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sorts, + sts, + + )values( + + #{id} , + #{formmainId} , + #{sourceName} , + #{code} , + #{sourceData} , + #{optionType} , + #{optionName} , + #{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 ${tableName} a WHERE a.sts = 'Y' ), + 'Y', + + ) + + + + insert into ${tableName}(formmain_id, source_name, code, source_data, option_type, option_name, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.formmainId},#{entity.sourceName},#{entity.code},#{entity.sourceData},#{entity.optionType},#{entity.optionName},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + + + + + insert into ${tableName}(formmain_id, source_name, code, source_data, option_type, option_name, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.formmainId},#{entity.sourceName},#{entity.code},#{entity.sourceData},#{entity.optionType},#{entity.optionName},#{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 + formmain_id = values(formmain_id), + source_name = values(source_name), + code = values(code), + source_data = values(source_data), + option_type = values(option_type), + option_name = values(option_name), + 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 ${tableName} set + + formmain_id = #{formmainId}, + source_name = #{sourceName}, + code = #{code}, + source_data = #{sourceData}, + option_type = #{optionType}, + option_name = #{optionName}, + 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 ${tableName} set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where id = #{id} + + + +update ${tableName} set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and formmain_id = #{formmainId} + and source_name = #{sourceName} + and code = #{code} + and source_data = #{sourceData} + and option_type = #{optionType} + and option_name = #{optionName} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and sts='Y' + + + + + delete from ${tableName} where id = #{id} + + + + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/dao/IMdmModuleRoleDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/dao/IMdmModuleRoleDao.java deleted file mode 100644 index 405d975f..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/dao/IMdmModuleRoleDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzya.frame.mdm.mdmModuleRole.dao; - -import com.hzya.frame.mdm.mdmModuleRole.entity.MdmModuleRoleEntity; -import com.hzya.frame.basedao.dao.IBaseDao; - -/** - * 主数据功能角色表(mdm_module_role: table)表数据库访问层 - * - * @author makejava - * @since 2023-10-17 15:32:25 - */ -public interface IMdmModuleRoleDao extends IBaseDao { - -} - diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/dao/impl/MdmModuleRoleDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/dao/impl/MdmModuleRoleDaoImpl.java deleted file mode 100644 index 7a5b8602..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/dao/impl/MdmModuleRoleDaoImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hzya.frame.mdm.mdmModuleRole.dao.impl; - -import com.hzya.frame.mdm.mdmModuleRole.entity.MdmModuleRoleEntity; -import com.hzya.frame.mdm.mdmModuleRole.dao.IMdmModuleRoleDao; -import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; - -/** - * 主数据功能角色表(MdmModuleRole)表数据库访问层 - * - * @author makejava - * @since 2023-10-17 15:32:25 - */ -@Repository(value = "MdmModuleRoleDaoImpl") -public class MdmModuleRoleDaoImpl extends MybatisGenericDao implements IMdmModuleRoleDao { - -} - diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/entity/MdmModuleRoleEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/entity/MdmModuleRoleEntity.java deleted file mode 100644 index 992ed5e7..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/entity/MdmModuleRoleEntity.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.hzya.frame.mdm.mdmModuleRole.entity; - -import java.util.Date; -import java.util.List; - -import com.hzya.frame.mdm.mdmModuleRoleButton.entity.MdmModuleRoleButtonEntity; -import com.hzya.frame.web.entity.BaseEntity; - -/** - * 主数据功能角色表(MdmModuleRole)实体类 - * - * @author makejava - * @since 2023-10-17 15:32:25 - */ -public class MdmModuleRoleEntity extends BaseEntity { - - /** - * 主数据模版ID - */ - private String mdmId; - /** - * 角色id - */ - private String roleId; - - //角色按钮 - private List mdmModuleRoleButtonEntities; - public String getMdmId() { - return mdmId; - } - - public void setMdmId(String mdmId) { - this.mdmId = mdmId; - } - - public String getRoleId() { - return roleId; - } - - public void setRoleId(String roleId) { - this.roleId = roleId; - } - - public List getMdmModuleRoleButtonEntities() { - return mdmModuleRoleButtonEntities; - } - - public void setMdmModuleRoleButtonEntities(List mdmModuleRoleButtonEntities) { - this.mdmModuleRoleButtonEntities = mdmModuleRoleButtonEntities; - } -} - diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/entity/MdmModuleRoleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/entity/MdmModuleRoleEntity.xml deleted file mode 100644 index b0a78a5b..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/entity/MdmModuleRoleEntity.xml +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - id - ,mdm_id - ,role_id - ,sorts - ,create_user_id - ,create_time - ,modify_user_id - ,modify_time - ,sts - ,org_id - - - - - - - - - - - - - - - - insert into mdm_module_role( - - id , - mdm_id , - role_id , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - sts, - - )values( - - #{id} , - #{mdmId} , - #{roleId} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - - 'Y', - - ) - - - - insert into mdm_module_role(mdm_id, role_id, sorts, create_user_id, create_time, modify_user_id, modify_time, - sts, org_id, sts) - values - - (#{entity.mdmId},#{entity.roleId},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}, - 'Y') - - - - - insert into mdm_module_role(mdm_id, role_id, sorts, create_user_id, create_time, modify_user_id, modify_time, - sts, org_id) - values - - (#{entity.mdmId},#{entity.roleId},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}) - - on duplicate key update - mdm_id = values(mdm_id), - role_id = values(role_id), - sorts = values(sorts), - 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) - - - - update mdm_module_role set - - mdm_id = #{mdmId}, - role_id = #{roleId}, - sorts = #{sorts}, - 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}, - - where id = #{id} - - - -update mdm_module_role set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} -where id = #{id} - - - - update mdm_module_role set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} - - and id = #{id} - and mdm_id = #{mdmId} - and role_id = #{roleId} - and sorts = #{sorts} - and sts = #{sts} - and sts='Y' - - - - - delete from mdm_module_role where id = #{id} - - - - diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/service/IMdmModuleRoleService.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/service/IMdmModuleRoleService.java deleted file mode 100644 index dfca9fc8..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/service/IMdmModuleRoleService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hzya.frame.mdm.mdmModuleRole.service; - -import com.hzya.frame.mdm.mdmModuleRole.entity.MdmModuleRoleEntity; -import com.hzya.frame.basedao.service.IBaseService; - -/** - * 主数据功能角色表(MdmModuleRole)表服务接口 - * - * @author makejava - * @since 2023-10-17 15:32:26 - */ -public interface IMdmModuleRoleService extends IBaseService { -} diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/service/impl/MdmModuleRoleServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/service/impl/MdmModuleRoleServiceImpl.java deleted file mode 100644 index da3d0b94..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/service/impl/MdmModuleRoleServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hzya.frame.mdm.mdmModuleRole.service.impl; - -import com.hzya.frame.mdm.mdmModuleRole.entity.MdmModuleRoleEntity; -import com.hzya.frame.mdm.mdmModuleRole.dao.IMdmModuleRoleDao; -import com.hzya.frame.mdm.mdmModuleRole.service.IMdmModuleRoleService; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; - -import javax.annotation.Resource; - -import com.hzya.frame.basedao.service.impl.BaseService; - -/** - * 主数据功能角色表(MdmModuleRole)表服务实现类 - * - * @author makejava - * @since 2023-10-17 15:32:27 - */ -@Service(value = "mdmModuleRoleService") -public class MdmModuleRoleServiceImpl extends BaseService implements IMdmModuleRoleService { - - private IMdmModuleRoleDao mdmModuleRoleDao; - - @Autowired - public void setMdmModuleRoleDao(IMdmModuleRoleDao dao) { - this.mdmModuleRoleDao = dao; - this.dao = dao; - } -} diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/dao/IMdmModuleRoleButtonDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/dao/IMdmModuleRoleButtonDao.java deleted file mode 100644 index 37e5690a..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/dao/IMdmModuleRoleButtonDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzya.frame.mdm.mdmModuleRoleButton.dao; - -import com.hzya.frame.mdm.mdmModuleRoleButton.entity.MdmModuleRoleButtonEntity; -import com.hzya.frame.basedao.dao.IBaseDao; - -/** - * 主数据功能角色按钮表(mdm_module_role_button: table)表数据库访问层 - * - * @author makejava - * @since 2023-10-17 15:33:09 - */ -public interface IMdmModuleRoleButtonDao extends IBaseDao { - -} - diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/dao/impl/MdmModuleRoleButtonDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/dao/impl/MdmModuleRoleButtonDaoImpl.java deleted file mode 100644 index 322c53e4..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/dao/impl/MdmModuleRoleButtonDaoImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hzya.frame.mdm.mdmModuleRoleButton.dao.impl; - -import com.hzya.frame.mdm.mdmModuleRoleButton.entity.MdmModuleRoleButtonEntity; -import com.hzya.frame.mdm.mdmModuleRoleButton.dao.IMdmModuleRoleButtonDao; -import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; - -/** - * 主数据功能角色按钮表(MdmModuleRoleButton)表数据库访问层 - * - * @author makejava - * @since 2023-10-17 15:33:10 - */ -@Repository(value = "MdmModuleRoleButtonDaoImpl") -public class MdmModuleRoleButtonDaoImpl extends MybatisGenericDao implements IMdmModuleRoleButtonDao { - -} - diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/entity/MdmModuleRoleButtonEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/entity/MdmModuleRoleButtonEntity.java deleted file mode 100644 index fa71faf2..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/entity/MdmModuleRoleButtonEntity.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.hzya.frame.mdm.mdmModuleRoleButton.entity; - -import java.util.Date; -import java.util.List; - -import com.hzya.frame.sys.userRole.entity.UserRole; -import com.hzya.frame.web.entity.BaseEntity; - -/** - * 主数据功能角色按钮表(MdmModuleRoleButton)实体类 - * - * @author makejava - * @since 2023-10-17 15:33:10 - */ -public class MdmModuleRoleButtonEntity extends BaseEntity { - - /** - * 主数据模版ID - */ - private String mdmId; - /** - * 模块角色id - */ - private String moduleRoleId; - /** - * 角色id - */ - private String roleId; - /** - * 按钮类型 - */ - private String buttonType; - /** - * 按钮名 - */ - private String buttonName; - - /** - * 角色ids - */ - private List roleIds; - - public List getRoleIds() { - return roleIds; - } - - public void setRoleIds(List roleIds) { - this.roleIds = roleIds; - } - - public String getMdmId() { - return mdmId; - } - - public void setMdmId(String mdmId) { - this.mdmId = mdmId; - } - - public String getModuleRoleId() { - return moduleRoleId; - } - - public void setModuleRoleId(String moduleRoleId) { - this.moduleRoleId = moduleRoleId; - } - - public String getRoleId() { - return roleId; - } - - public void setRoleId(String roleId) { - this.roleId = roleId; - } - - public String getButtonType() { - return buttonType; - } - - public void setButtonType(String buttonType) { - this.buttonType = buttonType; - } - - public String getButtonName() { - return buttonName; - } - - public void setButtonName(String buttonName) { - this.buttonName = buttonName; - } - -} - diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/entity/MdmModuleRoleButtonEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/entity/MdmModuleRoleButtonEntity.xml deleted file mode 100644 index 44ed53a7..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/entity/MdmModuleRoleButtonEntity.xml +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - id - ,mdm_id - ,module_role_id - ,role_id - ,button_type - ,button_name - ,sorts - ,create_user_id - ,create_time - ,modify_user_id - ,modify_time - ,sts - ,org_id - - - - - - - - - - - - - - - - insert into mdm_module_role_button( - - id , - mdm_id , - module_role_id , - role_id , - button_type , - button_name , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - sts, - - )values( - - #{id} , - #{mdmId} , - #{moduleRoleId} , - #{roleId} , - #{buttonType} , - #{buttonName} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - - 'Y', - - ) - - - - insert into mdm_module_role_button(mdm_id, module_role_id, role_id, button_type, button_name, sorts, - create_user_id, create_time, modify_user_id, modify_time, sts, org_id, sts) - values - - (#{entity.mdmId},#{entity.moduleRoleId},#{entity.roleId},#{entity.buttonType},#{entity.buttonName},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}, - 'Y') - - - - - insert into mdm_module_role_button(mdm_id, module_role_id, role_id, button_type, button_name, sorts, - create_user_id, create_time, modify_user_id, modify_time, sts, org_id) - values - - (#{entity.mdmId},#{entity.moduleRoleId},#{entity.roleId},#{entity.buttonType},#{entity.buttonName},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}) - - on duplicate key update - mdm_id = values(mdm_id), - module_role_id = values(module_role_id), - role_id = values(role_id), - button_type = values(button_type), - button_name = values(button_name), - sorts = values(sorts), - 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) - - - - update mdm_module_role_button set - - mdm_id = #{mdmId}, - module_role_id = #{moduleRoleId}, - role_id = #{roleId}, - button_type = #{buttonType}, - button_name = #{buttonName}, - sorts = #{sorts}, - 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}, - - where id = #{id} - - - -update mdm_module_role_button set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} -where id = #{id} - - - - update mdm_module_role_button set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} - - and id = #{id} - and mdm_id = #{mdmId} - and module_role_id = #{moduleRoleId} - and role_id = #{roleId} - and button_type = #{buttonType} - and button_name = #{buttonName} - and sorts = #{sorts} - and sts = #{sts} - and sts='Y' - - - - - delete from mdm_module_role_button where id = #{id} - - - - diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/service/IMdmModuleRoleButtonService.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/service/IMdmModuleRoleButtonService.java deleted file mode 100644 index 3f956fd2..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/service/IMdmModuleRoleButtonService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hzya.frame.mdm.mdmModuleRoleButton.service; - -import com.hzya.frame.mdm.mdmModuleRoleButton.entity.MdmModuleRoleButtonEntity; -import com.hzya.frame.basedao.service.IBaseService; - -/** - * 主数据功能角色按钮表(MdmModuleRoleButton)表服务接口 - * - * @author makejava - * @since 2023-10-17 15:33:11 - */ -public interface IMdmModuleRoleButtonService extends IBaseService { -} diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/service/impl/MdmModuleRoleButtonServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/service/impl/MdmModuleRoleButtonServiceImpl.java deleted file mode 100644 index bc5bfc73..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/service/impl/MdmModuleRoleButtonServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hzya.frame.mdm.mdmModuleRoleButton.service.impl; - -import com.hzya.frame.mdm.mdmModuleRoleButton.entity.MdmModuleRoleButtonEntity; -import com.hzya.frame.mdm.mdmModuleRoleButton.dao.IMdmModuleRoleButtonDao; -import com.hzya.frame.mdm.mdmModuleRoleButton.service.IMdmModuleRoleButtonService; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; - -import javax.annotation.Resource; - -import com.hzya.frame.basedao.service.impl.BaseService; - -/** - * 主数据功能角色按钮表(MdmModuleRoleButton)表服务实现类 - * - * @author makejava - * @since 2023-10-17 15:33:12 - */ -@Service(value = "mdmModuleRoleButtonService") -public class MdmModuleRoleButtonServiceImpl extends BaseService implements IMdmModuleRoleButtonService { - - private IMdmModuleRoleButtonDao mdmModuleRoleButtonDao; - - @Autowired - public void setMdmModuleRoleButtonDao(IMdmModuleRoleButtonDao dao) { - this.mdmModuleRoleButtonDao = dao; - this.dao = dao; - } -} diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/dao/IMdmModuleSendLogDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/dao/IMdmModuleSendLogDao.java new file mode 100644 index 00000000..156977bb --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/dao/IMdmModuleSendLogDao.java @@ -0,0 +1,15 @@ +package com.hzya.frame.mdm.mdmModuleSendLog.dao; + +import com.hzya.frame.mdm.mdmModuleSendLog.entity.MdmModuleSendLogEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 主数据模版(mdm_module_send_log: table)表数据库访问层 + * + * @author makejava + * @since 2024-06-05 16:11:09 + */ +public interface IMdmModuleSendLogDao extends IBaseDao { + +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/dao/impl/MdmModuleSendLogDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/dao/impl/MdmModuleSendLogDaoImpl.java new file mode 100644 index 00000000..9e59822d --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/dao/impl/MdmModuleSendLogDaoImpl.java @@ -0,0 +1,17 @@ +package com.hzya.frame.mdm.mdmModuleSendLog.dao.impl; + +import com.hzya.frame.mdm.mdmModuleSendLog.entity.MdmModuleSendLogEntity; +import com.hzya.frame.mdm.mdmModuleSendLog.dao.IMdmModuleSendLogDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * 主数据模版(MdmModuleSendLog)表数据库访问层 + * + * @author makejava + * @since 2024-06-05 16:11:09 + */ +@Repository(value = "MdmModuleSendLogDaoImpl") +public class MdmModuleSendLogDaoImpl extends MybatisGenericDao implements IMdmModuleSendLogDao{ + +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/entity/MdmModuleSendLogEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/entity/MdmModuleSendLogEntity.java new file mode 100644 index 00000000..20995957 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/entity/MdmModuleSendLogEntity.java @@ -0,0 +1,94 @@ +package com.hzya.frame.mdm.mdmModuleSendLog.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 主数据模版(MdmModuleSendLog)实体类 + * + * @author makejava + * @since 2024-06-05 16:11:10 + */ +public class MdmModuleSendLogEntity extends BaseEntity { + //主数据表名 + private String tableName; + //主数据编码 + private Long mdmCode; + /** 主表id */ + private String formmainId; + /** 目标应用 */ + private String targetApp; + /** 目标api */ + private String targetApi; + /** 源数据 */ + private String sourceData; + /** 操作类型 */ + private String optionType; + /** 公司id */ + private String companyId; + + + public String getFormmainId() { + return formmainId; + } + + public void setFormmainId(String formmainId) { + this.formmainId = formmainId; + } + + public String getTargetApp() { + return targetApp; + } + + public void setTargetApp(String targetApp) { + this.targetApp = targetApp; + } + + public String getTargetApi() { + return targetApi; + } + + public void setTargetApi(String targetApi) { + this.targetApi = targetApi; + } + + public String getSourceData() { + return sourceData; + } + + public void setSourceData(String sourceData) { + this.sourceData = sourceData; + } + + public String getOptionType() { + return optionType; + } + + public void setOptionType(String optionType) { + this.optionType = optionType; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public Long getMdmCode() { + return mdmCode; + } + + public void setMdmCode(Long mdmCode) { + this.mdmCode = mdmCode; + } +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/entity/MdmModuleSendLogEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/entity/MdmModuleSendLogEntity.xml new file mode 100644 index 00000000..0cea9a23 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/entity/MdmModuleSendLogEntity.xml @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + id + ,formmain_id + ,target_app + ,target_api + ,source_data + ,option_type + ,sorts + ,create_user_id + ,create_time + ,modify_user_id + ,modify_time + ,sts + ,org_id + ,company_id + + + + + + + + + + + + + + + + + + insert into ${tableName}( + + id , + formmain_id , + target_app , + target_api , + source_data , + option_type , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sorts, + sts, + + )values( + + #{id} , + #{formmainId} , + #{targetApp} , + #{targetApi} , + #{sourceData} , + #{optionType} , + #{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 ${tableName} a WHERE a.sts = 'Y' ), + 'Y', + + ) + + + + insert into ${tableName}(formmain_id, target_app, target_api, source_data, option_type, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.formmainId},#{entity.targetApp},#{entity.targetApi},#{entity.sourceData},#{entity.optionType},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + + + + + insert into ${tableName}(formmain_id, target_app, target_api, source_data, option_type, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.formmainId},#{entity.targetApp},#{entity.targetApi},#{entity.sourceData},#{entity.optionType},#{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 + formmain_id = values(formmain_id), + target_app = values(target_app), + target_api = values(target_api), + source_data = values(source_data), + option_type = values(option_type), + 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 ${tableName} set + + formmain_id = #{formmainId}, + target_app = #{targetApp}, + target_api = #{targetApi}, + source_data = #{sourceData}, + option_type = #{optionType}, + 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 ${tableName} set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where id = #{id} + + + +update ${tableName} set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and formmain_id = #{formmainId} + and target_app = #{targetApp} + and target_api = #{targetApi} + and source_data = #{sourceData} + and option_type = #{optionType} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and sts='Y' + + + + + delete from ${tableName} where id = #{id} + + + + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/IMdmModuleSourceDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/IMdmModuleSourceDao.java new file mode 100644 index 00000000..cc3b08c8 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/IMdmModuleSourceDao.java @@ -0,0 +1,27 @@ +package com.hzya.frame.mdm.mdmModuleSource.dao; + +import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +import java.util.List; + +/** + * 主数据数据来源(mdm_module_source: table)表数据库访问层 + * + * @author makejava + * @since 2024-06-05 11:42:56 + */ +public interface IMdmModuleSourceDao extends IBaseDao { + + /** + * + * @content 根据数据来源内类型是插件的应用类型做分组 + * @Param + * @Return + * @Author hecan + * @Date 2024/6/6 10:43 + * **/ + List MdmModuleSourceentityGroupByType(); + +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/impl/MdmModuleSourceDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/impl/MdmModuleSourceDaoImpl.java new file mode 100644 index 00000000..b7cc9034 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/impl/MdmModuleSourceDaoImpl.java @@ -0,0 +1,28 @@ +package com.hzya.frame.mdm.mdmModuleSource.dao.impl; + +import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; +import com.hzya.frame.mdm.mdmModuleSource.dao.IMdmModuleSourceDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; + +import java.util.List; + +/** + * 主数据数据来源(MdmModuleSource)表数据库访问层 + * + * @author makejava + * @since 2024-06-05 11:42:56 + */ +@Repository(value = "MdmModuleSourceDaoImpl") +public class MdmModuleSourceDaoImpl extends MybatisGenericDao implements IMdmModuleSourceDao{ + //根据数据来源内类型是插件的应用类型做分组 + @Override + public List MdmModuleSourceentityGroupByType() { + List list =(List) super.selectList(getSqlIdPrifx() + "MdmModuleSourceentityGroupByType", ""); + return list; + } + + + +} + 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 new file mode 100644 index 00000000..84e0358b --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java @@ -0,0 +1,74 @@ +package com.hzya.frame.mdm.mdmModuleSource.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 主数据数据来源(MdmModuleSource)实体类 + * + * @author makejava + * @since 2024-06-05 11:42:57 + */ +public class MdmModuleSourceEntity extends BaseEntity { + + /** 主数据模版ID */ + private String mdmId; + /** 来源类型 */ + private String sourceType; + /** 来源名称 */ + private String sourceName; + /** 来源编码 */ + private String sourceCode; + /** 公司id */ + private String companyId; + private String pluginCode;//插件编码 + + public String getPluginCode() { + return pluginCode; + } + + public void setPluginCode(String pluginCode) { + this.pluginCode = pluginCode; + } + + public String getMdmId() { + return mdmId; + } + + public void setMdmId(String mdmId) { + this.mdmId = mdmId; + } + + public String getSourceType() { + return sourceType; + } + + public void setSourceType(String sourceType) { + this.sourceType = sourceType; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getSourceCode() { + return sourceCode; + } + + public void setSourceCode(String sourceCode) { + this.sourceCode = sourceCode; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + +} + 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 new file mode 100644 index 00000000..245446f4 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml @@ -0,0 +1,253 @@ + + + + + + + + + + + + + + + + + + + + + + id + ,mdm_id + ,source_type + ,source_name + ,source_code + ,sorts + ,create_user_id + ,create_time + ,modify_user_id + ,modify_time + ,sts + ,org_id + ,company_id + + + + + + + + + + + + + + + + + + + insert into mdm_module_source( + + id , + mdm_id , + source_type , + source_name , + source_code , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sorts, + sts, + + )values( + + #{id} , + #{mdmId} , + #{sourceType} , + #{sourceName} , + #{sourceCode} , + #{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_module_source a WHERE a.sts = 'Y' ), + 'Y', + + ) + + + + insert into mdm_module_source(mdm_id, source_type, source_name, source_code, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.mdmId},#{entity.sourceType},#{entity.sourceName},#{entity.sourceCode},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + + + + + insert into mdm_module_source(mdm_id, source_type, source_name, source_code, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.mdmId},#{entity.sourceType},#{entity.sourceName},#{entity.sourceCode},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + mdm_id = values(mdm_id), + source_type = values(source_type), + source_name = values(source_name), + source_code = values(source_code), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + +update mdm_module_source set + + mdm_id = #{mdmId}, + source_type = #{sourceType}, + source_name = #{sourceName}, + source_code = #{sourceCode}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + +where id = #{id} + + + +update mdm_module_source set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where id = #{id} + + + +update mdm_module_source set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and mdm_id = #{mdmId} + and source_type = #{sourceType} + and source_name = #{sourceName} + and source_code = #{sourceCode} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and sts='Y' + + + + + delete from mdm_module_source where id = #{id} + + + + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/service/IMdmModuleSourceService.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/service/IMdmModuleSourceService.java new file mode 100644 index 00000000..f622682c --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/service/IMdmModuleSourceService.java @@ -0,0 +1,12 @@ +package com.hzya.frame.mdm.mdmModuleSource.service; + +import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; +import com.hzya.frame.basedao.service.IBaseService; +/** + * 主数据数据来源(MdmModuleSource)表服务接口 + * + * @author makejava + * @since 2024-06-05 11:42:57 + */ +public interface IMdmModuleSourceService extends IBaseService{ +} diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/service/impl/MdmModuleSourceServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/service/impl/MdmModuleSourceServiceImpl.java new file mode 100644 index 00000000..f9afb989 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/service/impl/MdmModuleSourceServiceImpl.java @@ -0,0 +1,26 @@ +package com.hzya.frame.mdm.mdmModuleSource.service.impl; + +import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; +import com.hzya.frame.mdm.mdmModuleSource.dao.IMdmModuleSourceDao; +import com.hzya.frame.mdm.mdmModuleSource.service.IMdmModuleSourceService; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; +import com.hzya.frame.basedao.service.impl.BaseService; +/** + * 主数据数据来源(MdmModuleSource)表服务实现类 + * + * @author makejava + * @since 2024-06-05 11:42:57 + */ +@Service(value = "mdmModuleSourceService") +public class MdmModuleSourceServiceImpl extends BaseService implements IMdmModuleSourceService { + + private IMdmModuleSourceDao mdmModuleSourceDao; + + @Autowired + public void setMdmModuleSourceDao(IMdmModuleSourceDao dao) { + this.mdmModuleSourceDao = dao; + this.dao = dao; + } +} diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/dao/IMdmModuleUserViewDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/dao/IMdmModuleUserViewDao.java deleted file mode 100644 index 1e2f0494..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/dao/IMdmModuleUserViewDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzya.frame.mdm.mdmModuleUserView.dao; - -import com.hzya.frame.mdm.mdmModuleUserView.entity.MdmModuleUserViewEntity; -import com.hzya.frame.basedao.dao.IBaseDao; - -/** - * 主数据用户视图表(mdm_module_user_view: table)表数据库访问层 - * - * @author makejava - * @since 2023-10-17 15:33:47 - */ -public interface IMdmModuleUserViewDao extends IBaseDao { - -} - diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/dao/impl/MdmModuleUserViewDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/dao/impl/MdmModuleUserViewDaoImpl.java deleted file mode 100644 index 37970aee..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/dao/impl/MdmModuleUserViewDaoImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hzya.frame.mdm.mdmModuleUserView.dao.impl; - -import com.hzya.frame.mdm.mdmModuleUserView.entity.MdmModuleUserViewEntity; -import com.hzya.frame.mdm.mdmModuleUserView.dao.IMdmModuleUserViewDao; -import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; - -/** - * 主数据用户视图表(MdmModuleUserView)表数据库访问层 - * - * @author makejava - * @since 2023-10-17 15:33:47 - */ -@Repository(value = "MdmModuleUserViewDaoImpl") -public class MdmModuleUserViewDaoImpl extends MybatisGenericDao implements IMdmModuleUserViewDao { - -} - diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/entity/MdmModuleUserViewEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/entity/MdmModuleUserViewEntity.java deleted file mode 100644 index 7a1ef8e3..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/entity/MdmModuleUserViewEntity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.hzya.frame.mdm.mdmModuleUserView.entity; - -import java.util.Date; - -import com.hzya.frame.web.entity.BaseEntity; - -/** - * 主数据用户视图表(MdmModuleUserView)实体类 - * - * @author makejava - * @since 2023-10-17 15:33:48 - */ -public class MdmModuleUserViewEntity extends BaseEntity { - - /** - * 主数据模版ID - */ - private String mdmId; - /** - * 用户id - */ - private String userId; - /** - * 视图明细id - */ - private String viewDetailId; - - - public String getMdmId() { - return mdmId; - } - - public void setMdmId(String mdmId) { - this.mdmId = mdmId; - } - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } - - public String getViewDetailId() { - return viewDetailId; - } - - public void setViewDetailId(String viewDetailId) { - this.viewDetailId = viewDetailId; - } - -} - diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/entity/MdmModuleUserViewEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/entity/MdmModuleUserViewEntity.xml deleted file mode 100644 index f99172ea..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/entity/MdmModuleUserViewEntity.xml +++ /dev/null @@ -1,241 +0,0 @@ - - - - - - - - - - - - - - - - - - - - id - ,mdm_id - ,user_id - ,view_detail_id - ,sorts - ,create_user_id - ,create_time - ,modify_user_id - ,modify_time - ,sts - ,org_id - - - - - - - - - - - - - - - - insert into mdm_module_user_view( - - id , - mdm_id , - user_id , - view_detail_id , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - sts, - - )values( - - #{id} , - #{mdmId} , - #{userId} , - #{viewDetailId} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - - 'Y', - - ) - - - - insert into mdm_module_user_view(mdm_id, user_id, view_detail_id, sorts, create_user_id, create_time, - modify_user_id, modify_time, sts, org_id, sts) - values - - (#{entity.mdmId},#{entity.userId},#{entity.viewDetailId},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}, - 'Y') - - - - - insert into mdm_module_user_view(mdm_id, user_id, view_detail_id, sorts, create_user_id, create_time, - modify_user_id, modify_time, sts, org_id) - values - - (#{entity.mdmId},#{entity.userId},#{entity.viewDetailId},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}) - - on duplicate key update - mdm_id = values(mdm_id), - user_id = values(user_id), - view_detail_id = values(view_detail_id), - sorts = values(sorts), - 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) - - - - update mdm_module_user_view set - - mdm_id = #{mdmId}, - user_id = #{userId}, - view_detail_id = #{viewDetailId}, - sorts = #{sorts}, - 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}, - - where id = #{id} - - - -update mdm_module_user_view set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} -where id = #{id} - - - - update mdm_module_user_view set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} - - and id = #{id} - and mdm_id = #{mdmId} - and user_id = #{userId} - and view_detail_id = #{viewDetailId} - and sorts = #{sorts} - and sts = #{sts} - and sts='Y' - - - - - delete from mdm_module_user_view where id = #{id} - - - - diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/service/IMdmModuleUserViewService.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/service/IMdmModuleUserViewService.java deleted file mode 100644 index 05ee428b..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/service/IMdmModuleUserViewService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hzya.frame.mdm.mdmModuleUserView.service; - -import com.hzya.frame.mdm.mdmModuleUserView.entity.MdmModuleUserViewEntity; -import com.hzya.frame.basedao.service.IBaseService; - -/** - * 主数据用户视图表(MdmModuleUserView)表服务接口 - * - * @author makejava - * @since 2023-10-17 15:33:48 - */ -public interface IMdmModuleUserViewService extends IBaseService { -} diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/service/impl/MdmModuleUserViewServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/service/impl/MdmModuleUserViewServiceImpl.java deleted file mode 100644 index d3984f4b..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/service/impl/MdmModuleUserViewServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hzya.frame.mdm.mdmModuleUserView.service.impl; - -import com.hzya.frame.mdm.mdmModuleUserView.entity.MdmModuleUserViewEntity; -import com.hzya.frame.mdm.mdmModuleUserView.dao.IMdmModuleUserViewDao; -import com.hzya.frame.mdm.mdmModuleUserView.service.IMdmModuleUserViewService; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; - -import javax.annotation.Resource; - -import com.hzya.frame.basedao.service.impl.BaseService; - -/** - * 主数据用户视图表(MdmModuleUserView)表服务实现类 - * - * @author makejava - * @since 2023-10-17 15:33:49 - */ -@Service(value = "mdmModuleUserViewService") -public class MdmModuleUserViewServiceImpl extends BaseService implements IMdmModuleUserViewService { - - private IMdmModuleUserViewDao mdmModuleUserViewDao; - - @Autowired - public void setMdmModuleUserViewDao(IMdmModuleUserViewDao dao) { - this.mdmModuleUserViewDao = dao; - this.dao = dao; - } -} diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/dao/IMdmModuleViewDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/dao/IMdmModuleViewDao.java index b9bedcc9..c1daba93 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/dao/IMdmModuleViewDao.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/dao/IMdmModuleViewDao.java @@ -1,13 +1,13 @@ package com.hzya.frame.mdm.mdmModuleView.dao; import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity; -import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.basedao.dao.IBaseDao; /** * 主数据视图表(mdm_module_view: table)表数据库访问层 * * @author makejava - * @since 2023-10-17 15:34:17 + * @since 2024-06-03 08:48:37 */ public interface IMdmModuleViewDao extends IBaseDao { diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/dao/impl/MdmModuleViewDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/dao/impl/MdmModuleViewDaoImpl.java index c9a5af9f..453f7b44 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/dao/impl/MdmModuleViewDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/dao/impl/MdmModuleViewDaoImpl.java @@ -4,15 +4,14 @@ import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity; import com.hzya.frame.mdm.mdmModuleView.dao.IMdmModuleViewDao; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; - /** * 主数据视图表(MdmModuleView)表数据库访问层 * * @author makejava - * @since 2023-10-17 15:34:17 + * @since 2024-06-03 08:48:37 */ @Repository(value = "MdmModuleViewDaoImpl") -public class MdmModuleViewDaoImpl extends MybatisGenericDao implements IMdmModuleViewDao { - +public class MdmModuleViewDaoImpl extends MybatisGenericDao implements IMdmModuleViewDao{ + } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/entity/MdmModuleViewEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/entity/MdmModuleViewEntity.java index 83d451fd..83103ab3 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/entity/MdmModuleViewEntity.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/entity/MdmModuleViewEntity.java @@ -1,34 +1,28 @@ package com.hzya.frame.mdm.mdmModuleView.entity; import java.util.Date; - import com.hzya.frame.web.entity.BaseEntity; - /** * 主数据视图表(MdmModuleView)实体类 * * @author makejava - * @since 2023-10-17 15:34:17 + * @since 2024-06-03 08:48:37 */ public class MdmModuleViewEntity extends BaseEntity { + + /** 主数据模版ID */ + private String mdmId; + /** 显示类型 */ + private String viewName; + /** 显示字段 */ + private String viewFiled; + /** 上级id字段 */ + private String upIdFiled; + /** 公司id */ + private String companyId; - /** - * 主数据模版ID - */ - private String mdmId; - /** - * 显示类型 1、树 2、列表 - */ - private String viewName; - /** - * 显示字段 - */ - private String viewFiled; - /** - * 上级id字段 - */ - private String upIdFiled; - + /** 数据类型 1、新增 2、修改 */ + private String dataType; public String getMdmId() { return mdmId; @@ -62,5 +56,20 @@ public class MdmModuleViewEntity extends BaseEntity { this.upIdFiled = upIdFiled; } + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public String getDataType() { + return dataType; + } + + public void setDataType(String dataType) { + this.dataType = dataType; + } } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/entity/MdmModuleViewEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/entity/MdmModuleViewEntity.xml index 14def405..0e990f0d 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/entity/MdmModuleViewEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/entity/MdmModuleViewEntity.xml @@ -2,22 +2,23 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + id ,mdm_id ,view_name @@ -30,218 +31,211 @@ ,modify_time ,sts ,org_id + ,company_id - - + select + + from mdm_module_view + + and id = #{id} + and mdm_id = #{mdmId} + and view_name = #{viewName} + and view_filed = #{viewFiled} + and up_id_filed = #{upIdFiled} + and sorts = #{sorts} + and create_user_id = #{create_user_id} + and create_time = #{create_time} + and modify_user_id = #{modify_user_id} + and modify_time = #{modify_time} + and sts = #{sts} + and org_id = #{org_id} + and company_id = #{companyId} and sts='Y' - - order by sorts asc - order by ${sort} ${order} - - - - + + + - + select + + from mdm_module_view + + and id like concat('%',#{id},'%') + and mdm_id like concat('%',#{mdmId},'%') + and view_name like concat('%',#{viewName},'%') + and view_filed like concat('%',#{viewFiled},'%') + and up_id_filed like concat('%',#{upIdFiled},'%') + and sorts like concat('%',#{sorts},'%') + and create_user_id like concat('%',#{create_user_id},'%') + and create_time like concat('%',#{create_time},'%') + and modify_user_id like concat('%',#{modify_user_id},'%') + and modify_time like concat('%',#{modify_time},'%') + and sts like concat('%',#{sts},'%') + and org_id like concat('%',#{org_id},'%') + and company_id like concat('%',#{companyId},'%') and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - + select + + from mdm_module_view + + or id = #{id} + or mdm_id = #{mdmId} + or view_name = #{viewName} + or view_filed = #{viewFiled} + or up_id_filed = #{upIdFiled} + or sorts = #{sorts} + or create_user_id = #{create_user_id} + or create_time = #{create_time} + or modify_user_id = #{modify_user_id} + or modify_time = #{modify_time} + or sts = #{sts} + or org_id = #{org_id} + or company_id = #{companyId} and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - - insert into mdm_module_view( - - id , - mdm_id , - view_name , - view_filed , - up_id_filed , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - sts, - - )values( - - #{id} , - #{mdmId} , - #{viewName} , - #{viewFiled} , - #{upIdFiled} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - - 'Y', - - ) - - - - insert into mdm_module_view(mdm_id, view_name, view_filed, up_id_filed, sorts, create_user_id, create_time, - modify_user_id, modify_time, sts, org_id, sts) - values - - (#{entity.mdmId},#{entity.viewName},#{entity.viewFiled},#{entity.upIdFiled},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}, - 'Y') - - - - - insert into mdm_module_view(mdm_id, view_name, view_filed, up_id_filed, sorts, create_user_id, create_time, - modify_user_id, modify_time, sts, org_id) - values - - (#{entity.mdmId},#{entity.viewName},#{entity.viewFiled},#{entity.upIdFiled},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}) - - on duplicate key update - mdm_id = values(mdm_id), - view_name = values(view_name), - view_filed = values(view_filed), - up_id_filed = values(up_id_filed), - sorts = values(sorts), - 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) - - - - update mdm_module_view set - - mdm_id = #{mdmId}, - view_name = #{viewName}, - view_filed = #{viewFiled}, - up_id_filed = #{upIdFiled}, - sorts = #{sorts}, - 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}, - - where id = #{id} - - - + + + insert into mdm_module_view( + + id , + mdm_id , + view_name , + view_filed , + up_id_filed , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sts, + + )values( + + #{id} , + #{mdmId} , + #{viewName} , + #{viewFiled} , + #{upIdFiled} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + 'Y', + + ) + + + + insert into mdm_module_view(mdm_id, view_name, view_filed, up_id_filed, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.mdmId},#{entity.viewName},#{entity.viewFiled},#{entity.upIdFiled},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + + + + + insert into mdm_module_view(mdm_id, view_name, view_filed, up_id_filed, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.mdmId},#{entity.viewName},#{entity.viewFiled},#{entity.upIdFiled},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + mdm_id = values(mdm_id), + view_name = values(view_name), + view_filed = values(view_filed), + up_id_filed = values(up_id_filed), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + +update mdm_module_view set + + mdm_id = #{mdmId}, + view_name = #{viewName}, + view_filed = #{viewFiled}, + up_id_filed = #{upIdFiled}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + +where id = #{id} + + + update mdm_module_view set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - - - update mdm_module_view set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} - - and id = #{id} - and mdm_id = #{mdmId} - and view_name = #{viewName} - and view_filed = #{viewFiled} - and up_id_filed = #{upIdFiled} - and sorts = #{sorts} - and sts = #{sts} + + +update mdm_module_view set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and mdm_id = #{mdmId} + and view_name = #{viewName} + and view_filed = #{viewFiled} + and up_id_filed = #{upIdFiled} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} and sts='Y' - - - - + + + + delete from mdm_module_view where id = #{id} diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/service/IMdmModuleViewService.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/service/IMdmModuleViewService.java index ffcd3338..5a9399ff 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/service/IMdmModuleViewService.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/service/IMdmModuleViewService.java @@ -2,12 +2,11 @@ package com.hzya.frame.mdm.mdmModuleView.service; import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity; import com.hzya.frame.basedao.service.IBaseService; - /** * 主数据视图表(MdmModuleView)表服务接口 * * @author makejava - * @since 2023-10-17 15:34:18 + * @since 2024-06-03 08:48:37 */ -public interface IMdmModuleViewService extends IBaseService { +public interface IMdmModuleViewService extends IBaseService{ } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/service/impl/MdmModuleViewServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/service/impl/MdmModuleViewServiceImpl.java index 7029f030..7bc7b2f5 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/service/impl/MdmModuleViewServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/service/impl/MdmModuleViewServiceImpl.java @@ -3,27 +3,24 @@ package com.hzya.frame.mdm.mdmModuleView.service.impl; import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity; import com.hzya.frame.mdm.mdmModuleView.dao.IMdmModuleViewDao; import com.hzya.frame.mdm.mdmModuleView.service.IMdmModuleViewService; -import org.springframework.stereotype.Service; +import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; - import javax.annotation.Resource; - import com.hzya.frame.basedao.service.impl.BaseService; - /** * 主数据视图表(MdmModuleView)表服务实现类 * * @author makejava - * @since 2023-10-17 15:34:19 + * @since 2024-06-03 08:48:37 */ @Service(value = "mdmModuleViewService") public class MdmModuleViewServiceImpl extends BaseService implements IMdmModuleViewService { - + private IMdmModuleViewDao mdmModuleViewDao; - + @Autowired - public void setMdmModuleViewDao(IMdmModuleViewDao dao) { - this.mdmModuleViewDao = dao; - this.dao = dao; - } + public void setMdmModuleViewDao(IMdmModuleViewDao dao) { + this.mdmModuleViewDao = dao; + this.dao = dao; + } } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/dao/IMdmModuleViewButtonDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/dao/IMdmModuleViewButtonDao.java new file mode 100644 index 00000000..66472d77 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/dao/IMdmModuleViewButtonDao.java @@ -0,0 +1,15 @@ +package com.hzya.frame.mdm.mdmModuleViewButton.dao; + +import com.hzya.frame.mdm.mdmModuleViewButton.entity.MdmModuleViewButtonEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 主数据视图按钮表(mdm_module_view_button: table)表数据库访问层 + * + * @author makejava + * @since 2024-06-03 08:48:46 + */ +public interface IMdmModuleViewButtonDao extends IBaseDao { + +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/dao/impl/MdmModuleViewButtonDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/dao/impl/MdmModuleViewButtonDaoImpl.java new file mode 100644 index 00000000..6d790b3e --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/dao/impl/MdmModuleViewButtonDaoImpl.java @@ -0,0 +1,17 @@ +package com.hzya.frame.mdm.mdmModuleViewButton.dao.impl; + +import com.hzya.frame.mdm.mdmModuleViewButton.entity.MdmModuleViewButtonEntity; +import com.hzya.frame.mdm.mdmModuleViewButton.dao.IMdmModuleViewButtonDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * 主数据视图按钮表(MdmModuleViewButton)表数据库访问层 + * + * @author makejava + * @since 2024-06-03 08:48:46 + */ +@Repository(value = "MdmModuleViewButtonDaoImpl") +public class MdmModuleViewButtonDaoImpl extends MybatisGenericDao implements IMdmModuleViewButtonDao{ + +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/entity/MdmModuleViewButtonEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/entity/MdmModuleViewButtonEntity.java new file mode 100644 index 00000000..6ac2b94f --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/entity/MdmModuleViewButtonEntity.java @@ -0,0 +1,74 @@ +package com.hzya.frame.mdm.mdmModuleViewButton.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 主数据视图按钮表(MdmModuleViewButton)实体类 + * + * @author makejava + * @since 2024-06-03 08:48:46 + */ +public class MdmModuleViewButtonEntity extends BaseEntity { + + /** 主数据模版ID */ + private String mdmId; + /** 视图id */ + private String viewId; + /** 类型1、新建2、重置3、查询4、修改 5、删除 6、查看 */ + private String buttonType; + /** 按钮值 */ + private String buttonValue; + /** 公司id */ + private String companyId; + + /** 数据类型 1、新增 2、修改 */ + private String dataType; + public String getMdmId() { + return mdmId; + } + + public void setMdmId(String mdmId) { + this.mdmId = mdmId; + } + + public String getViewId() { + return viewId; + } + + public void setViewId(String viewId) { + this.viewId = viewId; + } + + public String getButtonType() { + return buttonType; + } + + public void setButtonType(String buttonType) { + this.buttonType = buttonType; + } + + public String getButtonValue() { + return buttonValue; + } + + public void setButtonValue(String buttonValue) { + this.buttonValue = buttonValue; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public String getDataType() { + return dataType; + } + + public void setDataType(String dataType) { + this.dataType = dataType; + } +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/entity/MdmModuleViewButtonEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/entity/MdmModuleViewButtonEntity.xml new file mode 100644 index 00000000..e13d7aa0 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/entity/MdmModuleViewButtonEntity.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + id + ,mdm_id + ,view_id + ,button_type + ,button_value + ,sorts + ,create_user_id + ,create_time + ,modify_user_id + ,modify_time + ,sts + ,org_id + ,company_id + + + + + + + + + + + + + + + + insert into mdm_module_view_button( + + id , + mdm_id , + view_id , + button_type , + button_value , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sts, + + )values( + + #{id} , + #{mdmId} , + #{viewId} , + #{buttonType} , + #{buttonValue} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + 'Y', + + ) + + + + insert into mdm_module_view_button(mdm_id, view_id, button_type, button_value, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.mdmId},#{entity.viewId},#{entity.buttonType},#{entity.buttonValue},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + + + + + insert into mdm_module_view_button(mdm_id, view_id, button_type, button_value, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.mdmId},#{entity.viewId},#{entity.buttonType},#{entity.buttonValue},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + mdm_id = values(mdm_id), + view_id = values(view_id), + button_type = values(button_type), + button_value = values(button_value), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + +update mdm_module_view_button set + + mdm_id = #{mdmId}, + view_id = #{viewId}, + button_type = #{buttonType}, + button_value = #{buttonValue}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + +where id = #{id} + + + +update mdm_module_view_button set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where id = #{id} + + + +update mdm_module_view_button set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and mdm_id = #{mdmId} + and view_id = #{viewId} + and button_type = #{buttonType} + and button_value = #{buttonValue} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and sts='Y' + + + + + delete from mdm_module_view_button where id = #{id} + + + + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/service/IMdmModuleViewButtonService.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/service/IMdmModuleViewButtonService.java new file mode 100644 index 00000000..b5e0ce7e --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/service/IMdmModuleViewButtonService.java @@ -0,0 +1,12 @@ +package com.hzya.frame.mdm.mdmModuleViewButton.service; + +import com.hzya.frame.mdm.mdmModuleViewButton.entity.MdmModuleViewButtonEntity; +import com.hzya.frame.basedao.service.IBaseService; +/** + * 主数据视图按钮表(MdmModuleViewButton)表服务接口 + * + * @author makejava + * @since 2024-06-03 08:48:46 + */ +public interface IMdmModuleViewButtonService extends IBaseService{ +} diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/service/impl/MdmModuleViewButtonServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/service/impl/MdmModuleViewButtonServiceImpl.java new file mode 100644 index 00000000..5b05c552 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/service/impl/MdmModuleViewButtonServiceImpl.java @@ -0,0 +1,26 @@ +package com.hzya.frame.mdm.mdmModuleViewButton.service.impl; + +import com.hzya.frame.mdm.mdmModuleViewButton.entity.MdmModuleViewButtonEntity; +import com.hzya.frame.mdm.mdmModuleViewButton.dao.IMdmModuleViewButtonDao; +import com.hzya.frame.mdm.mdmModuleViewButton.service.IMdmModuleViewButtonService; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; +import com.hzya.frame.basedao.service.impl.BaseService; +/** + * 主数据视图按钮表(MdmModuleViewButton)表服务实现类 + * + * @author makejava + * @since 2024-06-03 08:48:46 + */ +@Service(value = "mdmModuleViewButtonService") +public class MdmModuleViewButtonServiceImpl extends BaseService implements IMdmModuleViewButtonService { + + private IMdmModuleViewButtonDao mdmModuleViewButtonDao; + + @Autowired + public void setMdmModuleViewButtonDao(IMdmModuleViewButtonDao dao) { + this.mdmModuleViewButtonDao = dao; + this.dao = dao; + } +} diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/dao/IMdmModuleViewDetailDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/dao/IMdmModuleViewDetailDao.java index c5623fb1..248da365 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/dao/IMdmModuleViewDetailDao.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/dao/IMdmModuleViewDetailDao.java @@ -1,13 +1,13 @@ package com.hzya.frame.mdm.mdmModuleViewDetail.dao; import com.hzya.frame.mdm.mdmModuleViewDetail.entity.MdmModuleViewDetailEntity; -import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.basedao.dao.IBaseDao; /** * 主数据视图明细表(mdm_module_view_detail: table)表数据库访问层 * * @author makejava - * @since 2023-10-17 15:34:58 + * @since 2024-06-03 08:48:55 */ public interface IMdmModuleViewDetailDao extends IBaseDao { diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/dao/impl/MdmModuleViewDetailDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/dao/impl/MdmModuleViewDetailDaoImpl.java index 4dd7e229..4b692a49 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/dao/impl/MdmModuleViewDetailDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/dao/impl/MdmModuleViewDetailDaoImpl.java @@ -4,15 +4,14 @@ import com.hzya.frame.mdm.mdmModuleViewDetail.entity.MdmModuleViewDetailEntity; import com.hzya.frame.mdm.mdmModuleViewDetail.dao.IMdmModuleViewDetailDao; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; - /** * 主数据视图明细表(MdmModuleViewDetail)表数据库访问层 * * @author makejava - * @since 2023-10-17 15:34:58 + * @since 2024-06-03 08:48:55 */ @Repository(value = "MdmModuleViewDetailDaoImpl") -public class MdmModuleViewDetailDaoImpl extends MybatisGenericDao implements IMdmModuleViewDetailDao { - +public class MdmModuleViewDetailDaoImpl extends MybatisGenericDao implements IMdmModuleViewDetailDao{ + } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/entity/MdmModuleViewDetailEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/entity/MdmModuleViewDetailEntity.java index c9151239..8d10318a 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/entity/MdmModuleViewDetailEntity.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/entity/MdmModuleViewDetailEntity.java @@ -1,34 +1,27 @@ package com.hzya.frame.mdm.mdmModuleViewDetail.entity; import java.util.Date; - import com.hzya.frame.web.entity.BaseEntity; - /** * 主数据视图明细表(MdmModuleViewDetail)实体类 * * @author makejava - * @since 2023-10-17 15:34:59 + * @since 2024-06-03 08:48:55 */ public class MdmModuleViewDetailEntity extends BaseEntity { - - /** - * 主数据模版ID - */ - private String mdmId; - /** - * 视图id - */ - private String viewId; - /** - * 字段 id - */ - private String viewFiled; - /** - * 类型1、查询2、列表3、新增4、修改 5、查看 - */ - private String viewType; - + + /** 主数据模版ID */ + private String mdmId; + /** 视图id */ + private String viewId; + /** 字段 */ + private String viewFiled; + /** 类型1、查询2、列表3、新增4、修改 5、查看 */ + private String viewType; + /** 公司id */ + private String companyId; + /** 数据类型 1、新增 2、修改 */ + private String dataType; public String getMdmId() { return mdmId; @@ -62,5 +55,20 @@ public class MdmModuleViewDetailEntity extends BaseEntity { this.viewType = viewType; } + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public String getDataType() { + return dataType; + } + + public void setDataType(String dataType) { + this.dataType = dataType; + } } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/entity/MdmModuleViewDetailEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/entity/MdmModuleViewDetailEntity.xml index 2a612e07..1b61a2da 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/entity/MdmModuleViewDetailEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/entity/MdmModuleViewDetailEntity.xml @@ -2,23 +2,23 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + id ,mdm_id ,view_id @@ -31,219 +31,211 @@ ,modify_time ,sts ,org_id + ,company_id - - + select + + from mdm_module_view_detail + + and id = #{id} + and mdm_id = #{mdmId} + and view_id = #{viewId} + and view_filed = #{viewFiled} + and view_type = #{viewType} + and sorts = #{sorts} + and create_user_id = #{create_user_id} + and create_time = #{create_time} + and modify_user_id = #{modify_user_id} + and modify_time = #{modify_time} + and sts = #{sts} + and org_id = #{org_id} + and company_id = #{companyId} and sts='Y' - - order by sorts asc - order by ${sort} ${order} - - - - + + + - + select + + from mdm_module_view_detail + + and id like concat('%',#{id},'%') + and mdm_id like concat('%',#{mdmId},'%') + and view_id like concat('%',#{viewId},'%') + and view_filed like concat('%',#{viewFiled},'%') + and view_type like concat('%',#{viewType},'%') + and sorts like concat('%',#{sorts},'%') + and create_user_id like concat('%',#{create_user_id},'%') + and create_time like concat('%',#{create_time},'%') + and modify_user_id like concat('%',#{modify_user_id},'%') + and modify_time like concat('%',#{modify_time},'%') + and sts like concat('%',#{sts},'%') + and org_id like concat('%',#{org_id},'%') + and company_id like concat('%',#{companyId},'%') and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - + select + + from mdm_module_view_detail + + or id = #{id} + or mdm_id = #{mdmId} + or view_id = #{viewId} + or view_filed = #{viewFiled} + or view_type = #{viewType} + or sorts = #{sorts} + or create_user_id = #{create_user_id} + or create_time = #{create_time} + or modify_user_id = #{modify_user_id} + or modify_time = #{modify_time} + or sts = #{sts} + or org_id = #{org_id} + or company_id = #{companyId} and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - - insert into mdm_module_view_detail( - - id , - mdm_id , - view_id , - view_filed , - view_type , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - sts, - - )values( - - #{id} , - #{mdmId} , - #{viewId} , - #{viewFiled} , - #{viewType} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - - 'Y', - - ) - - - - insert into mdm_module_view_detail(mdm_id, view_id, view_filed, view_type, sorts, create_user_id, create_time, - modify_user_id, modify_time, sts, org_id, sts) - values - - (#{entity.mdmId},#{entity.viewId},#{entity.viewFiled},#{entity.viewType},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}, - 'Y') - - - - - insert into mdm_module_view_detail(mdm_id, view_id, view_filed, view_type, sorts, create_user_id, create_time, - modify_user_id, modify_time, sts, org_id) - values - - (#{entity.mdmId},#{entity.viewId},#{entity.viewFiled},#{entity.viewType},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}) - - on duplicate key update - mdm_id = values(mdm_id), - view_id = values(view_id), - view_filed = values(view_filed), - view_type = values(view_type), - sorts = values(sorts), - 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) - - - - update mdm_module_view_detail set - - mdm_id = #{mdmId}, - view_id = #{viewId}, - view_filed = #{viewFiled}, - view_type = #{viewType}, - sorts = #{sorts}, - 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}, - - where id = #{id} - - - + + + insert into mdm_module_view_detail( + + id , + mdm_id , + view_id , + view_filed , + view_type , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sts, + + )values( + + #{id} , + #{mdmId} , + #{viewId} , + #{viewFiled} , + #{viewType} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + 'Y', + + ) + + + + insert into mdm_module_view_detail(mdm_id, view_id, view_filed, view_type, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.mdmId},#{entity.viewId},#{entity.viewFiled},#{entity.viewType},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + + + + + insert into mdm_module_view_detail(mdm_id, view_id, view_filed, view_type, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.mdmId},#{entity.viewId},#{entity.viewFiled},#{entity.viewType},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + mdm_id = values(mdm_id), + view_id = values(view_id), + view_filed = values(view_filed), + view_type = values(view_type), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + +update mdm_module_view_detail set + + mdm_id = #{mdmId}, + view_id = #{viewId}, + view_filed = #{viewFiled}, + view_type = #{viewType}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + +where id = #{id} + + + update mdm_module_view_detail set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - - - update mdm_module_view_detail set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} - - and id = #{id} - and mdm_id = #{mdmId} - and view_id = #{viewId} - and view_filed = #{viewFiled} - and view_type = #{viewType} - and sorts = #{sorts} - and sts = #{sts} + + +update mdm_module_view_detail set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and mdm_id = #{mdmId} + and view_id = #{viewId} + and view_filed = #{viewFiled} + and view_type = #{viewType} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} and sts='Y' - - - - + + + + delete from mdm_module_view_detail where id = #{id} diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/service/IMdmModuleViewDetailService.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/service/IMdmModuleViewDetailService.java index cf055f0a..cea4b1dc 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/service/IMdmModuleViewDetailService.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/service/IMdmModuleViewDetailService.java @@ -2,12 +2,11 @@ package com.hzya.frame.mdm.mdmModuleViewDetail.service; import com.hzya.frame.mdm.mdmModuleViewDetail.entity.MdmModuleViewDetailEntity; import com.hzya.frame.basedao.service.IBaseService; - /** * 主数据视图明细表(MdmModuleViewDetail)表服务接口 * * @author makejava - * @since 2023-10-17 15:35:00 + * @since 2024-06-03 08:48:55 */ -public interface IMdmModuleViewDetailService extends IBaseService { +public interface IMdmModuleViewDetailService extends IBaseService{ } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/service/impl/MdmModuleViewDetailServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/service/impl/MdmModuleViewDetailServiceImpl.java index fb83c460..34ffa328 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/service/impl/MdmModuleViewDetailServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/service/impl/MdmModuleViewDetailServiceImpl.java @@ -3,27 +3,24 @@ package com.hzya.frame.mdm.mdmModuleViewDetail.service.impl; import com.hzya.frame.mdm.mdmModuleViewDetail.entity.MdmModuleViewDetailEntity; import com.hzya.frame.mdm.mdmModuleViewDetail.dao.IMdmModuleViewDetailDao; import com.hzya.frame.mdm.mdmModuleViewDetail.service.IMdmModuleViewDetailService; -import org.springframework.stereotype.Service; +import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; - import javax.annotation.Resource; - import com.hzya.frame.basedao.service.impl.BaseService; - /** * 主数据视图明细表(MdmModuleViewDetail)表服务实现类 * * @author makejava - * @since 2023-10-17 15:35:00 + * @since 2024-06-03 08:48:55 */ @Service(value = "mdmModuleViewDetailService") public class MdmModuleViewDetailServiceImpl extends BaseService implements IMdmModuleViewDetailService { - + private IMdmModuleViewDetailDao mdmModuleViewDetailDao; - + @Autowired - public void setMdmModuleViewDetailDao(IMdmModuleViewDetailDao dao) { - this.mdmModuleViewDetailDao = dao; - this.dao = dao; - } + public void setMdmModuleViewDetailDao(IMdmModuleViewDetailDao dao) { + this.mdmModuleViewDetailDao = dao; + this.dao = dao; + } } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmTableCodeRule/dao/IMdmTableCodeRuleDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmTableCodeRule/dao/IMdmTableCodeRuleDao.java index a900d337..bf6031ad 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmTableCodeRule/dao/IMdmTableCodeRuleDao.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmTableCodeRule/dao/IMdmTableCodeRuleDao.java @@ -7,7 +7,7 @@ import com.hzya.frame.basedao.dao.IBaseDao; * 模版数据表编码规则表(mdm_table_code_rule: table)表数据库访问层 * * @author makejava - * @since 2023-11-06 16:12:34 + * @since 2024-06-03 10:56:13 */ public interface IMdmTableCodeRuleDao extends IBaseDao { diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmTableCodeRule/dao/impl/MdmTableCodeRuleDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmTableCodeRule/dao/impl/MdmTableCodeRuleDaoImpl.java index b7452719..3f47ae31 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmTableCodeRule/dao/impl/MdmTableCodeRuleDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmTableCodeRule/dao/impl/MdmTableCodeRuleDaoImpl.java @@ -8,7 +8,7 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao; * 模版数据表编码规则表(MdmTableCodeRule)表数据库访问层 * * @author makejava - * @since 2023-11-06 16:12:35 + * @since 2024-06-03 10:56:13 */ @Repository(value = "MdmTableCodeRuleDaoImpl") public class MdmTableCodeRuleDaoImpl extends MybatisGenericDao implements IMdmTableCodeRuleDao{ diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmTableCodeRule/entity/MdmTableCodeRuleEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmTableCodeRule/entity/MdmTableCodeRuleEntity.java index cca012ab..0b5c0531 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmTableCodeRule/entity/MdmTableCodeRuleEntity.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmTableCodeRule/entity/MdmTableCodeRuleEntity.java @@ -6,7 +6,7 @@ import com.hzya.frame.web.entity.BaseEntity; * 模版数据表编码规则表(MdmTableCodeRule)实体类 * * @author makejava - * @since 2023-11-06 16:12:35 + * @since 2024-06-03 10:56:13 */ public class MdmTableCodeRuleEntity extends BaseEntity { @@ -16,12 +16,14 @@ public class MdmTableCodeRuleEntity extends BaseEntity { private String dbId; /** 规则 */ private String dbName; - /** 类型 1、连接符号 2、字符串 3、日期 4、流水号 */ + /** 类型 1、固定值 2、日期 3、流水 */ private String dbType; /** 备注 */ private String remark; /** 规则值 */ private String dbValue; + /** 公司id */ + private String companyId; public String getMdmId() { @@ -72,5 +74,13 @@ public class MdmTableCodeRuleEntity extends BaseEntity { this.dbValue = dbValue; } + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmTableCodeRule/entity/MdmTableCodeRuleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmTableCodeRule/entity/MdmTableCodeRuleEntity.xml index 38427b56..20bf14eb 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmTableCodeRule/entity/MdmTableCodeRuleEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmTableCodeRule/entity/MdmTableCodeRuleEntity.xml @@ -9,6 +9,7 @@ + @@ -16,7 +17,7 @@ - + @@ -26,6 +27,7 @@ ,db_name ,db_type ,remark + ,db_value ,sorts ,create_user_id ,create_time @@ -33,7 +35,7 @@ ,modify_time ,sts ,org_id - ,db_value + ,company_id + select * from ${dbName} + + and id = #{id} + and formmain_id = #{formmainId} + and code = #{code} + and source_name = #{sourceName} + and source_data = #{sourceData} + and option_type = #{optionType} + and option_name = #{optionName} + and sorts = #{sorts} + and create_user_id = #{create_user_id} + and create_time = #{create_time} + and modify_user_id = #{modify_user_id} + and modify_time = #{modify_time} + and sts = #{sts} + and org_id = #{org_id} + and sts='Y' + + + + + + + + + insert into ${dbName} + + id, + formmain_id, + code , + source_name , + source_data , + option_type , + option_name , + sorts , + create_user_id , + modify_user_id , + org_id , + company_id , + create_time, + modify_time, + sts + + values + + #{id}, + #{formmainId}, + #{code} , + #{sourceName} , + #{sourceData} , + #{optionType} , + #{optionName} , + #{sorts} , + (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from ${dbName} a WHERE a.sts = 'Y' ), + #{create_user_id} , + #{modify_user_id} , + #{org_id} , + #{companyId} , + #{create_time} , + now() , + #{modify_time} , + now() , + #{sts} , + 'Y' + + + + + + update ${dbName} set + + formmain_id = #{formmainId}, + source_name = #{sourceName}, + code = #{code}, + source_data = #{sourceData}, + option_type = #{optionType}, + option_name = #{optionName}, + sorts = #{sorts}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + modify_time = now(), + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId} + + where id=#{id} and sts='Y' + + + + + + update + ${dbName} + set sts= 'N' ,modify_time = now(),modify_user_id = #{modify_user_id} + + formmain_id = #{formmainId}, + source_name = #{sourceName}, + code = #{code}, + source_data = #{sourceData}, + option_type = #{optionType}, + option_name = #{optionName}, + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and id=#{id} and sts='Y' + + + + + diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java new file mode 100644 index 00000000..97653c9a --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java @@ -0,0 +1,113 @@ +package com.hzya.frame.sysnew.comparison.dao; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.sysnew.comparison.entity.ComparisonDetailsEntity; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; + +import java.util.List; +import java.util.Map; + +public interface IComparisonDao extends IBaseDao { + + /** + * + * @content 根据主数据编码查询表名，字段名等信息 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/7 16:05 + * **/ + List queryComparison(ComparisonEntity comparison); + + /** + * + * @content 分页查询数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/9 15:11 + * **/ + List> queryComparisonPage(ComparisonEntity comparison); + + /** + * + * @content 保存通用数据数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/7 16:56 + * **/ + ComparisonEntity saveComparison(ComparisonEntity comparison); + + /** + * + * @content 生成单据规则 如：CK-yyyyMMdd-0001 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/9 9:42 + * **/ + ComparisonEntity queryComparisonRule(ComparisonEntity comparison); + + /** + * + * @content 更新通用数据数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/9 10:32 + * **/ + Integer updateComparisonByType(ComparisonEntity comparison); + + /** + * + * @content 删除通用数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/9 14:09 + * **/ + Integer deleteComparison(ComparisonEntity comparison); + + /** + * + * @content 查询单据规则 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/28 14:39 + * **/ + ComparisonEntity queryComparisonById(ComparisonEntity comparison); + + /** + * + * @content 根据主数据编码查询mdm_module数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/6/4 11:37 + * **/ + ComparisonEntity queryComparisonBymdmCode(ComparisonEntity comparison); + + /** + * + * @content 根据mdm_module得id查询mdm_module_db得数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/6/4 11:40 + * **/ + List queryComparisonBymdmId(ComparisonEntity comparison); + + /** + * + * @content 根据mdm_module得id查询mdm_module_db_fileds得数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/6/4 11:45 + * **/ + List queryComparisonBymdmIdFileds(ComparisonEntity comparison); + +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDetailsDao.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDetailsDao.java new file mode 100644 index 00000000..36c66021 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDetailsDao.java @@ -0,0 +1,51 @@ +package com.hzya.frame.sysnew.comparison.dao; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.sysnew.comparison.entity.ComparisonDetailsEntity; + +import java.util.List; +import java.util.Map; + +public interface IComparisonDetailsDao extends IBaseDao { + + /** + * + * @content 保存通用数据子表数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/9 10:41 + * **/ + ComparisonDetailsEntity saveComparisonDetails(ComparisonDetailsEntity comparisonDetailsEntity); + + /** + * + * @content 更新通用数据子表数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/9 10:41 + * **/ + Integer updateComparisonDetailsByType(ComparisonDetailsEntity comparisonDetailsEntity); + + /** + * + * @content 删除通用数据子表数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/9 14:11 + * **/ + Integer deleteComparisonDetails(ComparisonDetailsEntity comparisonDetailsEntity); + + /** + * + * @content 分页查询子表数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/9 15:34 + * **/ + List> queryComparisonDetailsPage(ComparisonDetailsEntity comparisonDetailsEntity); +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java new file mode 100644 index 00000000..d50098cb --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java @@ -0,0 +1,84 @@ +package com.hzya.frame.sysnew.comparison.dao.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.sysnew.comparison.dao.IComparisonDao; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +@Repository(value = "comparisonDaoImpl") +public class ComparisonDaoImpl extends MybatisGenericDao implements IComparisonDao { + //根据主数据编码查询表名，字段名等信息 + @Override + public List queryComparison(ComparisonEntity comparison) { + List query = super.query(getSqlIdPrifx() + "queryComparison", comparison); + return query; + } + + //分页查询 + @Override + public List> queryComparisonPage(ComparisonEntity comparison) { + List> query =(List>) super.selectList(getSqlIdPrifx() + "queryComparisonPage", comparison); + return query; + } + + //保存数据 + @Override + public ComparisonEntity saveComparison(ComparisonEntity comparison) { + ComparisonEntity comparisonEntity = super.save(getSqlIdPrifx() + "saveComparison", comparison); + return comparisonEntity; + } + + //生成单据规则 + @Override + public ComparisonEntity queryComparisonRule(ComparisonEntity comparison) { + List comparisonEntities = super.query(getSqlIdPrifx() + "queryComparisonRule", comparison); + return comparisonEntities.get(0); + } + + //更新通用数据数据 + @Override + public Integer updateComparisonByType(ComparisonEntity comparison) { + int update = super.update(getSqlIdPrifx() + "updateComparisonByType", comparison); + return update; + } + + //删除通用数据 + @Override + public Integer deleteComparison(ComparisonEntity comparison) { + int delete = super.delete(getSqlIdPrifx() + "deleteComparison", comparison); + return delete; + } + + //查询单据规则 + @Override + public ComparisonEntity queryComparisonById(ComparisonEntity comparison) { + List comparisonEntities = super.query(getSqlIdPrifx() + "queryComparisonById", comparison); + return comparisonEntities.get(0); + } + + //根据主数据编码查询mdm_module数据 + @Override + public ComparisonEntity queryComparisonBymdmCode(ComparisonEntity comparison) { + ComparisonEntity comparisonEntity =(ComparisonEntity) super.selectOne(getSqlIdPrifx() + "queryComparisonBymdmCode", comparison); + return comparisonEntity; + } + + //根据mdm_module得id查询mdm_module_db得数据 + @Override + public List queryComparisonBymdmId(ComparisonEntity comparison) { + List list =(List) super.selectList(getSqlIdPrifx() + "queryComparisonBymdmId", comparison); + return list; + } + + //根据mdm_module得id查询mdm_module_db_fileds得数据 + @Override + public List queryComparisonBymdmIdFileds(ComparisonEntity comparison) { + List list =(List) super.selectList(getSqlIdPrifx() + "queryComparisonBymdmIdFileds", comparison); + return list; + } + +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDetailsDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDetailsDaoImpl.java new file mode 100644 index 00000000..cab43d0d --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDetailsDaoImpl.java @@ -0,0 +1,46 @@ +package com.hzya.frame.sysnew.comparison.dao.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.sysnew.comparison.dao.IComparisonDao; +import com.hzya.frame.sysnew.comparison.dao.IComparisonDetailsDao; +import com.hzya.frame.sysnew.comparison.entity.ComparisonDetailsEntity; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +@Repository(value = "comparisonDetailsDaoImpl") +public class ComparisonDetailsDaoImpl extends MybatisGenericDao implements IComparisonDetailsDao { + + //保存通用数据子表数据 + @Override + public ComparisonDetailsEntity saveComparisonDetails(ComparisonDetailsEntity comparisonDetailsEntity) { + ComparisonDetailsEntity detailsEntity = super.save(getSqlIdPrifx() + "saveComparisonDetails", comparisonDetailsEntity); + return detailsEntity; + } + + //更新通用数据子表数据 + @Override + public Integer updateComparisonDetailsByType(ComparisonDetailsEntity comparisonDetailsEntity) { + int update = super.update(getSqlIdPrifx()+"updateComparisonDetailsByType", comparisonDetailsEntity); + return update; + } + + //删除通用数据子表的数据 + @Override + public Integer deleteComparisonDetails(ComparisonDetailsEntity comparisonDetailsEntity) { + int delete = super.delete(getSqlIdPrifx() + "deleteComparisonDetails", comparisonDetailsEntity); + return delete; + } + + //分页查询子表数据 + @Override + public List> queryComparisonDetailsPage(ComparisonDetailsEntity comparisonDetailsEntity) { + List> query =(List>) super.selectList(getSqlIdPrifx() + "queryComparisonDetailsPage", comparisonDetailsEntity); + return query; + } + + +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.java new file mode 100644 index 00000000..5766ec65 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.java @@ -0,0 +1,131 @@ +package com.hzya.frame.sysnew.comparison.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.hzya.frame.web.entity.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +import java.util.Map; + +/** + * + * @content 通用数据明细实体类 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/7 15:50 + * **/ +public class ComparisonDetailsEntity extends BaseEntity { + + private String contrastType;//对照类型 + private String documentRule;//单据规则 + private Long documentRuleNum;//单据规则流水号 + + + private String mdmName;//主数据名称 + private String mdmCode;//主数据编码 + private String dbName;//表名 + private String dbType;//类型 1、主表 2、明细 + private String enName;//字段名 英文 + private String chName;// 字段名 中文 + private String filedType;//字段类型 1、BIGINT 2、DECIMAL 3、VARCHAR 4、DATETIME + private String formmainId;//上级id + + public String getFormmainId() { + return formmainId; + } + + public void setFormmainId(String formmainId) { + this.formmainId = formmainId; + } + + private Map mapDetails; + + public String getContrastType() { + return contrastType; + } + + public void setContrastType(String contrastType) { + this.contrastType = contrastType; + } + + 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 getMdmName() { + return mdmName; + } + + public void setMdmName(String mdmName) { + this.mdmName = mdmName; + } + + public String getMdmCode() { + return mdmCode; + } + + public void setMdmCode(String mdmCode) { + this.mdmCode = mdmCode; + } + + public String getDbName() { + return dbName; + } + + public void setDbName(String dbName) { + this.dbName = dbName; + } + + public String getDbType() { + return dbType; + } + + public void setDbType(String dbType) { + this.dbType = dbType; + } + + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + + public String getChName() { + return chName; + } + + public void setChName(String chName) { + this.chName = chName; + } + + public String getFiledType() { + return filedType; + } + + public void setFiledType(String filedType) { + this.filedType = filedType; + } + + public Map getMapDetails() { + return mapDetails; + } + + public void setMapDetails(Map mapDetails) { + this.mapDetails = mapDetails; + } +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.xml new file mode 100644 index 00000000..0d1ca13f --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + insert into ${dbName} + + + ${column}, + + + values + + + #{value}, + + + + + + + update ${dbName} + + + ${key} =#{value} + + + where formmain_id=#{formmainId} and sts='Y' + + + + + update + ${dbName} + set sts= 'N' ,modify_time = now(),modify_user_id = #{modify_user_id}, data_status= 'N',delete_status='0' + + + and formmain_id=#{formmainId} and sts='Y' + + + + + diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.java new file mode 100644 index 00000000..6a97f2b4 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.java @@ -0,0 +1,248 @@ +package com.hzya.frame.sysnew.comparison.entity; + +import com.hzya.frame.web.entity.BaseEntity; + +import java.util.List; +import java.util.Map; + +/** + * + * @content 通用数据实体类 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/7 15:50 + * **/ +public class ComparisonEntity extends BaseEntity { + private String contrastType;//对照类型 + private String documentRule;//单据规则 + private Long documentRuleNum;//单据规则流水号 + + private String mdmName;//主数据名称 + private String mdmCode;//主数据编码 + private String dbName;//表名 + private String dbType;//类型 1、主表 2、明细 + private String enName;//字段名 英文 + private String chName;// 字段名 中文 + private String filedType;//字段类型 1、BIGINT 2、DECIMAL 3、VARCHAR 4、DATETIME + + private Map map; + private ComparisonDetailsEntity comparisonDetailsEntity; + private String formmainId;//上级id + + private String rulePrefix;//规则前缀 CK-yyyyMMdd-0001中的CK + private String ruleMiddle;//规则中间 CK-yyyyMMdd-0001中的yyyyMMdd + private int ruleSuffix;//规则后缀 CK-yyyyMMdd-0001中的0001 + + private String mId;//mdm_module的id + private String dbId;//mdm_module_db的id + + private String addType;//显示类型：新增 + private String updateType;//显示类型：修改 + private String showType;//显示类型：查看 + private String queryType;//显示类型：查询 + private String listType;//显示类型：列表 + private String viewType;//显示类型：显示 + + public String getAddType() { + return addType; + } + + public void setAddType(String addType) { + this.addType = addType; + } + + public String getUpdateType() { + return updateType; + } + + public void setUpdateType(String updateType) { + this.updateType = updateType; + } + + public String getShowType() { + return showType; + } + + public void setShowType(String showType) { + this.showType = showType; + } + + public String getQueryType() { + return queryType; + } + + public void setQueryType(String queryType) { + this.queryType = queryType; + } + + public String getListType() { + return listType; + } + + public void setListType(String listType) { + this.listType = listType; + } + + public String getViewType() { + return viewType; + } + + public void setViewType(String viewType) { + this.viewType = viewType; + } + + public String getRuleMiddle() { + return ruleMiddle; + } + + public void setRuleMiddle(String ruleMiddle) { + this.ruleMiddle = ruleMiddle; + } + + public int getRuleSuffix() { + return ruleSuffix; + } + + public void setRuleSuffix(int ruleSuffix) { + this.ruleSuffix = ruleSuffix; + } + + public String getmId() { + return mId; + } + + public void setmId(String mId) { + this.mId = mId; + } + + public String getDbId() { + return dbId; + } + + public void setDbId(String dbId) { + this.dbId = dbId; + } + + private List comparisonDetailsEntityList; + + public List getComparisonDetailsEntityList() { + return comparisonDetailsEntityList; + } + + public void setComparisonDetailsEntityList(List comparisonDetailsEntityList) { + this.comparisonDetailsEntityList = comparisonDetailsEntityList; + } + + public String getContrastType() { + return contrastType; + } + + public void setContrastType(String contrastType) { + this.contrastType = contrastType; + } + + 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 getMdmName() { + return mdmName; + } + + public void setMdmName(String mdmName) { + this.mdmName = mdmName; + } + + public String getMdmCode() { + return mdmCode; + } + + public void setMdmCode(String mdmCode) { + this.mdmCode = mdmCode; + } + + public String getDbName() { + return dbName; + } + + public void setDbName(String dbName) { + this.dbName = dbName; + } + + public String getDbType() { + return dbType; + } + + public void setDbType(String dbType) { + this.dbType = dbType; + } + + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + + public String getChName() { + return chName; + } + + public void setChName(String chName) { + this.chName = chName; + } + + public String getFiledType() { + return filedType; + } + + public void setFiledType(String filedType) { + this.filedType = filedType; + } + + public Map getMap() { + return map; + } + + public void setMap(Map map) { + this.map = map; + } + + public ComparisonDetailsEntity getComparisonDetailsEntity() { + return comparisonDetailsEntity; + } + + public void setComparisonDetailsEntity(ComparisonDetailsEntity comparisonDetailsEntity) { + this.comparisonDetailsEntity = comparisonDetailsEntity; + } + + public String getFormmainId() { + return formmainId; + } + + public void setFormmainId(String formmainId) { + this.formmainId = formmainId; + } + + public String getRulePrefix() { + return rulePrefix; + } + + public void setRulePrefix(String rulePrefix) { + this.rulePrefix = rulePrefix; + } +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.xml new file mode 100644 index 00000000..d24c345d --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into ${dbName} + + + ${column}, + + + values + + + #{value}, + + + + + + + update ${dbName} + + + ${key} =#{value} + + + where id=#{id} and sts='Y' + + + + + + update + ${dbName} + set data_status= 'N' ,modify_time = now(),modify_user_id = #{modify_user_id},delete_status='0' + + + and ${key} =#{value} + + and id=#{id} and sts='Y' + + + + + diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/dao/IMasterDataDao.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/dao/IMasterDataDao.java new file mode 100644 index 00000000..8fb8ce73 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/dao/IMasterDataDao.java @@ -0,0 +1,23 @@ +package com.hzya.frame.sysnew.comparison.masterData.dao; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; + +import java.util.HashMap; +import java.util.List; + +public interface IMasterDataDao extends IBaseService { + + + /** + * + * @content 查询U8C档案 + * @Param + * @Return + * @Author hecan + * @Date 2024/6/6 11:56 + * **/ + @DS("swu8c") + List> queryArchives(String str); +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/dao/impl/MasterDataDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/dao/impl/MasterDataDaoImpl.java new file mode 100644 index 00000000..ad9f3588 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/dao/impl/MasterDataDaoImpl.java @@ -0,0 +1,31 @@ +package com.hzya.frame.sysnew.comparison.masterData.dao.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.execsql.service.IExecSqlService; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; +import com.hzya.frame.sysnew.comparison.masterData.dao.IMasterDataDao; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Repository; + +import java.util.HashMap; +import java.util.List; + +@Repository(value = "masterDataDaoImpl") +public class MasterDataDaoImpl extends BaseService implements IMasterDataDao { + + @Autowired + private IExecSqlService execSqlService; + + @DS("swu8c") + @Override + public List> queryArchives(String str) { + try { + List> hashMaps = execSqlService.execSelectSql(str, ""); + return hashMaps; + }catch (Exception e){ + logger.info("U8C主数据档案用户档案没有需要同步中台的数据"); + return null; + } + } +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataOrgsService.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataOrgsService.java new file mode 100644 index 00000000..1e08f408 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataOrgsService.java @@ -0,0 +1,19 @@ +package com.hzya.frame.sysnew.comparison.masterData.service; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; +import com.hzya.frame.web.entity.JsonResultEntity; + +public interface IMasterDataOrgsService extends IBaseService { + /** + * + * @content 查询组织档案 + * @Param + * @Return + * @Author hecan + * @Date 2024/6/4 16:57 + * **/ + JsonResultEntity queryOrgsArchives(JSONObject jsonObject); + +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataProjectService.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataProjectService.java new file mode 100644 index 00000000..6b6799c1 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataProjectService.java @@ -0,0 +1,19 @@ +package com.hzya.frame.sysnew.comparison.masterData.service; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; +import com.hzya.frame.web.entity.JsonResultEntity; + +public interface IMasterDataProjectService extends IBaseService { + + /** + * + * @content 查询项目档案 + * @Param + * @Return + * @Author hecan + * @Date 2024/6/6 16:10 + * **/ + JsonResultEntity queryProjectArchives(JSONObject jsonObject); +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataOrgsServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataOrgsServiceImpl.java new file mode 100644 index 00000000..c6fe35a5 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataOrgsServiceImpl.java @@ -0,0 +1,138 @@ +package com.hzya.frame.sysnew.comparison.masterData.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.dateutil.DateUtil; +import com.hzya.frame.mdm.mdmModuleSource.dao.impl.MdmModuleSourceDaoImpl; +import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; +import com.hzya.frame.sysnew.comparison.masterData.dao.impl.MasterDataDaoImpl; +import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataOrgsService; +import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataProjectService; +import com.hzya.frame.sysnew.comparison.service.impl.ComparisonServiceImpl; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; + +@Service("masterDataOrgsServiceImpl") +public class MasterDataOrgsServiceImpl extends BaseService implements IMasterDataOrgsService { + + @Autowired + private MasterDataDaoImpl masterDataDaoImpl; + @Autowired + private ComparisonServiceImpl comparisonServiceimpl; + @Autowired + private MdmModuleSourceDaoImpl mdmModuleSourceDaoImpl; + + private String ts = ""; + //查询用户档案并同步中台 + @Override + public JsonResultEntity queryOrgsArchives(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + //查询主数据来源表，根据来源类型为插件得进行分类，获取来源名称和编码 + List list = mdmModuleSourceDaoImpl.MdmModuleSourceentityGroupByType(); + if (CollectionUtils.isEmpty(list)) { + logger.info("数据来源表中没有类型为插件得数据,无法获取来源名称和来源编码"); + return BaseResult.getFailureMessageEntity("数据来源表无插件类型"); + } + for (MdmModuleSourceEntity mdmModuleSourceEntity : list) { + //此处应该根据来源编码进行case ，暂时测试使用U8C + switch (mdmModuleSourceEntity.getPluginCode()) { + case "MdmOrgPlugin": + if (null == ts || "".equals(ts)) { + ts = DateUtil.dateToString(new Date(), "yyyy-MM-dd HH:mm:ss"); + } + ts = "'" + ts + "'"; + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("select pk_corp as id,unitcode as org_code,unitname as org_name,"); + stringBuffer.append("saleaddr as org_address,countryarea as org_countryzone,memo as org_memo,"); + stringBuffer.append("industry as org_ncindustry,fathercorp as org_fatherorg,legalbodycode as org_principal,"); + stringBuffer.append("phone1 as org_tel from bd_corp where dr='0' and ts>"+ts); + try { + List> hashMaps = masterDataDaoImpl.queryArchives(stringBuffer.toString()); + logger.info("查询出来的值为:{}",hashMaps); + if (null != hashMaps && hashMaps.size() > 0) { + ParametricAssembly(mdmModuleSourceEntity,hashMaps,"10001"); + } else { + logger.info("U8C主数据档案组织档案没有需要同步中台的数据"); + return null; + } + } catch (Exception e) { + logger.info("查询主数据档案组织档案错误:{}", e.getMessage()); + } + break; + default: + break; + } + } + return BaseResult.getSuccessMessageEntity("组织档案同步成功"); + } + + + + + + //查询档案参数组装 + private void ParametricAssembly(MdmModuleSourceEntity mdmModuleSourceEntity,List> hashMaps,String mdmCode){ + for (HashMap hashMap : hashMaps) { + JSONObject jsonObjectUser = new JSONObject(); + JSONObject jsonStr = new JSONObject(); + jsonObjectUser.put("id", hashMap.get("id")); + jsonObjectUser.put("mdmCode", mdmCode); + jsonStr.put("jsonStr", jsonObjectUser); + //先查询编码和名称查询是否存在 + JsonResultEntity jsonResultEntity = comparisonServiceimpl.queryEntityPage(jsonStr); + Object attribute = jsonResultEntity.getAttribute(); + logger.info("得到的attribute值为：{}", attribute); + JSONObject jsonObjectAttribute = (JSONObject) JSON.toJSON(attribute); + JSONArray jsonArrayList = jsonObjectAttribute.getJSONArray("list"); + //如果jsonArrayList为null，说明没有值，在表中不存在 + if (jsonArrayList == null || jsonArrayList.size() == 0) { + //将查询出来得数据调用通用接口新增，保存到表中 + JSONObject main = new JSONObject(); + for(String key:hashMap.keySet()) { + main.put(key, hashMap.get(key)); + } + jsonObjectUser.put("main", main); + jsonObjectUser.put("sourceName",mdmModuleSourceEntity.getSourceName()); + jsonObjectUser.put("code",mdmModuleSourceEntity.getSourceCode()); + jsonObjectUser.put("optionName", "数智中台"); + jsonStr.put("jsonStr", jsonObjectUser); + try { + comparisonServiceimpl.saveEntity(jsonStr); + } catch (Exception e) { + logger.info("U8C主数据档案新增档案失败,失败原因:{}",e.getMessage()); + } + } else { + for (Object o : jsonArrayList) { + JSONObject jsonObjectUpdate = JSON.parseObject(String.valueOf(o)); + String id = jsonObjectUpdate.getString("id"); + JSONObject main = new JSONObject(); + for(String key:hashMap.keySet()) { + main.put(key, hashMap.get(key)); + main.put("id",id); + } + jsonObjectUser.put("main", main); + jsonObjectUser.put("sourceName",mdmModuleSourceEntity.getSourceName()); + jsonObjectUser.put("code",mdmModuleSourceEntity.getSourceCode()); + jsonObjectUser.put("optionName", "数智中台"); + jsonStr.put("jsonStr", jsonObjectUser); + try { + comparisonServiceimpl.updateEntity(jsonStr); + } catch (Exception e) { + logger.info("U8C主数据档案更新档案失败,失败原因:{}", e.getMessage()); + } + } + } + } + } + +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataProjectServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataProjectServiceImpl.java new file mode 100644 index 00000000..a0f39bd0 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataProjectServiceImpl.java @@ -0,0 +1,132 @@ +package com.hzya.frame.sysnew.comparison.masterData.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.dateutil.DateUtil; +import com.hzya.frame.mdm.mdmModuleSource.dao.impl.MdmModuleSourceDaoImpl; +import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; +import com.hzya.frame.sysnew.comparison.masterData.dao.impl.MasterDataDaoImpl; +import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataProjectService; +import com.hzya.frame.sysnew.comparison.service.impl.ComparisonServiceImpl; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; + +@Service("masterDataProjectServiceImpl") +public class MasterDataProjectServiceImpl extends BaseService implements IMasterDataProjectService { + + @Autowired + private MasterDataDaoImpl masterDataDaoImpl; + @Autowired + private ComparisonServiceImpl comparisonServiceimpl; + @Autowired + private MdmModuleSourceDaoImpl mdmModuleSourceDaoImpl; + + private String ts = ""; + + //同步项目档案 + public JsonResultEntity queryProjectArchives(JSONObject json){ + JSONObject jsonObject = json.getJSONObject("jsonStr"); + //查询主数据来源表，根据来源类型为插件得进行分类，获取来源名称和编码 + List list = mdmModuleSourceDaoImpl.MdmModuleSourceentityGroupByType(); + if (CollectionUtils.isEmpty(list)) { + logger.info("数据来源表中没有类型为插件得数据,无法获取来源名称和来源编码"); + return BaseResult.getFailureMessageEntity("数据来源表无插件类型"); + } + for (MdmModuleSourceEntity mdmModuleSourceEntity : list) { + //此处应该根据来源编码进行case ，暂时测试使用U8C + switch (mdmModuleSourceEntity.getPluginCode()) { + case "MdmProjectPlugin": + if (null == ts || "".equals(ts)) { + ts = DateUtil.dateToString(new Date(), "yyyy-MM-dd HH:mm:ss"); + } + ts = "'" + ts + "'"; + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("select pk_jobbasfil as id,jobcode as project_code, jobname as project_name from bd_jobbasfil where dr='0' and ts>" + ts); + try { + List> hashMaps = masterDataDaoImpl.queryArchives(stringBuffer.toString()); + logger.info("查询出来的值为:{}",hashMaps); + if (null != hashMaps && hashMaps.size() > 0) { + ParametricAssembly(mdmModuleSourceEntity,hashMaps,"10002"); + } else { + logger.info("U8C主数据档案项目档案没有需要同步中台的数据"); + return null; + } + } catch (Exception e) { + logger.info("查询主数据档案项目档案错误:{}", e.getMessage()); + } + break; + default: + break; + } + } + return BaseResult.getSuccessMessageEntity("项目档案同步成功"); + } + + + //查询档案参数组装 + public JsonResultEntity ParametricAssembly(MdmModuleSourceEntity mdmModuleSourceEntity,List> hashMaps,String mdmCode){ + for (HashMap hashMap : hashMaps) { + JSONObject jsonObjectUser = new JSONObject(); + JSONObject jsonStr = new JSONObject(); + jsonObjectUser.put("id", hashMap.get("id")); + jsonObjectUser.put("mdmCode", mdmCode); + jsonStr.put("jsonStr", jsonObjectUser); + //先查询编码和名称查询是否存在 + JsonResultEntity jsonResultEntity = comparisonServiceimpl.queryEntityPage(jsonStr); + Object attribute = jsonResultEntity.getAttribute(); + logger.info("得到的attribute值为：{}", attribute); + JSONObject jsonObjectAttribute = (JSONObject) JSON.toJSON(attribute); + JSONArray jsonArrayList = jsonObjectAttribute.getJSONArray("list"); + //如果jsonArrayList为null，说明没有值，在表中不存在 + if (jsonArrayList == null || jsonArrayList.size() == 0) { + //将查询出来得数据调用通用接口新增，保存到表中 + JSONObject main = new JSONObject(); + for(String key:hashMap.keySet()) { + main.put(key, hashMap.get(key)); + } + jsonObjectUser.put("main", main); + jsonObjectUser.put("sourceName",mdmModuleSourceEntity.getSourceName()); + jsonObjectUser.put("code",mdmModuleSourceEntity.getSourceCode()); + jsonObjectUser.put("optionName", "数智中台"); + jsonStr.put("jsonStr", jsonObjectUser); + try { + comparisonServiceimpl.saveEntity(jsonStr); + } catch (Exception e) { + logger.info("U8C主数据档案新增用户档案失败,失败原因:{}",e.getMessage()); + } + } else { + for (Object o : jsonArrayList) { + JSONObject jsonObjectUpdate = JSON.parseObject(String.valueOf(o)); + String id = jsonObjectUpdate.getString("id"); + JSONObject main = new JSONObject(); + for(String key:hashMap.keySet()) { + main.put(key, hashMap.get(key)); + main.put("id",id); + } + jsonObjectUser.put("main", main); + jsonObjectUser.put("sourceName",mdmModuleSourceEntity.getSourceName()); + jsonObjectUser.put("code",mdmModuleSourceEntity.getSourceCode()); + jsonObjectUser.put("optionName", "数智中台"); + jsonStr.put("jsonStr", jsonObjectUser); + try { + comparisonServiceimpl.updateEntity(jsonStr); + } catch (Exception e) { + logger.info("U8C主数据档案更新用户档案失败,失败原因:{}", e.getMessage()); + } + } + } + } + return null; + } + +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonDetailsService.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonDetailsService.java new file mode 100644 index 00000000..ac5db9c0 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonDetailsService.java @@ -0,0 +1,7 @@ +package com.hzya.frame.sysnew.comparison.service; + +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.sysnew.comparison.entity.ComparisonDetailsEntity; + +public interface IComparisonDetailsService extends IBaseService { +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonService.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonService.java new file mode 100644 index 00000000..d03fe903 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonService.java @@ -0,0 +1,54 @@ +package com.hzya.frame.sysnew.comparison.service; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; +import com.hzya.frame.web.entity.JsonResultEntity; + +public interface IComparisonService extends IBaseService { + + /** + * + * @content 分页查询通用数据数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/7 15:55 + * **/ + @DS("master") + JsonResultEntity queryEntityPage(JSONObject jsonObject); + + /** + * + * @content 新增通用数据数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/7 16:52 + * **/ + @DS("master") + JsonResultEntity saveEntity(JSONObject jsonObject); + + /** + * + * @content 编辑通用数据数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/9 10:19 + * **/ + @DS("master") + JsonResultEntity updateEntity(JSONObject jsonObject); + + /** + * + * @content 删除通用数据数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/9 13:59 + * **/ + @DS("master") + JsonResultEntity deleteEntity(JSONObject jsonObject); +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonDetailsServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonDetailsServiceImpl.java new file mode 100644 index 00000000..64b6bfd9 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonDetailsServiceImpl.java @@ -0,0 +1,10 @@ +package com.hzya.frame.sysnew.comparison.service.impl; + +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.sysnew.comparison.entity.ComparisonDetailsEntity; +import com.hzya.frame.sysnew.comparison.service.IComparisonDetailsService; +import org.springframework.stereotype.Service; + +@Service(value = "comparisonDetailsServiceImpl") +public class ComparisonDetailsServiceImpl extends BaseService implements IComparisonDetailsService { +} 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 new file mode 100644 index 00000000..76ba706d --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java @@ -0,0 +1,590 @@ +package com.hzya.frame.sysnew.comparison.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.dynamic.datasource.annotation.DS; +import com.github.pagehelper.PageInfo; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; +import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; +import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity; +import com.hzya.frame.mdm.service.impl.MdmServiceCache; +import com.hzya.frame.sysnew.comparison.controlsLog.dao.impl.ControlsLogDaoImpl; +import com.hzya.frame.sysnew.comparison.dao.IComparisonDao; +import com.hzya.frame.sysnew.comparison.dao.IComparisonDetailsDao; +import com.hzya.frame.sysnew.comparison.entity.ComparisonDetailsEntity; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; +import com.hzya.frame.sysnew.comparison.service.IComparisonService; +import com.hzya.frame.uuid.UUIDUtils; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.apache.commons.collections.CollectionUtils; +import org.apache.ivy.Main; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import sun.java2d.pipe.AAShapePipe; + +import java.util.*; + +@Service(value = "comparisonServiceImpl") +public class ComparisonServiceImpl extends BaseService implements IComparisonService { + + private IComparisonDao comparisonDao; + + @Autowired + private IComparisonDetailsDao comparisonDetailsDao; + + @Autowired + private ControlsLogDaoImpl controlsLogDaoimpl; + + @Autowired + private MdmServiceCache mdmServiceCache; + + @Autowired + public void setGeneralDataDao(IComparisonDao dao) { + this.comparisonDao = dao; + this.dao = dao; + } + + //分页查询通用数据数据 + @DS("master") + @Override + public JsonResultEntity queryEntityPage(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + if (jsonObject == null) { + return BaseResult.getFailureMessageEntity("数据为空，请先传递数据"); + } + if (!checkStr(jsonObject.getString("mdmCode"))) { + return BaseResult.getFailureMessageEntity("主数据编码为空"); + } + ComparisonEntity comparisonEntity = jsonObject.toJavaObject(ComparisonEntity.class); + List comparisonEntities=new ArrayList<>(); + try { + //根据主数据编码查询表名称，字段名称等信息 10001 + //comparisonEntities = comparisonDao.queryComparison(comparisonEntity); + + //comparisonEntities=getComparisonEntity(comparisonEntity); + comparisonEntities=getComparisonEntityCache(comparisonEntity,"main"); + }catch (Exception e){ + logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("查询失败"); + } + Map map = new HashMap<>();//将主表数据存到map中 + if (comparisonEntities != null && comparisonEntities.size() > 0) { + for (ComparisonEntity entity : comparisonEntities) { + //遍历主表下面的所有key,字段名 + for (String key : jsonObject.keySet()) { + if (entity.getDbType().equals("1")) { + comparisonEntity.setDbName(entity.getDbName()); + if(!"mdmCode".equals(key)){ + map.put(key, jsonObject.getString(key)); + } + } + } + } + comparisonEntity.setMap(map); + try { + List> comparisonEntitiePages = comparisonDao.queryComparisonPage(comparisonEntity); + PageInfo pageInfo = new PageInfo(comparisonEntitiePages); + return BaseResult.getSuccessMessageEntity("查询成功", pageInfo); + } catch (Exception e) { + logger.info("查询通用数据错误:{}", e.getMessage()); + return BaseResult.getFailureMessageEntity("查询失败"); + } + } + return BaseResult.getFailureMessageEntity("查询失败","请检查传递参数"); + } + + //新增通用数据数据 + @DS("master") + @Override + public JsonResultEntity saveEntity(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + if (jsonObject == null) { + return BaseResult.getFailureMessageEntity("数据为空，请先传递数据"); + } + if (!checkStr(jsonObject.getString("mdmCode"))) { + return BaseResult.getFailureMessageEntity("主数据编码为空"); + } + if (!checkStr(jsonObject.getString("optionName"))) { + return BaseResult.getFailureMessageEntity("操作人为空"); + } + /*if (!checkStr(jsonObject.getString("rulePrefix"))) { + return BaseResult.getFailureMessageEntity("规则为空"); + }*/ + ComparisonEntity comparisonEntity = jsonObject.toJavaObject(ComparisonEntity.class); + ComparisonDetailsEntity comparisonDetailsEntity=new ComparisonDetailsEntity(); + List comparisonEntities=new ArrayList<>(); + try { + //根据主数据编码查询表名称，字段名称等信息 10001 + // comparisonEntities = comparisonDao.queryComparison(comparisonEntity); + + //comparisonEntities=getComparisonEntity(comparisonEntity); + comparisonEntities=getComparisonEntityCache(comparisonEntity,"main"); + }catch (Exception e){ + logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("保存失败"); + } + String main = jsonObject.getString("main");//获取主表数据 + JSONArray jsonArray = jsonObject.getJSONArray("details");//获取子表数据 + JSONObject jsonObjectMain = JSONObject.parseObject(main); + if(jsonObjectMain != null ) { + Map map = new HashMap<>();//将主表数据存到map中 + Map mapDetails = new HashMap<>();//将子表数据存到map中 + if (comparisonEntities != null && comparisonEntities.size() > 0) { + map=spliceMainMap(comparisonEntities,jsonObjectMain,map,comparisonEntity); + mapDetails=spliceDetailMap(comparisonEntities,mapDetails,comparisonDetailsEntity,jsonArray); + String uuid=null; + if(jsonObjectMain.getString("id")==null){ + uuid = UUIDUtils.getUUID(); + map.put("id", uuid); + }else{ + uuid = jsonObjectMain.getString("id"); + map.put("id", jsonObjectMain.getString("id")); + } + map.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); + map.put("modify_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); + map.put("org_id", "0"); + map.put("create_time", new Date()); + map.put("modify_time", new Date()); + map.put("sts", "Y"); + map.put("data_status","Y");//新增状态 + map.put("add_status","0");//新增状态 + map.put("update_status","1");//修改状态 + map.put("delete_status","1");//删除状态 + ComparisonEntity comparisonEntityRule = comparisonEntities.get(0); + //查询单据规则 + try { + comparisonEntityRule= comparisonDao.queryComparisonById(comparisonEntityRule); + String documentRule =comparisonEntityRule.getDocumentRule();; //"KH-2024-05-30-1"; + logger.info("通用数据保存接口中根据mId查询出来的单据规则为:{}",documentRule); + if(documentRule !=null){ + //获取规则前缀 CK + String rulePrefix=documentRule.substring(0,documentRule.indexOf("-")); + //获取规则中间日期 yyyy-MM-dd + String ruleDate = documentRule.substring(documentRule.indexOf("-") + 1, documentRule.lastIndexOf("-")); + String ruleMiddle = getRuleDate(ruleDate); + //获取规则后缀 + String ruleSuffixLength= documentRule.substring(documentRule.lastIndexOf("-")+1); + int ruleSuffix = ruleSuffixLength.length(); + //生成单据规则 + comparisonEntity.setRulePrefix(rulePrefix); + comparisonEntity.setRuleMiddle(ruleMiddle); + comparisonEntity.setRuleSuffix(ruleSuffix); + try { + //新生成单据规则保存到数据库 + comparisonEntityRule = comparisonDao.queryComparisonRule(comparisonEntity); + map.put("document_rule", comparisonEntityRule.getDocumentRule());//单据规则 + map.put("document_rule_num", comparisonEntityRule.getDocumentRuleNum());//单据规则流水号 + comparisonEntity.setMap(map); + } catch (Exception e) { + logger.info("保存通用数据时候生成单据规则错误:{}", e.getMessage()); + return BaseResult.getFailureMessageEntity("保存失败"); + } + } + }catch (Exception e){ + logger.info("通用数据保存接口中查询单据规则错误:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("保存失败"); + } + try { + //保存主表数据 + ComparisonEntity comparisonEntityOne = comparisonDao.saveComparison(comparisonEntity); + //保存子表数据 + if (mapDetails != null && mapDetails.size() > 0) { + String uuidDetail = UUIDUtils.getUUID(); + mapDetails.put("id", uuidDetail); + mapDetails.put("formmain_id", uuid); + mapDetails.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); + mapDetails.put("modify_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); + mapDetails.put("org_id", "0"); + mapDetails.put("create_time", new Date()); + mapDetails.put("modify_time", new Date()); + mapDetails.put("sts", "Y"); + mapDetails.put("data_status","Y");//新增状态 + comparisonDetailsEntity.setMapDetails(mapDetails); + ComparisonDetailsEntity comparisonDetailsEntityOne = comparisonDetailsDao.saveComparisonDetails(comparisonDetailsEntity); + //comparisonEntityOne.setComparisonDetailsEntity(comparisonDetailsEntityOne); + map.put("details",mapDetails); + //保存操作日志 + controlsLogDaoimpl.saveControlsLog(uuidDetail,jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),comparisonDetailsEntity.getDbName()+"_option_log"); + } + //保存操作日志 + controlsLogDaoimpl.saveControlsLog(uuid,jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); + return BaseResult.getSuccessMessageEntity("保存成功", map); + } catch (Exception e) { + logger.info("保存通用数据时候错误:{}", e.getMessage()); + return BaseResult.getFailureMessageEntity("保存失败"); + } + } + } + return BaseResult.getFailureMessageEntity("查询失败","请检查传递参数"); + } + + //更新通用数据数据 + @Override + public JsonResultEntity updateEntity(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + if (jsonObject == null) { + return BaseResult.getFailureMessageEntity("数据为空，请先传递数据"); + } + if (!checkStr(jsonObject.getString("mdmCode"))) { + return BaseResult.getFailureMessageEntity("主数据编码为空"); + } + if (!checkStr(jsonObject.getString("optionName"))) { + return BaseResult.getFailureMessageEntity("操作人为空"); + } + ComparisonEntity comparisonEntity = jsonObject.toJavaObject(ComparisonEntity.class); + ComparisonDetailsEntity comparisonDetailsEntity=new ComparisonDetailsEntity(); + JSONObject jsonObjectMain=jsonObject.getJSONObject("main");//获取主表数据 + JSONArray jsonArray = jsonObject.getJSONArray("details");//获取子表数据 + if(!checkStr(jsonObjectMain.getString("id"))){ + return BaseResult.getFailureMessageEntity("更新时候主表id不能为空"); + } + List comparisonEntities=new ArrayList<>(); + //根据主数据编码查询表名称，字段名称等信息 10001 + try { + // comparisonEntities = comparisonDao.queryComparison(comparisonEntity); + + //comparisonEntities=getComparisonEntity(comparisonEntity); + comparisonEntities=getComparisonEntityCache(comparisonEntity,"main"); + }catch (Exception e){ + logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("更新失败"); + } + Map map=new HashMap<>();//将主表数据存到map中 + Map mapDetails=new HashMap<>();//将子表数据存到map中 + if(comparisonEntities !=null && comparisonEntities.size()>0) { + map=spliceMainMap(comparisonEntities,jsonObjectMain,map,comparisonEntity); + mapDetails=spliceDetailMap(comparisonEntities,mapDetails,comparisonDetailsEntity,jsonArray); + map.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); + map.put("modify_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); + map.put("org_id", "0"); + map.put("modify_time", new Date()); + map.put("sts", "Y"); + map.put("data_status","F");//数据状态 + map.put("update_status","0");//修改状态 + comparisonEntity.setMap(map); + comparisonEntity.setId(jsonObjectMain.getString("id")); + /*//生成单据规则 + comparisonEntity.setRulePrefix(jsonObject.getString("rulePrefix")); + try { + ComparisonEntity comparisonEntityRule = comparisonDao.queryComparisonRule(comparisonEntity); + map.put("document_rule",comparisonEntityRule.getDocumentRule());//单据规则 + map.put("document_rule_num",comparisonEntityRule.getDocumentRuleNum());//单据规则流水号 + }catch (Exception e){ + logger.info("更新通用数据时候生成单据规则错误:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("更新失败",e.getMessage()); + }*/ + try { + //保存主表数据 + Integer integer = comparisonDao.updateComparisonByType(comparisonEntity); + if (integer > 0) { + //保存子表数据 + if (mapDetails != null && mapDetails.size() > 0) { + mapDetails.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); + mapDetails.put("modify_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); + mapDetails.put("org_id", "0"); + mapDetails.put("modify_time", new Date()); + mapDetails.put("sts", "Y"); + mapDetails.put("data_status","F");//数据状态 + comparisonDetailsEntity.setFormmainId(jsonObjectMain.getString("id")); + comparisonDetailsEntity.setMapDetails(mapDetails); + comparisonDetailsDao.updateComparisonDetailsByType(comparisonDetailsEntity); + //保存操作日志 + controlsLogDaoimpl.saveControlsLog(comparisonDetailsEntity.getId(),jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口更新",jsonObject.getString("optionName"),comparisonDetailsEntity.getDbName()+"_option_log"); + } + //保存操作日志 + controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口更新",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); + return BaseResult.getSuccessMessageEntity("更新成功", integer); + }else{ + return BaseResult.getFailureMessageEntity("更新失败"); + } + } catch (Exception e) { + logger.info("更新通用数据时候错误:{}", e.getMessage()); + return BaseResult.getFailureMessageEntity("更新失败"); + } + } + return BaseResult.getFailureMessageEntity("查询失败","请检查传递参数"); + } + + //删除通用数据 + @Override + public JsonResultEntity deleteEntity(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + if (jsonObject == null) { + return BaseResult.getFailureMessageEntity("数据为空，请先传递数据"); + } + if (!checkStr(jsonObject.getString("mdmCode"))) { + return BaseResult.getFailureMessageEntity("主数据编码为空"); + } + ComparisonEntity comparisonEntity = jsonObject.toJavaObject(ComparisonEntity.class); + ComparisonDetailsEntity comparisonDetailsEntity=new ComparisonDetailsEntity(); + JSONObject jsonObjectMain=jsonObject.getJSONObject("main");//获取主表数据 + if(!checkStr(jsonObjectMain.getString("id"))){ + return BaseResult.getFailureMessageEntity("删除时候主表id不能为空"); + } + List comparisonEntities=new ArrayList<>(); + //根据主数据编码查询表名称，字段名称等信息 10001 + try { + // comparisonEntities = comparisonDao.queryComparison(comparisonEntity); + + //comparisonEntities=getComparisonEntity(comparisonEntity); + comparisonEntities=getComparisonEntityCache(comparisonEntity,"main"); + }catch (Exception e){ + logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("删除失败"); + } + Map map=new HashMap<>(); + if(comparisonEntities !=null && comparisonEntities.size()>0) { + for (ComparisonEntity entity : comparisonEntities) { + //遍历主表下面的所有key,字段名 + for (String key : jsonObjectMain.keySet()) { + if (entity.getDbType().equals("1")) { + comparisonEntity.setDbName(entity.getDbName()); + if(entity.getEnName().equals(key)){ + map.put(key, jsonObjectMain.getString(key)); + } + } + if(entity.getDbType().equals("2")){ + comparisonDetailsEntity.setDbName(entity.getDbName()); + } + } + } + comparisonEntity.setId(jsonObjectMain.getString("id")); + comparisonEntity.setModify_user_id("c796fd9ba4c9f5ff3cc2fa41a040e443"); + comparisonEntity.setMap(map); + try { + Integer integer = comparisonDao.deleteComparison(comparisonEntity); + if(integer>0){ + if(comparisonDetailsEntity.getDbName()!=null){ + comparisonDetailsEntity.setFormmainId(jsonObjectMain.getString("id")); + comparisonDetailsEntity.setModify_user_id("c796fd9ba4c9f5ff3cc2fa41a040e443"); + comparisonDetailsDao.deleteComparisonDetails(comparisonDetailsEntity); + controlsLogDaoimpl.saveControlsLog(comparisonDetailsEntity.getId(),jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口删除",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); + } + controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口删除",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); + return BaseResult.getSuccessMessageEntity("删除成功",integer); + }else{ + return BaseResult.getFailureMessageEntity("删除失败","请查看id是否在表中存在"); + } + }catch (Exception e){ + logger.info("删除通用数据数据错误:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("删除失败"); + } + } + return BaseResult.getFailureMessageEntity("查询失败","请检查传递参数"); + } + + //根据不同的日期格式，返回不同的值 + private String getRuleDate(String str){ + switch (str){ + case "yyyy-MM-dd": + return "%Y-%m-%d"; + case "yyyyMMdd": + return "%Y%m%d"; + case "yyyy-MM-dd HH:mm:ss": + return "Y-%m-%d %H:%i:%s"; + case "yyyyMMddHHmmss": + return "%Y%m%d%H%i%s"; + case "yyyyMMddHHmmssSSS": + return "%Y%m%d%H%i%s%f"; + default: + return null; + } + } + + //得到主表数据 + private Map spliceMainMap(List comparisonEntities,JSONObject jsonObjectMain,Map map,ComparisonEntity comparisonEntity){ + for (ComparisonEntity entity : comparisonEntities) { + //遍历主表下面的所有key,字段名 + for (String key : jsonObjectMain.keySet()) { + if (entity.getDbType().equals("1")) { + comparisonEntity.setDbName(entity.getDbName()); + //如果表中得字段与输入得字段相等，则存起来 + if(entity.getEnName().equals(key)){ + map.put(key, jsonObjectMain.getString(key)); + } + } + } + } + return map; + } + + //得到明细表数据 + private Map spliceDetailMap(List comparisonEntities,Map mapDetails,ComparisonDetailsEntity comparisonDetailsEntity,JSONArray jsonArray){ + if (jsonArray != null && jsonArray.size() > 0) { + for (Object object : jsonArray) { + JSONObject jsonObjectDetails = (JSONObject) JSON.toJSON(object); + for (ComparisonEntity entity : comparisonEntities) { + //遍历主表下面的所有key,字段名 + for (String key : jsonObjectDetails.keySet()) { + if (entity.getDbType().equals("2")) { + comparisonDetailsEntity.setDbName(entity.getDbName()); + if(entity.getEnName().equals(key)){ + mapDetails.put(key, jsonObjectDetails.getString(key)); + } + } + } + } + } + } + return mapDetails; + } + + //根据主数据编码获取主表和明细表表名称，表字段信息 + public List getComparisonEntityCache(ComparisonEntity comparison,String type){ + List comparisonEntities = new ArrayList<>(); + //根据主数据编号获取模板主表 + MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(Long.valueOf(comparison.getMdmCode())); + //根据模板主表id获取模版表数据 + if(mdmModuleEntity!=null){ + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); + List mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity); + if(CollectionUtils.isNotEmpty(mdmModuleDbEntities)){ + for (MdmModuleDbEntity moduleDbEntity : mdmModuleDbEntities) { + switch (type){ + case "main": + //获取主表和明细表的字段信息 + if(moduleDbEntity.getDbType().equals("1") || moduleDbEntity.getDbType().equals("2")){ + MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity=new MdmModuleDbFiledsEntity(); + mdmModuleDbFiledsEntity.setMdmId(mdmModuleEntity.getId()); + List mdmModuleDbFiledsEntities = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity); + if(CollectionUtils.isNotEmpty(mdmModuleDbFiledsEntities)){ + for (MdmModuleDbFiledsEntity moduleDbFiledsEntity : mdmModuleDbFiledsEntities) { + if (moduleDbFiledsEntity.getDbId().equals(moduleDbEntity.getId())) { + ComparisonEntity comparisonEntityFile = new ComparisonEntity(); + comparisonEntityFile.setChName(moduleDbFiledsEntity.getChName()); + comparisonEntityFile.setEnName(moduleDbFiledsEntity.getEnName()); + comparisonEntityFile.setFiledType(moduleDbFiledsEntity.getFiledType()); + comparisonEntityFile.setAddType(moduleDbFiledsEntity.getAddType()); + comparisonEntityFile.setUpdateType(moduleDbFiledsEntity.getUpdateType()); + comparisonEntityFile.setShowType(moduleDbFiledsEntity.getShowType()); + comparisonEntityFile.setQueryType(moduleDbFiledsEntity.getQueryType()); + comparisonEntityFile.setListType(moduleDbFiledsEntity.getListType()); + comparisonEntityFile.setViewType(moduleDbFiledsEntity.getViewType()); + comparisonEntityFile.setDbName(moduleDbEntity.getDbName()); + comparisonEntityFile.setDbType(moduleDbEntity.getDbType()); + comparisonEntityFile.setDbId(moduleDbEntity.getId()); + comparisonEntityFile.setmId(mdmModuleEntity.getId()); + comparisonEntityFile.setMdmName(mdmModuleEntity.getMdmName()); + comparisonEntityFile.setMdmCode(String.valueOf(mdmModuleEntity.getMdmCode())); + comparisonEntities.add(comparisonEntityFile); + } + } + } + } + break; + case "option": + //获取主表和明细表的字段信息 + if(moduleDbEntity.getDbType().equals("3")){ + MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity=new MdmModuleDbFiledsEntity(); + mdmModuleDbFiledsEntity.setDbId(moduleDbEntity.getId()); + List mdmModuleDbFiledsEntities = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity); + if(CollectionUtils.isNotEmpty(mdmModuleDbFiledsEntities)){ + for (MdmModuleDbFiledsEntity moduleDbFiledsEntity : mdmModuleDbFiledsEntities) { + if (moduleDbFiledsEntity.getDbId().equals(moduleDbEntity.getId())) { + ComparisonEntity comparisonEntityFile = new ComparisonEntity(); + comparisonEntityFile.setChName(moduleDbFiledsEntity.getChName()); + comparisonEntityFile.setEnName(moduleDbFiledsEntity.getEnName()); + comparisonEntityFile.setFiledType(moduleDbFiledsEntity.getFiledType()); + comparisonEntityFile.setAddType(moduleDbFiledsEntity.getAddType()); + comparisonEntityFile.setUpdateType(moduleDbFiledsEntity.getUpdateType()); + comparisonEntityFile.setShowType(moduleDbFiledsEntity.getShowType()); + comparisonEntityFile.setQueryType(moduleDbFiledsEntity.getQueryType()); + comparisonEntityFile.setListType(moduleDbFiledsEntity.getListType()); + comparisonEntityFile.setViewType(moduleDbFiledsEntity.getViewType()); + comparisonEntityFile.setDbName(moduleDbEntity.getDbName()); + comparisonEntityFile.setDbType(moduleDbEntity.getDbType()); + comparisonEntityFile.setDbId(moduleDbEntity.getId()); + comparisonEntityFile.setmId(mdmModuleEntity.getId()); + comparisonEntityFile.setMdmName(mdmModuleEntity.getMdmName()); + comparisonEntityFile.setMdmCode(String.valueOf(mdmModuleEntity.getMdmCode())); + comparisonEntities.add(comparisonEntityFile); + } + } + } + } + break; + default: + break; + } + + } + } + return comparisonEntities; + } + return null; + } + + //根据主数据编码获取数据，表名称，字段名称等 + public List getComparisonEntity(ComparisonEntity comparisonEntity) { + List comparisonEntities = new ArrayList<>(); + //根据主数据编码查询mdm_module数据 + ComparisonEntity comparisonEntityModule = comparisonDao.queryComparisonBymdmCode(comparisonEntity); + if (comparisonEntityModule != null) { + //根据mdm_module得id查询mdm_module_db得数据 + List comparisonEntitiesModuleDb = comparisonDao.queryComparisonBymdmId(comparisonEntityModule); + if(CollectionUtils.isNotEmpty(comparisonEntitiesModuleDb)) { + for (ComparisonEntity comparison : comparisonEntitiesModuleDb) { + //查询出主表和明细表信息 + if(comparison.getDbType().equals("1")||comparison.getDbType().equals("2")) { + //根据mdm_module_db的id查询对应表的字段 + List comparisonEntitiesFiles = comparisonDao.queryComparisonBymdmIdFileds(comparison); + if (CollectionUtils.isNotEmpty(comparisonEntitiesFiles)) { + for (ComparisonEntity comparisonEntitiesFile : comparisonEntitiesFiles) { + ComparisonEntity comparisonEntityFile = new ComparisonEntity(); + comparisonEntityFile.setChName(comparisonEntitiesFile.getChName()); + comparisonEntityFile.setEnName(comparisonEntitiesFile.getEnName()); + comparisonEntityFile.setFiledType(comparisonEntitiesFile.getFiledType()); + comparisonEntityFile.setAddType(comparisonEntitiesFile.getAddType()); + comparisonEntityFile.setUpdateType(comparisonEntitiesFile.getUpdateType()); + comparisonEntityFile.setShowType(comparisonEntitiesFile.getShowType()); + comparisonEntityFile.setQueryType(comparisonEntitiesFile.getQueryType()); + comparisonEntityFile.setListType(comparisonEntitiesFile.getListType()); + comparisonEntityFile.setViewType(comparisonEntitiesFile.getViewType()); + comparisonEntityFile.setDbName(comparison.getDbName()); + comparisonEntityFile.setDbType(comparison.getDbType()); + comparisonEntityFile.setDbId(comparison.getDbId()); + comparisonEntityFile.setmId(comparisonEntitiesFile.getmId()); + comparisonEntityFile.setMdmName(comparisonEntityModule.getMdmName()); + comparisonEntityFile.setMdmCode(comparisonEntityModule.getMdmCode()); + comparisonEntities.add(comparisonEntityFile); + } + } + } + } + } + + /* //根据mdm_module得id查询mdm_module_db_fileds得数据 + List comparisonEntitiesFiles = comparisonDao.queryComparisonBymdmIdFileds(comparisonEntityModule); + for (ComparisonEntity comparison : comparisonEntitiesModuleDb) { + for (ComparisonEntity comparisonEntitiesFile : comparisonEntitiesFiles) { + if(comparison.getDbId().equals(comparisonEntitiesFile.getDbId())){ + ComparisonEntity comparisonEntityFile=new ComparisonEntity(); + comparisonEntityFile.setChName(comparisonEntitiesFile.getChName()); + comparisonEntityFile.setEnName(comparisonEntitiesFile.getEnName()); + comparisonEntityFile.setFiledType(comparisonEntitiesFile.getFiledType()); + comparisonEntityFile.setAddType(comparisonEntitiesFile.getAddType()); + comparisonEntityFile.setUpdateType(comparisonEntitiesFile.getUpdateType()); + comparisonEntityFile.setShowType(comparisonEntitiesFile.getShowType()); + comparisonEntityFile.setQueryType(comparisonEntitiesFile.getQueryType()); + comparisonEntityFile.setListType(comparisonEntitiesFile.getListType()); + comparisonEntityFile.setViewType(comparisonEntitiesFile.getViewType()); + comparisonEntityFile.setDbName(comparison.getDbName()); + comparisonEntityFile.setDbType(comparison.getDbType()); + comparisonEntityFile.setDbId(comparison.getDbId()); + comparisonEntityFile.setmId(comparisonEntitiesFile.getmId()); + comparisonEntityFile.setMdmName(comparisonEntityModule.getMdmName()); + comparisonEntityFile.setMdmCode(comparisonEntityModule.getMdmCode()); + comparisonEntities.add(comparisonEntityFile); + } + } + }*/ + return comparisonEntities; + } + return null; + } + +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/IGeneralDataDao.java b/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/IGeneralDataDao.java new file mode 100644 index 00000000..e7f315c1 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/IGeneralDataDao.java @@ -0,0 +1,49 @@ +package com.hzya.frame.sysnew.generalData.dao; + +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.sysnew.generalData.entity.GeneralDataEntity; + +import java.util.List; + +public interface IGeneralDataDao extends IBaseDao { + + /** + * + * @content 新增档案对照 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/6 16:49 + * **/ + GeneralDataEntity saveGeneralDataByType(GeneralDataEntity generalDataEntity); + + /** + * + * @content 查询档案对照 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/6 16:51 + * **/ + List queryGeneralData(GeneralDataEntity generalDataEntity); + + /** + * + * @content 编辑档案对照 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/6 17:17 + * **/ + Integer updateGeneralDataByType(GeneralDataEntity generalDataEntity); + + /** + * + * @content 删除档案对照 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/6 17:20 + * **/ + Integer deleteGeneralDataByType(GeneralDataEntity generalDataEntity); +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/impl/GeneralDataDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/impl/GeneralDataDaoImpl.java new file mode 100644 index 00000000..914dacca --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/impl/GeneralDataDaoImpl.java @@ -0,0 +1,40 @@ +package com.hzya.frame.sysnew.generalData.dao.impl; + +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.sysnew.generalData.dao.IGeneralDataDao; +import com.hzya.frame.sysnew.generalData.entity.GeneralDataEntity; +import org.springframework.stereotype.Repository; + +import java.util.List; + + +@Repository(value = "generalDataDaoImpl") +public class GeneralDataDaoImpl extends MybatisGenericDao implements IGeneralDataDao { + //新增档案对照 + @Override + public GeneralDataEntity saveGeneralDataByType(GeneralDataEntity generalDataEntity) { + generalDataEntity = super.save(getSqlIdPrifx() + "saveGeneralDataByType", generalDataEntity); + return generalDataEntity; + } + + //查询档案对照 + @Override + public List queryGeneralData(GeneralDataEntity generalDataEntity) { + List query = super.query(getSqlIdPrifx() + "queryGeneralData", generalDataEntity); + return query; + } + + //编辑档案对照 + @Override + public Integer updateGeneralDataByType(GeneralDataEntity generalDataEntity) { + int update = super.update(getSqlIdPrifx() + "updateGeneralDataByType", generalDataEntity); + return update; + } + + //删除档案对照 + @Override + public Integer deleteGeneralDataByType(GeneralDataEntity generalDataEntity) { + int update = super.update(getSqlIdPrifx() + "deleteGeneralDataByType", generalDataEntity); + return update; + } +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.java b/service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.java new file mode 100644 index 00000000..ac9bc603 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.java @@ -0,0 +1,169 @@ +package com.hzya.frame.sysnew.generalData.entity; + +import com.hzya.frame.web.entity.BaseEntity; + +/** + * + * @content 档案对照实体类 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/6 16:21 + * **/ +public class GeneralDataEntity extends BaseEntity { + private String archivesType;//类型 + private String leftCode;//左编码 + private String rightCode;//右编码 + + private String leftAppId;//左应用id + private String leftAppCode;//左应用编码 + private String leftAppName;//左应用名称 + private String leftApiId;//左接口ID + private String leftId;//左id + private String leftName;//左名称 + private String rightAppId;//右应用id + private String rightAppCode;//右应用编码 + private String rightAppName;//右应用名称 + private String rightApiId;//右接口ID + private String rightId;//右id + private String rightName;//右名称 + + private String leftOrg;//左公司 + private String rightOrg;//右公司 + + public String getLeftOrg() { + return leftOrg; + } + + public void setLeftOrg(String leftOrg) { + this.leftOrg = leftOrg; + } + + public String getRightOrg() { + return rightOrg; + } + + public void setRightOrg(String rightOrg) { + this.rightOrg = rightOrg; + } + + public String getArchivesType() { + return archivesType; + } + + public void setArchivesType(String archivesType) { + this.archivesType = archivesType; + } + + public String getLeftCode() { + return leftCode; + } + + public void setLeftCode(String leftCode) { + this.leftCode = leftCode; + } + + public String getRightCode() { + return rightCode; + } + + public void setRightCode(String rightCode) { + this.rightCode = rightCode; + } + + public String getLeftAppId() { + return leftAppId; + } + + public void setLeftAppId(String leftAppId) { + this.leftAppId = leftAppId; + } + + public String getLeftAppCode() { + return leftAppCode; + } + + public void setLeftAppCode(String leftAppCode) { + this.leftAppCode = leftAppCode; + } + + public String getLeftAppName() { + return leftAppName; + } + + public void setLeftAppName(String leftAppName) { + this.leftAppName = leftAppName; + } + + public String getLeftApiId() { + return leftApiId; + } + + public void setLeftApiId(String leftApiId) { + this.leftApiId = leftApiId; + } + + public String getLeftId() { + return leftId; + } + + public void setLeftId(String leftId) { + this.leftId = leftId; + } + + public String getLeftName() { + return leftName; + } + + public void setLeftName(String leftName) { + this.leftName = leftName; + } + + public String getRightAppId() { + return rightAppId; + } + + public void setRightAppId(String rightAppId) { + this.rightAppId = rightAppId; + } + + public String getRightAppCode() { + return rightAppCode; + } + + public void setRightAppCode(String rightAppCode) { + this.rightAppCode = rightAppCode; + } + + public String getRightAppName() { + return rightAppName; + } + + public void setRightAppName(String rightAppName) { + this.rightAppName = rightAppName; + } + + public String getRightApiId() { + return rightApiId; + } + + public void setRightApiId(String rightApiId) { + this.rightApiId = rightApiId; + } + + public String getRightId() { + return rightId; + } + + public void setRightId(String rightId) { + this.rightId = rightId; + } + + public String getRightName() { + return rightName; + } + + public void setRightName(String rightName) { + this.rightName = rightName; + } +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.xml new file mode 100644 index 00000000..50065a16 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.xml @@ -0,0 +1,258 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into + + sys_personnel_control + sys_org_control + sys_stock_control + sys_merchant_control + sys_taxrate_control + sys_project_control + sys_bank_control + sys_bankaccount_control + sys_assets_control + + ( + + id , + left_app_id , + left_app_code , + left_app_name , + left_api_id , + left_id , + left_code , + left_name , + right_app_id , + right_app_code , + right_app_name , + right_api_id , + right_id , + right_code , + right_name , + left_org , + right_org , + sorts , + create_user_id , + modify_user_id , + org_id , + company_id , + create_time, + modify_time, + sts + + )values( + + #{id} , + #{leftAppId} , + #{leftAppCode} , + #{leftAppName} , + #{leftApiId} , + #{leftId} , + #{leftCode} , + #{leftName} , + #{rightAppId} , + #{rightAppCode} , + #{rightAppName} , + #{rightApiId} , + #{rightId} , + #{rightCode} , + #{rightName} , + #{leftOrg} , + #{rightOrg} , + #{sorts} , + (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from + + sys_personnel_control + sys_org_control + sys_stock_control + sys_merchant_control + sys_taxrate_control + sys_project_control + sys_bank_control + sys_bankaccount_control + sys_assets_control + + a WHERE a.sts = 'Y' ), + #{create_user_id} , + #{modify_user_id} , + #{org_id} , + #{companyId} , + #{create_time} , + now() , + #{modify_time} , + now() , + #{sts} , + 'Y' + + ) + + + + + update + + sys_personnel_control + sys_org_control + sys_stock_control + sys_merchant_control + sys_taxrate_control + sys_project_control + sys_bank_control + sys_bankaccount_control + sys_assets_control + + set + + left_app_id = #{leftAppId}, + left_app_code = #{leftAppCode}, + left_app_name = #{leftAppName}, + left_api_id = #{leftApiId}, + left_id = #{leftId}, + left_code = #{leftCode}, + left_name = #{leftName}, + right_app_id = #{rightAppId}, + right_app_code = #{rightAppCode}, + right_app_name = #{rightAppName}, + right_api_id = #{rightApiId}, + right_id = #{rightId}, + right_code = #{rightCode}, + right_name = #{rightName}, + left_org = #{leftOrg} , + right_org = #{rightOrg} , + sorts = #{sorts}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + modify_time = now(), + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId} + + where id = #{id} + + + + + update + + sys_personnel_control + sys_org_control + sys_stock_control + sys_merchant_control + sys_taxrate_control + sys_project_control + sys_bank_control + sys_bankaccount_control + sys_assets_control + + set sts= 'N' ,modify_time = now(),modify_user_id = #{modify_user_id} + + and left_app_id = #{leftAppId} + and left_app_code = #{leftAppCode} + and left_app_name = #{leftAppName} + and left_api_id = #{leftApiId} + and left_id = #{leftId} + and left_code = #{leftCode} + and left_name = #{leftName} + and right_app_id = #{rightAppId} + and right_app_code = #{rightAppCode} + and right_app_name = #{rightAppName} + and right_api_id = #{rightApiId} + and right_id = #{rightId} + and right_code = #{rightCode} + and right_name = #{rightName} + left_org = #{leftOrg} , + right_org = #{rightOrg} , + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and id=#{id} and sts='Y' + + + + + diff --git a/service/src/main/java/com/hzya/frame/sysnew/generalData/service/IGeneralDataService.java b/service/src/main/java/com/hzya/frame/sysnew/generalData/service/IGeneralDataService.java new file mode 100644 index 00000000..105511f6 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/generalData/service/IGeneralDataService.java @@ -0,0 +1,59 @@ +package com.hzya.frame.sysnew.generalData.service; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.sysnew.generalData.entity.GeneralDataEntity; +import com.hzya.frame.web.entity.JsonResultEntity; + +public interface IGeneralDataService extends IBaseService { + + /** + * + * @content 新增档案对照 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/6 16:23 + * **/ + JsonResultEntity saveEntity(JSONObject jsonObject); + + /** + * + * @content 查询档案对照 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/6 17:00 + * **/ + JsonResultEntity queryEntityPage(JSONObject jsonObject); + + /** + * + * @content 编辑档案对照 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/6 17:16 + * **/ + JsonResultEntity updateEntity(JSONObject jsonObject); + + /** + * + * @content 删除档案对照 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/6 17:23 + * **/ + JsonResultEntity deleteEntity(JSONObject jsonObject); + + /** + * + * @content 查询单个档案对照 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/6 17:26 + * **/ + JsonResultEntity getEntity(JSONObject jsonObject); +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/generalData/service/impl/GeneralDataServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/generalData/service/impl/GeneralDataServiceImpl.java new file mode 100644 index 00000000..16095bc6 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/generalData/service/impl/GeneralDataServiceImpl.java @@ -0,0 +1,241 @@ +package com.hzya.frame.sysnew.generalData.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.sysnew.generalData.dao.IGeneralDataDao; +import com.hzya.frame.sysnew.generalData.entity.GeneralDataEntity; +import com.hzya.frame.sysnew.generalData.service.IGeneralDataService; +import com.hzya.frame.sysnew.homeComponent.dao.ISysHomeComponentDao; +import com.hzya.frame.uuid.UUIDLong; +import com.hzya.frame.uuid.UUIDUtils; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; + +@Service(value = "generalDataServiceImpl") +public class GeneralDataServiceImpl extends BaseService implements IGeneralDataService { + private IGeneralDataDao generalDataDao; + + @Autowired + public void setGeneralDataDao(IGeneralDataDao dao) { + this.generalDataDao = dao; + this.dao = dao; + } + + //新增档案对照 + @Override + public JsonResultEntity saveEntity(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + if(jsonObject == null ){ + return BaseResult.getFailureMessageEntity("数据为空，请先传递数据"); + } + if(!checkStr(jsonObject.getString("archivesType"))){ + return BaseResult.getFailureMessageEntity("档案对照类型为空"); + } + if(!checkStr(jsonObject.getString("leftCode"))){ + return BaseResult.getFailureMessageEntity("左编码为空"); + } + if(!checkStr(jsonObject.getString("rightCode"))){ + return BaseResult.getFailureMessageEntity("右编码为空"); + } + if(!checkStr(jsonObject.getString("leftAppCode"))){ + return BaseResult.getFailureMessageEntity("左应用编码为空"); + } + if(!checkStr(jsonObject.getString("rightAppCode"))){ + return BaseResult.getFailureMessageEntity("右应用编码为空"); + } + List fzhs = Arrays.asList(new String[]{"1", "2", "6", "73", "D01" , "jobass" , "93" , "96", "22"}); + if(!fzhs.contains(jsonObject.getString("archivesType"))){ + return BaseResult.getFailureMessageEntity("档案类型错误，请联系管理员"); + } + /* switch (jsonObject.getString("archivesType")){ + case "1"://人员对照 + GeneralDataEntity generalDataEntityPersonnel = jsonObject.toJavaObject(GeneralDataEntity.class); + generalDataDao.saveGeneralDataByType(generalDataEntityPersonnel); + break; + case "2"://部门档案 + GeneralDataEntity generalDataEntityOrg = jsonObject.toJavaObject(GeneralDataEntity.class); + generalDataDao.saveGeneralDataByType(generalDataEntityOrg); + break; + case "6"://存货对照 + GeneralDataEntity generalDataEntityStock = jsonObject.toJavaObject(GeneralDataEntity.class); + generalDataDao.saveGeneralDataByType(generalDataEntityStock); + break; + case "73"://客商辅助核算 + GeneralDataEntity generalDataEntityMerchant = jsonObject.toJavaObject(GeneralDataEntity.class); + generalDataDao.saveGeneralDataByType(generalDataEntityMerchant); + break; + case "D01"://税率 + GeneralDataEntity generalDataEntityTaxrate = jsonObject.toJavaObject(GeneralDataEntity.class); + generalDataDao.saveGeneralDataByType(generalDataEntityTaxrate); + break; + case "jobass"://项目辅助核算 + GeneralDataEntity generalDataEntityProject = jsonObject.toJavaObject(GeneralDataEntity.class); + generalDataDao.saveGeneralDataByType(generalDataEntityProject); + break; + case "93"://银行类别 + GeneralDataEntity generalDataEntityBank = jsonObject.toJavaObject(GeneralDataEntity.class); + generalDataDao.saveGeneralDataByType(generalDataEntityBank); + break; + case "96"://银行账户 + GeneralDataEntity generalDataEntityBankaccount = jsonObject.toJavaObject(GeneralDataEntity.class); + generalDataDao.saveGeneralDataByType(generalDataEntityBankaccount); + break; + case "22"://资产类别 + GeneralDataEntity generalDataEntityAssets = jsonObject.toJavaObject(GeneralDataEntity.class); + generalDataDao.saveGeneralDataByType(generalDataEntityAssets); + break; + default: + break; + }*/ + GeneralDataEntity generalDataEntity = jsonObject.toJavaObject(GeneralDataEntity.class); + generalDataEntity.setId(UUIDUtils.getUUID()); + generalDataEntity.setCreate_user_id("1"); + generalDataEntity.setModify_user_id("1"); + generalDataEntity.setOrg_id("0"); + generalDataEntity.setCompanyId("0"); + try { + GeneralDataEntity generalDataEntitySave = generalDataDao.saveGeneralDataByType(generalDataEntity); + return BaseResult.getSuccessMessageEntity("新增成功",generalDataEntitySave); + }catch (Exception e){ + logger.info("档案对照新增错误:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("新增失败"); + } + } + + //查询档案对照 + @Override + public JsonResultEntity queryEntityPage(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + if(jsonObject == null ){ + return BaseResult.getFailureMessageEntity("数据为空，请先传递数据"); + } + if(!checkStr(jsonObject.getString("archivesType"))){ + return BaseResult.getFailureMessageEntity("档案对照类型为空"); + } + /*if(!checkStr(jsonObject.getString("leftCode"))){ + return BaseResult.getFailureMessageEntity("左编码为空"); + } + if(!checkStr(jsonObject.getString("rightCode"))){ + return BaseResult.getFailureMessageEntity("右编码为空"); + }*/ + List fzhs = Arrays.asList(new String[]{"1", "2", "6", "73", "D01" , "jobass" , "93" , "96", "22"}); + if(!fzhs.contains(jsonObject.getString("archivesType"))){ + return BaseResult.getFailureMessageEntity("档案类型错误，请联系管理员"); + } + GeneralDataEntity generalDataEntity = jsonObject.toJavaObject(GeneralDataEntity.class); + try { + List generalDataEntities = generalDataDao.queryGeneralData(generalDataEntity); + PageInfo pageInfo=new PageInfo(generalDataEntities); + return BaseResult.getSuccessMessageEntity("查询成功",pageInfo); + }catch (Exception e){ + logger.info("档案对照查询错误：{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("查询失败"); + } + } + + //编辑档案对照 + @Override + public JsonResultEntity updateEntity(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + if(jsonObject == null ){ + return BaseResult.getFailureMessageEntity("数据为空，请先传递数据"); + } + if(!checkStr(jsonObject.getString("id"))){ + return BaseResult.getFailureMessageEntity("id为空"); + } + if(!checkStr(jsonObject.getString("archivesType"))){ + return BaseResult.getFailureMessageEntity("档案对照类型为空"); + } + /*if(!checkStr(jsonObject.getString("leftCode"))){ + return BaseResult.getFailureMessageEntity("左编码为空"); + } + if(!checkStr(jsonObject.getString("rightCode"))){ + return BaseResult.getFailureMessageEntity("右编码为空"); + } + if(!checkStr(jsonObject.getString("leftAppCode"))){ + return BaseResult.getFailureMessageEntity("左应用编码为空"); + } + if(!checkStr(jsonObject.getString("rightAppCode"))){ + return BaseResult.getFailureMessageEntity("右应用编码为空"); + }*/ + List fzhs = Arrays.asList(new String[]{"1", "2", "6", "73", "D01" , "jobass" , "93" , "96", "22"}); + if(!fzhs.contains(jsonObject.getString("archivesType"))){ + return BaseResult.getFailureMessageEntity("档案类型错误，请联系管理员"); + } + GeneralDataEntity generalDataEntity = jsonObject.toJavaObject(GeneralDataEntity.class); + try { + generalDataDao.updateGeneralDataByType(generalDataEntity); + return BaseResult.getSuccessMessageEntity("编辑成功"); + }catch (Exception e){ + logger.info("档案对照编辑失败:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("编辑失败"); + } + } + + //删除档案对照 + @Override + public JsonResultEntity deleteEntity(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + if(jsonObject == null ){ + return BaseResult.getFailureMessageEntity("数据为空，请先传递数据"); + } + if(!checkStr(jsonObject.getString("id"))){ + return BaseResult.getFailureMessageEntity("id为空"); + } + if(!checkStr(jsonObject.getString("archivesType"))){ + return BaseResult.getFailureMessageEntity("档案对照类型为空"); + } + /*if(!checkStr(jsonObject.getString("leftCode"))){ + return BaseResult.getFailureMessageEntity("左编码为空"); + } + if(!checkStr(jsonObject.getString("rightCode"))){ + return BaseResult.getFailureMessageEntity("右编码为空"); + } + if(!checkStr(jsonObject.getString("leftAppCode"))){ + return BaseResult.getFailureMessageEntity("左应用编码为空"); + } + if(!checkStr(jsonObject.getString("rightAppCode"))){ + return BaseResult.getFailureMessageEntity("右应用编码为空"); + }*/ + List fzhs = Arrays.asList(new String[]{"1", "2", "6", "73", "D01" , "jobass" , "93" , "96", "22"}); + if(!fzhs.contains(jsonObject.getString("archivesType"))){ + return BaseResult.getFailureMessageEntity("档案类型错误，请联系管理员"); + } + GeneralDataEntity generalDataEntity = jsonObject.toJavaObject(GeneralDataEntity.class); + try { + generalDataEntity.setCreate_user_id("1"); + generalDataEntity.setModify_user_id("1"); + generalDataDao.deleteGeneralDataByType(generalDataEntity); + return BaseResult.getSuccessMessageEntity("删除成功"); + }catch (Exception e){ + logger.info("档案对照删除失败:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("删除失败"); + } + } + + //查询单个档案对照对象 + @Override + public JsonResultEntity getEntity(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + if(jsonObject == null ){ + return BaseResult.getFailureMessageEntity("数据为空，请先传递数据"); + } + if(!checkStr(jsonObject.getString("id"))){ + return BaseResult.getFailureMessageEntity("id为空"); + } + GeneralDataEntity generalDataEntity = jsonObject.toJavaObject(GeneralDataEntity.class); + try { + GeneralDataEntity generalDataEntityOne = generalDataDao.queryOne(generalDataEntity); + return BaseResult.getSuccessMessageEntity("查询单个成功",generalDataEntityOne); + }catch (Exception e){ + logger.info("查询单个档案对照错误:{}",e.getMessage()); + return BaseResult.getSuccessMessageEntity("查询单个失败"); + } + } +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.xml index a5a9d746..68a3bff1 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.xml @@ -143,7 +143,7 @@ and company_id like concat('%',#{companyId},'%') and sts='Y' - order by sorts asc + order by sorts desc order by ${sort} ${order} diff --git a/service/src/main/java/com/hzya/frame/sysnew/login/impl/LoginServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/login/impl/LoginServiceImpl.java index 0a299f73..48fb1f2c 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/login/impl/LoginServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/login/impl/LoginServiceImpl.java @@ -67,36 +67,36 @@ public class LoginServiceImpl implements ILoginService { return BaseResult.getFailureMessageEntity("当前用户已停用，请先启用"); } //校验当前登陆人是否有权限 - boolean flag = false; - SysInterfaceEntity sysInterfaceEntity = (SysInterfaceEntity) interfaceCache.get("6","beanNameloginServiceinterfacNamedoLogin"); - if(sysInterfaceEntity == null || sysInterfaceEntity.getId() == null){ - return BaseResult.getFailureMessageEntity("用户无访问权限，请联系管理员"); - } - //查询用户权限 - if(!flag){ - SysPopedomInterfaceEntity userPopedomInterfaceEntity = (SysPopedomInterfaceEntity) interfaceCache.get("4","userId"+sysUserEntity.getId()+"interfaceId"+sysInterfaceEntity.getId()); - if(userPopedomInterfaceEntity != null && userPopedomInterfaceEntity.getId() != null ){ - flag = true; - } - } - //查询用户角色的权限 - if(!flag){ - List userRoleMap = (List) interfaceCache.get("3",null); - if(userRoleMap != null && userRoleMap.size() > 0){ - for (SysUserRolesEntity sysUserRolesEntity : userRoleMap) { - if(sysUserRolesEntity.getUserId().equals(sysUserEntity.getId())){ - SysPopedomInterfaceEntity sysPopedomInterfaceEntity = (SysPopedomInterfaceEntity) interfaceCache.get("5","roleId"+sysUserRolesEntity.getRoleId()+"interfaceId"+sysInterfaceEntity.getId()); - if(sysPopedomInterfaceEntity != null && sysPopedomInterfaceEntity.getId() != null ){ - flag = true; - break; - } - } - } - } - } - if(!flag){ - return BaseResult.getFailureMessageEntity("用户无访问权限，请联系管理员"); - } + //boolean flag = false; + //SysInterfaceEntity sysInterfaceEntity = (SysInterfaceEntity) interfaceCache.get("6","beanNameloginServiceinterfacNamedoLogin"); + //if(sysInterfaceEntity == null || sysInterfaceEntity.getId() == null){ + // return BaseResult.getFailureMessageEntity("用户无访问权限，请联系管理员"); + //} + ////查询用户权限 + //if(!flag){ + // SysPopedomInterfaceEntity userPopedomInterfaceEntity = (SysPopedomInterfaceEntity) interfaceCache.get("4","userId"+sysUserEntity.getId()+"interfaceId"+sysInterfaceEntity.getId()); + // if(userPopedomInterfaceEntity != null && userPopedomInterfaceEntity.getId() != null ){ + // flag = true; + // } + //} + ////查询用户角色的权限 + //if(!flag){ + // List userRoleMap = (List) interfaceCache.get("3",null); + // if(userRoleMap != null && userRoleMap.size() > 0){ + // for (SysUserRolesEntity sysUserRolesEntity : userRoleMap) { + // if(sysUserRolesEntity.getUserId().equals(sysUserEntity.getId())){ + // SysPopedomInterfaceEntity sysPopedomInterfaceEntity = (SysPopedomInterfaceEntity) interfaceCache.get("5","roleId"+sysUserRolesEntity.getRoleId()+"interfaceId"+sysInterfaceEntity.getId()); + // if(sysPopedomInterfaceEntity != null && sysPopedomInterfaceEntity.getId() != null ){ + // flag = true; + // break; + // } + // } + // } + // } + //} + //if(!flag){ + // return BaseResult.getFailureMessageEntity("用户无访问权限，请联系管理员"); + //} //登录 StpUtil.login(sysUserEntity.getId()); //获取token diff --git a/service/src/main/java/com/hzya/frame/sysnew/user/entity/SysUserEntity.java b/service/src/main/java/com/hzya/frame/sysnew/user/entity/SysUserEntity.java index 7d9a333f..c552e1d2 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/user/entity/SysUserEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/user/entity/SysUserEntity.java @@ -27,6 +27,11 @@ public class SysUserEntity extends BaseEntity { * 登录密码 */ private String password; + + /** + * 老登录密码 + */ + private String OldPassword; /** * 盐 */ @@ -204,5 +209,13 @@ public class SysUserEntity extends BaseEntity { public void setOrganId(String organId) { this.organId = organId; } + + public String getOldPassword() { + return OldPassword; + } + + public void setOldPassword(String oldPassword) { + OldPassword = oldPassword; + } } diff --git a/service/src/main/java/com/hzya/frame/sysnew/user/service/ISysUserService.java b/service/src/main/java/com/hzya/frame/sysnew/user/service/ISysUserService.java index fba89aba..559a5424 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/user/service/ISysUserService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/user/service/ISysUserService.java @@ -84,6 +84,14 @@ public interface ISysUserService extends IBaseService { * @Date 2:37 下午 2024/3/27 **/ JsonResultEntity resetPassword(JSONObject jsonObject); + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 用户重置密码 + * @Date 2:37 下午 2024/3/27 + **/ + JsonResultEntity userResetPassword(JSONObject jsonObject); /** diff --git a/service/src/main/java/com/hzya/frame/sysnew/user/service/impl/SysUserServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/user/service/impl/SysUserServiceImpl.java index 80655731..e7648cce 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/user/service/impl/SysUserServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/user/service/impl/SysUserServiceImpl.java @@ -1,5 +1,6 @@ package com.hzya.frame.sysnew.user.service.impl; +import cn.dev33.satoken.stp.StpUtil; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -380,7 +381,43 @@ public class SysUserServiceImpl extends BaseService imple interfaceCache.reloadData("1"); return BaseResult.getSuccessMessageEntity("重置密码成功"); } - + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 重置密码 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity userResetPassword(JSONObject jsonObject) { + SysUserEntity entity = getData("jsonStr", jsonObject, SysUserEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getOldPassword() == null || "".equals(entity.getOldPassword())) { + return BaseResult.getFailureMessageEntity("请先输入原密码"); + } + if (entity.getPassword() == null || "".equals(entity.getPassword())) { + return BaseResult.getFailureMessageEntity("请先输入新密码"); + } + if(entity.getPassword().equals(entity.getOldPassword())){ + return BaseResult.getFailureMessageEntity("新密码和原密码不能一样"); + } + SysUserEntity oldEntity = sysUserDao.get(StpUtil.getLoginIdAsString()); + if (oldEntity == null) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if(!oldEntity.getPassword().equals(AESUtil.encrypt(oldEntity.getLoginCode()+"-"+entity.getOldPassword()))){ + return BaseResult.getFailureMessageEntity("原密码错误，请重新输入"); + } + oldEntity.setPassword(AESUtil.encrypt(oldEntity.getLoginCode()+"-"+entity.getPassword())); + oldEntity.setUpdate(); + //保存密码 + sysUserDao.update(oldEntity); + interfaceCache.reloadData("1"); + StpUtil.logoutByTokenValue(StpUtil.getTokenValue()); + return BaseResult.getSuccessMessageEntity("重置密码成功"); + } /** * @param jsonObject diff --git a/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java b/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java index 093550aa..86d047b0 100644 --- a/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java +++ b/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java @@ -235,7 +235,7 @@ public class EntranceServiceImpl implements IEntranceService { public Object platformInterface(ServletRequest servletRequest, ServletResponse servletResponse) throws InvocationTargetException, IllegalAccessException { HttpServletRequest request = (HttpServletRequest) servletRequest; //tailuo 要访问的Bean名称 - String service = request.getHeader("tl"); + String service = request.getHeader("yatl"); //bean方法 String serviceMethod = request.getHeader("yadj"); String body = ServletUtil.getBody(servletRequest);