From 41aff3b56072181ea4729ed595069e6729dd2ce9 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Mon, 19 Aug 2019 11:53:34 +0800
Subject: [PATCH 1/2] ``
---
.../java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java | 8 ++++++++
.../estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java | 6 +++---
.../java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
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..58bb4ae 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,6 +31,14 @@ 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;
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..75ed494 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
@@ -35,9 +35,9 @@ public class BsDataSourceSuitCase extends BaseBean {
@ApiParam(value = "数据源套件模式(枚举,被动读,主动写)")
private int 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/BsSuitType.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java
index 576c4f1..26aa382 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 int suitCaseNum = 0;
}
From 94924cb26464a6498d7bcd137c1024a58c5cc4a2 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Mon, 19 Aug 2019 13:10:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?POJO=20=20=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/i3plus-pojo-model/pom.xml | 4 ++++
pom.xml | 6 ++++++
2 files changed, 10 insertions(+)
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/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