AE86 4 年之前
父節點
當前提交
1d3eab363a

+ 4 - 7
dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/MappingServiceImpl.java

@@ -20,10 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -193,13 +190,13 @@ public class MappingServiceImpl extends BaseServiceImpl implements MappingServic
         Mapping mapping = (Mapping) model;
         Connector s = manager.getConnector(mapping.getSourceConnectorId());
         Connector t = manager.getConnector(mapping.getTargetConnectorId());
-        List<String> sTables = s.getTable();
-        List<String> tTables = t.getTable();
-        if (CollectionUtils.isEmpty(sTables) || CollectionUtils.isEmpty(tTables)) {
+        if (CollectionUtils.isEmpty(s.getTable()) || CollectionUtils.isEmpty(t.getTable())) {
             return;
         }
 
         // 存在交集
+        List<String> sTables = new LinkedList<>(s.getTable());
+        List<String> tTables = new LinkedList<>(t.getTable());
         sTables.retainAll(tTables);
         if (!CollectionUtils.isEmpty(sTables)) {
             Map<String, String> params = new HashMap<>();

+ 4 - 2
dbsyncer-connector/src/main/java/org/dbsyncer/connector/database/AbstractDatabaseConnector.java

@@ -199,7 +199,7 @@ public abstract class AbstractDatabaseConnector implements Database {
             // 3、设置参数
             jdbcTemplate.batchUpdate(insertSql, new BatchPreparedStatementSetter() {
                 @Override
-                public void setValues(PreparedStatement preparedStatement, int i) throws SQLException {
+                public void setValues(PreparedStatement preparedStatement, int i) {
                     batchRowsSetter(preparedStatement, fields, fSize, data.get(i));
                 }
 
@@ -301,7 +301,9 @@ public abstract class AbstractDatabaseConnector implements Database {
         MetaInfo metaInfo = getDqlMetaInfo(config);
         Assert.notNull(metaInfo, "SQL解析异常.");
         DatabaseConfig cfg = (DatabaseConfig) config;
-        return Arrays.asList(cfg.getSql());
+        List<String> tables = new ArrayList<>();
+        tables.add(cfg.getSql());
+        return tables;
     }
 
     /**