diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java index 325358c..eee532e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java @@ -1,7 +1,5 @@ package cn.estsh.i3plus.pojo.base.annotation; -import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; 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 8d05091..fb98a2a 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 @@ -82,4 +82,73 @@ public class SoftSwitchEnumUtil { } } + /** + * 认证方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum VERIFICATION_METHOD{ + LOGIN(1,"登录"); + + private int value; + private String description; + + VERIFICATION_METHOD(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 KEY_TYPE{ + ACCOUNT_PASSWORD(1,"账号密码"); + + private int value; + private String description; + + KEY_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; + } + } + + //keyTypeId } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 22b0e41..40f9822 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -531,4 +531,5 @@ public class DdlPreparedPack { } return name; } + } 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 ee14fce..3b748f8 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 @@ -48,7 +48,7 @@ public class SuitCoreModel { private String suitCaseStatusCode; /** - * 安全证书 + * 适配认证 */ private BsSslKey sslKey; @@ -88,7 +88,7 @@ public class SuitCoreModel { /** * * @param requestSource 请求来源 - * @param sslKey 安全证书对象 + * @param sslKey 适配认证对象 * @param bsSuitCase 适配器信息 */ public SuitCoreModel(Integer requestSource,BsSslKey sslKey, BsSuitCase bsSuitCase) { 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 275709a..f449535 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 @@ -64,7 +64,7 @@ public class BsParamAdapter extends BaseBean { private String transferParamName; @Column(name = "TRANSFER_PARAM_VAL_TYPE_ID") - @ApiParam(value = "转换参数类型") + @ApiParam(value = "转换参数值类型") private Integer transferParamValTypeId; } 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 232477e..e422ef8 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 @@ -17,7 +17,7 @@ import javax.persistence.Transient; import java.util.List; /** - * @Description : 安全证书 + * @Description : 适配认证 * @Reference : * @Author : yunhao * @CreateDate : 2019-08-13 9:21 @@ -29,9 +29,13 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "BS_SSL_KEY") -@Api(value = "安全证书", description = "安全证书") +@Api(value = "适配认证", description = "适配认证") public class BsSslKey extends BaseBean { + @Column(name = "KEY_NAME") + @ApiParam(value = "证书名称") + private String keyName; + @Column(name = "VERIFICATION_METHOD_ID") @ApiParam(value = "认证方式(枚举)") private Integer verificationMethodId; @@ -40,13 +44,9 @@ public class BsSslKey extends BaseBean { @ApiParam(value = "认证url") private String verificationUrl; - @Column(name = "KEY_TYPE") + @Column(name = "KEY_TYPE_ID") @ApiParam(value = "证书类型枚举") - private Integer keyType; - - @Column(name = "KEY_NAME") - @ApiParam(value = "证书名称") - private String keyName; + private Integer keyTypeId; @Column(name = "KEY_FILE_ID") @ApiParam(value = "证书文件id") 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 index 287cfb3..f9837ca 100644 --- 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 @@ -16,7 +16,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description : 安全证书参数 + * @Description : 适配认证参数 * @Reference : * @Author : yunhao * @CreateDate : 2019-08-13 9:21 @@ -28,7 +28,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "BS_SSL_KEY_PARAM") -@Api(value = "安全证书参数", description = "安全证书参数") +@Api(value = "适配认证参数", description = "适配认证参数") @XStreamAlias("BsSslKeyParam") public class BsSslKeyParam extends BaseBean { @@ -45,4 +45,8 @@ public class BsSslKeyParam extends BaseBean { @ApiParam(value = "参数值") private String paramValue; + @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/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index 8a88131..47d1e44 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 @@ -95,9 +95,13 @@ public class BsSuitCase extends BaseBean { private Integer failNum; @Column(name = "SUIT_CASE_DESCRIPTION") - @ApiParam(value = "适配类型描述") + @ApiParam(value = "适配器描述") private String suitCaseDescription; + @Column(name = "SUIT_CASE_STATUS") + @ApiParam(value = "适配器状态") + private Integer suitCaseStatus; + @Transient @ApiParam(value = "适配器参数") List bsSuitCaseParamList; 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 0c61a85..2563cbf 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 @@ -59,6 +59,10 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "适配方式id枚举") private Integer suitMethodId; + @Column(name = "SUIT_METHOD_NAME_RDD") + @ApiParam(value = "适配方式名称枚举") + private Integer suitMethodNameRdd; + @Column(name = "SUIT_TYPE_ID") @ApiParam(value = "适配类型id") @JsonSerialize(using = ToStringSerializer.class) 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/BsSuitRecordParam.java similarity index 95% rename from modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/SuitRecordParam.java rename to modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java index bb04309f..5b384ce 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/BsSuitRecordParam.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "SUIT_RECORD_PARAM") @Api(value = "适配记录参数", description = "适配记录参数") -public class SuitRecordParam extends BaseBean { +public class BsSuitRecordParam extends BaseBean { @Column(name = "SUIT_RECORD_ID") @ApiParam(value = "适配记录id") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyParamRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyParamRepository.java new file mode 100644 index 0000000..2dcfb34 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyParamRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKeyParam; + +/** + * @Description : 安全证书参数 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-21 17:47 + * @Modify: + **/ +public interface BsSslKeyParamRepository 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 index 5549947..dd7ef61 100644 --- 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 @@ -5,7 +5,7 @@ import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey; import org.springframework.stereotype.Repository; /** - * @Description : 安全证书 + * @Description : 适配认证 * @Reference : * @Author : yunhao * @CreateDate : 2019-08-13 9:21 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/BsSuitRecordParamRepository.java similarity index 65% rename from modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/SuitRecordParamRepository.java rename to modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRecordParamRepository.java index e2b4a0b..ac8d35b 100644 --- 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/BsSuitRecordParamRepository.java @@ -1,7 +1,7 @@ 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 cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecordParam; import org.springframework.stereotype.Repository; /** @@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository; * @Modify: */ @Repository -public interface SuitRecordParamRepository extends BaseRepository { +public interface BsSuitRecordParamRepository 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 index e10ea61..09901b1 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 @@ -177,7 +177,7 @@ public class SoftSwitchHqlPack { } /** - * 安全证书查询条件分页 + * 适配认证查询条件分页 * @param bsSslKey 查询条件 * @return */ @@ -185,7 +185,7 @@ public class SoftSwitchHqlPack { DdlPackBean ddlPackBean = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(),"keyName",ddlPackBean); - DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyType(),"keyType",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyTypeId(),"keyTypeId",ddlPackBean); ddlPackBean.setOrderByStr(bsSslKey.orderBy()); @@ -193,7 +193,7 @@ public class SoftSwitchHqlPack { } /** - * 安全证书唯一校验 + * 适配认证唯一校验 * @param bsSslKey * @return */ @@ -206,4 +206,66 @@ public class SoftSwitchHqlPack { return ddlPackBean; } + /** + * 适配认证参数按条件查询 + * @param bsSslKeyParam 查询条件 + * @return + */ + public static DdlPackBean packHqlBsSslKeyParam(BsSslKeyParam bsSslKeyParam){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean); + + ddlPackBean.setOrderByStr(bsSslKeyParam.orderBy()); + + return ddlPackBean; + } + + /** + * 适配认证参数唯一校验 + * @param bsSslKeyParam + * @return + */ + public static DdlPackBean packHqlCheckBsSslKeyParamOnly(BsSslKeyParam bsSslKeyParam){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean); + + return ddlPackBean; + } + + /** + * 数据源查询条件封装 + * @param bsDataSource + * @return + */ + public static DdlPackBean packHqlBsDataSource(BsDataSource bsDataSource){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceName(), "dataSourceName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsDataSource.getDataSourceTypeId(), "dataSourceTypeId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsDataSource.getIsValid(), "isValid", ddlPackBean); + + ddlPackBean.setOrderByStr(bsDataSource.orderBy()); + + return ddlPackBean; + } + + /** + * 数据源唯一校验 + * @param bsDataSource + * @return + */ + public static DdlPackBean packHqlCheckBsDataSourceOnly(BsDataSource bsDataSource){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bsDataSource.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean); + + return ddlPackBean; + } + }