I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MDM 系统结构优化

Browse Source 
单元测试开关
yun-zuoyi
汪云昊 5 years ago
parent 7fa1df9a4e
commit 4de301bf79
10 changed files with 53 additions and 19 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java
Unescape Escape View File

@ -123,7 +123,7 @@ public class MdmEnumUtil {
public enum MDM_SYNC_TYPE{
INSERT(1, "新增"),
UPDATE(2, "修改"),
DELETE(2, "删除");
DELETE(3, "删除");
private int value;
private String description;

4
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
Unescape Escape View File

@ -76,6 +76,10 @@ public class BfElement extends BaseBean {
@ApiParam(value = "是否编辑")
private Integer isObjectEdit;
@Column(name = "IS_READ_ONLY_SHOW")
@ApiParam(value = "是否只读显示")
private Integer isReadOnlyShow;
@Column(name = "IS_OBJECT_DEL")
@ApiParam(value = "是否删除")
private Integer isObjectDel;

12
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java
Unescape Escape View File

@ -30,12 +30,13 @@ public abstract class BaseMdmBean extends BaseBean {
@Transient
@ApiModelProperty("是否主数据")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
@Column(name = "MDM_VERSION")
@ApiModelProperty("mdm数据版本")
@JsonSerialize(using = ToStringSerializer.class)
@AnnoOutputColumn(hidden = true)
private Long mdmVersion;
public long getMdmVersionVal() {
@ -50,21 +51,26 @@ public abstract class BaseMdmBean extends BaseBean {
@Column(name = "IS_MDM_PUBLISHED")
@ApiModelProperty("是否发布")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
private Integer isMdmPublished;
@Column(name = "MDM_OPERATE_TYPE")
@ApiModelProperty("操作类型")
@AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class)
@AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class,hidden = true)
private Integer mdmOperateType;
public Integer getMdmOperateTypeVal() {
return mdmOperateType == null ? MdmEnumUtil.MDM_OPERATE_TYPE.INSERT.getValue() : mdmOperateType;
}
public String getMdmOperateTypeTxt(){
return MdmEnumUtil.MDM_OPERATE_TYPE.valueOfDescription(getMdmOperateTypeVal());
}
@Column(name = "MDM_REF_ID")
@ApiModelProperty("关联id")
@JsonSerialize(using = ToStringSerializer.class)
@AnnoOutputColumn(hidden = true)
private Long mdmRefId;
//排序方式

12
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java
Unescape Escape View File

@ -28,22 +28,22 @@ public class BaseMdmBusiExtdBean extends BaseMdmBean {
@Transient
@ApiModelProperty("是否主数据")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
@Transient
@ApiModelProperty("主数据Class")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
public static Class<BaseMdmBean> mdmMasterClass = BaseMdmBean.class;
@AnnoOutputColumn(hidden = true)
protected static Class<BaseMdmBean> mdmMasterClass = BaseMdmBean.class;
@Transient
@ApiModelProperty("软件模块")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
public static Integer mdmSoftType;
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true)
protected static Integer mdmSoftType;
@Column(name = "MDM_MASTER_ID")
@ApiModelProperty("主数据id")
@JsonSerialize(using = ToStringSerializer.class)
private Long mdmMasterId;
public Long mdmMasterId;
}

10
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java
Unescape Escape View File

@ -11,6 +11,11 @@ import io.swagger.annotations.ApiModelProperty;
**/
public abstract class BaseMdmBusiModelBean<M extends BaseMdmBean, B extends BaseMdmBusiExtdBean> {
public BaseMdmBusiModelBean(M mdmMasterBean, B mdmBusiBean) {
this.mdmMasterBean = mdmMasterBean;
this.mdmBusiBean = mdmBusiBean;
}
@ApiModelProperty("主数据")
private M mdmMasterBean;
@ -20,11 +25,6 @@ public abstract class BaseMdmBusiModelBean<M extends BaseMdmBean, B extends Base
public BaseMdmBusiModelBean() {
}
public BaseMdmBusiModelBean(M mdmMasterBean, B mdmBusiBean) {
this.mdmMasterBean = mdmMasterBean;
this.mdmBusiBean = mdmBusiBean;
}
/**
* 获取主数据m
*

12
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java
Unescape Escape View File

@ -31,10 +31,18 @@ public class MdmSyncData implements Serializable {
return syncType == null ? MdmEnumUtil.MDM_SYNC_TYPE.INSERT.getValue() : syncType;
}
public String getSyncTypeTxt(){
return syncType == null ? "无":MdmEnumUtil.MDM_SYNC_TYPE.valueOfDescription(syncType);
}
@ApiModelProperty("同步模块")
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class)
private Integer syncSoftType;
public String getSyncSoftTypeTxt(){
return syncSoftType == null ? "无":CommonEnumUtil.SOFT_TYPE.valueOfDescription(syncSoftType);
}
@ApiModelProperty("是否是主数据")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
private Integer isMasterData;
@ -43,6 +51,10 @@ public class MdmSyncData implements Serializable {
return isMasterData == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isMasterData;
}
public String getIsMasterDataTxt(){
return isMasterData == null ? "无":CommonEnumUtil.TRUE_OR_FALSE.valueOfDescription(isMasterData);
}
@ApiModelProperty("同步数据class")
private String syncDataClass;

4
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java
Unescape Escape View File

@ -36,12 +36,12 @@ public class MdmGearCoreBusiExtd extends BaseMdmBusiExtdBean {
@Transient
@ApiModelProperty("主数据Class")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
@AnnoOutputColumn(hidden = true)
public static Class mdmMasterClass = MdmGear.class;
@Transient
@ApiModelProperty("软件模块")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true)
public static Integer mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue();
@Column(name = "CORE_NUM")

13
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean;
import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd;
import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
import java.util.List;
@ -43,7 +44,17 @@ public class MdmHqlPack {
DdlPreparedPack.getNumEqualPack(mdmGear.getId(),"id",ddlPackBean);
DdlPreparedPack.getStringLikerPack(mdmGear.getName(),"name",ddlPackBean);
DdlPreparedPack.timeBuilder(mdmGear.getCreateDatetime(),"createDatetime",ddlPackBean,false,true);
DdlPreparedPack.timeBuilder(mdmGear.getModifyDatetime(),"modifyDatetime",ddlPackBean,false,true);
return ddlPackBean;
}
public static DdlPackBean packHqlMdmGearCoreExtd(MdmGearCoreBusiExtd mdmGear) {
DdlPackBean ddlPackBean = getMdmPackBean(mdmGear);
DdlPreparedPack.getNumEqualPack(mdmGear.getId(),"id",ddlPackBean);
DdlPreparedPack.getNumEqualPack(mdmGear.getMdmMasterId(),"mdmMasterId",ddlPackBean);
DdlPreparedPack.timeBuilder(mdmGear.getModifyDatetime(),"modifyDatetime",ddlPackBean,false,true);
return ddlPackBean;
}

2
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java
Unescape Escape View File

@ -527,7 +527,7 @@ public class DdlMdmModelPreparedPack {
public static void getInPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null) {
packBean.addColumnQuery(entityType, "in_"+columnName,
" and " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", data);
" and " + entityType.getAlias() + "." + columnName + " in ( :" + entityType.getAlias() + "_in_" + columnName + " ) ", data);
}
}

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
Unescape Escape View File

@ -1051,6 +1051,7 @@ public class CoreHqlPack {
DdlPreparedPack.getStringLeftLikerPack(bean.getRefClass(),"refClass",packBean);
DdlPreparedPack.getStringLeftLikerPack(bean.getVersionMethodName(),"versionMethodName",packBean);
DdlPreparedPack.getStringLikerPack(bean.getPojoCompare(),"pojoCompare",packBean);
DdlPreparedPack.timeBuilder(bean.getModifyDatetime(),"modifyDatetime",packBean,false,true);
return packBean;
}

Write Preview
Loading…
Cancel
Save