Merge remote-tracking branch 'origin/ext-dev' into ext-dev

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", "生产管理软件-节点中心"),
 
         /**
@@ -68,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", "设备信息管理服务"),
 
         /**
          * 基础服务

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;
+
 }

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")
+    @Column(name = "TABLE_NAME_SRC")
-    @ApiParam(value = "迁移的类的名称")
+    @ApiParam(value = "迁移源表名")
-    private String refBeanName;
+    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;
 
 }

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() {
+    }
 }

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;
     /**
      * 来源表名