diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index ecab56a..2fa0f79 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.StringUtils; +import java.util.Date; + /** * @Description : 模块表单枚举类 * @Reference : @@ -831,8 +833,9 @@ public class BlockFormEnumUtil { TEXT(200, "TEXT", "文本"), NUMBER(210, "NUMBER", "数字"), PASSWORD(230, "PASSWORD", "密码"), - DATE(300, "DATE", "日期(yyyy-MM-dd)"), - DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"), + DATE_TIME(300, "DATE", "日期"), +// DATE(300, "DATE", "日期(yyyy-MM-dd)"), +// DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"), // ELEMENT(700, "DICT_SELECT", "元素"), DICTIONARY(800, "DICT_SELECT", "字典"), CASCADE(900, "CASCADE", "级联"); @@ -973,7 +976,8 @@ public class BlockFormEnumUtil { NUM_ADD(20, "ADD", "加法计算",Double.class), NUM_LESS(30, "MIN", "减法计算",Double.class), NUM_MAKE(40, "MUL", "乘法计算",Double.class), - NUM_DIVISION(50, "DIVISION", "除法计算",Double.class); + NUM_DIVISION(50, "DIVISION", "除法计算",Double.class), + JOIN_TABLE(60, "JOIN_TABLE", "连表查询",String.class); private int value; private String code; @@ -1162,16 +1166,16 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PROPERTY_TYPE { - STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE,null), - CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null), - INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), - LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), - DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), - FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), - BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), + STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE,""), + CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,""), + INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"), + LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"), + DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"), + FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"), + BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"), BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null), - BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null); -// DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,null); + BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null), + DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,SQL_WHERE.BETWEEN,null,"yyyy-MM-dd hh:mm:ss"); /** * 属性类型值 @@ -1204,11 +1208,28 @@ public class BlockFormEnumUtil { private SQL_WHERE defaultWhere; /** + * 默认 格式化 方式 + */ + private String defaultFormat; + + /** * 默认查询关系 */ private String defaultValue; - private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) { + private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, + PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) { + this.value = value; + this.code = code; + this.description = description; + this.classPath = classPath; + this.clzFullName = clzFullName; + this.controlType = controlType; + this.defaultWhere = defaultWhere; + } + + private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, + PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) { this.value = value; this.code = code; this.description = description; @@ -1217,6 +1238,20 @@ public class BlockFormEnumUtil { this.controlType = controlType; this.defaultWhere = defaultWhere; this.defaultValue = defaultValue; + this.defaultFormat = defaultFormat; + } + + private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, + PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue,String defaultFormat) { + this.value = value; + this.code = code; + this.description = description; + this.classPath = classPath; + this.clzFullName = clzFullName; + this.controlType = controlType; + this.defaultWhere = defaultWhere; + this.defaultValue = defaultValue; + this.defaultFormat = defaultFormat; } public int getValue() { @@ -1247,6 +1282,14 @@ public class BlockFormEnumUtil { return defaultWhere; } + public String getDefaultFormat() { + return defaultFormat; + } + + public String getDefaultValue() { + return defaultValue; + } + public static String valueOfCode(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -2377,7 +2420,8 @@ public class BlockFormEnumUtil { LIKE(7, "LIKE", "全模糊"), START_LIKE(7, "LIKE", "前模糊"), END_LIKE(7, "LIKE", "后模糊"), - IN(8, "in", "in"); + IN(8, "in", "in"), + BETWEEN(9, "BETWEEN", "区间查询(逗号区分)"),; private int value; private String code; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 4a39acd..82b0e3c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1152,4 +1152,39 @@ public class ImppEnumUtil { return tmp; } } + + + /** + * 字典分组 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DICTIONARY_GROUP { + SYSTEM(1, "系统字典"), + EXTERNAL(2, "外部人员"); + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private DICTIONARY_GROUP(int value, String description) { + this.value = value; + this.description = description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java new file mode 100644 index 0000000..d0bc317 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +/** + * @Description : 软适配 枚举接口 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:34 + * @Modify: + **/ +public class SoftSwitchEnumUtil { +} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java index 01c97de..688db18 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java @@ -70,6 +70,11 @@ public class BfElementPropertyVirtual extends BaseBean { @ApiParam(value = "提示信息") private String propertyLabelText; + @Lob + @ApiParam(value = "自定义执行SQL") + @Column(name = "PROPERTY_EXECUTE_SQL") + private String propertyExecuteSql; + @Column(name = "PROPERTY_SORT") @ApiParam(value = "显示顺序") private Integer propertySort; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java index e1f5a71..115b32d 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java @@ -37,6 +37,10 @@ public class BfMenu extends BaseBean { @ApiParam(value ="菜单名称") private String menuName; + @Column(name="MENU_CODE") + @ApiParam(value ="功能代码(唯一校验，路径跳转使用)") + private String menuCode; + @Column(name="PARENT_ID") @ApiParam(value ="父级菜单id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java index 0146041..3750ee0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java @@ -4,8 +4,10 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,8 @@ import javax.persistence.Table; @Entity @DynamicInsert @DynamicUpdate +@AllArgsConstructor +@NoArgsConstructor @EqualsAndHashCode(callSuper = true) @Table(name="MES_EVENT_ACTION") @Api("系统业务事件动作") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java index 16550fd..98ecaa6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java @@ -34,7 +34,7 @@ public class MesRepair extends BaseBean { @Column(name="REPAIR_NAME") @ApiParam("维修名称") - private String repariName; + private String repairName; @Column(name="REPAIR_TYPE") @ApiParam("维修类型") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java index 2dc63ce..944b7fd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java @@ -18,8 +18,12 @@ import java.util.Map; public class ActionRequestBean implements Serializable { @ApiParam("事件代码") + @Deprecated public String eventCode; + @ApiParam("按钮代码") + public String buttonCode; + @ApiParam("单个结果") public Obj resultObject; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesActionMethodModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesActionMethodModel.java new file mode 100644 index 0000000..9e8b522 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesActionMethodModel.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/6 9:19 AM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("动作函数关系model") +public class MesActionMethodModel implements Serializable { + @ApiParam("id") + private Long id; + + @ApiParam("动作名称") + private String actionName; + + @ApiParam("动作代码") + private String actionCode; + + @ApiParam("函数代码") + private String methodCode; + + @ApiParam("序号") + private Integer seq; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEventActionModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEventActionModel.java new file mode 100644 index 0000000..a3994e7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEventActionModel.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import cn.estsh.i3plus.pojo.mes.bean.MesEventAction; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/6 9:19 AM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("事件动作关系model") +public class MesEventActionModel implements Serializable { + @ApiParam("id") + private Long id; + + @ApiParam("动作名称") + private String actionName; + + @ApiParam("事件名称") + private String eventName; + + @ApiParam("动作代码") + private String actionCode; + + + @ApiParam("事件代码") + private String eventCode; + + + + @ApiParam("序号") + private Integer seq; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionRepository.java index 47d0046..52fb22c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionRepository.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.mes.bean.MesAction; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @Description : * @Reference : @@ -13,4 +15,8 @@ import org.springframework.stereotype.Repository; **/ @Repository public interface MesActionRepository extends BaseRepository { + + List findByOrganizeCodeAndIsDeleted(String organizeCode,Integer isDeleted); + + List findByActionCodeAndIsValidAndIsDeleted(String actionCode,Integer isValid,Integer isDeleted); } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventActionRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventActionRepository.java index 0489df8..435fd8c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventActionRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventActionRepository.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.mes.bean.MesEventAction; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @Description : * @Reference : @@ -13,4 +15,5 @@ import org.springframework.stereotype.Repository; **/ @Repository public interface MesEventActionRepository extends BaseRepository { + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventRepository.java index 2a90e5c..83b3c4b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventRepository.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.mes.bean.MesEvent; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @Description : * @Reference : @@ -13,4 +15,11 @@ import org.springframework.stereotype.Repository; **/ @Repository public interface MesEventRepository extends BaseRepository { + + List findByOrganizeCodeAndIsDeleted(String organizeCode,Integer isDeleted); + + List findByButtonCodeAndIsValidAndIsDeleted(String buttonCode,Integer isValid,Integer isDeleted); + + List findByEventCodeAndIsValidAndIsDeleted(String eventCode,Integer isValid,Integer isDeleted); + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMethodRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMethodRepository.java index ab7b3dd..d845f61 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMethodRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMethodRepository.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.mes.bean.MesMethod; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @Description : * @Reference : @@ -13,4 +15,8 @@ import org.springframework.stereotype.Repository; **/ @Repository public interface MesMethodRepository extends BaseRepository { + + List findByMethodCodeAndIsValidAndIsDeleted(String methodCode, Integer isValid, Integer isDeleted); + + List findByOrganizeCodeAndIsDeleted(String organizeCode, int value); } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 1d85548..eb4687f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -26,7 +26,6 @@ public class MesHqlPack { public static DdlPackBean getAllBaseData(String organizeCode) { DdlPackBean packBean = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); return packBean; } @@ -45,6 +44,9 @@ public class MesHqlPack { if (StringUtils.isNotEmpty(mesPcn.getAreaCode())) { DdlPreparedPack.getStringLikerPack(mesPcn.getAreaCode(), "areaCode", packBean); } + if (mesPcn.getIsValid() != null) { + DdlPreparedPack.getNumEqualPack(mesPcn.getIsValid(), "isValid", packBean); + } return packBean; } /** @@ -160,6 +162,9 @@ public class MesHqlPack { if (StringUtils.isNotEmpty(mesWorkOrder.getPlanOrderNo())) { DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); } + if (mesWorkOrder.getIsValid() != null) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean); + } // 时间段查询 // DdlPreparedPack.timeBuilder( @@ -195,6 +200,10 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesQueueOrder.getOrderNo(), "orderNo", packBean); } + if (mesQueueOrder.getIsValid() != null) { + DdlPreparedPack.getNumEqualPack(mesQueueOrder.getIsValid(), "isValid", packBean); + } + // 只查询创建状态的队列 DdlPreparedPack.getNumEqualPack(MesEnumUtil.QUEUE_ORDER_STATUS.NORMAL.getValue(), "status", packBean); @@ -280,15 +289,16 @@ public class MesHqlPack { /** * MES设备信息查询条件封装 + * * @param mesEquipment * @return */ public static DdlPackBean getMesEquipment(MesEquipment mesEquipment, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquipment, organizeCode); - if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())){ + if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())) { DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean); } - if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){ + if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())) { DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean); } @@ -308,6 +318,7 @@ public class MesHqlPack { packBean.setOrderByStr(mesRoute.orderBy()); return packBean; } + /** * 产品流程配置查询条件封装 * @@ -326,18 +337,19 @@ public class MesHqlPack { /** * MES班次信息查询条件封装 + * * @param shift * @return */ public static DdlPackBean getMesShift(MesShift shift, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode); - if (StringUtils.isNotEmpty(shift.getShiftCode())){ + if (StringUtils.isNotEmpty(shift.getShiftCode())) { DdlPreparedPack.getStringEqualPack(shift.getShiftCode(), "shiftCode", packBean); } - if (StringUtils.isNotEmpty(shift.getShiftName())){ + if (StringUtils.isNotEmpty(shift.getShiftName())) { DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean); } - if (StringUtils.isNotEmpty(shift.getWorkCenterCode())){ + if (StringUtils.isNotEmpty(shift.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(shift.getWorkCenterCode(), "workCenterCode", packBean); } @@ -346,32 +358,95 @@ public class MesHqlPack { /** * MES班次休息信息查询条件封装 + * * @param shiftRest * @return */ public static DdlPackBean getMesShiftRest(MesShiftRest shiftRest, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(shiftRest, organizeCode); - if (StringUtils.isNotEmpty(shiftRest.getWorkCenterCode())){ + if (StringUtils.isNotEmpty(shiftRest.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(shiftRest.getWorkCenterCode(), "workCenterCode", packBean); } - if (StringUtils.isNotEmpty(shiftRest.getShiftCode())){ + if (StringUtils.isNotEmpty(shiftRest.getShiftCode())) { DdlPreparedPack.getStringEqualPack(shiftRest.getShiftCode(), "shiftCode", packBean); } return packBean; } +/******************created by wynne*************/ + /** + * MES 报废信息查询 + * @param mesScrap + * @return + */ + public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (StringUtils.isNotEmpty(mesScrap.getScrapCode())){ + DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean); + } + if (StringUtils.isNotEmpty(mesScrap.getScrapName())){ + DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean); + } + if (mesScrap.getIsValid() != null) { + DdlPreparedPack.getNumEqualPack(mesScrap.getIsValid(), "isValid", packBean); + } + return packBean; + } + + /** + * MES PCN系统配置信息条件查询 + * @param mesConfig + * @return + */ + public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (StringUtils.isNotEmpty(mesConfig.getCfgCode())){ + DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean); + } + if (StringUtils.isNotEmpty(mesConfig.getCfgName())){ + DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean); + } + if (mesConfig.getIsValid() != null) { + DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean); + } + return packBean; + } + + /** + * MES 维修信息条件查询 + * @param mesRepair + * @return + */ + public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (StringUtils.isNotEmpty(mesRepair.getRepairCode())){ + DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean); + } + if (StringUtils.isNotEmpty(mesRepair.getRepairName())){ + DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean); + } + if (mesRepair.getRepairType() != null){ + DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean); + } + if (mesRepair.getIsValid() != null) { + DdlPreparedPack.getNumEqualPack(mesRepair.getIsValid(), "isValid", packBean); + } + + return packBean; + } /** * MES 上传文件FastDfs封装 + * * @param mesESOP * @return */ public static DdlPackBean getMesESOP(MesESOP mesESOP, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesESOP, organizeCode); - if (StringUtils.isNotEmpty(mesESOP.getWorkCenterCode())){ + if (StringUtils.isNotEmpty(mesESOP.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean); } - if (StringUtils.isNotEmpty(mesESOP.getPartNo())){ + if (StringUtils.isNotEmpty(mesESOP.getPartNo())) { DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean); } @@ -379,16 +454,126 @@ public class MesHqlPack { } /** + * 事件分页获取封装 + * + * @param mesEvent + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEvent(MesEvent mesEvent, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEvent, organizeCode); + if (StringUtils.isNotEmpty(mesEvent.getButtonCode())) { + DdlPreparedPack.getStringLikerPack(mesEvent.getButtonCode(), "buttonCode", packBean); + } + if (StringUtils.isNotEmpty(mesEvent.getEventCode())) { + DdlPreparedPack.getStringLikerPack(mesEvent.getEventCode(), "eventCode", packBean); + } + if (StringUtils.isNotEmpty(mesEvent.getEventName())) { + DdlPreparedPack.getStringLikerPack(mesEvent.getEventName(), "eventName", packBean); + } + return packBean; + } + + /** + * 动作分页获取封装 + * + * @param mesAction + * @param organizeCode + * @return + */ + public static DdlPackBean getMesAction(MesAction mesAction, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode); + if (StringUtils.isNotEmpty(mesAction.getActionCode())) { + DdlPreparedPack.getStringRightLikerPack(mesAction.getActionCode(), "actionCode", packBean); + } + + if (StringUtils.isNotEmpty(mesAction.getActionName())) { + DdlPreparedPack.getStringLikerPack(mesAction.getActionName(), "actionName", packBean); + } + + if (mesAction.getActionType() != null && StringUtils.isNotEmpty(mesAction.getActionType() + "")) { + DdlPreparedPack.getStringEqualPack(mesAction.getActionType() + "", "actionType", packBean); + } + return packBean; + } + + /** + * 函数分页获取封装 + * + * @param mesMethod + * @param organizeCode + * @return + */ + public static DdlPackBean getMesMethod(MesMethod mesMethod, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, organizeCode); + if (StringUtils.isNotEmpty(mesMethod.getMethodCode())) { + DdlPreparedPack.getStringRightLikerPack(mesMethod.getMethodCode(), "methodCode", packBean); + } + if (StringUtils.isNotEmpty(mesMethod.getMethodName())) { + DdlPreparedPack.getStringLikerPack(mesMethod.getMethodName(), "methodName", packBean); + } + if (StringUtils.isNotEmpty(mesMethod.getCallClass())) { + DdlPreparedPack.getStringRightLikerPack(mesMethod.getCallClass(), "callClass", packBean); + } + if (mesMethod.getMethodType() != null && StringUtils.isNotEmpty(mesMethod.getMethodType() + "")) { + DdlPreparedPack.getStringEqualPack(mesMethod.getMethodType() + "", "methodType", packBean); + } + return packBean; + } + + /** + * 事件动作分页获取封装 + * + * @param mesActionMethod + * @param organizeCode + * @return + */ + public static DdlPackBean getMesActionMethod(MesActionMethod mesActionMethod, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesActionMethod, organizeCode); + if (StringUtils.isNotEmpty(mesActionMethod.getActionCode())) { + DdlPreparedPack.getStringLikerPack(mesActionMethod.getActionCode(), "actionCode", packBean); + } + if (StringUtils.isNotEmpty(mesActionMethod.getMethodCode())) { + DdlPreparedPack.getStringLikerPack(mesActionMethod.getMethodCode(), "methodCode", packBean); + } + return packBean; + } + + /** + * 事件动作分页获取封装 + * + * @param mesEventAction + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEventAction(MesEventAction mesEventAction, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEventAction, organizeCode); + if (StringUtils.isNotEmpty(mesEventAction.getOrganizeCode())) { + DdlPreparedPack.getStringEqualPack(mesEventAction.getOrganizeCode(), "organizeCode", packBean); + } + if (StringUtils.isNotEmpty(mesEventAction.getEventCode())) { + DdlPreparedPack.getStringLikerPack(mesEventAction.getEventCode(), "eventCode", packBean); + } + if (StringUtils.isNotEmpty(mesEventAction.getActionCode())) { + DdlPreparedPack.getStringLikerPack(mesEventAction.getActionCode(), "actionCode", packBean); + } + + return packBean; + } + + /******************created by wynne*************/ + /** * MES工序信息查询条件封装 + * * @param process * @return */ public static DdlPackBean getMesProcess(MesProcess process, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(process, organizeCode); - if (StringUtils.isNotEmpty(process.getProcessCode())){ + if (StringUtils.isNotEmpty(process.getProcessCode())) { DdlPreparedPack.getStringEqualPack(process.getProcessCode(), "processCode", packBean); } - if (StringUtils.isNotEmpty(process.getProcessName())){ + if (StringUtils.isNotEmpty(process.getProcessName())) { DdlPreparedPack.getStringLikerPack(process.getProcessName(), "processName", packBean); } @@ -397,18 +582,19 @@ public class MesHqlPack { /** * MES工步信息查询条件封装 + * * @param step * @return */ public static DdlPackBean getMesStep(MesStep step, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(step, organizeCode); - if (StringUtils.isNotEmpty(step.getStepCode())){ + if (StringUtils.isNotEmpty(step.getStepCode())) { DdlPreparedPack.getStringEqualPack(step.getStepCode(), "stepCode", packBean); } - if (StringUtils.isNotEmpty(step.getStepName())){ + if (StringUtils.isNotEmpty(step.getStepName())) { DdlPreparedPack.getStringLikerPack(step.getStepName(), "stepName", packBean); } - if (StringUtils.isNotEmpty(step.getStepType())){ + if (StringUtils.isNotEmpty(step.getStepType())) { DdlPreparedPack.getStringLikerPack(step.getStepType(), "stepType", packBean); } @@ -417,18 +603,19 @@ public class MesHqlPack { /** * MES工步参数信息查询条件封装 + * * @param stepParam * @return */ public static DdlPackBean getMesStepParam(MesStepParam stepParam, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(stepParam, organizeCode); - if (StringUtils.isNotEmpty(stepParam.getStepCode())){ + if (StringUtils.isNotEmpty(stepParam.getStepCode())) { DdlPreparedPack.getStringEqualPack(stepParam.getStepCode(), "stepCode", packBean); } - if (StringUtils.isNotEmpty(stepParam.getParamCode())){ + if (StringUtils.isNotEmpty(stepParam.getParamCode())) { DdlPreparedPack.getStringEqualPack(stepParam.getParamCode(), "paramCode", packBean); } - if (StringUtils.isNotEmpty(stepParam.getParamName())){ + if (StringUtils.isNotEmpty(stepParam.getParamName())) { DdlPreparedPack.getStringLikerPack(stepParam.getParamName(), "paramName", packBean); } @@ -437,21 +624,22 @@ public class MesHqlPack { /** * MES工序工作单元对应关系查询条件封装 + * * @param routeProcessCell * @return */ public static DdlPackBean getMesRouteProcessCell(MesRouteProcessCell routeProcessCell, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(routeProcessCell, organizeCode); - if (StringUtils.isNotEmpty(routeProcessCell.getRouteCode())){ + if (StringUtils.isNotEmpty(routeProcessCell.getRouteCode())) { DdlPreparedPack.getStringEqualPack(routeProcessCell.getRouteCode(), "routeCode", packBean); } - if (StringUtils.isNotEmpty(routeProcessCell.getProcessCode())){ + if (StringUtils.isNotEmpty(routeProcessCell.getProcessCode())) { DdlPreparedPack.getStringEqualPack(routeProcessCell.getProcessCode(), "processCode", packBean); } - if (StringUtils.isNotEmpty(routeProcessCell.getWorkCellCode())){ + if (StringUtils.isNotEmpty(routeProcessCell.getWorkCellCode())) { DdlPreparedPack.getStringEqualPack(routeProcessCell.getWorkCellCode(), "workCellCode", packBean); } - if (StringUtils.isNotEmpty(routeProcessCell.getWorkCenterCode())){ + if (StringUtils.isNotEmpty(routeProcessCell.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(routeProcessCell.getWorkCenterCode(), "workCenterCode", packBean); } @@ -460,18 +648,19 @@ public class MesHqlPack { /** * MES BOM信息查询条件封装 + * * @param bom * @return */ public static DdlPackBean getMesBom(MesBom bom, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(bom, organizeCode); - if (StringUtils.isNotEmpty(bom.getPartNo())){ + if (StringUtils.isNotEmpty(bom.getPartNo())) { DdlPreparedPack.getStringEqualPack(bom.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(bom.getItemPartNo())){ + if (StringUtils.isNotEmpty(bom.getItemPartNo())) { DdlPreparedPack.getStringEqualPack(bom.getItemPartNo(), "itemPartNo", packBean); } - if (StringUtils.isNotEmpty(bom.getBomVersion())){ + if (StringUtils.isNotEmpty(bom.getBomVersion())) { DdlPreparedPack.getStringEqualPack(bom.getBomVersion(), "bomVersion", packBean); } @@ -480,18 +669,19 @@ public class MesHqlPack { /** * MES工序BOM信息查询条件封装 + * * @param processBom * @return */ public static DdlPackBean getMesProcessBom(MesProcessBom processBom, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(processBom, organizeCode); - if (StringUtils.isNotEmpty(processBom.getPartNo())){ + if (StringUtils.isNotEmpty(processBom.getPartNo())) { DdlPreparedPack.getStringEqualPack(processBom.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(processBom.getItemPartNo())){ + if (StringUtils.isNotEmpty(processBom.getItemPartNo())) { DdlPreparedPack.getStringEqualPack(processBom.getItemPartNo(), "itemPartNo", packBean); } - if (StringUtils.isNotEmpty(processBom.getProcessCode())){ + if (StringUtils.isNotEmpty(processBom.getProcessCode())) { DdlPreparedPack.getStringEqualPack(processBom.getProcessCode(), "processCode", packBean); } @@ -500,15 +690,16 @@ public class MesHqlPack { /** * MES 客户信息查询条件封装 + * * @param customer * @return */ public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode); - if (StringUtils.isNotEmpty(customer.getCustomerCode())){ + if (StringUtils.isNotEmpty(customer.getCustomerCode())) { DdlPreparedPack.getStringEqualPack(customer.getCustomerCode(), "customerCode", packBean); } - if (StringUtils.isNotEmpty(customer.getCustomerName())){ + if (StringUtils.isNotEmpty(customer.getCustomerName())) { DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean); } @@ -517,15 +708,16 @@ public class MesHqlPack { /** * MES 客户产线信息查询条件封装 + * * @param custProdLine * @return */ public static DdlPackBean getMesCustProdLine(MesCustProdLine custProdLine, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(custProdLine, organizeCode); - if (StringUtils.isNotEmpty(custProdLine.getCustProdLineCode())){ + if (StringUtils.isNotEmpty(custProdLine.getCustProdLineCode())) { DdlPreparedPack.getStringEqualPack(custProdLine.getCustProdLineCode(), "custProdLineCode", packBean); } - if (StringUtils.isNotEmpty(custProdLine.getCustProdLineName())){ + if (StringUtils.isNotEmpty(custProdLine.getCustProdLineName())) { DdlPreparedPack.getStringLikerPack(custProdLine.getCustProdLineName(), "custProdLineName", packBean); } @@ -534,18 +726,19 @@ public class MesHqlPack { /** * MES 客户零件关系信息查询条件封装 + * * @param customerPart * @return */ public static DdlPackBean getMesCustomerPart(MesCustomerPart customerPart, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(customerPart, organizeCode); - if (StringUtils.isNotEmpty(customerPart.getCustomerCode())){ + if (StringUtils.isNotEmpty(customerPart.getCustomerCode())) { DdlPreparedPack.getStringEqualPack(customerPart.getCustomerCode(), "customerCode", packBean); } - if (StringUtils.isNotEmpty(customerPart.getPartNo())){ + if (StringUtils.isNotEmpty(customerPart.getPartNo())) { DdlPreparedPack.getStringEqualPack(customerPart.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(customerPart.getCustomerPartNo())){ + if (StringUtils.isNotEmpty(customerPart.getCustomerPartNo())) { DdlPreparedPack.getStringEqualPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean); } @@ -554,15 +747,16 @@ public class MesHqlPack { /** * MES 设备关键数据信息查询条件封装 + * * @param keyData * @return */ public static DdlPackBean getMesKeyData(MesKeyData keyData, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode); - if (StringUtils.isNotEmpty(keyData.getKeyDataCode())){ + if (StringUtils.isNotEmpty(keyData.getKeyDataCode())) { DdlPreparedPack.getStringEqualPack(keyData.getKeyDataCode(), "keyDataCode", packBean); } - if (StringUtils.isNotEmpty(keyData.getKeyDataName())){ + if (StringUtils.isNotEmpty(keyData.getKeyDataName())) { DdlPreparedPack.getStringEqualPack(keyData.getKeyDataName(), "keyDataName", packBean); } @@ -571,15 +765,16 @@ public class MesHqlPack { /** * MES 物料关键数据关系信息查询条件封装 + * * @param kpData * @return */ public static DdlPackBean getMesKpData(MesKpData kpData, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(kpData, organizeCode); - if (StringUtils.isNotEmpty(kpData.getPartNo())){ + if (StringUtils.isNotEmpty(kpData.getPartNo())) { DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "partNo", packBean); } - if (StringUtils.isNotEmpty(kpData.getKeyDataCode())){ + if (StringUtils.isNotEmpty(kpData.getKeyDataCode())) { DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "keyDataCode", packBean); } @@ -588,15 +783,16 @@ public class MesHqlPack { /** * MES 产品配置类型信息查询条件封装 + * * @param prodCfgType * @return */ public static DdlPackBean getMesProdCfgType(MesProdCfgType prodCfgType, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgType, organizeCode); - if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeCode())){ + if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeCode())) { DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); } - if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeName())){ + if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeName())) { DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeName(), "prodCfgTypeName", packBean); } @@ -605,18 +801,19 @@ public class MesHqlPack { /** * MES 产品配置信息查询条件封装 + * * @param prodCfg * @return */ public static DdlPackBean getMesProdCfg(MesProdCfg prodCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfg, organizeCode); - if (StringUtils.isNotEmpty(prodCfg.getProdCfgCode())){ + if (StringUtils.isNotEmpty(prodCfg.getProdCfgCode())) { DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgCode(), "prodCfgCode", packBean); } - if (StringUtils.isNotEmpty(prodCfg.getProdCfgName())){ + if (StringUtils.isNotEmpty(prodCfg.getProdCfgName())) { DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgName(), "prodCfgName", packBean); } - if (StringUtils.isNotEmpty(prodCfg.getProdCfgTypeCode())){ + if (StringUtils.isNotEmpty(prodCfg.getProdCfgTypeCode())) { DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); } @@ -625,15 +822,16 @@ public class MesHqlPack { /** * MES 产品配置关系信息查询条件封装 + * * @param prodCfgDetail * @return */ public static DdlPackBean getMesProdCfgDetail(MesProdCfgDetail prodCfgDetail, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgDetail, organizeCode); - if (StringUtils.isNotEmpty(prodCfgDetail.getProdCfgCode())){ + if (StringUtils.isNotEmpty(prodCfgDetail.getProdCfgCode())) { DdlPreparedPack.getStringEqualPack(prodCfgDetail.getProdCfgCode(), "prodCfgCode", packBean); } - if (StringUtils.isNotEmpty(prodCfgDetail.getPartNo())){ + if (StringUtils.isNotEmpty(prodCfgDetail.getPartNo())) { DdlPreparedPack.getStringEqualPack(prodCfgDetail.getPartNo(), "partNo", packBean); } @@ -642,24 +840,25 @@ public class MesHqlPack { /** * MES 物料信息查询条件封装 + * * @param part * @return */ public static DdlPackBean getMesPart(MesPart part, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(part, organizeCode); - if (StringUtils.isNotEmpty(part.getPartNo())){ + if (StringUtils.isNotEmpty(part.getPartNo())) { DdlPreparedPack.getStringEqualPack(part.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(part.getPartName())){ + if (StringUtils.isNotEmpty(part.getPartName())) { DdlPreparedPack.getStringLikerPack(part.getPartName(), "partName", packBean); } - if (StringUtils.isNotEmpty(part.getCategoryCode1())){ + if (StringUtils.isNotEmpty(part.getCategoryCode1())) { DdlPreparedPack.getStringEqualPack(part.getCategoryCode1(), "categoryCode1", packBean); } - if (StringUtils.isNotEmpty(part.getCategoryCode2())){ + if (StringUtils.isNotEmpty(part.getCategoryCode2())) { DdlPreparedPack.getStringEqualPack(part.getCategoryCode2(), "categoryCode2", packBean); } - if (StringUtils.isNotEmpty(part.getCategoryCode3())){ + if (StringUtils.isNotEmpty(part.getCategoryCode3())) { DdlPreparedPack.getStringEqualPack(part.getCategoryCode3(), "categoryCode3", packBean); } @@ -668,15 +867,16 @@ public class MesHqlPack { /** * MES 物料分类信息查询条件封装 + * * @param partCategory * @return */ public static DdlPackBean getMesPartCategory(MesPartCategory partCategory, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(partCategory, organizeCode); - if (StringUtils.isNotEmpty(partCategory.getCategoryCode())){ + if (StringUtils.isNotEmpty(partCategory.getCategoryCode())) { DdlPreparedPack.getStringEqualPack(partCategory.getCategoryCode(), "categoryCode", packBean); } - if (StringUtils.isNotEmpty(partCategory.getCategoryName())){ + if (StringUtils.isNotEmpty(partCategory.getCategoryName())) { DdlPreparedPack.getStringLikerPack(partCategory.getCategoryName(), "categoryName", packBean); } @@ -685,18 +885,19 @@ public class MesHqlPack { /** * MES 包装规格信息查询条件封装 + * * @param packSpec * @return */ public static DdlPackBean getMesPackSpec(MesPackSpec packSpec, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(packSpec, organizeCode); - if (StringUtils.isNotEmpty(packSpec.getSpecCode())){ + if (StringUtils.isNotEmpty(packSpec.getSpecCode())) { DdlPreparedPack.getStringEqualPack(packSpec.getSpecCode(), "specCode", packBean); } - if (StringUtils.isNotEmpty(packSpec.getSpecName())){ + if (StringUtils.isNotEmpty(packSpec.getSpecName())) { DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean); } - if (StringUtils.isNotEmpty(packSpec.getParentSpec())){ + if (StringUtils.isNotEmpty(packSpec.getParentSpec())) { DdlPreparedPack.getStringEqualPack(packSpec.getParentSpec(), "parentSpec", packBean); } @@ -705,15 +906,16 @@ public class MesHqlPack { /** * MES 产品类型信息查询条件封装 + * * @param produceCategory * @return */ public static DdlPackBean getMesProduceCategory(MesProduceCategory produceCategory, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(produceCategory, organizeCode); - if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryCode())){ + if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryCode())) { DdlPreparedPack.getStringEqualPack(produceCategory.getProduceCategoryCode(), "produceCategoryCode", packBean); } - if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryName())){ + if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryName())) { DdlPreparedPack.getStringLikerPack(produceCategory.getProduceCategoryName(), "produceCategoryName", packBean); } @@ -722,12 +924,13 @@ public class MesHqlPack { /** * MES 关键件条码规则信息查询条件封装 + * * @param kpsnRule * @return */ public static DdlPackBean getMesKpsnRule(MesKpsnRule kpsnRule, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(kpsnRule, organizeCode); - if (StringUtils.isNotEmpty(kpsnRule.getPartNo())){ + if (StringUtils.isNotEmpty(kpsnRule.getPartNo())) { DdlPreparedPack.getStringEqualPack(kpsnRule.getPartNo(), "partNo", packBean); } @@ -736,15 +939,16 @@ public class MesHqlPack { /** * MES 产品排程清单信息查询条件封装 + * * @param partScheduleBom * @return */ public static DdlPackBean getMesPartScheduleBom(MesPartScheduleBom partScheduleBom, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(partScheduleBom, organizeCode); - if (StringUtils.isNotEmpty(partScheduleBom.getPartNo())){ + if (StringUtils.isNotEmpty(partScheduleBom.getPartNo())) { DdlPreparedPack.getStringEqualPack(partScheduleBom.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(partScheduleBom.getItemPartNo())){ + if (StringUtils.isNotEmpty(partScheduleBom.getItemPartNo())) { DdlPreparedPack.getStringLikerPack(partScheduleBom.getItemPartNo(), "itemPartNo", packBean); } @@ -753,15 +957,16 @@ public class MesHqlPack { /** * MES对象与dao对应关系查询条件封装 + * * @param objectDao * @return */ public static DdlPackBean getMesObjectDao(MesObjectDao objectDao, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(objectDao, organizeCode); - if (StringUtils.isNotEmpty(objectDao.getObjectCode())){ + if (StringUtils.isNotEmpty(objectDao.getObjectCode())) { DdlPreparedPack.getStringEqualPack(objectDao.getObjectCode(), "objectCode", packBean); } - if (StringUtils.isNotEmpty(objectDao.getDaoClass())){ + if (StringUtils.isNotEmpty(objectDao.getDaoClass())) { DdlPreparedPack.getStringEqualPack(objectDao.getDaoClass(), "daoClass", packBean); } @@ -770,18 +975,19 @@ public class MesHqlPack { /** * MES-PCN同步配置查询条件封装 + * * @param pcnSyncCfg * @return */ public static DdlPackBean getMesPcnSyncCfg(MesPcnSyncCfg pcnSyncCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(pcnSyncCfg, organizeCode); - if (StringUtils.isNotEmpty(pcnSyncCfg.getObjectCode())){ + if (StringUtils.isNotEmpty(pcnSyncCfg.getObjectCode())) { DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean); } - if (StringUtils.isNotEmpty(pcnSyncCfg.getPcnCode())){ + if (StringUtils.isNotEmpty(pcnSyncCfg.getPcnCode())) { DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean); } - if (null != pcnSyncCfg.getSyncType()){ + if (null != pcnSyncCfg.getSyncType()) { DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean); } @@ -790,15 +996,16 @@ public class MesHqlPack { /** * MES工作单元参数配置查询条件封装 + * * @param workCellParamCfg * @return */ public static DdlPackBean getMesWorkCellParamCfg(MesWorkCellParamCfg workCellParamCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParamCfg, organizeCode); - if (StringUtils.isNotEmpty(workCellParamCfg.getWorkCellCode())){ + if (StringUtils.isNotEmpty(workCellParamCfg.getWorkCellCode())) { DdlPreparedPack.getStringEqualPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean); } - if (StringUtils.isNotEmpty(workCellParamCfg.getParamCode())){ + if (StringUtils.isNotEmpty(workCellParamCfg.getParamCode())) { DdlPreparedPack.getStringEqualPack(workCellParamCfg.getParamCode(), "paramCode", packBean); } @@ -807,12 +1014,13 @@ public class MesHqlPack { /** * MES工作单元队列查询条件封装 + * * @param workCellPoint * @return */ public static DdlPackBean getMesWorkCellPoint(MesWorkCellPoint workCellPoint, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(workCellPoint, organizeCode); - if (StringUtils.isNotEmpty(workCellPoint.getWorkCellCode())){ + if (StringUtils.isNotEmpty(workCellPoint.getWorkCellCode())) { DdlPreparedPack.getStringEqualPack(workCellPoint.getWorkCellCode(), "workCellCode", packBean); } return packBean; @@ -820,18 +1028,19 @@ public class MesHqlPack { /** * PLC设备信息配置查询条件封装 + * * @param plcConfigure * @return */ public static DdlPackBean getMesPLCConfigure(MesPLCConfigure plcConfigure, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(plcConfigure, organizeCode); - if (StringUtils.isNotEmpty(plcConfigure.getAreaCode())){ + if (StringUtils.isNotEmpty(plcConfigure.getAreaCode())) { DdlPreparedPack.getStringEqualPack(plcConfigure.getAreaCode(), "areaCode", packBean); } - if (StringUtils.isNotEmpty(plcConfigure.getWorkCenterCode())){ + if (StringUtils.isNotEmpty(plcConfigure.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(plcConfigure.getWorkCenterCode(), "workCenterCode", packBean); } - if (StringUtils.isNotEmpty(plcConfigure.getWorkCellCode())){ + if (StringUtils.isNotEmpty(plcConfigure.getWorkCellCode())) { DdlPreparedPack.getStringEqualPack(plcConfigure.getWorkCellCode(), "workCellCode", packBean); } return packBean; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java index 32929c7..5122623 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java @@ -45,6 +45,11 @@ public class SysDictionary extends BaseBean { @ApiParam(value ="字典所属模块") private Integer dictionarySoftType; + //枚举 ImppEnumUtil.DICTIONARY_GROUP + @Column(name="DICTIONARY_GROUP") + @ApiParam(value ="字典分组") + private Integer dictionaryGroup; + // 根节点-1 @Column(name="PARENT_ID") @ApiParam(value ="父节点" , example = "-1") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index b607923..9afa74c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -105,20 +105,20 @@ public class SysUser extends BaseBean { @ApiParam(value ="组织名称" , access ="组织名称") private String organizeNameRdd; - @Lob - @Column(name="ROLE_NAMES_RDD") - @ApiParam(value ="角色名称集合") - private String roleNamesRdd; - - @Lob - @Column(name="DEPARTMENT_NAMES_RDD") - @ApiParam(value ="部门名称集合") - private String departmentNamesRdd; - - @Lob - @Column(name="ORGANIZE_NAMES_RDD") - @ApiParam(value ="组织名称集合") - private String organizeNamesRdd; +// @Lob +// @Column(name="ROLE_NAMES_RDD") +// @ApiParam(value ="角色名称集合") +// private String roleNamesRdd; +// +// @Lob +// @Column(name="DEPARTMENT_NAMES_RDD") +// @ApiParam(value ="部门名称集合") +// private String departmentNamesRdd; +// +// @Lob +// @Column(name="ORGANIZE_NAMES_RDD") +// @ApiParam(value ="组织名称集合") +// private String organizeNamesRdd; /********************************** 非数据库信息 ********************************/ diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index 51d7362..0a3735b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -183,28 +183,28 @@ public class SysUserInfo extends BaseBean { @ApiParam(value ="部门名称" , access ="部门名称") private String departmentNameRdd; - @Column(name="DEPARTMENT_NAMES_RDD") - @ApiParam(value ="部门集合" , access ="部门集合") - @AnnoOutputColumn(hidden = true) - private String departmentNamesRdd; +// @Column(name="DEPARTMENT_NAMES_RDD") +// @ApiParam(value ="部门集合" , access ="部门集合") +// @AnnoOutputColumn(hidden = true) +// private String departmentNamesRdd; @Column(name="POSITION_NAME_RDD") @ApiParam(value ="岗位名称" , access ="岗位名称") private String positionNameRdd; - @Column(name="POSITION_NAMES_RDD") - @ApiParam(value ="岗位集合" , access ="岗位集合") - @AnnoOutputColumn(hidden = true) - private String positionNamesRdd; +// @Column(name="POSITION_NAMES_RDD") +// @ApiParam(value ="岗位集合" , access ="岗位集合") +// @AnnoOutputColumn(hidden = true) +// private String positionNamesRdd; @Column(name="ORGANIZE_NAME_RDD") @ApiParam(value ="组织名称" , access ="组织名称") private String organizeNameRdd; - @Column(name="ORGANIZE_NAMES_RDD") - @ApiParam(value ="组织集合" , access ="组织集合") - @AnnoOutputColumn(hidden = true) - private String organizeNamesRdd; +// @Column(name="ORGANIZE_NAMES_RDD") +// @ApiParam(value ="组织集合" , access ="组织集合") +// @AnnoOutputColumn(hidden = true) +// private String organizeNamesRdd; /********************************** 非数据库信息 ********************************/ diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index bcff699..2d777b9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -316,24 +316,24 @@ public class CoreHqlPack { * @param dictionary * @return */ - public static String packHqlSysDictionary(SysDictionary dictionary) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysDictionaryPage(SysDictionary dictionary) { + DdlPackBean result = new DdlPackBean(); // hql拼接 - HqlPack.getStringLikerPack(dictionary.getName(), "name", result); - HqlPack.getStringLikerPack(dictionary.getDictionaryCode(), "dictionaryCode", result); - HqlPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); + DdlPreparedPack.getStringLikerPack(dictionary.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(dictionary.getDictionaryCode(), "dictionaryCode", result); + DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // 默认查询非顶级字典 if (dictionary.getParentId() == null || dictionary.getParentId() < 1){ - HqlPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result); + DdlPreparedPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result); } - HqlPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); - HqlPack.getStringLikerPack(dictionary.getParentCodeRdd(),"parentCodeRdd", result); + DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); + DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(),"parentCodeRdd", result); // 添加默认排序 - HqlPack.getOrderDefault(dictionary); + DdlPreparedPack.getOrderDefault(dictionary); - return result.toString(); + return result; } /** @@ -550,20 +550,20 @@ public class CoreHqlPack { * @param dictionary * @return */ - public static String packHqlSysDictionaryCode(SysDictionary dictionary){ - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysDictionaryCode(SysDictionary dictionary){ + DdlPackBean result = new DdlPackBean(); // and - HqlPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result); - HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); - HqlPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); + DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result); + DdlPreparedPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); + DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); // not - HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result); + DdlPreparedPack.getNumNOEqualPack(dictionary.getId(),"id",result); // 添加默认排序 - HqlPack.getOrderDefault(dictionary); + DdlPreparedPack.getOrderDefault(dictionary); - return result.toString(); + return result; } /** @@ -571,20 +571,20 @@ public class CoreHqlPack { * @param dictionary * @return */ - public static String packHqlSysDictionaryValue(SysDictionary dictionary){ - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysDictionaryValue(SysDictionary dictionary){ + DdlPackBean result = new DdlPackBean(); // and - HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result); - HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); - HqlPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); + DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result); + DdlPreparedPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); + DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); // not - HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result); + DdlPreparedPack.getNumNOEqualPack(dictionary.getId(),"id",result); // 添加默认排序 - HqlPack.getOrderDefault(dictionary); + DdlPreparedPack.getOrderDefault(dictionary); - return result.toString(); + return result; } /** @@ -932,4 +932,22 @@ public class CoreHqlPack { return packBean; } + + /** + * 按条件查询字典 + * @param sysDictionary + * @return + */ + public static DdlPackBean packHqlSysDictionary(SysDictionary sysDictionary){ + DdlPackBean packBean = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(sysDictionary.getName(), "name", packBean); + DdlPreparedPack.getStringEqualPack(sysDictionary.getDictionaryCode(), "dictionaryCode", packBean); + DdlPreparedPack.getStringEqualPack(sysDictionary.getParentCodeRdd(), "parentCodeRdd", packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getParentId(),"parentId",packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionarySoftType(), "dictionarySoftType", packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryGroup(),"dictionaryGroup",packBean); + + return packBean; + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java new file mode 100644 index 0000000..128e256 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 数据源管理 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_DATA_SOURCE") +@Api(value = "数据源管理", description = "数据源管理") +public class BsDataSource extends BaseBean { + + @Column(name = "DATA_SOURCE_NAME") + @ApiParam(value = "数据源名称") + private String dataSourceName; + + @Column(name = "DATA_SOURCE_TYPE_ID") + @ApiParam(value = "数据源类型id") + private int dataSourceTypeId; + + @Column(name = "DATA_SOURCE_HOST") + @ApiParam(value = "数据源主机") + private String dataSourceHost; + + @Column(name = "DATA_SOURCE_PORT") + @ApiParam(value = "数据源端口") + private int dataSourcePort; + + @Column(name = "DATA_SOURCE_USER") + @ApiParam(value = "用户名") + private String dataSourceUser; + + @Column(name = "DATA_SOURCE_PASSWORD") + @ApiParam(value = "密码") + private String dataSourcePassword; + + @Column(name = "DATA_SOURCE_DESCRIPTION") + @ApiParam(value = "数据源用户描述") + private String dataSourceDescription; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java new file mode 100644 index 0000000..e4e9d3c --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 数据库套件 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_DATA_SOURCE_SUIT_CASE") +@Api(value = "数据库套件", description = "数据库套件") +public class BsDataSourceSuitCase extends BaseBean { + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "套件id") + private long suitCaseId; + + @Column(name = "DATA_SOURCE_MODE_ID") + @ApiParam(value = "数据源套件模式（枚举，被动读，主动写）") + private int dataSourceModeId; + + @Column(name = "DATA_SOURCE_ID") + @ApiParam(value = "数据源id") + private long dataSourceId; + + @Column(name = "DATA_SOURCE_NAME_RDD") + @ApiParam(value = "数据源名称") + private String dataSourceNameRdd; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCaseTable.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCaseTable.java new file mode 100644 index 0000000..fac9121 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCaseTable.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 数据库表操作 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_DATA_SOURCE_SUIT_CASE_TABLE") +@Api(value = "数据库表操作", description = "数据库表操作") +public class BsDataSourceSuitCaseTable extends BaseBean { + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "套件id") + private long suitCaseId; + + @Column(name = "TABLE_NAME") + @ApiParam(value = "数据库表名") + private String tableName; + + @Column(name = "QUERY_SQL") + @ApiParam(value = "查询sql") + private String querySql; + + @Column(name = "AFTER_QUERY_SQL") + @ApiParam(value = "查询后操作sql") + private String afterQuerySql; + + @Column(name = "INSERT_SQL") + @ApiParam(value = "插入sql") + private String insertSql; + + @Column(name = "AFTER_INSERT_SQL") + @ApiParam(value = "插入后执行sql") + private String afterInsertSql; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsMessageQueue.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsMessageQueue.java new file mode 100644 index 0000000..88c70d5 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsMessageQueue.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : MQ管理 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_MESSAGE_QUEUE") +@Api(value = "MQ管理", description = "MQ管理") +public class BsMessageQueue extends BaseBean { + + @Column(name = "MESSAGE_QUEUE_NAME") + @ApiParam(value = "消息队列名称") + private String messageQueueName; + + @Column(name = "MESSAGE_QUEUE_TYPE") + @ApiParam(value = "消息队列类型") + private int messageQueueType; + + @Column(name = "MESSAGE_QUEUE_HOST") + @ApiParam(value = "消息队列主机") + private String messageQueueHost; + + @Column(name = "MESSAGE_QUEUE_PORT") + @ApiParam(value = "消息队列端口") + private int messageQueuePort; + + @Column(name = "CERTIFICATE_ID") + @ApiParam(value = "证书id") + private long certificateId; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java new file mode 100644 index 0000000..8885ba1 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 数据适配转换 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_PARAM_ADAPTER") +@Api(value = "数据适配转换", description = "数据适配转换") +public class BsParamAdapter extends BaseBean { + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "适配套件id") + private long suitCaseId; + + @Column(name = "SUIT_CASE_NAME") + @ApiParam(value = "适配套件名称") + private String suitCaseName; + + @Column(name = "SUIT_CASE_CODE") + @ApiParam(value = "适配套件代码") + private String suitCaseCode; + + @Column(name = "SUIT_PARAM_TYPE_ID") + @ApiParam(value = "参数类型枚举") + private int suitParamTypeId; + + @Column(name = "SUIT_PARAM_ID") + @ApiParam(value = "原参数id") + private long suitParamId; + + @Column(name = "SUIT_PARAM_NAME_RDD") + @ApiParam(value = "参数名称") + private String suitParamNameRdd; + + @Column(name = "SUIT_PARAM_VAL_TYPE_ID") + @ApiParam(value = "原参数值类型") + private int suitParamValTypeId; + + @Column(name = "TRANSFER_PARAM_NAME") + @ApiParam(value = "转换参数名称") + private String transferParamName; + + @Column(name = "TRANSFER_PARAM_VAL_TYPE_ID") + @ApiParam(value = "转换参数类型") + private int transferParamValTypeId; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java new file mode 100644 index 0000000..f7e0858 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : socket套件 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SOCKET_SUIT_CASE") +@Api(value = "socket套件", description = "socket套件") +public class BsSocketSuitCase extends BaseBean { + + @Column(name = "SOCKET_TYPE_ID") + @ApiParam(value = "socket类型（枚举）") + private int socketTypeId; + + @Column(name = "SOCKET_MODE_ID") + @ApiParam(value = "socket模式(枚举,服务端，客户端)") + private int socketModeId; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java new file mode 100644 index 0000000..9a1f66f --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 安全证书 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SSL_KEY") +@Api(value = "安全证书", description = "安全证书") +public class BsSslKey extends BaseBean { + + @Column(name = "VERIFICATION_METHOD_ID") + @ApiParam(value = "认证方式(枚举)") + private int verificationMethodId; + + @Column(name = "VERIFICATION_URL") + @ApiParam(value = "认证url") + private String verificationUrl; + + @Column(name = "KEY_TYPE") + @ApiParam(value = "证书类型枚举") + private int keyType; + + @Column(name = "KEY_NAME") + @ApiParam(value = "证书名称") + private String keyName; + + @Column(name = "KEY_FILE_ID") + @ApiParam(value = "证书文件id") + private long keyFileId; + + @Column(name = "KEY_FILE_PATH") + @ApiParam(value = "证书文件路径") + private String keyFilePath; + + @Column(name = "KEY_FILE_NAME") + @ApiParam(value = "证书文件名称") + private String keyFileName; + + @Column(name = "KEY_CONTENT") + @ApiParam(value = "秘钥内容") + private String keyContent; + + @Column(name = "KEY_DESCRIPTION") + @ApiParam(value = "证书描述") + private String keyDescription; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java new file mode 100644 index 0000000..875adb3 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -0,0 +1,87 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 适配套件 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_CASE") +@Api(value = "适配套件", description = "适配套件") +public class BsSuitCase extends BaseBean { + + @Column(name = "CASE_TYPE_ID") + @ApiParam(value = "套件类型id(枚举)") + private int caseTypeId; + + @Column(name = "CASE_DETAIL_ID") + @ApiParam(value = "适配器明细id") + private long caseDetailId; + + @Column(name = "SUIT_TYPE_ID") + @ApiParam(value = "适配类型id") + private long suitTypeId; + + @Column(name = "SUIT_TYPE_NAME") + @ApiParam(value = "适配类型名称") + private String suitTypeName; + + @Column(name = "SUIT_CASE_CODE") + @ApiParam(value = "适配器代码") + private String suitCaseCode; + + @Column(name = "SUIT_CASE_HOST") + @ApiParam(value = "适配主机") + private String suitCaseHost; + + @Column(name = "SUIT_CASE_PORT") + @ApiParam(value = "适配端口") + private int suitCasePort; + + @Column(name = "IS_NEED_CERTIFICATION") + @ApiParam(value = "是否需要认证") + private int isNeedCertification; + + @Column(name = "CERTIFICATE_ID") + @ApiParam(value = "证书id") + private long certificateId; + + @Column(name = "TIMING_SUIT_NUM") + @ApiParam(value = "定时适配次数") + private int timingSuitNum; + + @Column(name = "INITIATIVE_SUIT_NUM") + @ApiParam(value = "主动适配测试") + private int initiativeSuitNum; + + @Column(name = "SUCCESS_NUM") + @ApiParam(value = "成功次数") + private int successNum; + + @Column(name = "FAIL_NUM") + @ApiParam(value = "失败次数") + private int failNum; + + @Column(name = "SUIT_CASE_DESCRIPTION") + @ApiParam(value = "适配类型描述") + private String suitCaseDescription; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java new file mode 100644 index 0000000..310bdc5 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 适配器出入参 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_CASE_PARAM") +@Api(value = "适配器出入参", description = "适配器出入参") +public class BsSuitCaseParam extends BaseBean { + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "套件id") + private long suitCaseId; + + @Column(name = "SUIT_CASE_CODE_RDD") + @ApiParam(value = "套件代码") + private String suitCaseCodeRdd; + + @Column(name = "PARAM_TYPE_ID") + @ApiParam(value = "参数类型，枚举(出,入)") + private int paramTypeId; + + @Column(name = "PARAM_NAME") + @ApiParam(value = "参数名称)") + private String paramName; + + @Column(name = "PARAM_VAL_TYPE_ID") + @ApiParam(value = "参数值类型") + private int paramValTypeId; + + @Column(name = "PARAM_DEFAULT_VAL") + @ApiParam(value = "参数默认值") + private String paramDefaultVal; + + @Column(name = "PARAM_DESCRIPTION") + @ApiParam(value = "参数描述") + private String paramDescription; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java new file mode 100644 index 0000000..f827b7f --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 适配报文详情 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_DATA_DETAIL") +@Api(value = "适配报文详情", description = "适配报文详情") +public class BsSuitDataDetail extends BaseBean { + + @Column(name = "SUIT_CASE_NAME_RDD") + @ApiParam(value = "适配套件名称") + private String suitCaseNameRdd; + + @Column(name = "SUIT_CASE_CODE_RDD") + @ApiParam(value = "适配套件代码") + private String suitCaseCodeRdd; + + @Column(name = "SUIT_TYPE_NAME_RDD") + @ApiParam(value = "适配类型名称") + private String suitTypeNameRdd; + + @Column(name = "SUIT_RECORD_ID") + @ApiParam(value = "适配记录id") + private long suitRecordId; + + @Column(name = "GET_DATE_TIME") + @ApiParam(value = "获取报文时间") + private String getDateTime; + + @Column(name = "ORGIN_DATA") + @ApiParam(value = "原始报文数据") + private String orginData; + + @Column(name = "TRANS_DATA") + @ApiParam(value = "转换后的报文数据") + private String transData; + + @Column(name = "PROCESS_STATE") + @ApiParam(value = "处理状态") + private int processState; + + @Column(name = "PROCESS_TIME") + @ApiParam(value = "处理时间") + private String processTime; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java new file mode 100644 index 0000000..67d398b --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -0,0 +1,87 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 适配记录 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_RECORD") +@Api(value = "适配记录", description = "适配记录") +public class BsSuitRecord extends BaseBean { + + @Column(name = "SUIT_CASE_NAME_RDD") + @ApiParam(value = "适配套件名称") + private String suitCaseNameRdd; + + @Column(name = "SUIT_CASE_CODE_RDD") + @ApiParam(value = "适配套件代码") + private String suitCaseCodeRdd; + + @Column(name = "SUIT_CASE_TYPE") + @ApiParam(value = "适配套件类型id枚举") + private int suitCaseType; + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "适配器套件id") + private long suitCaseId; + + @Column(name = "SUIT_CASE_DETAIL_ID") + @ApiParam(value = "适配套件明细id") + private long suitCaseDetailId; + + @Column(name = "SUIT_METHOD_ID") + @ApiParam(value = "适配方式id枚举") + private int suitMethodId; + + @Column(name = "SUIT_TYPE_ID") + @ApiParam(value = "适配类型id") + private long suitTypeId; + + @Column(name = "SUIT_TYPE_NAME_RDD") + @ApiParam(value = "适配类型名称") + private String suitTypeNameRdd; + + @Column(name = "REQUEST_SOURCE") + @ApiParam(value = "请求来源(枚举)") + private int requestSource; + + @Column(name = "SUIT_SSL_KEY_ID") + @ApiParam(value = "证书id") + private long suitSslKeyId; + + @Column(name = "SUIT_SSL_KEY_NAME_RDD") + @ApiParam(value = "证书名称") + private String suitSslKeyNameRdd; + + @Column(name = "SUIT_RESULT") + @ApiParam(value = "适配结果") + private int suitResult; + + @Column(name = "PROCESS_STATE") + @ApiParam(value = "处理状态") + private int processState; + + @Column(name = "PROCESS_TIME") + @ApiParam(value = "处理时间") + private String processTime; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java new file mode 100644 index 0000000..331c11f --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 请求适配记录 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_REQUEST_RECORD") +@Api(value = "请求适配记录", description = "请求适配记录") +public class BsSuitRequestRecord extends BaseBean { + + @Column(name = "SUIT_RECORD_ID") + @ApiParam(value = "适配记录id") + private long suitRecordId; + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "适配器套件id") + private long suitCaseId; + + @Column(name = "REQUEST_SOURCE") + @ApiParam(value = "请求来源(枚举)") + private int requestSource; + + @Column(name = "REQUEST_ORGIN_PARAM") + @ApiParam(value = "请求原始参数") + private String requestOrginParam; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java new file mode 100644 index 0000000..4b657d3 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 定时适配任务 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_SCHEDULE") +@Api(value = "定时适配任务", description = "定时适配任务") +public class BsSuitSchedule extends BaseBean { + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "适配套件id") + private long suitCaseId; + + @Column(name = "SUIT_CASE_NAME_RDD") + @ApiParam(value = "适配套件名称") + private String suitCaseNameRdd; + + @Column(name = "EXECUTE_CRON") + @ApiParam(value = "执行时间表达式") + private String executeCron; + + @Column(name = "LAST_EXECUTE_DATE_TIME") + @ApiParam(value = "最后一次执行时间") + private String lastExecuteDateTime; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java new file mode 100644 index 0000000..576c4f1 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 适配类型 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_TYPE") +@Api(value = "适配类型", description = "适配类型") +public class BsSuitType extends BaseBean { + + @Column(name = "SUIT_TYPE_NAME") + @ApiParam(value = "适配类型") + private String suitTypeName; + + @Column(name = "SUIT_CASE_NUM") + @ApiParam(value = "适配器数量") + private int suitCaseNum; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/SuitRecordParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/SuitRecordParam.java new file mode 100644 index 0000000..5f0bb46 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/SuitRecordParam.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 适配记录参数 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "SUIT_RECORD_PARAM") +@Api(value = "适配记录参数", description = "适配记录参数") +public class SuitRecordParam extends BaseBean { + + @Column(name = "SUIT_RECORD_ID") + @ApiParam(value = "适配记录id") + private long suitRecordId; + + @Column(name = "PARAM_NAME") + @ApiParam(value = "参数名称") + private String paramName; + + @Column(name = "PARAM_VAL") + @ApiParam(value = "参数值") + private String paramVal; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceRepository.java new file mode 100644 index 0000000..7896c2e --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSource; +import org.springframework.stereotype.Repository; + +/** + * @Description : 数据源管理 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Repository +public interface BsDataSourceRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java new file mode 100644 index 0000000..eadac50 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCase; +import org.springframework.stereotype.Repository; + +/** + * @Description : 数据库套件 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Repository +public interface BsDataSourceSuitCaseRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java new file mode 100644 index 0000000..16100db --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCaseTable; +import org.springframework.stereotype.Repository; + +/** + * @Description : 数据库表操作 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Repository +public interface BsDataSourceSuitCaseTableRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsMessageQueueRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsMessageQueueRepository.java new file mode 100644 index 0000000..0ff1087 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsMessageQueueRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsMessageQueue; +import org.springframework.stereotype.Repository; + +/** + * @Description : MQ管理 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Repository +public interface BsMessageQueueRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsParamAdapterRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsParamAdapterRepository.java new file mode 100644 index 0000000..055a2d0 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsParamAdapterRepository.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter; +import org.springframework.stereotype.Repository; + +/** + * @Description : 数据适配转换 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Repository +public interface BsParamAdapterRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSocketSuitCaseRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSocketSuitCaseRepository.java new file mode 100644 index 0000000..8672634 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSocketSuitCaseRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase; +import org.springframework.stereotype.Repository; + +/** + * @Description : socket套件 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Repository +public interface BsSocketSuitCaseRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyRepository.java new file mode 100644 index 0000000..5549947 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey; +import org.springframework.stereotype.Repository; + +/** + * @Description : 安全证书 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Repository +public interface BsSslKeyRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseParamRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseParamRepository.java new file mode 100644 index 0000000..50a9e02 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseParamRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : 适配器出入参 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Repository +public interface BsSuitCaseParamRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRepository.java new file mode 100644 index 0000000..79495df --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; +import org.springframework.stereotype.Repository; + +/** + * @Description : 适配套件 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Repository +public interface BsSuitCaseRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitDataDetailRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitDataDetailRepository.java new file mode 100644 index 0000000..ada687c --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitDataDetailRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitDataDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : 适配报文详情 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Repository +public interface BsSuitDataDetailRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRecordRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRecordRepository.java new file mode 100644 index 0000000..add963c --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRecordRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : 适配记录 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Repository +public interface BsSuitRecordRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRequestRecordRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRequestRecordRepository.java new file mode 100644 index 0000000..74c9fb4 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRequestRecordRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRequestRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : 请求适配记录 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Repository +public interface BsSuitRequestRecordRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitScheduleRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitScheduleRepository.java new file mode 100644 index 0000000..5e6b472 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitScheduleRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitSchedule; +import org.springframework.stereotype.Repository; + +/** + * @Description : 定时适配任务 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Repository +public interface BsSuitScheduleRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitTypeRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitTypeRepository.java new file mode 100644 index 0000000..e2f0aa7 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitTypeRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitType; +import org.springframework.stereotype.Repository; + +/** + * @Description : 适配类型 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Repository +public interface BsSuitTypeRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/SuitRecordParamRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/SuitRecordParamRepository.java new file mode 100644 index 0000000..e2b4a0b --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/SuitRecordParamRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.SuitRecordParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : 适配记录参数 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Repository +public interface SuitRecordParamRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/TestDataBaseRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/TestDataBaseRepository.java index 3cf2b11..91de0d7 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/TestDataBaseRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/TestDataBaseRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.softswitch.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase; +import org.springframework.stereotype.Repository; /** * @Description : @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase; * @CreateDate : 2019-02-28 15:48 * @Modify: **/ +@Repository public interface TestDataBaseRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftswitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java similarity index 53% rename from modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftswitchHqlPack.java rename to modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 9230fc5..66e905f 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftswitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -1,6 +1,9 @@ package cn.estsh.i3plus.pojo.softswitch.sqlpack; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam; import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase; import org.apache.commons.lang3.StringUtils; @@ -11,8 +14,7 @@ import org.apache.commons.lang3.StringUtils; * @CreateDate : 2019-02-28 16:05 * @Modify: **/ -public class SoftswitchHqlPack { - +public class SoftSwitchHqlPack { /** * In 参数封装 @@ -41,4 +43,20 @@ public class SoftswitchHqlPack { return result.toString(); } + /** + * 适配套件参数条件封装 + * @param bsSuitCaseParam 查询条件 + * @return + */ + public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCaseParam bsSuitCaseParam){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getParamTypeId(), "paramTypeId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSuitCaseParam.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean); + + return ddlPackBean; + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java index ceff079..ee0b539 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java @@ -24,18 +24,17 @@ import javax.persistence.Transient; **/ @Data @Entity -@Table(name="WMS_ACTION_STEP_CALL_PARAM") +@Table(name = "WMS_ACTION_STEP_CALL_PARAM") @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="作业步骤调用参数表",description = "作业步骤调用参数表") +@Api(value = "作业步骤调用参数表", description = "作业步骤调用参数表") public class WmsActionStepCallParam extends BaseBean { private static final long serialVersionUID = -2813779192436803301L; @Column(name = "AGD_ID") @ApiParam(value = "流程明细编号") @JsonSerialize(using = ToStringSerializer.class) - private Long agdId; @Column(name = "SEQ") @@ -59,4 +58,15 @@ public class WmsActionStepCallParam extends BaseBean { @ApiParam(value = "组件名称") private String amName; + @Transient + @ApiParam(value = "流程ID") + private Long agId; + + public WmsActionStepCallParam() { + } + + public WmsActionStepCallParam(Long id, Long agId) { + this.id = id; + this.agId = agId; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index 610d8e5..281e113 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -143,10 +143,14 @@ public class WmsTransQuan extends BaseBean { @ApiParam(value = "报废数量", example = "0") private Double scrapQty; - @Transient - @ApiParam("交易类型") + @Column(name="TRANS_TYPE_NAME") + @ApiParam(value ="交易名称") private String transTypeName; + /*@Transient + @ApiParam("交易类型") + private String transTypeName;*/ + @Transient @ApiParam("仓库名称") private String warehouseName; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 8330f08..30eeaec 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -334,7 +334,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); + DdlPreparedPack.getStringRightLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); DdlPreparedPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result); @@ -922,6 +922,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsTransQuan.getMoveNo(), "moveNo", result); DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getTransTypeName(), "transTypeName", result); getStringBuilderPack(wmsTransQuan, result);