diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 493b4b1..15a7e6d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -752,6 +752,42 @@ public class MesEnumUtil { } /** + * 系统配置表枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CONFIG_TYPE { + + FASTDFS_SAVE_PATH(10, "savePath"); + + + private int value; + private String description; + + CONFIG_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * 事件类型枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) 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 index d0bc317..8d05091 100644 --- 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 @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.base.enumutil; +import com.fasterxml.jackson.annotation.JsonFormat; + /** * @Description : 软适配 枚举接口 * @Reference : @@ -8,4 +10,76 @@ package cn.estsh.i3plus.pojo.base.enumutil; * @Modify: **/ public class SoftSwitchEnumUtil { + + /** + * 套件类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CASE_TYPE{ + SOCKET(1,"SOCKET"), + RESTFUL(2,"RESTFUL"), + DATASOURCE(3,"数据源"); + + private int value; + private String description; + + CASE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 请求来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum REQUEST_SOURCE{ + ACTIVE(1,"主动请求"), + SCHEDULE(2,"定时调度"); + + private int value; + private String description; + + REQUEST_SOURCE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(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-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java index baed2c2..69cf64b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java @@ -62,4 +62,28 @@ public class MesESOP extends BaseBean { @Column(name="SOP_URL") @ApiParam("SOP_URL") private String sopUrl; + + @Column(name="GROUP_NAME") + @ApiParam("GROUP_NAME") + private String groupName; + + @Column(name="FILE_ORIGIN_NAME") + @ApiParam("FILE_ORIGIN_NAME") + private String fileOriginName; + + @Column(name="FILE_SIZE") + @ApiParam("FILE_SIZE") + private String fileSize; + + @Column(name="FILE_TYPE_ID") + @ApiParam("FILE_TYPE_ID") + private String fileTypeId; + + @Column(name="FILE_TYPE_NAME") + @ApiParam("FILE_TYPE_NAME") + private String fileTypeName; + + @Column(name="SYNC_TAG") + @ApiParam("SYNC_TAG") + private Integer syncTag=0; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java new file mode 100644 index 0000000..418ab92 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/19 7:00 PM + * @Description: + **/ + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("FastDfs文件model") +public class FastDfsDownloadModel { + + @ApiParam("部分相对路径") + private String dirPath; + + @ApiParam("文件名称") + private String fileName; + + @ApiParam("文件字节") + private byte[] fileByte; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java index 1dbdf9f..e93d75b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java @@ -23,27 +23,27 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_ESOP") +@Table(name = "MES_ESOP") @Api("作业指导书信息表(ODS)") public class MesESOP extends BaseBean { - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="WORK_CELL_CODE") + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; - @Column(name="ROUTE_CODE") + @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; - @Column(name="PROCESS_CODE") + @Column(name = "PROCESS_CODE") @ApiParam("工序代码") private String processCode; @@ -55,11 +55,32 @@ public class MesESOP extends BaseBean { @ApiParam("工步序号") private Integer stepSeq; - @Column(name="SOP_NAME") + @Column(name = "SOP_NAME") @ApiParam("SOP名称") private String sopName; - @Column(name="SOP_URL") + @Column(name = "SOP_URL") @ApiParam("SOP_URL") - private String sopUrl; + private String sopUrl; + + @Column(name="GROUP_NAME") + @ApiParam("GROUP_NAME") + private String groupName; + + @Column(name="FILE_ORIGIN_NAME") + @ApiParam("FILE_ORIGIN_NAME") + private String fileOriginName; + + @Column(name="FILE_SIZE") + @ApiParam("FILE_SIZE") + private String fileSize; + + @Column(name="FILE_TYPE_ID") + @ApiParam("FILE_TYPE_ID") + private String fileTypeId; + + @Column(name="FILE_TYPE_NAME") + @ApiParam("FILE_TYPE_NAME") + private String fileTypeName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java new file mode 100644 index 0000000..bef0a34 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java @@ -0,0 +1,31 @@ +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/19 7:00 PM + * @Description: + **/ + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("FastDfs文件model") +public class FastDfsDownloadModel { + + @ApiParam("部分相对路径") + private String dirPath; + + @ApiParam("文件名称") + private String fileName; + + @ApiParam("文件字节") + private byte[] fileByte; + +} 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 eb0f365..02349f5 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 @@ -49,6 +49,7 @@ public class MesHqlPack { } return packBean; } + /** * 生产计划查询条件封装 * @@ -376,15 +377,16 @@ public class MesHqlPack { /******************created by wynne*************/ /** * MES 报废信息查询 + * * @param mesScrap * @return */ public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (StringUtils.isNotEmpty(mesScrap.getScrapCode())){ + if (StringUtils.isNotEmpty(mesScrap.getScrapCode())) { DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean); } - if (StringUtils.isNotEmpty(mesScrap.getScrapName())){ + if (StringUtils.isNotEmpty(mesScrap.getScrapName())) { DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean); } if (mesScrap.getIsValid() != null) { @@ -395,15 +397,16 @@ public class MesHqlPack { /** * MES PCN系统配置信息条件查询 + * * @param mesConfig * @return */ public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (StringUtils.isNotEmpty(mesConfig.getCfgCode())){ + if (StringUtils.isNotEmpty(mesConfig.getCfgCode())) { DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean); } - if (StringUtils.isNotEmpty(mesConfig.getCfgName())){ + if (StringUtils.isNotEmpty(mesConfig.getCfgName())) { DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean); } if (mesConfig.getIsValid() != null) { @@ -414,18 +417,19 @@ public class MesHqlPack { /** * MES 维修信息条件查询 + * * @param mesRepair * @return */ public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (StringUtils.isNotEmpty(mesRepair.getRepairCode())){ + if (StringUtils.isNotEmpty(mesRepair.getRepairCode())) { DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean); } - if (StringUtils.isNotEmpty(mesRepair.getRepairName())){ + if (StringUtils.isNotEmpty(mesRepair.getRepairName())) { DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean); } - if (mesRepair.getRepairType() != null){ + if (mesRepair.getRepairType() != null) { DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean); } if (mesRepair.getIsValid() != null) { @@ -474,26 +478,27 @@ public class MesHqlPack { return packBean; } - public static DdlPackBean getMesEventByButtonCode(String buttonCode,String org){ - DdlPackBean packBean=getAllBaseData(org); - DdlPreparedPack.getStringEqualPack(buttonCode,"buttonCode",packBean); - DdlPreparedPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",packBean); + public static DdlPackBean getMesEventByButtonCode(String buttonCode, String org) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(buttonCode, "buttonCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); return packBean; } - public static DdlPackBean getMesEventByEventCode(String eventCode,String org){ - DdlPackBean packBean=getAllBaseData(org); - DdlPreparedPack.getStringEqualPack(eventCode,"eventCode",packBean); - DdlPreparedPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",packBean); + + public static DdlPackBean getMesEventByEventCode(String eventCode, String org) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(eventCode, "eventCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); return packBean; } - public static DdlPackBean getMesActionByActionCode(MesAction mesAction,String organizeCode){ - DdlPackBean packBean=getAllBaseDataByNormalPro(mesAction,organizeCode); - DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(),"actionCode",packBean); + + public static DdlPackBean getMesActionByActionCode(MesAction mesAction, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode); + DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(), "actionCode", packBean); return packBean; } - /** * 动作分页获取封装 * @@ -511,9 +516,8 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesAction.getActionName(), "actionName", packBean); } - if (mesAction.getActionType() != null && StringUtils.isNotEmpty(mesAction.getActionType() + "")) { - DdlPreparedPack.getStringEqualPack(mesAction.getActionType() + "", "actionType", packBean); - } + DdlPreparedPack.getNumEqualPack(mesAction.getActionType(), "actionType", packBean); + return packBean; } @@ -548,6 +552,7 @@ public class MesHqlPack { } return packBean; } + /** * 事件动作分页获取封装 * diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 642c9a6..39a7704 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -42,6 +42,10 @@ i3plus.pojo i3plus-pojo-form + + i3plus.pojo + i3plus-pojo-softswitch + diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java index 38f205f..71ec94e 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java @@ -1,10 +1,17 @@ package cn.estsh.i3plus.pojo.model.softswitch; import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +import com.thoughtworks.xstream.annotations.XStreamOmitField; import lombok.Data; +import javax.persistence.Transient; + /** * @Description : * @Reference : @@ -16,27 +23,88 @@ import lombok.Data; @XStreamAlias("model") public class SuitCoreModel { + /** + * 适配套件代码 + */ @XStreamAsAttribute - private Long id; + private String suitCaseCode;// adapterId + + /** + * 套件类型 + */ @XStreamAsAttribute private Integer caseType; + + /** + * 适配结果信息 + */ + private String suitMessage; + + /** + * 请求来源 + */ + private Integer requestSource; + private String suitCaseStatusCode; - private String suitCaseMessage; - private String key; - private PojoAuth auth; - private Request request; + /** + * 安全证书 + */ + private BsSslKey sslKey; + + /** + * 认证令牌 + */ + private String token; + /** + * 适配器套件 + */ + @XStreamOmitField + private BsSuitCase bsSuitCase; + + /** + * 认证结果 + */ + private Integer suitSslKeyResult; + + /** + * 认证信息 + */ + private String suitSslKeyResultMessage; + + /** + * 适配结果 + */ + private Integer suitResult; + + /** + * 适配报文 + */ @XStreamCDATA - private String responseResult; - - public SuitCoreModel(Long id, Integer caseType, String suitCaseStatusCode, String key, PojoAuth auth, Request request) { - this.id = id; - this.caseType = caseType; - this.suitCaseStatusCode = suitCaseStatusCode; - this.key = key; - this.auth = auth; - this.request = request; + private String suitResultMessage; + + /** + * + * @param requestSource 请求来源 + * @param sslKey 安全证书对象 + * @param bsSuitCase 适配器信息 + */ + public SuitCoreModel(Integer requestSource,BsSslKey sslKey, BsSuitCase bsSuitCase) { + this.sslKey = sslKey; + this.bsSuitCase = bsSuitCase; + this.requestSource = requestSource; + + // 设置套件类型 + this.caseType = bsSuitCase.getCaseTypeId(); + // 设置套件代码 + this.suitCaseCode = bsSuitCase.getSuitCaseCode(); + // 设置默认 + this.suitCaseStatusCode = ResourceEnumUtil.MESSAGE.FAIL.getCode(); + // 设置默认 + this.suitSslKeyResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); + // 设置默认 + this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); } } 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 index 128e256..ac58030 100644 --- 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 @@ -31,9 +31,17 @@ public class BsDataSource extends BaseBean { @ApiParam(value = "数据源名称") private String dataSourceName; + @Column(name = "DATA_SOURCE_CODE") + @ApiParam(value = "数据源编码",access = "作为关系引用，在数据切换的时候会找不到ID 数据变了引用还在") + private String dataSourceCode; + + @Column(name = "DATA_BASE_NAME") + @ApiParam(value = "数据库名称") + private String dataBaseName; + @Column(name = "DATA_SOURCE_TYPE_ID") @ApiParam(value = "数据源类型id") - private int dataSourceTypeId; + private Integer dataSourceTypeId; @Column(name = "DATA_SOURCE_HOST") @ApiParam(value = "数据源主机") @@ -41,7 +49,7 @@ public class BsDataSource extends BaseBean { @Column(name = "DATA_SOURCE_PORT") @ApiParam(value = "数据源端口") - private int dataSourcePort; + private Integer dataSourcePort; @Column(name = "DATA_SOURCE_USER") @ApiParam(value = "用户名") 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 index e4e9d3c..738d19a 100644 --- 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,15 +31,16 @@ public class BsDataSourceSuitCase extends BaseBean { @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") - private long suitCaseId; + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; @Column(name = "DATA_SOURCE_MODE_ID") @ApiParam(value = "数据源套件模式（枚举，被动读，主动写）") - private int dataSourceModeId; + private Integer dataSourceModeId; - @Column(name = "DATA_SOURCE_ID") - @ApiParam(value = "数据源id") - private long dataSourceId; + @Column(name = "DATA_SOURCE_CODE") + @ApiParam(value = "数据源编码") + private String dataSourceCode; @Column(name = "DATA_SOURCE_NAME_RDD") @ApiParam(value = "数据源名称") 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 index fac9121..d7876d2 100644 --- 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,7 +31,8 @@ public class BsDataSourceSuitCaseTable extends BaseBean { @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") - private long suitCaseId; + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; @Column(name = "TABLE_NAME") @ApiParam(value = "数据库表名") 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 index 88c70d5..5dbad2d 100644 --- 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -33,7 +35,7 @@ public class BsMessageQueue extends BaseBean { @Column(name = "MESSAGE_QUEUE_TYPE") @ApiParam(value = "消息队列类型") - private int messageQueueType; + private Integer messageQueueType; @Column(name = "MESSAGE_QUEUE_HOST") @ApiParam(value = "消息队列主机") @@ -41,11 +43,7 @@ public class BsMessageQueue extends BaseBean { @Column(name = "MESSAGE_QUEUE_PORT") @ApiParam(value = "消息队列端口") - private int messageQueuePort; - - @Column(name = "CERTIFICATE_ID") - @ApiParam(value = "证书id") - private long certificateId; + private Integer messageQueuePort; } 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 index 8885ba1..dc12e39 100644 --- 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,7 +31,8 @@ public class BsParamAdapter extends BaseBean { @Column(name = "SUIT_CASE_ID") @ApiParam(value = "适配套件id") - private long suitCaseId; + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; @Column(name = "SUIT_CASE_NAME") @ApiParam(value = "适配套件名称") @@ -41,11 +44,12 @@ public class BsParamAdapter extends BaseBean { @Column(name = "SUIT_PARAM_TYPE_ID") @ApiParam(value = "参数类型枚举") - private int suitParamTypeId; + private Integer suitParamTypeId; @Column(name = "SUIT_PARAM_ID") @ApiParam(value = "原参数id") - private long suitParamId; + @JsonSerialize(using = ToStringSerializer.class) + private Long suitParamId; @Column(name = "SUIT_PARAM_NAME_RDD") @ApiParam(value = "参数名称") @@ -53,7 +57,7 @@ public class BsParamAdapter extends BaseBean { @Column(name = "SUIT_PARAM_VAL_TYPE_ID") @ApiParam(value = "原参数值类型") - private int suitParamValTypeId; + private Integer suitParamValTypeId; @Column(name = "TRANSFER_PARAM_NAME") @ApiParam(value = "转换参数名称") @@ -61,7 +65,7 @@ public class BsParamAdapter extends BaseBean { @Column(name = "TRANSFER_PARAM_VAL_TYPE_ID") @ApiParam(value = "转换参数类型") - private int transferParamValTypeId; + private Integer 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 index f7e0858..417a872 100644 --- 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 @@ -29,11 +29,11 @@ public class BsSocketSuitCase extends BaseBean { @Column(name = "SOCKET_TYPE_ID") @ApiParam(value = "socket类型（枚举）") - private int socketTypeId; + private Integer socketTypeId; @Column(name = "SOCKET_MODE_ID") @ApiParam(value = "socket模式(枚举,服务端，客户端)") - private int socketModeId; + private Integer 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 index 9a1f66f..232477e 100644 --- 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 @@ -1,6 +1,9 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.thoughtworks.xstream.annotations.XStreamAlias; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -10,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : 安全证书 @@ -29,7 +34,7 @@ public class BsSslKey extends BaseBean { @Column(name = "VERIFICATION_METHOD_ID") @ApiParam(value = "认证方式(枚举)") - private int verificationMethodId; + private Integer verificationMethodId; @Column(name = "VERIFICATION_URL") @ApiParam(value = "认证url") @@ -37,7 +42,7 @@ public class BsSslKey extends BaseBean { @Column(name = "KEY_TYPE") @ApiParam(value = "证书类型枚举") - private int keyType; + private Integer keyType; @Column(name = "KEY_NAME") @ApiParam(value = "证书名称") @@ -45,7 +50,8 @@ public class BsSslKey extends BaseBean { @Column(name = "KEY_FILE_ID") @ApiParam(value = "证书文件id") - private long keyFileId; + @JsonSerialize(using = ToStringSerializer.class) + private Long keyFileId; @Column(name = "KEY_FILE_PATH") @ApiParam(value = "证书文件路径") @@ -63,5 +69,9 @@ public class BsSslKey extends BaseBean { @ApiParam(value = "证书描述") private String keyDescription; + @Transient + @ApiParam(value = "证书参数集合") + private List bsSslKeyParamList; + } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java new file mode 100644 index 0000000..287cfb3 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.thoughtworks.xstream.annotations.XStreamAlias; +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_PARAM") +@Api(value = "安全证书参数", description = "安全证书参数") +@XStreamAlias("BsSslKeyParam") +public class BsSslKeyParam extends BaseBean { + + @Column(name = "SSL_KEY_ID") + @ApiParam(value = "证书id") + @JsonSerialize(using = ToStringSerializer.class) + private Long sslKeyId; + + @Column(name = "PARAM_NAME") + @ApiParam(value = "参数名称") + private String paramName; + + @Column(name = "PARAM_VALUE") + @ApiParam(value = "参数值") + private String paramValue; + +} 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 index 875adb3..8a88131 100644 --- 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -10,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : 适配套件 @@ -27,17 +31,23 @@ import javax.persistence.Table; @Api(value = "适配套件", description = "适配套件") public class BsSuitCase extends BaseBean { + @Column(name = "SUIT_CASE_NAME") + @ApiParam(value = "套件名称") + private String suitCaseName; + @Column(name = "CASE_TYPE_ID") @ApiParam(value = "套件类型id(枚举)") - private int caseTypeId; + private Integer caseTypeId; @Column(name = "CASE_DETAIL_ID") @ApiParam(value = "适配器明细id") - private long caseDetailId; + @JsonSerialize(using = ToStringSerializer.class) + private Long caseDetailId; @Column(name = "SUIT_TYPE_ID") @ApiParam(value = "适配类型id") - private long suitTypeId; + @JsonSerialize(using = ToStringSerializer.class) + private Long suitTypeId; @Column(name = "SUIT_TYPE_NAME") @ApiParam(value = "适配类型名称") @@ -53,35 +63,43 @@ public class BsSuitCase extends BaseBean { @Column(name = "SUIT_CASE_PORT") @ApiParam(value = "适配端口") - private int suitCasePort; + private Integer suitCasePort; + + @Column(name = "SUIT_CASE_URL") + @ApiParam(value = "适配URL") + private String suitCaseURL; @Column(name = "IS_NEED_CERTIFICATION") @ApiParam(value = "是否需要认证") - private int isNeedCertification; + private Integer isNeedCertification; - @Column(name = "CERTIFICATE_ID") + @Column(name = "SSL_KEY_ID") @ApiParam(value = "证书id") - private long certificateId; + @JsonSerialize(using = ToStringSerializer.class) + private Long sslKeyId; @Column(name = "TIMING_SUIT_NUM") @ApiParam(value = "定时适配次数") - private int timingSuitNum; + private Integer timingSuitNum; @Column(name = "INITIATIVE_SUIT_NUM") @ApiParam(value = "主动适配测试") - private int initiativeSuitNum; + private Integer initiativeSuitNum; @Column(name = "SUCCESS_NUM") @ApiParam(value = "成功次数") - private int successNum; + private Integer successNum; @Column(name = "FAIL_NUM") @ApiParam(value = "失败次数") - private int failNum; + private Integer failNum; @Column(name = "SUIT_CASE_DESCRIPTION") @ApiParam(value = "适配类型描述") private String suitCaseDescription; + @Transient + @ApiParam(value = "适配器参数") + List bsSuitCaseParamList; } 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 index 310bdc5..3c08750 100644 --- 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -10,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 适配器出入参 @@ -29,7 +32,8 @@ public class BsSuitCaseParam extends BaseBean { @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") - private long suitCaseId; + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; @Column(name = "SUIT_CASE_CODE_RDD") @ApiParam(value = "套件代码") @@ -37,7 +41,7 @@ public class BsSuitCaseParam extends BaseBean { @Column(name = "PARAM_TYPE_ID") @ApiParam(value = "参数类型，枚举(出,入)") - private int paramTypeId; + private Integer paramTypeId; @Column(name = "PARAM_NAME") @ApiParam(value = "参数名称)") @@ -45,7 +49,7 @@ public class BsSuitCaseParam extends BaseBean { @Column(name = "PARAM_VAL_TYPE_ID") @ApiParam(value = "参数值类型") - private int paramValTypeId; + private Integer paramValTypeId; @Column(name = "PARAM_DEFAULT_VAL") @ApiParam(value = "参数默认值") @@ -55,5 +59,9 @@ public class BsSuitCaseParam extends BaseBean { @ApiParam(value = "参数描述") private String paramDescription; + @Transient + @ApiParam(value = "参数值") + private String paramValue; + } 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 index f827b7f..4fa1bd2 100644 --- 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -41,7 +43,8 @@ public class BsSuitDataDetail extends BaseBean { @Column(name = "SUIT_RECORD_ID") @ApiParam(value = "适配记录id") - private long suitRecordId; + @JsonSerialize(using = ToStringSerializer.class) + private Long suitRecordId; @Column(name = "GET_DATE_TIME") @ApiParam(value = "获取报文时间") @@ -57,7 +60,7 @@ public class BsSuitDataDetail extends BaseBean { @Column(name = "PROCESS_STATE") @ApiParam(value = "处理状态") - private int processState; + private Integer processState; @Column(name = "PROCESS_TIME") @ApiParam(value = "处理时间") 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 index 67d398b..0c61a85 100644 --- 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -37,23 +39,30 @@ public class BsSuitRecord extends BaseBean { @Column(name = "SUIT_CASE_TYPE") @ApiParam(value = "适配套件类型id枚举") - private int suitCaseType; + private Integer suitCaseType; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "适配器套件id") - private long suitCaseId; + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; + + @Column(name = "CASE_TYPE_ID") + @ApiParam(value = "套件类型id(枚举)") + private Integer caseTypeId; @Column(name = "SUIT_CASE_DETAIL_ID") @ApiParam(value = "适配套件明细id") - private long suitCaseDetailId; + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseDetailId; @Column(name = "SUIT_METHOD_ID") @ApiParam(value = "适配方式id枚举") - private int suitMethodId; + private Integer suitMethodId; @Column(name = "SUIT_TYPE_ID") @ApiParam(value = "适配类型id") - private long suitTypeId; + @JsonSerialize(using = ToStringSerializer.class) + private Long suitTypeId; @Column(name = "SUIT_TYPE_NAME_RDD") @ApiParam(value = "适配类型名称") @@ -61,23 +70,36 @@ public class BsSuitRecord extends BaseBean { @Column(name = "REQUEST_SOURCE") @ApiParam(value = "请求来源(枚举)") - private int requestSource; + private Integer requestSource; - @Column(name = "SUIT_SSL_KEY_ID") + @Column(name = "SSL_KEY_ID") @ApiParam(value = "证书id") - private long suitSslKeyId; + @JsonSerialize(using = ToStringSerializer.class) + private Long sslKeyId; @Column(name = "SUIT_SSL_KEY_NAME_RDD") @ApiParam(value = "证书名称") private String suitSslKeyNameRdd; + @Column(name = "SUIT_SSL_KEY_RESULT") + @ApiParam(value = "认证结果") + private String suitSslKeyResult; + + @Column(name = "SUIT_SSL_KEY_RESULT_MESSAGE") + @ApiParam(value = "认证信息") + private String suitSslKeyResultMessage; + @Column(name = "SUIT_RESULT") @ApiParam(value = "适配结果") - private int suitResult; + private Integer suitResult; + + @Column(name = "SUIT_MESSAGE") + @ApiParam(value = "适配信息") + private String suitMessage; @Column(name = "PROCESS_STATE") @ApiParam(value = "处理状态") - private int processState; + private Integer processState; @Column(name = "PROCESS_TIME") @ApiParam(value = "处理时间") 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 index 331c11f..4a63337 100644 --- 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,15 +31,17 @@ public class BsSuitRequestRecord extends BaseBean { @Column(name = "SUIT_RECORD_ID") @ApiParam(value = "适配记录id") - private long suitRecordId; + @JsonSerialize(using = ToStringSerializer.class) + private Long suitRecordId; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "适配器套件id") - private long suitCaseId; + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; @Column(name = "REQUEST_SOURCE") @ApiParam(value = "请求来源(枚举)") - private int requestSource; + private Integer requestSource; @Column(name = "REQUEST_ORGIN_PARAM") @ApiParam(value = "请求原始参数") 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 index 4b657d3..f938368 100644 --- 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,7 +31,8 @@ public class BsSuitSchedule extends BaseBean { @Column(name = "SUIT_CASE_ID") @ApiParam(value = "适配套件id") - private long suitCaseId; + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; @Column(name = "SUIT_CASE_NAME_RDD") @ApiParam(value = "适配套件名称") 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 index 576c4f1..1499369 100644 --- 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 @@ -33,7 +33,7 @@ public class BsSuitType extends BaseBean { @Column(name = "SUIT_CASE_NUM") @ApiParam(value = "适配器数量") - private int suitCaseNum; + private Integer suitCaseNum = 0; } 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 index 5f0bb46..bb04309f 100644 --- 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 @@ -29,7 +29,7 @@ public class SuitRecordParam extends BaseBean { @Column(name = "SUIT_RECORD_ID") @ApiParam(value = "适配记录id") - private long suitRecordId; + private Long suitRecordId; @Column(name = "PARAM_NAME") @ApiParam(value = "参数名称") 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 index c00091f..ccea28f 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 @@ -3,6 +3,7 @@ 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.BsSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam; import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase; import org.apache.commons.lang3.StringUtils; @@ -76,4 +77,37 @@ public class SoftSwitchHqlPack { return ddlPackBean; } + /** + * 适配套件条件封装 + * @param bsSuitCase 查询条件 + * @return + */ + public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCase bsSuitCase){ + DdlPackBean ddlPackBean = new DdlPackBean(); + +// DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseCode(),"suitCaseCode",ddlPackBean); +// DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitTypeName(),"suitTypeName",ddlPackBean); +// DdlPreparedPack.getNumEqualPack(bsSuitCase.getParamTypeId(), "paramTypeId", ddlPackBean); +// DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitCaseId(), "suitCaseId", ddlPackBean); +// DdlPreparedPack.getStringEqualPack(bsSuitCase.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean); + + ddlPackBean.setOrderByStr(bsSuitCase.orderBy()); + + return ddlPackBean; + } + + /** + * 适配套件唯一校验 + * @param bsSuitCase 适配套件信息 + * @return + */ + public static DdlPackBean packHqlCheckBsSuitCaseOnly(BsSuitCase bsSuitCase){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getNumNOEqualPack(bsSuitCase.getId(),"id",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitCaseCode(), "suitCaseCode", ddlPackBean); + + return ddlPackBean; + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java index ed3f142..71ba453 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="BAS_VENDOR") -@Api("供应商") +@Api("供应商信息") public class BasVendor extends BaseBean{ private static final long serialVersionUID = 9214639813072592779L; 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 30eeaec..c9fc769 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 @@ -2051,6 +2051,8 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsCSRange.getLocateNo(), "locateNo", result); DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"item"}, result); + getStringBuilderPack(wmsCSRange, result); return result; diff --git a/pom.xml b/pom.xml index 9e20085..f355cca 100644 --- a/pom.xml +++ b/pom.xml @@ -128,6 +128,12 @@ ${project.version} + + i3plus.pojo + i3plus-pojo-softswitch + ${project.version} + + com.fasterxml.jackson.core