From 81a2b4753e388e6061ee4061ff9539cf8acee395 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 14 Dec 2021 15:26:33 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E5=99=A8=E6=94=AF=E6=8C=81and=E3=80=81or=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/provider/query/QueryProvider.java    | 12 ++++++++++++
 .../dataease/provider/query/ck/CKQueryProvider.java  | 10 ----------
 .../provider/query/db2/Db2QueryProvider.java         | 10 ----------
 .../provider/query/doris/DorisQueryProvider.java     | 10 ----------
 .../dataease/provider/query/es/EsQueryProvider.java  | 10 ----------
 .../provider/query/hive/HiveQueryProvider.java       | 10 ----------
 .../provider/query/mongodb/MongoQueryProvider.java   | 10 ----------
 .../provider/query/mysql/MysqlQueryProvider.java     | 10 ----------
 .../provider/query/oracle/OracleQueryProvider.java   | 10 ----------
 .../dataease/provider/query/pg/PgQueryProvider.java  | 10 ----------
 .../query/redshift/RedshiftQueryProvider.java        | 10 ----------
 .../query/sqlserver/SqlserverQueryProvider.java      | 10 ----------
 12 files changed, 12 insertions(+), 110 deletions(-)

diff --git a/backend/src/main/java/io/dataease/provider/query/QueryProvider.java b/backend/src/main/java/io/dataease/provider/query/QueryProvider.java
index 894d317d9e..8716317f0b 100644
--- a/backend/src/main/java/io/dataease/provider/query/QueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/QueryProvider.java
@@ -78,4 +78,16 @@ public abstract class QueryProvider {
     public String convertTableToSql(String tableName, Datasource ds) {
         return "select * from  TABLE_NAME".replace("TABLE_NAME", tableName);
     }
+
+    public String getLogic(String logic) {
+        if (logic != null) {
+            switch (logic) {
+                case "and":
+                    return "AND";
+                case "or":
+                    return "OR";
+            }
+        }
+        return "AND";
+    }
 }
diff --git a/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
index 6c0200c5c3..9b73bd8fef 100644
--- a/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
@@ -1102,14 +1102,4 @@ public class CKQueryProvider extends QueryProvider {
             return sql;
         }
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }
diff --git a/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java b/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java
index 2bf85cde47..eeaefb2ef2 100644
--- a/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java
@@ -1034,14 +1034,4 @@ public class Db2QueryProvider extends QueryProvider {
             return sql;
         }
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }
diff --git a/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java
index 3d14ad7fe9..5485ff430b 100644
--- a/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java
@@ -1080,14 +1080,4 @@ public class DorisQueryProvider extends QueryProvider {
             return sql;
         }
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }
diff --git a/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java
index 0eae4242d9..a8e42128de 100644
--- a/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java
@@ -990,14 +990,4 @@ public class EsQueryProvider extends QueryProvider {
             return sql;
         }
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }
diff --git a/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
index 15cbcae957..8a8293e6a0 100644
--- a/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
@@ -1055,14 +1055,4 @@ public class HiveQueryProvider extends QueryProvider {
             return sql;
         }
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }
diff --git a/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java
index 6cd5d84c02..ae50621c29 100644
--- a/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java
@@ -944,14 +944,4 @@ public class MongoQueryProvider extends QueryProvider {
             return sql;
         }
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }
diff --git a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
index 07cbbe6a64..e893451d5f 100644
--- a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
@@ -1058,14 +1058,4 @@ public class MysqlQueryProvider extends QueryProvider {
             return sql;
         }
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }
diff --git a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
index 76e3313ff4..6df28b1841 100644
--- a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
@@ -1131,14 +1131,4 @@ public class OracleQueryProvider extends QueryProvider {
             return sql;
         }
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }
diff --git a/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
index 46982dd15c..67d19614e0 100644
--- a/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
@@ -1047,14 +1047,4 @@ public class PgQueryProvider extends QueryProvider {
             return sql;
         }
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }
diff --git a/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java
index afeded3a65..7fdd3af2c7 100644
--- a/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java
@@ -974,14 +974,4 @@ public class RedshiftQueryProvider extends QueryProvider {
             return sql;
         }
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }
diff --git a/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
index 8a534ffabb..da2e5cbed6 100644
--- a/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
@@ -1089,14 +1089,4 @@ public class SqlserverQueryProvider extends QueryProvider {
         }
         return originField;
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }