diff --git a/backend/src/main/java/io/dataease/commons/constants/DatasourceTypes.java b/backend/src/main/java/io/dataease/commons/constants/DatasourceTypes.java deleted file mode 100644 index 6e5dd1fb08..0000000000 --- a/backend/src/main/java/io/dataease/commons/constants/DatasourceTypes.java +++ /dev/null @@ -1,68 +0,0 @@ -package io.dataease.commons.constants; - -public enum DatasourceTypes { - excel("excel", "excel", "", "", "", "", ""), - mysql("mysql", "mysql", "com.mysql.jdbc.Driver", "`", "`", "'", "'"), - hive("hive", "hive", "org.apache.hive.jdbc.HiveDriver", "`", "`", "'", "'"), - impala("impala", "impala", "org.apache.hive.jdbc.HiveDriver", "`", "`", "'", "'"), - mariadb("mariadb", "mariadb", "com.mysql.jdbc.Driver", "`", "`", "'", "'"), - ds_doris("ds_doris", "ds_doris", "com.mysql.jdbc.Driver", "`", "`", "'", "'"), - pg("pg", "pg", "org.postgresql.Driver", "\"", "\"", "\"", "\""), - sqlServer("sqlServer", "sqlServer", "com.microsoft.sqlserver.jdbc.SQLServerDriver", "\"", "\"", "\"", "\""), - oracle("oracle", "oracle", "oracle.jdbc.driver.OracleDriver", "\"", "\"", "\"", "\""), - mongo("mongo", "mongodb", "com.mongodb.jdbc.MongoDriver", "`", "`", "\"", "\""), - ck("ch", "ch", "ru.yandex.clickhouse.ClickHouseDriver", "`", "`", "'", "'"), - db2("db2", "db2", "com.ibm.db2.jcc.DB2Driver", "\"", "\"", "\"", "\""), - es("es", "es", "", "\"", "\"", "\"", "\""), - redshift("redshift", "redshift", "org.postgresql.Driver", "\"", "\"", "\"", "\""), - api("api", "api", "", "\"", "\"", "\"", "\""), - engine_doris("engine_doris", "engine_doris", "com.mysql.jdbc.Driver", "`", "`", "", ""), - engine_mysql("mysql", "mysql", "com.mysql.jdbc.Driver", "`", "`", "'", "'"); - - - private String feature; - private String desc; - private String driver; - private String keywordPrefix; - private String keywordSuffix; - private String aliasPrefix; - private String aliasSuffix; - - DatasourceTypes(String feature, String desc, String driver, String keywordPrefix, String keywordSuffix, String aliasPrefix, String aliasSuffix) { - this.feature = feature; - this.desc = desc; - this.driver = driver; - this.keywordPrefix = keywordPrefix; - this.keywordSuffix = keywordSuffix; - this.aliasPrefix = aliasPrefix; - this.aliasSuffix = aliasSuffix; - } - - public String getFeature() { - return feature; - } - - public String getDesc() { - return desc; - } - - public String getDriver() { - return driver; - } - - public String getKeywordPrefix() { - return keywordPrefix; - } - - public String getKeywordSuffix() { - return keywordSuffix; - } - - public String getAliasPrefix() { - return aliasPrefix; - } - - public String getAliasSuffix() { - return aliasSuffix; - } -} diff --git a/backend/src/main/java/io/dataease/provider/ProviderFactory.java b/backend/src/main/java/io/dataease/provider/ProviderFactory.java index b874513dc2..42c6091bc6 100644 --- a/backend/src/main/java/io/dataease/provider/ProviderFactory.java +++ b/backend/src/main/java/io/dataease/provider/ProviderFactory.java @@ -1,6 +1,6 @@ package io.dataease.provider; -import io.dataease.commons.constants.DatasourceTypes; +import io.dataease.plugins.common.constants.DatasourceTypes; import io.dataease.provider.datasource.DatasourceProvider; import io.dataease.provider.query.api.ApiProvider; import org.springframework.beans.BeansException; diff --git a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java index eac13d4f2d..af64cfca60 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java @@ -5,11 +5,11 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.wall.WallFilter; import com.google.gson.Gson; -import io.dataease.commons.constants.DatasourceTypes; import io.dataease.controller.request.datasource.DatasourceRequest; import io.dataease.dto.datasource.*; import io.dataease.exception.DataEaseException; import io.dataease.i18n.Translator; +import io.dataease.plugins.common.constants.DatasourceTypes; import io.dataease.provider.ProviderFactory; import io.dataease.provider.QueryProvider; import org.apache.commons.lang3.StringUtils; diff --git a/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlConstants.java b/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlConstants.java index badf689d39..93ddac560c 100644 --- a/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlConstants.java +++ b/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlConstants.java @@ -3,7 +3,8 @@ package io.dataease.provider.engine.mysql; import io.dataease.plugins.common.constants.SQLConstants; -import static io.dataease.commons.constants.DatasourceTypes.engine_mysql; +import static io.dataease.plugins.common.constants.DatasourceTypes.engine_mysql; +import static io.dataease.plugins.common.constants.DatasourceTypes.engine_mysql; /** * @Author gin diff --git a/backend/src/main/java/io/dataease/provider/query/impala/ImpalaConstants.java b/backend/src/main/java/io/dataease/provider/query/impala/ImpalaConstants.java deleted file mode 100644 index a7ffdc6824..0000000000 --- a/backend/src/main/java/io/dataease/provider/query/impala/ImpalaConstants.java +++ /dev/null @@ -1,39 +0,0 @@ -package io.dataease.provider.query.impala; - -import io.dataease.provider.SQLConstants; - -import static io.dataease.commons.constants.DatasourceTypes.mysql; - -public class ImpalaConstants extends SQLConstants { - public static final String KEYWORD_TABLE = mysql.getKeywordPrefix() + "%s" + mysql.getKeywordSuffix(); - - public static final String KEYWORD_FIX = "%s." + mysql.getKeywordPrefix() + "%s" + mysql.getKeywordSuffix(); - - public static final String UNIX_TIMESTAMP = "unix_timestamp(%s)"; - - public static final String DATE_FORMAT = "from_unixtime(UNIX_TIMESTAMP(%s), '%s')"; - - public static final String FROM_UNIXTIME = "FROM_UNIXTIME(%s,'%s')"; - - public static final String STR_TO_DATE = "STR_TO_DATE(%s,'%s')"; - - public static final String CAST = "CAST(%s AS %s)"; - - public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; - - public static final String DEFAULT_INT_FORMAT = "BIGINT"; - - public static final String DEFAULT_FLOAT_FORMAT = "DECIMAL(20,2)"; - - public static final String WHERE_VALUE_NULL = "(NULL,'')"; - - public static final String WHERE_VALUE_VALUE = "'%s'"; - - public static final String AGG_COUNT = "COUNT(*)"; - - public static final String AGG_FIELD = "%s(%s)"; - - public static final String WHERE_BETWEEN = "'%s' AND '%s'"; - - public static final String BRACKETS = "(%s)"; -} diff --git a/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java index 9fc7c88c5a..1cf0c5a7e6 100644 --- a/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java @@ -11,8 +11,9 @@ import io.dataease.dto.chart.ChartCustomFilterItemDTO; import io.dataease.dto.chart.ChartFieldCustomFilterDTO; import io.dataease.dto.chart.ChartViewFieldDTO; import io.dataease.dto.sqlObj.SQLObj; +import io.dataease.plugins.common.constants.ImpalaConstants; +import io.dataease.plugins.common.constants.SQLConstants; import io.dataease.provider.QueryProvider; -import io.dataease.provider.SQLConstants; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -29,7 +30,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; -import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX; +import static io.dataease.plugins.common.constants.SQLConstants.TABLE_ALIAS_PREFIX; @Service("impalaQuery") diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index cb32136baa..ed4e4a9d64 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -24,6 +24,7 @@ import io.dataease.dto.dataset.union.UnionParamDTO; import io.dataease.dto.datasource.TableField; import io.dataease.exception.DataEaseException; import io.dataease.i18n.Translator; +import io.dataease.plugins.common.constants.DatasourceTypes; import io.dataease.plugins.loader.ClassloaderResponsity; import io.dataease.provider.ProviderFactory; import io.dataease.provider.datasource.DatasourceProvider; diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index a5e847554a..03afdf3c7e 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -10,8 +10,8 @@ import io.dataease.base.mapper.ext.ExtChartViewMapper; import io.dataease.commons.constants.*; import io.dataease.commons.model.AuthURD; import io.dataease.commons.utils.*; -import io.dataease.commons.constants.DatasourceTypes; import io.dataease.controller.request.datasource.ApiDefinition; +import io.dataease.plugins.common.constants.DatasourceTypes; import io.dataease.provider.DDLProvider; import io.dataease.provider.datasource.DatasourceProvider; import io.dataease.provider.datasource.JdbcProvider; diff --git a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java index 73e91e0ae1..fca4f1f6a1 100644 --- a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java +++ b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java @@ -10,7 +10,6 @@ import io.dataease.base.mapper.DatasetTableMapper; import io.dataease.base.mapper.DatasourceMapper; import io.dataease.base.mapper.ext.ExtDataSourceMapper; import io.dataease.base.mapper.ext.query.GridExample; -import io.dataease.commons.constants.DatasourceTypes; import io.dataease.commons.constants.DePermissionType; import io.dataease.commons.exception.DEException; import io.dataease.commons.model.AuthURD; @@ -28,6 +27,7 @@ import io.dataease.dto.dataset.DataTableInfoDTO; import io.dataease.dto.datasource.*; import io.dataease.exception.DataEaseException; import io.dataease.i18n.Translator; +import io.dataease.plugins.common.constants.DatasourceTypes; import io.dataease.provider.ProviderFactory; import io.dataease.provider.datasource.ApiProvider; import io.dataease.provider.datasource.DatasourceProvider;