From c2437fd00f22ef138716f43945c5b04c6d25a92c Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 7 Jan 2022 10:03:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=98=A0=E5=B0=84bean?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 79 +++++++++++++++++++ .../pojo/wms/bean/datasource/CusDatasource.java | 89 ++++++++++++++++++++++ .../wms/dbinterface/WmsInterfaceDataMapper.java | 10 +++ .../wms/repository/CusDatasourceRepository.java | 16 ++++ .../WmsInterfaceDataMapperRepository.java | 1 - 5 files changed, 194 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/datasource/CusDatasource.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/CusDatasourceRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 8ef2a14..d139dda 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -9747,6 +9747,85 @@ public class WmsEnumUtil { return valueOf(val); } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_SOURCE_STATUS { + CONN_SUCCESS(10, "连接成功", "连接成功"), + CONN_FAILURE(20, "连接失败", "连接失败"); + + private int value; + private String code; + private String description; + + private DATA_SOURCE_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + 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; + } + + public static WmsEnumUtil.DATA_SOURCE_STATUS valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/datasource/CusDatasource.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/datasource/CusDatasource.java new file mode 100644 index 0000000..c15859c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/datasource/CusDatasource.java @@ -0,0 +1,89 @@ +package cn.estsh.i3plus.pojo.wms.bean.datasource; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; +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 : Castle + * @CreateDate : 2021/12/17 10:26 + * @Modify: + **/ +@Data +@NoArgsConstructor +@DynamicInsert +@DynamicUpdate +@Entity +@Table(name = "wms_cus_datasource") +public class CusDatasource extends BaseBean { + @Column( + name = "SOURCE_NAME" + ) + @ApiParam("数据源名称") + private String sourceName; + @Column( + name = "SOURCE_CODE" + ) + @ApiParam("数据源编码") + private String sourceCode; + @Column( + name = "SOURCE_STATUS" + ) + @ApiParam( + value = "数据源状态", + name = "状态：可用，不可用 看枚举当中是否存在" + ) + private Integer sourceStatus; + @Column( + name = "SOURCE_TYPE" + ) + @ApiParam( + value = "数据源类型", + name = "BlockFormEnumUtil.DATA_SOURCE_TYPE" + ) + private Integer sourceType; + @Column( + name = "SOURCE_HOST" + ) + @ApiParam("数据源连接地址") + private String sourceHost; + @Column( + name = "SOURCE_PORT" + ) + @ApiParam("数据源端口") + private Integer sourcePort; + @Column( + name = "SOURCE_DATA_BASE_NAME" + ) + @ApiParam("数据库名称") + private String sourceDataBaseName; + @Column( + name = "SOURCE_USER_NAME" + ) + @ApiParam("数据库用户名称") + private String sourceUserName; + @Column( + name = "SOURCE_PASSWORD" + ) + @ApiParam("数据库用户密码") + private String sourcePassword; + @Column( + name = "SOURCE_DESCRIPTION" + ) + @ApiParam("数据源描述") + private String sourceDescription; + + public CusDatasource(Long id, String sourceCode) { + this.id = id; + this.sourceCode = sourceCode; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index bb92ad8..bc98a06 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -50,6 +50,16 @@ public class WmsInterfaceDataMapper extends BaseBean { @Column(name = "SRC_DATA_SOURCE", length = 50) public String dataSource; /** + * 目标数据源id + */ + @Column(name = "DEST_DATA_SOURCE_ID)") + public Long destDatasourceId; + /** + * 来源数据源id + */ + @Column(name = "SRC_DATA_SOURCE_ID)") + public Long srcDatasourceId; + /** * 来源表名 */ @Column(name = "SRC_TABLE_NAME", length = 50) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/CusDatasourceRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/CusDatasourceRepository.java new file mode 100644 index 0000000..aaf5cd3 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/CusDatasourceRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.datasource.CusDatasource; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/12/21 13:33 + * @Modify: + **/ +@Repository +public interface CusDatasourceRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataMapperRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataMapperRepository.java index 4b3a5a8..2b75b20 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataMapperRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataMapperRepository.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.AmpJisRec; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import org.springframework.stereotype.Repository; From 94c61f77f4befeead63e7c5434e50634fb1482e8 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 7 Jan 2022 15:28:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=86=B7=E7=83=AD=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=86=E7=A6=BB--=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 56 +++++++------- .../i3plus/pojo/platform/bean/CoreDataSource.java | 90 ++++++++++++++++++++++ .../pojo/platform/bean/DataSeparatorMessage.java | 23 +----- .../pojo/platform/bean/DataSeparatorRule.java | 22 +----- .../repository/CoreDataSourceRepository.java | 16 ++++ .../pojo/wms/bean/datasource/CusDatasource.java | 4 +- 6 files changed, 143 insertions(+), 68 deletions(-) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/CoreDataSource.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/CoreDataSourceRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 2bd2a28..db6d931 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1642,34 +1642,34 @@ public class ImppEnumUtil { } } - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum DATA_SEPARATOR_STRATEGY{ - MYSQL(10,"mysql","dataSeparatorStrategyMysql","迁移数据到mysql"); - private final int value; - private final String code; - private final String strategyName; - private final String description; - DATA_SEPARATOR_STRATEGY(int value,String code,String strategyName,String description){ - this.value = value; - this.code = code; - this.strategyName = strategyName; - this.description = description; - } - - public String getCode() { - return code; - } - - public static String codeOfStrategyName(String code) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { - tmp = values()[i].strategyName; - } - } - return tmp; - } - } +// @JsonFormat(shape = JsonFormat.Shape.OBJECT) +// public enum DATA_SEPARATOR_STRATEGY{ +// MYSQL(10,"mysql","dataSeparatorStrategyMysql","迁移数据到mysql"); +// private final int value; +// private final String code; +// private final String strategyName; +// private final String description; +// DATA_SEPARATOR_STRATEGY(int value,String code,String strategyName,String description){ +// this.value = value; +// this.code = code; +// this.strategyName = strategyName; +// this.description = description; +// } +// +// public String getCode() { +// return code; +// } +// +// public static String codeOfStrategyName(String code) { +// String tmp = null; +// for (int i = 0; i < values().length; i++) { +// if (values()[i].code.equals(code)) { +// tmp = values()[i].strategyName; +// } +// } +// return tmp; +// } +// } @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AUTH_LOGIN_STRATEGY { diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/CoreDataSource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/CoreDataSource.java new file mode 100644 index 0000000..f89de70 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/CoreDataSource.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; +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 : Castle + * @CreateDate : 2022/1/7 10:44 + * @Modify: + **/ +@Data +@NoArgsConstructor +@DynamicInsert +@DynamicUpdate +@Entity +@Table(name = "ORE_DATA_SOURCE") +public class CoreDataSource extends BaseBean{ + @Column( + name = "SOURCE_NAME" + ) + @ApiParam("数据源名称") + private String sourceName; + @Column( + name = "SOURCE_CODE" + ) + @ApiParam("数据源编码") + private String sourceCode; + @Column( + name = "SOURCE_STATUS" + ) + @ApiParam( + value = "数据源状态", + name = "状态：可用，不可用 看枚举当中是否存在" + ) + private Integer sourceStatus; + @Column( + name = "SOURCE_TYPE" + ) + @ApiParam( + value = "数据源类型", + name = "BlockFormEnumUtil.DATA_SOURCE_TYPE" + ) + private Integer sourceType; + @Column( + name = "SOURCE_HOST" + ) + @ApiParam("数据源连接地址") + private String sourceHost; + @Column( + name = "SOURCE_PORT" + ) + @ApiParam("数据源端口") + private Integer sourcePort; + @Column( + name = "SOURCE_DATA_BASE_NAME" + ) + @ApiParam("数据库名称") + private String sourceDataBaseName; + @Column( + name = "SOURCE_USER_NAME" + ) + @ApiParam("数据库用户名称") + private String sourceUserName; + @Column( + name = "SOURCE_PASSWORD" + ) + @ApiParam("数据库用户密码") + private String sourcePassword; + @Column( + name = "SOURCE_DESCRIPTION" + ) + @ApiParam("数据源描述") + private String sourceDescription; + + public CoreDataSource(Long id, String sourceName) { + this.id = id; + this.sourceCode = sourceName; + } + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorMessage.java index 5744d4c..29ffded 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorMessage.java @@ -26,29 +26,14 @@ public class DataSeparatorMessage implements Serializable { * 迁移数据的关联类 */ private String refClass; - /** - * 需要迁移到的目的地，eg: mysql,sqlServer,es等 - */ - private String destUrl; - /** - * 目标迁移位置的的账号 - */ - private String userName; - /** - * 目标迁移位置的密码 - */ - private String password; + /** * 目标迁移的表名 */ private String destTableName; + /** - * 迁移的类型，是迁移到es，mysql,sqlserver等 - */ - private String classification; - /** - * 目标库名 + * 目的地数据源id */ - private String databaseName; - + private Long destDataSourceId; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorRule.java index 9777350..95b0b2a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorRule.java @@ -35,11 +35,6 @@ public class DataSeparatorRule extends BaseBean { @ApiParam(value = "具体的数字，作为迁移标准") private String rule; - - @Column(name = "CLASSIFICATION") - @ApiParam(value = "迁移分类，是迁移到mysql,sqlserver,ES 等做区分") - private String classification; - @Column(name = "REF_BEAN_NAME") @ApiParam(value = "迁移的类的名称") private String refBeanName; @@ -49,20 +44,9 @@ public class DataSeparatorRule extends BaseBean { @ApiParam(value = "迁移目的地的表名") private String tableNameDest; - @Column(name = "IP") - @ApiParam(value = "目标位置的ip") - private String ip; - - @Column(name = "USER_NAME") - @ApiParam(value = "目标库的用户名") - private String userName; - - @Column(name = "PASSWORD") - @ApiParam(value = "目标库的密码") - private String password; + @Column(name = "DEST_DATA_SOURCE_ID") + @ApiParam(value = "目的数据源id") + private Long destDataSourceId; - @Column(name = "DATABASE_NAME") - @ApiParam(value = "目标库名") - private String databaseName; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/CoreDataSourceRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/CoreDataSourceRepository.java new file mode 100644 index 0000000..77f99d9 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/CoreDataSourceRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.CoreDataSource; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/1/7 13:18 + * @Modify: + **/ +@Repository +public interface CoreDataSourceRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/datasource/CusDatasource.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/datasource/CusDatasource.java index c15859c..6e0d709 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/datasource/CusDatasource.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/datasource/CusDatasource.java @@ -82,8 +82,8 @@ public class CusDatasource extends BaseBean { @ApiParam("数据源描述") private String sourceDescription; - public CusDatasource(Long id, String sourceCode) { + public CusDatasource(Long id, String sourceName) { this.id = id; - this.sourceCode = sourceCode; + this.sourceName = sourceName; } } From d21cc0273993b1ec2b1fcc85974e5e526028439f Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Mon, 10 Jan 2022 11:37:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=81=A5=E5=BA=B7?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8F=98=E9=87=8F=EF=BC=8C=E5=91=A8=E6=9C=9F?= =?UTF-8?q?=E5=92=8C=E8=AE=A1=E7=AE=97=E9=A2=91=E6=AC=A1=E6=8D=A2=E6=88=90?= =?UTF-8?q?corn=E8=A1=A8=E8=BE=BE=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java index 5d078f4..348b704 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java @@ -47,14 +47,14 @@ public class WmsHealthVariable extends BaseBean { private String variableName; @Column(name = "CYCLE_RANGE") - @ApiParam(value = "周期(天)") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) - private Integer cycleRange; + @ApiParam(value = "周期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String cycleRange; @Column(name = "CALC_FREQUENCY") - @ApiParam(value = "计算频次(天)") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) - private Integer calcFrequency; + @ApiParam(value = "计算频次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String calcFrequency; @Column(name = "LAST_CALC_TIME") @ApiParam(value = "末次计算时间")