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/service/src/main/java/com/hzya/frame/mdm/entity/DbFiledsDto.java b/service/src/main/java/com/hzya/frame/mdm/entity/DbFiledsDto.java deleted file mode 100644 index ae094e16..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/entity/DbFiledsDto.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.hzya.frame.mdm.entity; - -import com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity; -import com.hzya.frame.web.entity.BaseEntity; - -import java.util.List; - -public class DbFiledsDto { - - /** - * 1\修改 2、新增 - */ - private String dataType; - - /** - * 中文名 - */ - private String chName; - /** - * 英文名 - */ - private String enName; - /** - * 字段类型 1、BIGINT 2、DECIMAL 3、VARCHAR 4、DATETIME - */ - private String filedType; - /** - * 长度 - */ - private String filedLength; - - public DbFiledsDto() { - } - - public DbFiledsDto(String dataType,String chName, String enName, String filedType, String filedLength) { - this.dataType = dataType; - this.chName = chName; - this.enName = enName; - this.filedType = filedType; - this.filedLength = filedLength; - } - - public String getChName() { - return chName; - } - - public void setChName(String chName) { - this.chName = chName; - } - - public String getEnName() { - return enName; - } - - public void setEnName(String enName) { - this.enName = enName; - } - - public String getFiledType() { - return filedType; - } - - public void setFiledType(String filedType) { - this.filedType = filedType; - } - - public String getFiledLength() { - return filedLength; - } - - public void setFiledLength(String filedLength) { - this.filedLength = filedLength; - } - - public String getDataType() { - return dataType; - } - - public void setDataType(String dataType) { - this.dataType = dataType; - } -} - diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDataDto.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDataDto.java deleted file mode 100644 index 0370431c..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDataDto.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hzya.frame.mdm.entity; - - -import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; - -import java.util.List; - -public class MdmDataDto { - - private String id; - private String tableName; - private String documentRule; - private Integer documentRuleNum; - /** - * 类型 1、主表 2、明细 - */ - private String dbType; - - private List mdmDataFiledDtos; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } - - public List getMdmDataFiledDtos() { - return mdmDataFiledDtos; - } - - public void setMdmDataFiledDtos(List mdmDataFiledDtos) { - this.mdmDataFiledDtos = mdmDataFiledDtos; - } - - public String getDocumentRule() { - return documentRule; - } - - public void setDocumentRule(String documentRule) { - this.documentRule = documentRule; - } - - public Integer getDocumentRuleNum() { - return documentRuleNum; - } - - public void setDocumentRuleNum(Integer documentRuleNum) { - this.documentRuleNum = documentRuleNum; - } - - public String getDbType() { - return dbType; - } - - public void setDbType(String dbType) { - this.dbType = dbType; - } -} - diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDataFiledDto.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDataFiledDto.java deleted file mode 100644 index d9e40e8d..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDataFiledDto.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hzya.frame.mdm.entity; - - -import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; - -import java.util.List; - -public class MdmDataFiledDto { - - private String filedsName; - private String filedsValue; - - public String getFiledsName() { - return filedsName; - } - - public void setFiledsName(String filedsName) { - this.filedsName = filedsName; - } - - public String getFiledsValue() { - return filedsValue; - } - - public void setFiledsValue(String filedsValue) { - this.filedsValue = filedsValue; - } -} - 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 deleted file mode 100644 index 70da08eb..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDbFiledVo.java +++ /dev/null @@ -1,37 +0,0 @@ -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; - private String name; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public MdmDbFiledVo() { - } - - public MdmDbFiledVo(String id, String name) { - this.id = id; - this.name = name; - } -} - 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/MdmDetailViewVo.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDetailViewVo.java deleted file mode 100644 index 586e4d7d..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDetailViewVo.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.hzya.frame.mdm.entity; - -import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; -import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; -import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity; - -import java.util.List; - -public class MdmDetailViewVo { - //模版信息 - private MdmModuleEntity mdmModuleEntity; - //主数据主表 - private MdmModuleDbEntity mainMdmModuleDb; - //主数据子表 - private List sublistMdmModuleDb; - - public MdmModuleEntity getMdmModuleEntity() { - return mdmModuleEntity; - } - - public void setMdmModuleEntity(MdmModuleEntity mdmModuleEntity) { - this.mdmModuleEntity = mdmModuleEntity; - } - - public MdmModuleDbEntity getMainMdmModuleDb() { - return mainMdmModuleDb; - } - - public void setMainMdmModuleDb(MdmModuleDbEntity mainMdmModuleDb) { - this.mainMdmModuleDb = mainMdmModuleDb; - } - - public List getSublistMdmModuleDb() { - return sublistMdmModuleDb; - } - - public void setSublistMdmModuleDb(List sublistMdmModuleDb) { - this.sublistMdmModuleDb = sublistMdmModuleDb; - } -} - 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 deleted file mode 100644 index d27cc712..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDistributeDto.java +++ /dev/null @@ -1,34 +0,0 @@ -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 List mdmModuleDistributeEntities; - - public List getMdmModuleDistributeEntities() { - return mdmModuleDistributeEntities; - } - - public void setMdmModuleDistributeEntities(List mdmModuleDistributeEntities) { - this.mdmModuleDistributeEntities = mdmModuleDistributeEntities; - } - - 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/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..b5e8332d 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,38 +2,14 @@ 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 { - //id - private String id; - //3、新增4、修改 5、查看 - private String showType; - //分页 - private Integer pageNum; - private Integer pageSize; - /** - * 显示字段 - */ - private String viewFiled; - /** - * 上级id字段 - */ - private String upIdFiled; - //主数据名称 - private String mdmName; //主数据编码 - private Integer mdmCode; - //主数据类型 - private String mdmType; - //描述 - private String remark; - //描述 - private String[] ids; + private Long mdmCode; //单据编码规则 private List mdmTableCodeRuleEntityList; //主数据主表 @@ -41,29 +17,20 @@ public class MdmDto { //主数据子表 private List sublistMdmModuleDb; - private String tableName; - private String value; - - private String label; - private String lableValue; - - 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() { @@ -81,125 +48,5 @@ public class MdmDto { public void setSublistMdmModuleDb(List sublistMdmModuleDb) { 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; - } - - public void setId(String id) { - this.id = id; - } - - public Integer getPageNum() { - return pageNum; - } - - public void setPageNum(Integer pageNum) { - this.pageNum = pageNum; - } - - public Integer getPageSize() { - return pageSize; - } - - public void setPageSize(Integer pageSize) { - 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; - } - - public void setViewFiled(String viewFiled) { - this.viewFiled = viewFiled; - } - - public String getUpIdFiled() { - return upIdFiled; - } - - public void setUpIdFiled(String upIdFiled) { - this.upIdFiled = upIdFiled; - } - - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public String getUpId() { - return upId; - } - - 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 deleted file mode 100644 index 4386ac8c..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmModuleViewDto.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.hzya.frame.mdm.entity; - -import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity; -import com.hzya.frame.mdm.mdmModuleViewDetail.entity.MdmModuleViewDetailEntity; - -import java.util.List; - -public class MdmModuleViewDto { - - //id - private String id; - //模版 - private MdmModuleViewEntity mdmModuleViewEntity; - //新增 - private List addFiled; - //修改 - private List editFiled; - //查看 - private List showFiled; - //查询 - private List queryFiled; - //列表 - private List listFiled; - - public MdmModuleViewEntity getMdmModuleViewEntity() { - return mdmModuleViewEntity; - } - - public void setMdmModuleViewEntity(MdmModuleViewEntity mdmModuleViewEntity) { - this.mdmModuleViewEntity = mdmModuleViewEntity; - } - - public List getAddFiled() { - return addFiled; - } - - public void setAddFiled(List addFiled) { - this.addFiled = addFiled; - } - - public List getEditFiled() { - return editFiled; - } - - public void setEditFiled(List editFiled) { - this.editFiled = editFiled; - } - - public List getShowFiled() { - return showFiled; - } - - public void setShowFiled(List showFiled) { - this.showFiled = showFiled; - } - - public List getQueryFiled() { - return queryFiled; - } - - public void setQueryFiled(List queryFiled) { - this.queryFiled = queryFiled; - } - - public List getListFiled() { - return listFiled; - } - - public void setListFiled(List listFiled) { - this.listFiled = listFiled; - } - - 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/MdmModuleViewVo.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmModuleViewVo.java deleted file mode 100644 index e41fc9ae..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmModuleViewVo.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.hzya.frame.mdm.entity; - -import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity; -import com.hzya.frame.mdm.mdmModuleViewDetail.entity.MdmModuleViewDetailEntity; - -import java.util.List; - -public class MdmModuleViewVo { - - - //模版 - private MdmModuleViewEntity mdmModuleViewEntity; - //新增 - private List addFiled; - //修改 - private List editFiled; - //查看 - private List showFiled; - //查询 - private List queryFiled; - //列表 - private List listFiled; - - //新增 - private List dbAddFiled; - //修改 - private List dbEditFiled; - //查看 - private List dbShowFiled; - //查询 - private List dbQueryFiled; - //列表 - private List dbListFiled; - - public List getAddFiled() { - return addFiled; - } - - public void setAddFiled(List addFiled) { - this.addFiled = addFiled; - } - - public List getEditFiled() { - return editFiled; - } - - public void setEditFiled(List editFiled) { - this.editFiled = editFiled; - } - - public List getShowFiled() { - return showFiled; - } - - public void setShowFiled(List showFiled) { - this.showFiled = showFiled; - } - - public List getQueryFiled() { - return queryFiled; - } - - public void setQueryFiled(List queryFiled) { - this.queryFiled = queryFiled; - } - - public List getListFiled() { - return listFiled; - } - - public void setListFiled(List listFiled) { - this.listFiled = listFiled; - } - - public MdmModuleViewEntity getMdmModuleViewEntity() { - return mdmModuleViewEntity; - } - - public void setMdmModuleViewEntity(MdmModuleViewEntity mdmModuleViewEntity) { - this.mdmModuleViewEntity = mdmModuleViewEntity; - } - - public List getDbAddFiled() { - return dbAddFiled; - } - - public void setDbAddFiled(List dbAddFiled) { - this.dbAddFiled = dbAddFiled; - } - - public List getDbEditFiled() { - return dbEditFiled; - } - - public void setDbEditFiled(List dbEditFiled) { - this.dbEditFiled = dbEditFiled; - } - - public List getDbShowFiled() { - return dbShowFiled; - } - - public void setDbShowFiled(List dbShowFiled) { - this.dbShowFiled = dbShowFiled; - } - - public List getDbQueryFiled() { - return dbQueryFiled; - } - - public void setDbQueryFiled(List dbQueryFiled) { - this.dbQueryFiled = dbQueryFiled; - } - - public List getDbListFiled() { - return dbListFiled; - } - - public void setDbListFiled(List dbListFiled) { - this.dbListFiled = dbListFiled; - } -} - diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmQuery.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmQuery.java deleted file mode 100644 index bda7c895..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmQuery.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hzya.frame.mdm.entity; - - -import com.hzya.frame.sys.entity.TemplateKeyValue; - -import java.util.List; - -public class MdmQuery { - - //分页 - private Integer pageNum; - private Integer pageSize; - //表名 - private String tableName; - //查询条件 - private List queryCondition; - //返回字段 - private List returnField; - //明细表查询条件 - private List detailQueryCondition; - - public Integer getPageNum() { - return pageNum; - } - - public void setPageNum(Integer pageNum) { - this.pageNum = pageNum; - } - - public Integer getPageSize() { - return pageSize; - } - - public void setPageSize(Integer pageSize) { - this.pageSize = pageSize; - } - - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } - - public List getQueryCondition() { - return queryCondition; - } - - public void setQueryCondition(List queryCondition) { - this.queryCondition = queryCondition; - } - - public List getReturnField() { - return returnField; - } - - public void setReturnField(List returnField) { - this.returnField = returnField; - } - - public List getDetailQueryCondition() { - return detailQueryCondition; - } - - public void setDetailQueryCondition(List detailQueryCondition) { - this.detailQueryCondition = detailQueryCondition; - } -} 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/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/MdmViewFiledVo.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmViewFiledVo.java deleted file mode 100644 index f1e25c5a..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmViewFiledVo.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.hzya.frame.mdm.entity; - -import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; -import com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity; -import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity; - -import java.util.List; - -public class MdmViewFiledVo { - - //字段id - private String id; - //表名 - private String dbName; - //类型 1、主表 2、明细 - private String dbType; - //主数据模版ID - private String mdmId; - //模版数据库id - private String dbId; - //中文名 - private String chName; - //英文名 - private String enName; - //排序 - private Integer sorts; - /** - * 字段类型 1、BIGINT 2、DECIMAL 3、VARCHAR 4、DATETIME - */ - private String filedType; - //字段规则 - private List ruleList; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - 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 getMdmId() { - return mdmId; - } - - public void setMdmId(String mdmId) { - this.mdmId = mdmId; - } - - public String getDbId() { - return dbId; - } - - public void setDbId(String dbId) { - this.dbId = dbId; - } - - public String getChName() { - return chName; - } - - public void setChName(String chName) { - this.chName = chName; - } - - public String getEnName() { - return enName; - } - - public void setEnName(String enName) { - this.enName = enName; - } - - public List getRuleList() { - return ruleList; - } - - public void setRuleList(List ruleList) { - this.ruleList = ruleList; - } - - public Integer getSorts() { - return sorts; - } - - public void setSorts(Integer sorts) { - this.sorts = sorts; - } - - public String getFiledType() { - return filedType; - } - - public void setFiledType(String filedType) { - this.filedType = filedType; - } -} - 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 deleted file mode 100644 index 25749a1b..00000000 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmViewVo.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.hzya.frame.mdm.entity; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; -import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; -import java.util.List; - -public class MdmViewVo { - - private String id; - //模版信息 - private MdmModuleEntity mdmModuleEntity; - //模版展示信息 - private MdmModuleViewEntity mdmModuleViewEntity; - //查询条件 - private List queryList; - //列表 - private List listList; - //按钮 - private List buttonList; - - public List getQueryList() { - return queryList; - } - - public void setQueryList(List queryList) { - this.queryList = queryList; - } - - public List getListList() { - return listList; - } - - public void setListList(List listList) { - this.listList = listList; - } - - public List getButtonList() { - return buttonList; - } - - public void setButtonList(List buttonList) { - this.buttonList = buttonList; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public MdmModuleEntity getMdmModuleEntity() { - return mdmModuleEntity; - } - - public void setMdmModuleEntity(MdmModuleEntity mdmModuleEntity) { - this.mdmModuleEntity = mdmModuleEntity; - } - - public MdmModuleViewEntity getMdmModuleViewEntity() { - return mdmModuleViewEntity; - } - - public void setMdmModuleViewEntity(MdmModuleViewEntity mdmModuleViewEntity) { - this.mdmModuleViewEntity = mdmModuleViewEntity; - } -} - 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..8dcabbcb 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,16 +1,8 @@ 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; import java.util.Map; @@ -18,41 +10,15 @@ 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); - - Integer checkData(Map map); - - Integer updateForm(MdmDataDto mdmDataDto); - Integer saveForm(MdmDataDto mdmDataDto); - - Integer deleteTemplateById(FormmainDeleteDto formmainDeleteDto); - - 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 caabbdff..fda4b148 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,18 +1,10 @@ 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; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -20,126 +12,28 @@ 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.query(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); - return o; - } - @Override - public Integer createTableDistribute(Map maps) { - Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "createTableDistribute", maps); - return o; - } - @Override - public Integer alterTable(Map maps) { - Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "alterTable", maps); - return o; - } - - @Override - public Integer alterTableName(Map maps) { - Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "alterTableName", maps); - 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..f323ccab 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 + + - - - - - - - - - - - - - - - - - - - - insert into ${tableName}( - - - - - ${item.filedsName}, - - - create_user_id, - modify_user_id, - - - - sorts, - create_time, - modify_time, - sts, - - document_rule, - document_rule_num, - - - )values - ( - - - - - #{item.filedsValue}, - - - #{item.filedsValue}, - #{item.filedsValue}, - - - - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from ${tableName} a WHERE - a.sts = 'Y' ), - now(), - now(), - 'Y', - - ( concat(#{documentRule}, - (SELECT - IF - ( - LENGTH( (SELECT - IFNULL(MAX(b.document_rule_num),0)+1 - FROM - ${tableName} b - WHERE - DATE_FORMAT( b.create_time, '%Y-%m' ) = DATE_FORMAT( now(), '%Y-%m' )) ) <= ${documentRuleNum}, - LPAD( (SELECT - IFNULL(MAX(c.document_rule_num),0)+1 - FROM - ${tableName} c - WHERE - DATE_FORMAT( c.create_time, '%Y-%m' ) = DATE_FORMAT( now(), '%Y-%m' )), ${documentRuleNum}, '0' ), - (SELECT - IFNULL(MAX(d.document_rule_num),0)+1 - FROM - ${tableName} d - WHERE - DATE_FORMAT( d.create_time, '%Y-%m' ) = DATE_FORMAT( now(), '%Y-%m' )) - ) - ) - )), - (SELECT - IF - ( - LENGTH( (SELECT - IFNULL(MAX(e.document_rule_num),0)+1 - FROM - ${tableName} e - WHERE - DATE_FORMAT( e.create_time, '%Y-%m' ) = DATE_FORMAT( now(), '%Y-%m' )) ) <= ${documentRuleNum}, - LPAD( (SELECT - IFNULL(MAX(f.document_rule_num),0)+1 - FROM - ${tableName} f - WHERE - DATE_FORMAT( f.create_time, '%Y-%m' ) = DATE_FORMAT( now(), '%Y-%m' )), ${documentRuleNum}, '0' ), - (SELECT - IFNULL(MAX(g.document_rule_num),0)+1 - FROM - ${tableName} g - WHERE - DATE_FORMAT( g.create_time, '%Y-%m' ) = DATE_FORMAT( now(), '%Y-%m' )) - ) - ) - - - ) - - - 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} - - and id = #{id} - and formmain_id = #{formmain_id} - and sts='Y' - - - - - - update ${tableName} set - sts='N',modify_time = now(),modify_user_id = #{loginId} - - - 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..92b955dd 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,29 +1,15 @@ 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; -import java.util.Map; +import com.hzya.frame.basedao.dao.IBaseDao; /** * 模版数据库表(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..77d8c8bb 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,51 +1,17 @@ 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; - -import java.util.HashMap; -import java.util.List; -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 { - - @Override - public HashMap getServiceDataById(Map maps) { - HashMap o = (HashMap) super.selectOne(getSqlIdPrifx() + "getServiceDataById", maps); - return o; - - } - - @Override - public List> getServiceByFormmainId(Map maps) { - List> o = (List>) super.selectList(getSqlIdPrifx() + "getServiceByFormmainId", maps); - return o; - - } - @Override - public List> getServiceByDistributeId(Map maps) { - List> o = (List>) super.selectList(getSqlIdPrifx() + "getServiceByDistributeId", maps); - return o; - - } - @Override - public List getServiceByDistributeIdNoCase(Map maps) { - List o = (List) super.selectList(getSqlIdPrifx() + "getServiceByDistributeIdNoCase", maps); - return o; - - } - +public class MdmModuleDbDaoImpl extends MybatisGenericDao implements IMdmModuleDbDao{ + } 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..383d4ca7 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,293 +31,213 @@ ,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..194a0ace 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,57 +5,43 @@ 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; - /** - * roletype - */ - private String roletype; - /** - * roletype - */ - private String roleValue; - //字段规则 - private List mdmModuleDbFiledsRules; - - public List getMdmModuleDbFiledsRules() { - return mdmModuleDbFiledsRules; - } - - public void setMdmModuleDbFiledsRules(List mdmModuleDbFiledsRules) { - this.mdmModuleDbFiledsRules = mdmModuleDbFiledsRules; - } + + /** 主数据模版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; + private List mdmModuleDbFiledsRules; public String getMdmId() { return mdmId; @@ -97,6 +83,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,20 +139,28 @@ public class MdmModuleDbFiledsEntity extends BaseEntity { this.filedLength = filedLength; } - public String getRoletype() { - return roletype; + public String getCompanyId() { + return companyId; } - public void setRoletype(String roletype) { - this.roletype = roletype; + public void setCompanyId(String companyId) { + this.companyId = companyId; } - public String getRoleValue() { - return roleValue; + public List getMdmModuleDbFiledsRules() { + return mdmModuleDbFiledsRules; } - public void setRoleValue(String roleValue) { - this.roleValue = roleValue; + public void setMdmModuleDbFiledsRules(List mdmModuleDbFiledsRules) { + this.mdmModuleDbFiledsRules = mdmModuleDbFiledsRules; + } + + public String getDataType() { + return dataType; + } + + public void setDataType(String dataType) { + this.dataType = dataType; } } 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..23df5360 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 @@ -1,15 +1,12 @@ package com.hzya.frame.mdm.mdmModuleDistribute.entity; import java.util.Date; -import java.util.List; - -import com.hzya.frame.mdm.mdmModuleDistributeDetail.entity.MdmModuleDistributeDetailEntity; 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 +14,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; + /** 启用停用 0、停用1、启用 */ + private String enabledState; + /** 公司id */ + private String companyId; - 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; - } public String getMdmId() { return mdmId; @@ -64,6 +42,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,36 +66,20 @@ 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 String getAddPlug() { - return addPlug; - } - - public void setAddPlug(String addPlug) { - this.addPlug = addPlug; - } - - public String getDeletePlug() { - return deletePlug; - } - - public void setDeletePlug(String deletePlug) { - this.deletePlug = deletePlug; + public void setCompanyId(String companyId) { + this.companyId = companyId; } } 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/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/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..9c1344ba 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,33 +1,25 @@ 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; - /** - * 显示类型 1、树 2、列表 - */ - private String viewName; - /** - * 显示字段 - */ - private String viewFiled; - /** - * 上级id字段 - */ - private String upIdFiled; + + /** 主数据模版ID */ + private String mdmId; + /** 显示类型 */ + private String viewName; + /** 显示字段 */ + private String viewFiled; + /** 上级id字段 */ + private String upIdFiled; + /** 公司id */ + private String companyId; public String getMdmId() { @@ -62,5 +54,13 @@ public class MdmModuleViewEntity extends BaseEntity { this.upIdFiled = upIdFiled; } + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + } 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..261b8bdf --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/entity/MdmModuleViewButtonEntity.java @@ -0,0 +1,66 @@ +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; + + + 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; + } + +} + 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..e49e3044 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,33 +1,25 @@ 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; public String getMdmId() { @@ -62,5 +54,13 @@ public class MdmModuleViewDetailEntity extends BaseEntity { this.viewType = viewType; } + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + } 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 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