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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java

@@ -1643,6 +1643,35 @@ 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 AUTH_LOGIN_STRATEGY {
         ACCOUNT(10, "Default", "defaultLoginStrategy", "账户密码登录"),
         E9(20, "E9", "e9LoginStrategy", "泛微单点登录策略"),

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorMessage.java

@@ -18,9 +18,37 @@ public class DataSeparatorMessage implements Serializable {
 
     private static final long serialVersionUID = -1;
 
+    /**
+     * 需要迁移数据的 id
+     */
     private Long id;
-
+    /**
+     * 迁移数据的关联类
+     */
     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;
+    /**
+     * 目标库名
+     */
+    private String databaseName;
 
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorRule.java

@@ -0,0 +1,68 @@
+package cn.estsh.i3plus.pojo.platform.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2021/12/8 15:33
+ * @Modify:
+ **/
+@Entity
+@Data
+@Table(name = "DATA_SEPARATOR_RULE")
+@Api(value = "迁移数据规则")
+public class DataSeparatorRule extends BaseBean {
+
+
+    @Column(name = "RULE_COLUMN")
+    @ApiParam(value = "迁移数据根据的列名")
+    private String ruleColumn;
+
+    @Column(name = "SYS_SEPARATOR")
+    @ApiParam(value = "操作符，大于，等于，小于")
+    private String separator;
+
+    @Column(name = "RULE")
+    @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;
+
+
+    @Column(name = "TABLE_NAME_DEST")
+    @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 = "DATABASE_NAME")
+    @ApiParam(value = "目标库名")
+    private String databaseName;
+
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/DataSeparatorRepository.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.DataSeparatorRule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2021/12/7 13:27
+ * @Modify:
+ **/
+@Repository
+public interface DataSeparatorRepository extends BaseRepository<DataSeparatorRule,Long> {
+}

modules/i3plus-pojo-screen/pom.xml

@@ -6,6 +6,8 @@
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
         <version>1.0.0.1</version>
+        <relativePath>../../pom.xml</relativePath>
+
     </parent>
     <modelVersion>4.0.0</modelVersion>