AE86 před 4 roky
rodič
revize
cffbd2a07a

+ 15 - 10
dbsyncer-connector/src/main/java/org/dbsyncer/connector/config/Field.java

@@ -1,5 +1,7 @@
 package org.dbsyncer.connector.config;
 
+import org.dbsyncer.common.util.JsonUtil;
+
 /**
  * 字段属性
  *
@@ -32,12 +34,6 @@ public class Field {
     public Field() {
     }
 
-    public Field(String name, String typeName, int type) {
-        this.name = name;
-        this.typeName = typeName;
-        this.type = type;
-    }
-
     public Field(String name, String typeName, int type, boolean pk) {
         this.name = name;
         this.typeName = typeName;
@@ -49,14 +45,26 @@ public class Field {
         return name;
     }
 
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public String getTypeName() {
         return typeName;
     }
 
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
     public int getType() {
         return type;
     }
 
+    public void setType(int type) {
+        this.type = type;
+    }
+
     public boolean isPk() {
         return pk;
     }
@@ -67,9 +75,6 @@ public class Field {
 
     @Override
     public String toString() {
-        return new StringBuilder().append("Field{").append("name='").append(name).append('\'')
-                .append(", typeName='").append(typeName).append('\'')
-                .append(", type=").append(type)
-                .append(", pk=").append(pk).append('}').toString();
+        return JsonUtil.objToJson(this);
     }
 }

+ 16 - 0
dbsyncer-connector/src/main/java/org/dbsyncer/connector/config/Filter.java

@@ -35,15 +35,31 @@ public class Filter {
         return name;
     }
 
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public String getOperation() {
         return operation;
     }
 
+    public void setOperation(String operation) {
+        this.operation = operation;
+    }
+
     public String getFilter() {
         return filter;
     }
 
+    public void setFilter(String filter) {
+        this.filter = filter;
+    }
+
     public String getValue() {
         return value;
     }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
 }

+ 1 - 17
dbsyncer-connector/src/main/java/org/dbsyncer/connector/constant/ConnectorConstant.java

@@ -32,20 +32,4 @@ public class ConnectorConstant {
      */
     public static final String OPERTION_QUERY_COUNT = "QUERY_COUNT";
 
-    /**
-     * 查询最近记录点
-     * <p>例如:SELECT MAX(MY_TEST.LAST_TIME) FROM MY_TEST</p>
-     */
-    public static final String OPERTION_QUERY_MAX = "QUERY_MAX";
-
-    /**
-     * 查询表达式and
-     */
-    public static final String OPERTION_QUERY_AND = "and";
-
-    /**
-     * 查询表达式or
-     */
-    public static final String OPERTION_QUERY_OR = "or";
-
-}
+}

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

@@ -90,13 +90,13 @@ public abstract class AbstractDatabaseConnector implements Database {
         Table table = commandConfig.getTable();
         Map<String, String> map = new HashMap<>();
 
-        String query = SqlBuilderEnum.QUERY.getName();
+        String query = ConnectorConstant.OPERTION_QUERY;
         map.put(query, buildSql(query, table, queryFilterSql));
 
         // 获取查询总数SQL
         StringBuilder queryCount = new StringBuilder();
         String quotation = buildSqlWithQuotation();
-        queryCount.append("select count(*) from ").append(quotation).append(table.getName()).append(quotation);
+        queryCount.append("SELECT COUNT(*) FROM ").append(quotation).append(table.getName()).append(quotation);
         if (StringUtils.isNotBlank(queryFilterSql)) {
             queryCount.append(queryFilterSql);
         }

+ 17 - 1
dbsyncer-parser/src/main/java/org/dbsyncer/parser/model/Convert.java

@@ -42,15 +42,31 @@ public class Convert {
         return name;
     }
 
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public String getConvertName() {
         return convertName;
     }
 
+    public void setConvertName(String convertName) {
+        this.convertName = convertName;
+    }
+
     public String getConvertCode() {
         return convertCode;
     }
 
+    public void setConvertCode(String convertCode) {
+        this.convertCode = convertCode;
+    }
+
     public String getArgs() {
         return args;
     }
-}
+
+    public void setArgs(String args) {
+        this.args = args;
+    }
+}

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

@@ -94,7 +94,6 @@ public class TestController implements InitializingBean {
 
     @Override
     public void afterPropertiesSet() {
-        logger.info("123");
         // 初始化拦截mapping
         initHandlerMapping();
         // 添加解析器