Skip to content

D
dataease
提交 6a30bd49 authored 作者: junjie's avatar junjie
浏览文件
操作

fix: sql过滤

上级 a58363b1
隐藏空白字符变更
内嵌 并排
正在显示 包含 201 行增加 和 0 行删除
backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
浏览文件 @ 6a30bd49
...@@ -795,6 +795,16 @@ public class CKQueryProvider extends QueryProvider { ...@@ -795,6 +795,16 @@ public class CKQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 1) { if (field.getDeExtractType() == 1) {
whereName = originName; whereName = originName;
} }
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(CKConstants.toFloat64, originName);
}
if (field.getDeExtractType() == 1) {
whereName = String.format(CKConstants.toInt32, String.format(CKConstants.toDateTime, originName)) + "*1000";
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
...@@ -892,6 +902,16 @@ public class CKQueryProvider extends QueryProvider { ...@@ -892,6 +902,16 @@ public class CKQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 1) { if (field.getDeExtractType() == 1) {
whereName = originName; whereName = originName;
} }
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(CKConstants.toFloat64, originName);
}
if (field.getDeExtractType() == 1) {
whereName = String.format(CKConstants.toInt32, String.format(CKConstants.toDateTime, originName)) + "*1000";
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
......
backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java
浏览文件 @ 6a30bd49
...@@ -763,6 +763,16 @@ public class Db2QueryProvider extends QueryProvider { ...@@ -763,6 +763,16 @@ public class Db2QueryProvider extends QueryProvider {
if (field.getDeExtractType() == DeTypeConstants.DE_TIME) { if (field.getDeExtractType() == DeTypeConstants.DE_TIME) {
whereName = originName; whereName = originName;
} }
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(Db2Constants.CAST, originName, Db2Constants.DEFAULT_FLOAT_FORMAT);
}
if (field.getDeExtractType() == 1) {
whereName = String.format(Db2Constants.UNIX_TIMESTAMP, originName);
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
...@@ -850,6 +860,16 @@ public class Db2QueryProvider extends QueryProvider { ...@@ -850,6 +860,16 @@ public class Db2QueryProvider extends QueryProvider {
if (field.getDeExtractType() == DeTypeConstants.DE_TIME) { if (field.getDeExtractType() == DeTypeConstants.DE_TIME) {
whereName = originName; whereName = originName;
} }
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(Db2Constants.CAST, originName, Db2Constants.DEFAULT_FLOAT_FORMAT);
}
if (field.getDeExtractType() == 1) {
whereName = String.format(Db2Constants.UNIX_TIMESTAMP, originName);
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
......
backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java
浏览文件 @ 6a30bd49
...@@ -775,6 +775,16 @@ public class DorisQueryProvider extends QueryProvider { ...@@ -775,6 +775,16 @@ public class DorisQueryProvider extends QueryProvider {
String cast = String.format(DorisConstants.CAST, originName, DorisConstants.DEFAULT_INT_FORMAT) + "/1000"; String cast = String.format(DorisConstants.CAST, originName, DorisConstants.DEFAULT_INT_FORMAT) + "/1000";
whereName = String.format(DorisConstants.FROM_UNIXTIME, cast, DorisConstants.DEFAULT_DATE_FORMAT); whereName = String.format(DorisConstants.FROM_UNIXTIME, cast, DorisConstants.DEFAULT_DATE_FORMAT);
} }
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(DorisConstants.CAST, originName, DorisConstants.DEFAULT_FLOAT_FORMAT);
}
if (field.getDeExtractType() == 1) {
whereName = String.format(DorisConstants.UNIX_TIMESTAMP, originName) + "*1000";
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
whereName = originName;
}
} else if (field.getDeType() == 0) { } else if (field.getDeType() == 0) {
whereName = String.format(DorisConstants.CAST, originName, DorisConstants.VARCHAR); whereName = String.format(DorisConstants.CAST, originName, DorisConstants.VARCHAR);
} else { } else {
...@@ -864,6 +874,16 @@ public class DorisQueryProvider extends QueryProvider { ...@@ -864,6 +874,16 @@ public class DorisQueryProvider extends QueryProvider {
} }
} else if (field.getDeType() == 0) { } else if (field.getDeType() == 0) {
whereName = String.format(DorisConstants.CAST, originName, DorisConstants.VARCHAR); whereName = String.format(DorisConstants.CAST, originName, DorisConstants.VARCHAR);
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(DorisConstants.CAST, originName, DorisConstants.DEFAULT_FLOAT_FORMAT);
}
if (field.getDeExtractType() == 1) {
whereName = String.format(DorisConstants.UNIX_TIMESTAMP, originName) + "*1000";
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
......
backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java
浏览文件 @ 6a30bd49
...@@ -792,6 +792,16 @@ public class EsQueryProvider extends QueryProvider { ...@@ -792,6 +792,16 @@ public class EsQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 1) { if (field.getDeExtractType() == 1) {
whereName = originName; whereName = originName;
} }
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(EsSqlLConstants.CAST, originName, "double");
}
if (field.getDeExtractType() == 1) {
whereName = String.format(EsSqlLConstants.CAST, originName, "bigint");
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
...@@ -873,6 +883,16 @@ public class EsQueryProvider extends QueryProvider { ...@@ -873,6 +883,16 @@ public class EsQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 1) { if (field.getDeExtractType() == 1) {
whereName = originName; whereName = originName;
} }
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(EsSqlLConstants.CAST, originName, "double");
}
if (field.getDeExtractType() == 1) {
whereName = String.format(EsSqlLConstants.CAST, originName, "bigint");
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
......
backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
浏览文件 @ 6a30bd49
...@@ -756,6 +756,16 @@ public class HiveQueryProvider extends QueryProvider { ...@@ -756,6 +756,16 @@ public class HiveQueryProvider extends QueryProvider {
if (field.getDeExtractType() == DeTypeConstants.DE_TIME) { if (field.getDeExtractType() == DeTypeConstants.DE_TIME) {
whereName = originName; whereName = originName;
} }
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(HiveConstants.CAST, originName, HiveConstants.DEFAULT_FLOAT_FORMAT);
}
if (field.getDeExtractType() == 1) {
whereName = String.format(HiveConstants.UNIX_TIMESTAMP, originName) + "*1000";
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
...@@ -838,6 +848,16 @@ public class HiveQueryProvider extends QueryProvider { ...@@ -838,6 +848,16 @@ public class HiveQueryProvider extends QueryProvider {
if (field.getDeExtractType() == DeTypeConstants.DE_TIME) { if (field.getDeExtractType() == DeTypeConstants.DE_TIME) {
whereName = originName; whereName = originName;
} }
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(HiveConstants.CAST, originName, HiveConstants.DEFAULT_FLOAT_FORMAT);
}
if (field.getDeExtractType() == 1) {
whereName = String.format(HiveConstants.UNIX_TIMESTAMP, originName) + "*1000";
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
......
backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
浏览文件 @ 6a30bd49
...@@ -760,6 +760,16 @@ public class MysqlQueryProvider extends QueryProvider { ...@@ -760,6 +760,16 @@ public class MysqlQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 1) { if (field.getDeExtractType() == 1) {
whereName = originName; whereName = originName;
} }
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(MySQLConstants.CAST, originName, MySQLConstants.DEFAULT_FLOAT_FORMAT);
}
if (field.getDeExtractType() == 1) {
whereName = String.format(MySQLConstants.UNIX_TIMESTAMP, originName);
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
...@@ -841,6 +851,16 @@ public class MysqlQueryProvider extends QueryProvider { ...@@ -841,6 +851,16 @@ public class MysqlQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 1) { if (field.getDeExtractType() == 1) {
whereName = originName; whereName = originName;
} }
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(MySQLConstants.CAST, originName, MySQLConstants.DEFAULT_FLOAT_FORMAT);
}
if (field.getDeExtractType() == 1) {
whereName = String.format(MySQLConstants.UNIX_TIMESTAMP, originName);
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
......
backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
浏览文件 @ 6a30bd49
...@@ -812,6 +812,16 @@ public class OracleQueryProvider extends QueryProvider { ...@@ -812,6 +812,16 @@ public class OracleQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 1) { if (field.getDeExtractType() == 1) {
whereName = originName; whereName = originName;
} }
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(OracleConstants.CAST, originName, OracleConstants.DEFAULT_FLOAT_FORMAT);
}
if (field.getDeExtractType() == 1) {
whereName = String.format(OracleConstants.UNIX_TIMESTAMP, originName) + "*1000";
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
...@@ -898,6 +908,16 @@ public class OracleQueryProvider extends QueryProvider { ...@@ -898,6 +908,16 @@ public class OracleQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 1) { if (field.getDeExtractType() == 1) {
whereName = originName; whereName = originName;
} }
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(OracleConstants.CAST, originName, OracleConstants.DEFAULT_FLOAT_FORMAT);
}
if (field.getDeExtractType() == 1) {
whereName = String.format(OracleConstants.UNIX_TIMESTAMP, originName) + "*1000";
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
......
backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
浏览文件 @ 6a30bd49
...@@ -15,6 +15,7 @@ import io.dataease.dto.datasource.JdbcConfiguration; ...@@ -15,6 +15,7 @@ import io.dataease.dto.datasource.JdbcConfiguration;
import io.dataease.dto.sqlObj.SQLObj; import io.dataease.dto.sqlObj.SQLObj;
import io.dataease.provider.query.QueryProvider; import io.dataease.provider.query.QueryProvider;
import io.dataease.provider.query.SQLConstants; import io.dataease.provider.query.SQLConstants;
import io.dataease.provider.query.oracle.OracleConstants;
import io.dataease.provider.query.sqlserver.SqlServerSQLConstants; import io.dataease.provider.query.sqlserver.SqlServerSQLConstants;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
...@@ -787,6 +788,16 @@ public class PgQueryProvider extends QueryProvider { ...@@ -787,6 +788,16 @@ public class PgQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 1) { if (field.getDeExtractType() == 1) {
whereName = originName; whereName = originName;
} }
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(PgConstants.CAST, originName, PgConstants.DEFAULT_FLOAT_FORMAT);
}
if (field.getDeExtractType() == 1) {
whereName = String.format(PgConstants.UNIX_TIMESTAMP, originName);
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
...@@ -869,6 +880,16 @@ public class PgQueryProvider extends QueryProvider { ...@@ -869,6 +880,16 @@ public class PgQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 1) { if (field.getDeExtractType() == 1) {
whereName = originName; whereName = originName;
} }
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(PgConstants.CAST, originName, PgConstants.DEFAULT_FLOAT_FORMAT);
}
if (field.getDeExtractType() == 1) {
whereName = String.format(PgConstants.UNIX_TIMESTAMP, originName);
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
......
backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java
浏览文件 @ 6a30bd49
...@@ -728,6 +728,16 @@ public class RedshiftQueryProvider extends QueryProvider { ...@@ -728,6 +728,16 @@ public class RedshiftQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 1) { if (field.getDeExtractType() == 1) {
whereName = originName; whereName = originName;
} }
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(PgConstants.CAST, originName, PgConstants.DEFAULT_FLOAT_FORMAT);
}
if (field.getDeExtractType() == 1) {
whereName = String.format(PgConstants.UNIX_TIMESTAMP, originName);
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
...@@ -806,6 +816,16 @@ public class RedshiftQueryProvider extends QueryProvider { ...@@ -806,6 +816,16 @@ public class RedshiftQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 1) { if (field.getDeExtractType() == 1) {
whereName = originName; whereName = originName;
} }
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(PgConstants.CAST, originName, PgConstants.DEFAULT_FLOAT_FORMAT);
}
if (field.getDeExtractType() == 1) {
whereName = String.format(PgConstants.UNIX_TIMESTAMP, originName);
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
......
backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
浏览文件 @ 6a30bd49
...@@ -821,6 +821,16 @@ public class SqlserverQueryProvider extends QueryProvider { ...@@ -821,6 +821,16 @@ public class SqlserverQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 1) { if (field.getDeExtractType() == 1) {
whereName = originName; whereName = originName;
} }
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(SqlServerSQLConstants.CONVERT, SqlServerSQLConstants.DEFAULT_FLOAT_FORMAT, originName);
}
if (field.getDeExtractType() == 1) {
whereName = String.format(SqlServerSQLConstants.UNIX_TIMESTAMP, originName);
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
...@@ -903,6 +913,16 @@ public class SqlserverQueryProvider extends QueryProvider { ...@@ -903,6 +913,16 @@ public class SqlserverQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 1) { if (field.getDeExtractType() == 1) {
whereName = originName; whereName = originName;
} }
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(SqlServerSQLConstants.CONVERT, SqlServerSQLConstants.DEFAULT_FLOAT_FORMAT, originName);
}
if (field.getDeExtractType() == 1) {
whereName = String.format(SqlServerSQLConstants.UNIX_TIMESTAMP, originName);
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论