From b81b9c569d766d214dc817e79c3ceabe5292e342 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Thu, 13 Jan 2022 09:58:16 +0800 Subject: [PATCH 1/2] =?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--=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 1 + .../estsh/i3plus/pojo/platform/bean/DataSeparatorMessage.java | 11 ++++++++--- .../cn/estsh/i3plus/pojo/platform/bean/DataSeparatorRule.java | 10 ++++++---- .../estsh/i3plus/pojo/wms/bean/datasource/CusDatasource.java | 4 +++- .../i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 4 ++-- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index c32f579..b97d606 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -32,6 +32,7 @@ public class CommonEnumUtil { * Mes 服务 */ MES(4, 8300, 11, 103000000L, "i3mes", "生产管理软件"), + MES_HISTORY(4,8310,11,103000010L,"i3mes-history","生产管理软件历史数据"), MES_PCN(6, 8350, 12, 107000000L, "i3mes-pcn", "生产管理软件-节点中心"), /** 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 29ffded..083359b 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 @@ -22,11 +22,11 @@ public class DataSeparatorMessage implements Serializable { * 需要迁移数据的 id */ private Long id; + /** - * 迁移数据的关联类 + * 迁移数据的原表 */ - private String refClass; - + private String srcTableName; /** * 目标迁移的表名 */ @@ -36,4 +36,9 @@ public class DataSeparatorMessage implements Serializable { * 目的地数据源id */ private Long destDataSourceId; + /** + * 来源数据源 + */ + private Long srcDataSourceId; + } 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 95b0b2a..4e5caa2 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,10 +35,9 @@ public class DataSeparatorRule extends BaseBean { @ApiParam(value = "具体的数字，作为迁移标准") private String rule; - @Column(name = "REF_BEAN_NAME") - @ApiParam(value = "迁移的类的名称") - private String refBeanName; - + @Column(name = "TABLE_NAME_SRC") + @ApiParam(value = "迁移源表名") + private String tableNameSrc; @Column(name = "TABLE_NAME_DEST") @ApiParam(value = "迁移目的地的表名") @@ -48,5 +47,8 @@ public class DataSeparatorRule extends BaseBean { @ApiParam(value = "目的数据源id") private Long destDataSourceId; + @Column(name = "SRC_DATA_SOURCE_ID") + @ApiParam(value = "来源数据源id") + private Long srcDataSourceId; } 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 6e0d709..c7ab33d 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 @@ -19,7 +19,6 @@ import javax.persistence.Table; * @Modify: **/ @Data -@NoArgsConstructor @DynamicInsert @DynamicUpdate @Entity @@ -86,4 +85,7 @@ public class CusDatasource extends BaseBean { this.id = id; this.sourceName = sourceName; } + + public CusDatasource() { + } } 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 bc98a06..871f531 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 @@ -52,12 +52,12 @@ public class WmsInterfaceDataMapper extends BaseBean { /** * 目标数据源id */ - @Column(name = "DEST_DATA_SOURCE_ID)") + @Column(name = "DEST_DATA_SOURCE_ID") public Long destDatasourceId; /** * 来源数据源id */ - @Column(name = "SRC_DATA_SOURCE_ID)") + @Column(name = "SRC_DATA_SOURCE_ID") public Long srcDatasourceId; /** * 来源表名 From c9535bf555251339969c4f7787ea0f659bde0330 Mon Sep 17 00:00:00 2001 From: nies Date: Thu, 13 Jan 2022 11:37:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E7=B1=BB=E5=9E=8BEAM=20=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index b97d606..ced42c6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -69,6 +69,7 @@ public class CommonEnumUtil { APS_3(38, 18400, 26, 190000000L, "i3aps-3", "高级计划与排产-3"), APS_4(48, 8400, 27, 200000000L, "i3aps-4", "高级计划与排产-4"), SURFACE(98, 0, 0, 0, "i3surface", "对外服务"), + EAM(108, 8500, 28, 210000000L, "eam", "设备信息管理服务"), /** * 基础服务