diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java index 23f4dc5..c220e6c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java @@ -62,6 +62,7 @@ public class XStreamFactory { // xStream.setMode(XStream.NO_REFERENCES); xStream.autodetectAnnotations(true); +// XStream.setupDefaultSecurity(xStream); return xStream; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 3756ccf..bc7bf48 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -211,6 +211,8 @@ public class CommonEnumUtil { public enum SYS_LOCALE_RESOURCE_TYPE { COMMON(1, "通用"), EXCEPTION(2, "异常"), + EXCEPTION_DETAIL(3, "异常明细"), + EXCEPTION_SOLUTION(4, "解决方案"), MODULE(10, "模块"), METHOD(11, "功能"), BUTTON(12, "按钮"), 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 0fa4064..fe92b7f 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 @@ -1188,10 +1188,10 @@ public class MesHqlPack { * @param organizeCode * @return */ - public static DdlPackBean getMesActionAllData(String organizeCode) { + public static DdlPackBean getMesAllData(String organizeCode) { DdlPackBean packBean = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); return packBean; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index 77b0134..f249f9f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService; +import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -18,6 +19,7 @@ import java.io.Serializable; * @Modify: **/ @Data +@JsonInclude(JsonInclude.Include.NON_NULL) public class BsSuitCaseModel implements Serializable { private static final long serialVersionUID = -7420782744192475445L; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index 88ab98d..51de22a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -48,6 +48,11 @@ public class SuitClientModel { * 请求来源 */ private Integer requestSource; + + /** + * 适配方式 + */ + private Integer suitMethodId; /** * 适配状态码 */ 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 eba3850..ab512fc 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,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -95,6 +96,13 @@ public class BsSuitCase extends BaseBean { @ApiParam(value = "是否需要认证") private Integer isNeedCertification; + public int getIsNeedCertificationVal(){ + if(isNeedCertification==null){ + return CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + } + return isNeedCertification.intValue(); + } + @Column(name = "SSL_KEY_ID") @ApiParam(value = "证书id") @JsonSerialize(using = ToStringSerializer.class) @@ -129,6 +137,10 @@ public class BsSuitCase extends BaseBean { private Object bsSuitCaseDetail; @Transient + @ApiParam(value = "适配器套件明细") + private BsSslKey bsSslKey; + + @Transient @ApiParam(value = "适配器参数") private List bsSuitCaseParamList; 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 4fa1bd2..0ba342b 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -29,6 +30,10 @@ import javax.persistence.Table; @Api(value = "适配报文详情", description = "适配报文详情") public class BsSuitDataDetail extends BaseBean { + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "适配套件id") + private String suitCaseId; + @Column(name = "SUIT_CASE_NAME_RDD") @ApiParam(value = "适配套件名称") private String suitCaseNameRdd; @@ -50,10 +55,12 @@ public class BsSuitDataDetail extends BaseBean { @ApiParam(value = "获取报文时间") private String getDateTime; + @Lob @Column(name = "ORGIN_DATA") @ApiParam(value = "原始报文数据") private String orginData; + @Lob @Column(name = "TRANS_DATA") @ApiParam(value = "转换后的报文数据") private String transData; 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 18f5afa..7702cdd 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 @@ -37,10 +37,6 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "适配套件代码") private String suitCaseCodeRdd; - @Column(name = "SUIT_CASE_TYPE") - @ApiParam(value = "适配套件类型id枚举") - private Integer suitCaseType; - @Column(name = "SUIT_CASE_ID") @ApiParam(value = "适配器套件id") @JsonSerialize(using = ToStringSerializer.class) @@ -87,7 +83,7 @@ public class BsSuitRecord extends BaseBean { @Column(name = "SUIT_SSL_KEY_RESULT") @ApiParam(value = "认证结果") - private String suitSslKeyResult; + private Integer suitSslKeyResult; @Column(name = "SUIT_SSL_KEY_RESULT_MESSAGE") @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 4a63337..e00832f 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -43,6 +44,7 @@ public class BsSuitRequestRecord extends BaseBean { @ApiParam(value = "请求来源(枚举)") private Integer requestSource; + @Lob @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/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 9377c97..8956ae4 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 @@ -79,7 +79,7 @@ public class SoftSwitchHqlPack { * @param bsSuitCase 查询条件 * @return */ - public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCase bsSuitCase){ + public static DdlPackBean packHqlBsSuitCase(BsSuitCase bsSuitCase){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseName(),"suitCaseName",ddlPackBean); @@ -289,7 +289,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getId(), "id", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getSuitCaseId(), "suitCaseId", ddlPackBean); - DdlPreparedPack.getStringLikerPack(bsSuitCaseDataSourceTable.getOperateName(), "operateName", ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSuitCaseDataSourceTable.getOperateName(), "operateName", ddlPackBean); return ddlPackBean; } @@ -304,4 +304,42 @@ public class SoftSwitchHqlPack { return result; } + + /** + * 适配记录查询条件封装 + * @param bsSuitRecord + * @return + */ + public static DdlPackBean packHqlBsSuitRecord(BsSuitRecord bsSuitRecord){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean); + DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); + + ddlPackBean.setOrderByStr(bsSuitRecord.orderBy()); + + return ddlPackBean; + } + + /** + * 适配记录查询条件封装 + * @return + */ + public static DdlPackBean packHqlBsSuitDataDetail(BsSuitDataDetail bsSuitDataDetail){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getProcessState(),"processState",ddlPackBean); + DdlPreparedPack.timeBuilder(bsSuitDataDetail.getGetDateTime(), "getDateTime", ddlPackBean, false, true); + DdlPreparedPack.timeBuilder(bsSuitDataDetail.getProcessTime(), "processTime", ddlPackBean, false, true); + + ddlPackBean.setOrderByStr(bsSuitDataDetail.orderBy()); + + return ddlPackBean; + } }