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] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=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 { /**