AE86 5 anos atrás
pai
commit
7007c9e127

+ 8 - 0
dbsyncer-biz/src/main/java/org/dbsyncer/biz/MappingService.java

@@ -1,6 +1,7 @@
 package org.dbsyncer.biz;
 package org.dbsyncer.biz;
 
 
 import org.dbsyncer.biz.vo.MappingVo;
 import org.dbsyncer.biz.vo.MappingVo;
+import org.dbsyncer.parser.model.TableGroup;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
@@ -62,4 +63,11 @@ public interface MappingService {
      */
      */
     boolean stop(String id);
     boolean stop(String id);
 
 
+    /**
+     * 获取驱动数据源和目标源表公共字段
+     *
+     * @return
+     */
+    TableGroup getTableGroup();
+
 }
 }

+ 0 - 2
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/mapping/MappingChecker.java

@@ -6,10 +6,8 @@ package org.dbsyncer.biz.checker.impl.mapping;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.dbsyncer.biz.checker.AbstractChecker;
 import org.dbsyncer.biz.checker.AbstractChecker;
-import org.dbsyncer.biz.checker.ConnectorConfigChecker;
 import org.dbsyncer.biz.checker.MappingConfigChecker;
 import org.dbsyncer.biz.checker.MappingConfigChecker;
 import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.common.util.JsonUtil;
-import org.dbsyncer.listener.config.ListenerConfig;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.parser.constant.ModelConstant;
 import org.dbsyncer.parser.constant.ModelConstant;
 import org.dbsyncer.parser.model.Mapping;
 import org.dbsyncer.parser.model.Mapping;

+ 0 - 2
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/mapping/TimingConfigChecker.java

@@ -5,12 +5,10 @@ package org.dbsyncer.biz.checker.impl.mapping;
 
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.dbsyncer.biz.checker.MappingConfigChecker;
 import org.dbsyncer.biz.checker.MappingConfigChecker;
-import org.dbsyncer.listener.config.ListenerConfig;
 import org.dbsyncer.listener.config.TimingListenerConfig;
 import org.dbsyncer.listener.config.TimingListenerConfig;
 import org.dbsyncer.parser.model.Mapping;
 import org.dbsyncer.parser.model.Mapping;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
-import java.util.Arrays;
 import java.util.Map;
 import java.util.Map;
 
 
 /**
 /**

+ 0 - 6
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/tablegroup/TableGroupChecker.java

@@ -3,15 +3,9 @@
  */
  */
 package org.dbsyncer.biz.checker.impl.tablegroup;
 package org.dbsyncer.biz.checker.impl.tablegroup;
 
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
 import org.dbsyncer.biz.checker.AbstractChecker;
 import org.dbsyncer.biz.checker.AbstractChecker;
 import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.common.util.JsonUtil;
-import org.dbsyncer.listener.config.ListenerConfig;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.manager.Manager;
-import org.dbsyncer.parser.constant.ModelConstant;
-import org.dbsyncer.parser.model.ConfigModel;
-import org.dbsyncer.parser.model.Mapping;
 import org.dbsyncer.parser.model.TableGroup;
 import org.dbsyncer.parser.model.TableGroup;
 import org.dbsyncer.storage.constant.ConfigConstant;
 import org.dbsyncer.storage.constant.ConfigConstant;
 import org.slf4j.Logger;
 import org.slf4j.Logger;

+ 0 - 2
dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/ConnectorServiceImpl.java

@@ -3,9 +3,7 @@ package org.dbsyncer.biz.impl;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.dbsyncer.biz.ConnectorService;
 import org.dbsyncer.biz.ConnectorService;
 import org.dbsyncer.biz.checker.Checker;
 import org.dbsyncer.biz.checker.Checker;
-import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.manager.Manager;
-import org.dbsyncer.parser.model.ConfigModel;
 import org.dbsyncer.parser.model.Connector;
 import org.dbsyncer.parser.model.Connector;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;

+ 18 - 1
dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/MappingServiceImpl.java

@@ -5,12 +5,14 @@ import org.dbsyncer.biz.checker.Checker;
 import org.dbsyncer.biz.vo.MappingVo;
 import org.dbsyncer.biz.vo.MappingVo;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.common.util.JsonUtil;
+import org.dbsyncer.connector.config.Field;
+import org.dbsyncer.connector.config.Table;
 import org.dbsyncer.listener.config.TimingListenerConfig;
 import org.dbsyncer.listener.config.TimingListenerConfig;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.parser.constant.ModelConstant;
 import org.dbsyncer.parser.constant.ModelConstant;
-import org.dbsyncer.parser.model.ConfigModel;
 import org.dbsyncer.parser.model.Connector;
 import org.dbsyncer.parser.model.Connector;
 import org.dbsyncer.parser.model.Mapping;
 import org.dbsyncer.parser.model.Mapping;
+import org.dbsyncer.parser.model.TableGroup;
 import org.dbsyncer.storage.constant.ConfigConstant;
 import org.dbsyncer.storage.constant.ConfigConstant;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
@@ -101,6 +103,21 @@ public class MappingServiceImpl implements MappingService {
         return true;
         return true;
     }
     }
 
 
+    @Override
+    public TableGroup getTableGroup() {
+        // TODO 模拟测试
+        TableGroup tableGroup = new TableGroup();
+        Table table = new Table();
+        List<Field> fields = new ArrayList<>();
+        fields.add(new Field("ID","VARCHAR",12));
+        fields.add(new Field("NAME","VARCHAR",12));
+        table.setColumn(fields);
+        tableGroup.setSourceTable(table);
+        tableGroup.setTargetTable(table);
+
+        return tableGroup;
+    }
+
     private MappingVo convertMapping2Vo(Mapping mapping) {
     private MappingVo convertMapping2Vo(Mapping mapping) {
         Assert.notNull(mapping, "Mapping can not be null.");
         Assert.notNull(mapping, "Mapping can not be null.");
         Connector s = manager.getConnector(mapping.getSourceConnectorId());
         Connector s = manager.getConnector(mapping.getSourceConnectorId());

+ 0 - 1
dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/TableGroupServiceImpl.java

@@ -6,7 +6,6 @@ import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.connector.config.MetaInfo;
 import org.dbsyncer.connector.config.MetaInfo;
 import org.dbsyncer.connector.config.Table;
 import org.dbsyncer.connector.config.Table;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.manager.Manager;
-import org.dbsyncer.parser.model.ConfigModel;
 import org.dbsyncer.parser.model.Mapping;
 import org.dbsyncer.parser.model.Mapping;
 import org.dbsyncer.parser.model.TableGroup;
 import org.dbsyncer.parser.model.TableGroup;
 import org.slf4j.Logger;
 import org.slf4j.Logger;

+ 1 - 0
dbsyncer-web/src/main/java/org/dbsyncer/web/controller/index/MappingController.java

@@ -45,6 +45,7 @@ public class MappingController extends BaseController {
     @GetMapping("/page/{page}")
     @GetMapping("/page/{page}")
     public String page(ModelMap model, @PathVariable("page") String page, @RequestParam(value = "id") String id) {
     public String page(ModelMap model, @PathVariable("page") String page, @RequestParam(value = "id") String id) {
         model.put("mapping", mappingService.getMapping(id));
         model.put("mapping", mappingService.getMapping(id));
+        model.put("tableGroup", mappingService.getTableGroup());
         model.put("tableGroups", tableGroupService.getTableGroupAll(id));
         model.put("tableGroups", tableGroupService.getTableGroupAll(id));
         initConfig(model);
         initConfig(model);
         return "mapping/" + page;
         return "mapping/" + page;