From 92d4bf46ce3e9ae1646ee73b2780db678cee911e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 13 Aug 2019 09:34:45 +0800 Subject: [PATCH 1/4] #5255,#5039 --- .../i3plus/pojo/wms/bean/WmsActionStepCallParam.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) 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; + } } From dc78cf114f4573f6d72a5f70ac8a6b8874d32e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 13 Aug 2019 14:20:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/softswitch/bean/BsDataSource.java | 63 ++++++++++++++++ .../pojo/softswitch/bean/BsDataSourceSuitCase.java | 47 ++++++++++++ .../softswitch/bean/BsDataSourceSuitCaseTable.java | 55 ++++++++++++++ .../pojo/softswitch/bean/BsMessageQueue.java | 51 +++++++++++++ .../pojo/softswitch/bean/BsParamAdapter.java | 67 +++++++++++++++++ .../pojo/softswitch/bean/BsSocketSuitCase.java | 39 ++++++++++ .../i3plus/pojo/softswitch/bean/BsSslKey.java | 67 +++++++++++++++++ .../i3plus/pojo/softswitch/bean/BsSuitCase.java | 87 ++++++++++++++++++++++ .../pojo/softswitch/bean/BsSuitCaseParam.java | 55 ++++++++++++++ .../pojo/softswitch/bean/BsSuitDataDetail.java | 67 +++++++++++++++++ .../i3plus/pojo/softswitch/bean/BsSuitRecord.java | 87 ++++++++++++++++++++++ .../pojo/softswitch/bean/BsSuitRequestRecord.java | 47 ++++++++++++ .../pojo/softswitch/bean/BsSuitSchedule.java | 47 ++++++++++++ .../i3plus/pojo/softswitch/bean/BsSuitType.java | 39 ++++++++++ .../pojo/softswitch/bean/SuitRecordParam.java | 43 +++++++++++ 15 files changed, 861 insertions(+) create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCaseTable.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsMessageQueue.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/SuitRecordParam.java 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..db7474f --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java @@ -0,0 +1,63 @@ +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; + + @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/BsDataSourceSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java new file mode 100644 index 0000000..7d110cd --- /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_ID_RDD") + @ApiParam(value = "数据源名称") + private String dataSourceIdRdd; + +} + 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..74ac472 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.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_SUIT_CASE_PARAM") +@Api(value = "适配器出入参", description = "适配器出入参") +public class BsSuitCaseParam extends BaseBean { + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "套件id") + private long suitCaseId; + + @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; + +} + From f82011cf5bbbfebf30f0c910a8357c98c558c50c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 13 Aug 2019 14:37:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../softswitch/repository/BsDataSourceRepository.java | 16 ++++++++++++++++ .../repository/BsDataSourceSuitCaseRepository.java | 16 ++++++++++++++++ .../repository/BsDataSourceSuitCaseTableRepository.java | 16 ++++++++++++++++ .../softswitch/repository/BsMessageQueueRepository.java | 16 ++++++++++++++++ .../softswitch/repository/BsParamAdapterRepository.java | 16 ++++++++++++++++ .../repository/BsSocketSuitCaseRepository.java | 16 ++++++++++++++++ .../pojo/softswitch/repository/BsSslKeyRepository.java | 16 ++++++++++++++++ .../softswitch/repository/BsSuitCaseParamRepository.java | 16 ++++++++++++++++ .../pojo/softswitch/repository/BsSuitCaseRepository.java | 16 ++++++++++++++++ .../repository/BsSuitDataDetailRepository.java | 16 ++++++++++++++++ .../softswitch/repository/BsSuitRecordRepository.java | 16 ++++++++++++++++ .../repository/BsSuitRequestRecordRepository.java | 16 ++++++++++++++++ .../softswitch/repository/BsSuitScheduleRepository.java | 16 ++++++++++++++++ .../pojo/softswitch/repository/BsSuitTypeRepository.java | 16 ++++++++++++++++ .../softswitch/repository/SuitRecordParamRepository.java | 16 ++++++++++++++++ 15 files changed, 240 insertions(+) create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsMessageQueueRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsParamAdapterRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSocketSuitCaseRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseParamRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitDataDetailRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRecordRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRequestRecordRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitScheduleRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitTypeRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/SuitRecordParamRepository.java 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..0bdd817 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSource; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 数据源管理 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +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..fbd7a50 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCase; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 数据库套件 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +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..532fe5b --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCaseTable; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 数据库表操作 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +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..0a5be4b --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsMessageQueueRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsMessageQueue; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : MQ管理 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +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..ff6078a --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsParamAdapterRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 数据适配转换 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +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..a2b2e1f --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSocketSuitCaseRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : socket套件 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +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..ed13fa4 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 安全证书 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +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..49ad6c4 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 适配器出入参 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +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..8a76054 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 适配套件 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +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..4230fb5 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitDataDetailRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitDataDetail; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 适配报文详情 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +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..a98d63e --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 适配记录 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +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..687c3ec --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRequestRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRequestRecord; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 请求适配记录 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +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..ea4a12b --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitScheduleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitSchedule; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 定时适配任务 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +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..ec9376a --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitTypeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitType; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 适配类型 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +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..b9eb3b6 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/SuitRecordParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.SuitRecordParam; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 适配记录参数 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +public interface SuitRecordParamRepository extends BaseRepository { + +} + From 7455c6c64069766e8b30c0bcfab8e131b98a5eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 13 Aug 2019 16:24:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java | 11 +++++++++++ .../cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java | 4 ---- .../i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java | 4 ++-- .../{SoftswitchHqlPack.java => SoftSwitchHqlPack.java} | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java rename modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/{SoftswitchHqlPack.java => SoftSwitchHqlPack.java} (96%) 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-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 db7474f..128e256 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 @@ -55,9 +55,5 @@ public class BsDataSource extends BaseBean { @ApiParam(value = "数据源用户描述") private String dataSourceDescription; - @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/BsDataSourceSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java index 7d110cd..e4e9d3c 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 @@ -39,9 +39,9 @@ public class BsDataSourceSuitCase extends BaseBean { @ApiParam(value = "数据源id") private long dataSourceId; - @Column(name = "DATA_SOURCE_ID_RDD") + @Column(name = "DATA_SOURCE_NAME_RDD") @ApiParam(value = "数据源名称") - private String dataSourceIdRdd; + private String dataSourceNameRdd; } 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 96% 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..6d2a268 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 @@ -11,7 +11,7 @@ import org.apache.commons.lang3.StringUtils; * @CreateDate : 2019-02-28 16:05 * @Modify: **/ -public class SoftswitchHqlPack { +public class SoftSwitchHqlPack { /**