Skip to content

D
dataease
Unverified 提交 004e2f72 authored 作者: taojinlong's avatar taojinlong 提交者： GitHub
浏览文件
操作

Merge pull request #555 from dataease/pr@dev@sqlserver

Merge branch 'dev' into pr@dev@sqlserver
上级 f87ac3ca dcbea29b
显示空白字符变更
内嵌 并排
正在显示 包含 928 行增加 和 602 行删除
backend/src/main/java/io/dataease/commons/constants/DeTypeConstants.java 0 → 100644
浏览文件 @ 004e2f72
package io.dataease.commons.constants;
public class DeTypeConstants {
public final static Integer DE_STRING = 0;
public final static Integer DE_TIME = 1;
public final static Integer DE_INT = 2;
public final static Integer DE_FLOAT = 3;
public final static Integer DE_BOOL = 4;
public final static Integer DE_Binary = 5;
}
backend/src/main/java/io/dataease/commons/filter/SqlFilter.java
浏览文件 @ 004e2f72
...@@ -68,7 +68,6 @@ public class SqlFilter implements Filter { ...@@ -68,7 +68,6 @@ public class SqlFilter implements Filter {
} }
br.close(); br.close();
} catch (IOException e) { } catch (IOException e) {
System.out.println("IOException: " + e);
} }
return str; return str;
......
backend/src/main/java/io/dataease/controller/sys/LicenseController.java
浏览文件 @ 004e2f72
...@@ -32,7 +32,6 @@ public class LicenseController { ...@@ -32,7 +32,6 @@ public class LicenseController {
return ResultHolder.success(null); return ResultHolder.success(null);
} }
F2CLicenseResponse f2CLicenseResponse = defaultLicenseService.validateLicense(); F2CLicenseResponse f2CLicenseResponse = defaultLicenseService.validateLicense();
System.out.println(new Gson().toJson(f2CLicenseResponse));
switch (f2CLicenseResponse.getStatus()) { switch (f2CLicenseResponse.getStatus()) {
case no_record: case no_record:
return ResultHolder.success(f2CLicenseResponse); return ResultHolder.success(f2CLicenseResponse);
......
backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java
浏览文件 @ 004e2f72
...@@ -8,6 +8,7 @@ import lombok.Setter; ...@@ -8,6 +8,7 @@ import lombok.Setter;
@Setter @Setter
public class SqlServerConfigration extends JdbcDTO { public class SqlServerConfigration extends JdbcDTO {
private String driver = "com.microsoft.sqlserver.jdbc.SQLServerDriver"; private String driver = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
private String schema;
public String getJdbc(){ public String getJdbc(){
return "jdbc:sqlserver://HOSTNAME:PORT;DatabaseName=DATABASE".replace("HOSTNAME", getHost()).replace("PORT", getPort().toString()).replace("DATABASE", getDataBase()); return "jdbc:sqlserver://HOSTNAME:PORT;DatabaseName=DATABASE".replace("HOSTNAME", getHost()).replace("PORT", getPort().toString()).replace("DATABASE", getDataBase());
......
backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java
浏览文件 @ 004e2f72
...@@ -108,7 +108,9 @@ public class JdbcProvider extends DatasourceProvider { ...@@ -108,7 +108,9 @@ public class JdbcProvider extends DatasourceProvider {
int columType = metaData.getColumnType(j + 1); int columType = metaData.getColumnType(j + 1);
switch (columType) { switch (columType) {
case Types.DATE: case Types.DATE:
if(rs.getDate(j + 1) != null){
row[j] = rs.getDate(j + 1).toString(); row[j] = rs.getDate(j + 1).toString();
}
break; break;
default: default:
row[j] = rs.getString(j + 1); row[j] = rs.getString(j + 1);
...@@ -287,7 +289,7 @@ public class JdbcProvider extends DatasourceProvider { ...@@ -287,7 +289,7 @@ public class JdbcProvider extends DatasourceProvider {
} }
tableFiled.setRemarks(remarks); tableFiled.setRemarks(remarks);
tableFiled.setFieldSize(Integer.valueOf(resultSet.getString("COLUMN_SIZE"))); tableFiled.setFieldSize(Integer.valueOf(resultSet.getString("COLUMN_SIZE")));
String dbType = resultSet.getString("TYPE_NAME"); String dbType = resultSet.getString("TYPE_NAME").toUpperCase();
tableFiled.setFieldType(dbType); tableFiled.setFieldType(dbType);
if(dbType.equalsIgnoreCase("LONG")){tableFiled.setFieldSize(65533);} if(dbType.equalsIgnoreCase("LONG")){tableFiled.setFieldSize(65533);}
if(StringUtils.isNotEmpty(dbType) && dbType.toLowerCase().contains("date") && tableFiled.getFieldSize() < 50 ){ if(StringUtils.isNotEmpty(dbType) && dbType.toLowerCase().contains("date") && tableFiled.getFieldSize() < 50 ){
...@@ -506,7 +508,9 @@ public class JdbcProvider extends DatasourceProvider { ...@@ -506,7 +508,9 @@ public class JdbcProvider extends DatasourceProvider {
return "show tables;"; return "show tables;";
case sqlServer: case sqlServer:
SqlServerConfigration sqlServerConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), SqlServerConfigration.class); SqlServerConfigration sqlServerConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), SqlServerConfigration.class);
return "SELECT TABLE_NAME FROM DATABASE.INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE';".replace("DATABASE", sqlServerConfigration.getDataBase()); return "SELECT TABLE_NAME FROM DATABASE.INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_SCHEMA = 'DS_SCHEMA' ;"
.replace("DATABASE", sqlServerConfigration.getDataBase())
.replace("DS_SCHEMA", sqlServerConfigration.getSchema());
case oracle: case oracle:
OracleConfigration oracleConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), OracleConfigration.class); OracleConfigration oracleConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), OracleConfigration.class);
if(StringUtils.isEmpty(oracleConfigration.getSchema())){ if(StringUtils.isEmpty(oracleConfigration.getSchema())){
...@@ -523,6 +527,8 @@ public class JdbcProvider extends DatasourceProvider { ...@@ -523,6 +527,8 @@ public class JdbcProvider extends DatasourceProvider {
switch (datasourceType) { switch (datasourceType) {
case oracle: case oracle:
return "select * from all_users"; return "select * from all_users";
case sqlServer:
return "select name from sys.schemas;";
default: default:
return "show tables;"; return "show tables;";
} }
......
backend/src/main/java/io/dataease/provider/QueryProvider.java
浏览文件 @ 004e2f72
package io.dataease.provider; package io.dataease.provider;
import io.dataease.base.domain.DatasetTableField; import io.dataease.base.domain.DatasetTableField;
import io.dataease.base.domain.Datasource;
import io.dataease.controller.request.chart.ChartExtFilterRequest; import io.dataease.controller.request.chart.ChartExtFilterRequest;
import io.dataease.dto.chart.ChartCustomFilterDTO; import io.dataease.dto.chart.ChartCustomFilterDTO;
import io.dataease.dto.chart.ChartViewFieldDTO; import io.dataease.dto.chart.ChartViewFieldDTO;
...@@ -12,21 +13,18 @@ import java.util.List; ...@@ -12,21 +13,18 @@ import java.util.List;
* @Date 2021/5/17 2:42 下午 * @Date 2021/5/17 2:42 下午
*/ */
public abstract class QueryProvider { public abstract class QueryProvider {
public abstract Integer transFieldType(String field);
public abstract String createQueryCountSQL(String table);
public abstract String createQueryCountSQLAsTmp(String sql); public abstract Integer transFieldType(String field);
public abstract String createSQLPreview(String sql, String orderBy); public abstract String createSQLPreview(String sql, String orderBy);
public abstract String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup); public abstract String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds);
public abstract String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup); public abstract String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup);
public abstract String createQuerySQLWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup); public abstract String createQuerySQLWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds);
public abstract String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup); public abstract String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds);
public abstract String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup); public abstract String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup);
......
backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
浏览文件 @ 004e2f72
...@@ -2,6 +2,7 @@ package io.dataease.provider.doris; ...@@ -2,6 +2,7 @@ package io.dataease.provider.doris;
import io.dataease.base.domain.DatasetTableField; import io.dataease.base.domain.DatasetTableField;
import io.dataease.base.domain.DatasetTableFieldExample; import io.dataease.base.domain.DatasetTableFieldExample;
import io.dataease.base.domain.Datasource;
import io.dataease.base.mapper.DatasetTableFieldMapper; import io.dataease.base.mapper.DatasetTableFieldMapper;
import io.dataease.controller.request.chart.ChartExtFilterRequest; import io.dataease.controller.request.chart.ChartExtFilterRequest;
import io.dataease.dto.chart.ChartCustomFilterDTO; import io.dataease.dto.chart.ChartCustomFilterDTO;
...@@ -70,23 +71,13 @@ public class DorisQueryProvider extends QueryProvider { ...@@ -70,23 +71,13 @@ public class DorisQueryProvider extends QueryProvider {
} }
} }
@Override
public String createQueryCountSQL(String table) {
return MessageFormat.format("SELECT count(*) FROM {0}", table);
}
@Override
public String createQueryCountSQLAsTmp(String sql) {
return createQueryCountSQL(" (" + sql + ") AS tmp ");
}
@Override @Override
public String createSQLPreview(String sql, String orderBy) { public String createSQLPreview(String sql, String orderBy) {
return "SELECT * FROM (" + sql + ") AS tmp ORDER BY " + orderBy + " LIMIT 0,1000"; return "SELECT * FROM (" + sql + ") AS tmp ORDER BY " + orderBy + " LIMIT 0,1000";
} }
@Override @Override
public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup) { public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds) {
SQLObj tableObj = SQLObj.builder() SQLObj tableObj = SQLObj.builder()
.tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(DorisConstants.KEYWORD_TABLE, table)) .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(DorisConstants.KEYWORD_TABLE, table))
.tableAlias(String.format(TABLE_ALIAS_PREFIX, 0)) .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
...@@ -159,17 +150,17 @@ public class DorisQueryProvider extends QueryProvider { ...@@ -159,17 +150,17 @@ public class DorisQueryProvider extends QueryProvider {
@Override @Override
public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup) { public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup) {
return createQuerySQL("(" + sql + ")", fields, isGroup); return createQuerySQL("(" + sql + ")", fields, isGroup, null);
} }
@Override @Override
public String createQuerySQLWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) { public String createQuerySQLWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds) {
return createQuerySQL(table, fields, isGroup) + " LIMIT " + (page - 1) * pageSize + "," + realSize; return createQuerySQL(table, fields, isGroup, null) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
} }
@Override @Override
public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup) { public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds) {
return createQuerySQL(table, fields, isGroup) + " LIMIT 0," + limit; return createQuerySQL(table, fields, isGroup, null) + " LIMIT 0," + limit;
} }
@Override @Override
......
backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java
浏览文件 @ 004e2f72
...@@ -2,6 +2,7 @@ package io.dataease.provider.mysql; ...@@ -2,6 +2,7 @@ package io.dataease.provider.mysql;
import io.dataease.base.domain.DatasetTableField; import io.dataease.base.domain.DatasetTableField;
import io.dataease.base.domain.DatasetTableFieldExample; import io.dataease.base.domain.DatasetTableFieldExample;
import io.dataease.base.domain.Datasource;
import io.dataease.base.mapper.DatasetTableFieldMapper; import io.dataease.base.mapper.DatasetTableFieldMapper;
import io.dataease.controller.request.chart.ChartExtFilterRequest; import io.dataease.controller.request.chart.ChartExtFilterRequest;
import io.dataease.dto.chart.ChartCustomFilterDTO; import io.dataease.dto.chart.ChartCustomFilterDTO;
...@@ -70,23 +71,13 @@ public class MysqlQueryProvider extends QueryProvider { ...@@ -70,23 +71,13 @@ public class MysqlQueryProvider extends QueryProvider {
} }
} }
@Override
public String createQueryCountSQL(String table) {
return MessageFormat.format("SELECT COUNT(*) FROM {0}", table);
}
@Override
public String createQueryCountSQLAsTmp(String sql) {
return createQueryCountSQL(" (" + sqlFix(sql) + ") AS tmp ");
}
@Override @Override
public String createSQLPreview(String sql, String orderBy) { public String createSQLPreview(String sql, String orderBy) {
return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp ORDER BY null " + " LIMIT 0,1000"; return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp ORDER BY null " + " LIMIT 0,1000";
} }
@Override @Override
public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup) { public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds) {
SQLObj tableObj = SQLObj.builder() SQLObj tableObj = SQLObj.builder()
.tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(MySQLConstants.KEYWORD_TABLE, table)) .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(MySQLConstants.KEYWORD_TABLE, table))
.tableAlias(String.format(TABLE_ALIAS_PREFIX, 0)) .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
...@@ -150,17 +141,17 @@ public class MysqlQueryProvider extends QueryProvider { ...@@ -150,17 +141,17 @@ public class MysqlQueryProvider extends QueryProvider {
@Override @Override
public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup) { public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup) {
return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup); return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null);
} }
@Override @Override
public String createQuerySQLWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) { public String createQuerySQLWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds) {
return createQuerySQL(table, fields, isGroup) + " LIMIT " + (page - 1) * pageSize + "," + realSize; return createQuerySQL(table, fields, isGroup, null) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
} }
@Override @Override
public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup) { public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds) {
return createQuerySQL(table, fields, isGroup) + " LIMIT 0," + limit; return createQuerySQL(table, fields, isGroup, null) + " LIMIT 0," + limit;
} }
@Override @Override
......
backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
浏览文件 @ 004e2f72
...@@ -2,6 +2,7 @@ package io.dataease.provider.oracle; ...@@ -2,6 +2,7 @@ package io.dataease.provider.oracle;
import io.dataease.base.domain.DatasetTableField; import io.dataease.base.domain.DatasetTableField;
import io.dataease.base.domain.DatasetTableFieldExample; import io.dataease.base.domain.DatasetTableFieldExample;
import io.dataease.base.domain.Datasource;
import io.dataease.base.mapper.DatasetTableFieldMapper; import io.dataease.base.mapper.DatasetTableFieldMapper;
import io.dataease.controller.request.chart.ChartExtFilterRequest; import io.dataease.controller.request.chart.ChartExtFilterRequest;
import io.dataease.dto.chart.ChartCustomFilterDTO; import io.dataease.dto.chart.ChartCustomFilterDTO;
...@@ -82,23 +83,13 @@ public class OracleQueryProvider extends QueryProvider { ...@@ -82,23 +83,13 @@ public class OracleQueryProvider extends QueryProvider {
} }
} }
@Override
public String createQueryCountSQL(String table) {
return MessageFormat.format("SELECT COUNT(*) FROM {0}", table);
}
@Override
public String createQueryCountSQLAsTmp(String sql) {
return createQueryCountSQL(" (" + sqlFix(sql) + ") DE_TMP ");
}
@Override @Override
public String createSQLPreview(String sql, String orderBy) { public String createSQLPreview(String sql, String orderBy) {
return "SELECT * FROM (" + sqlFix(sql) + ") DE_TMP " + " WHERE rownum <= 1000"; return "SELECT * FROM (" + sqlFix(sql) + ") DE_TMP " + " WHERE rownum <= 1000";
} }
@Override @Override
public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup) { public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds) {
SQLObj tableObj = SQLObj.builder() SQLObj tableObj = SQLObj.builder()
.tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(OracleConstants.KEYWORD_TABLE, table)) .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(OracleConstants.KEYWORD_TABLE, table))
.tableAlias(String.format(OracleConstants.ALIAS_FIX, String.format(TABLE_ALIAS_PREFIX, 0))) .tableAlias(String.format(OracleConstants.ALIAS_FIX, String.format(TABLE_ALIAS_PREFIX, 0)))
...@@ -179,19 +170,19 @@ public class OracleQueryProvider extends QueryProvider { ...@@ -179,19 +170,19 @@ public class OracleQueryProvider extends QueryProvider {
@Override @Override
public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup) { public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup) {
return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup); return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null);
} }
@Override @Override
public String createQuerySQLWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) { public String createQuerySQLWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds) {
List<SQLObj> xFields = xFields(table, fields); List<SQLObj> xFields = xFields(table, fields);
return MessageFormat.format("SELECT {0} FROM ( SELECT DE_TMP.*, rownum r FROM ( {1} ) DE_TMP WHERE rownum <= {2} ) WHERE r > {3} ", return MessageFormat.format("SELECT {0} FROM ( SELECT DE_TMP.*, rownum r FROM ( {1} ) DE_TMP WHERE rownum <= {2} ) WHERE r > {3} ",
sqlColumn(xFields), createQuerySQL(table, fields, isGroup), Integer.valueOf(page * realSize).toString(), Integer.valueOf((page - 1) * pageSize).toString()); sqlColumn(xFields), createQuerySQL(table, fields, isGroup, null), Integer.valueOf(page * realSize).toString(), Integer.valueOf((page - 1) * pageSize).toString());
} }
@Override @Override
public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup) { public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds) {
return String.format("SELECT %s.* from %s WHERE rownum <= %s ", table, table, limit.toString()); return String.format("SELECT %s.* from %s WHERE rownum <= %s ", table, table, limit.toString());
} }
......
backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java 0 → 100644
浏览文件 @ 004e2f72
package io.dataease.provider.sqlserver;
import io.dataease.provider.SQLConstants;
import static io.dataease.datasource.constants.DatasourceTypes.sqlServer;
/**
* @Author gin
* @Date 2021/7/8 7:22 下午
*/
public class SqlServerSQLConstants extends SQLConstants {
public static final String KEYWORD_TABLE = sqlServer.getKeywordPrefix() + "%s" + sqlServer.getKeywordSuffix();
public static final String KEYWORD_FIX = "%s." + sqlServer.getKeywordPrefix() + "%s" + sqlServer.getKeywordSuffix();
public static final String UNIX_TIMESTAMP = "CAST(DATEDIFF(ss,'1970-01-01 08:00:00', %s) as bigint ) * 1000 ";
public static final String DATE_FORMAT = "CONVERT(varchar(100), %s, %s)";
public static final String FROM_UNIXTIME = "convert(varchar, %s ,120)";
public static final String CONVERT = "CONVERT(%s, %s)";
public static final String LONG_TO_DATE = "DATEADD(second,%s,'1970-01-01 08:00:00')";
public static final String STRING_TO_DATE = "CONVERT(datetime, %s ,120)";
public static final String DEFAULT_INT_FORMAT = "DECIMAL(20,0)";
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)";
}
backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java
浏览文件 @ 004e2f72
//package io.dataease.provider.sqlserver; package io.dataease.provider.sqlserver;
//
//import io.dataease.base.domain.DatasetTableField; import com.google.gson.Gson;
//import io.dataease.controller.request.chart.ChartExtFilterRequest; import io.dataease.base.domain.DatasetTableField;
//import io.dataease.dto.chart.ChartCustomFilterDTO; import io.dataease.base.domain.Datasource;
//import io.dataease.dto.chart.ChartViewFieldDTO; import io.dataease.commons.constants.DeTypeConstants;
//import io.dataease.provider.QueryProvider; import io.dataease.controller.request.chart.ChartExtFilterRequest;
//import org.apache.commons.collections4.CollectionUtils; import io.dataease.datasource.dto.SqlServerConfigration;
//import org.apache.commons.lang3.ObjectUtils; import io.dataease.dto.chart.ChartCustomFilterDTO;
//import org.apache.commons.lang3.StringUtils; import io.dataease.dto.chart.ChartViewFieldDTO;
//import org.springframework.stereotype.Service; import io.dataease.dto.sqlObj.SQLObj;
// import io.dataease.provider.QueryProvider;
//import java.text.MessageFormat; import io.dataease.provider.SQLConstants;
//import java.text.SimpleDateFormat; import org.apache.commons.collections4.CollectionUtils;
//import java.util.Arrays; import org.apache.commons.lang3.ObjectUtils;
//import java.util.Date; import org.apache.commons.lang3.StringUtils;
//import java.util.List; import org.springframework.stereotype.Service;
// import org.stringtemplate.v4.ST;
///** import org.stringtemplate.v4.STGroup;
// * @Author gin import org.stringtemplate.v4.STGroupFile;
// * @Date 2021/5/17 2:43 下午
// */ import java.text.MessageFormat;
//@Service("sqlServerQuery") import java.text.SimpleDateFormat;
//public class SqlserverQueryProvider extends QueryProvider { import java.util.ArrayList;
// @Override import java.util.Date;
// public Integer transFieldType(String field) { import java.util.List;
// switch (field) {
// case "CHAR": import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX;
// case "VARCHAR":
// case "TEXT": @Service("sqlserverQuery")
// case "TINYTEXT": public class SqlserverQueryProvider extends QueryProvider {
// case "MEDIUMTEXT": @Override
// case "LONGTEXT": public Integer transFieldType(String field) {
// case "ENUM": switch (field) {
// return 0;// 文本 case "CHAR":
// case "DATE": case "NCHAR":
// case "TIME": case "NTEXT":
// case "YEAR": case "VARCHAR":
// case "DATETIME": case "TEXT":
// case "TIMESTAMP": case "TINYTEXT":
// return 1;// 时间 case "MEDIUMTEXT":
// case "INT": case "LONGTEXT":
// case "SMALLINT": case "ENUM":
// case "MEDIUMINT": case "XML":
// case "INTEGER": case "TIME":
// case "BIGINT": return DeTypeConstants.DE_STRING;// 文本
// return 2;// 整型 case "DATE":
// case "FLOAT": case "YEAR":
// case "DOUBLE": case "DATETIME":
// case "DECIMAL": case "DATETIME2":
// return 3;// 浮点 case "DATETIMEOFFSET":
// case "BIT": return DeTypeConstants.DE_TIME;// 时间
// case "TINYINT": case "INT":
// return 4;// 布尔 case "MEDIUMINT":
// default: case "INTEGER":
// return 0; case "BIGINT":
// } case "SMALLINT":
// } return DeTypeConstants.DE_INT;// 整型
// case "FLOAT":
// @Override case "DOUBLE":
// public String createQueryCountSQL(String table) { case "DECIMAL":
// return MessageFormat.format("SELECT COUNT(*) FROM {0}", table); case "MONEY":
// } case "NUMERIC":
// return DeTypeConstants.DE_FLOAT;// 浮点
// @Override case "BIT":
// public String createQueryCountSQLAsTmp(String sql) { case "TINYINT":
// return createQueryCountSQL(" (" + sqlFix(sql) + ") AS tmp "); return DeTypeConstants.DE_BOOL;// 布尔
// } case "TIMESTAMP":
// return DeTypeConstants.DE_Binary;// 二进制
// @Override default:
// public String createSQLPreview(String sql, String orderBy) { return DeTypeConstants.DE_STRING;
// return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp ORDER BY null " + " LIMIT 0,1000"; }
// } }
//
// @Override @Override
// public String createQuerySQL(String table, List<DatasetTableField> fields) { public String createSQLPreview(String sql, String orderBy) {
// String[] array = fields.stream().map(f -> { return "SELECT top 1000 * FROM (" + sqlFix(sql) + ") AS tmp";
// StringBuilder stringBuilder = new StringBuilder(); }
// // 如果原始类型为时间
// if (f.getDeExtractType() == 1) { @Override
// if (f.getDeType() == 2 || f.getDeType() == 3) { public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds) {
// stringBuilder.append("UNIX_TIMESTAMP(`").append(f.getOriginName()).append("`)*1000 AS ").append(f.getDataeaseName());
// } else { SQLObj tableObj = SQLObj.builder()
// stringBuilder.append("`").append(f.getOriginName()).append("` AS ").append(f.getDataeaseName()); .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(SqlServerSQLConstants.KEYWORD_TABLE, table))
// } .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
// } else if (f.getDeExtractType() == 0) { .build();
// if (f.getDeType() == 2) { if(ds != null){
// stringBuilder.append("CAST(`").append(f.getOriginName()).append("` AS DECIMAL(20,0)) AS ").append(f.getDataeaseName()); String schema = new Gson().fromJson(ds.getConfiguration(), SqlServerConfigration.class).getSchema();
// } else if (f.getDeType() == 3) { tableObj.setTableName(schema + "." + tableObj.getTableName());
// stringBuilder.append("CAST(`").append(f.getOriginName()).append("` AS DECIMAL(20,2)) AS ").append(f.getDataeaseName()); }
// } else if (f.getDeType() == 1) {
// stringBuilder.append("DATE_FORMAT(`").append(f.getOriginName()).append("`,'%Y-%m-%d %H:%i:%S') AS _").append(f.getDataeaseName()); List<SQLObj> xFields = new ArrayList<>();
// } else { if (CollectionUtils.isNotEmpty(fields)) {
// stringBuilder.append("`").append(f.getOriginName()).append("` AS ").append(f.getDataeaseName()); for (int i = 0; i < fields.size(); i++) {
// } DatasetTableField f = fields.get(i);
// } else { String originField = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), f.getOriginName());
// if (f.getDeType() == 1) { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
// stringBuilder.append("FROM_UNIXTIME(CAST(`").append(f.getOriginName()).append("` AS DECIMAL(20,0))/1000,'%Y-%m-%d %H:%i:%S') AS ").append(f.getDataeaseName()); String fieldName = "";
// } else { // 处理横轴字段
// stringBuilder.append("`").append(f.getOriginName()).append("` AS ").append(f.getDataeaseName()); if (f.getDeExtractType() == DeTypeConstants.DE_TIME) { // 时间 转为 数值
// } if (f.getDeType() == DeTypeConstants.DE_INT || f.getDeType() == DeTypeConstants.DE_FLOAT) {
// } fieldName = String.format(SqlServerSQLConstants.UNIX_TIMESTAMP, originField);
// return stringBuilder.toString(); } else {
// }).toArray(String[]::new); fieldName = originField;
// return MessageFormat.format("SELECT {0} FROM {1} ORDER BY null", StringUtils.join(array, ","), table); }
// } } else if (f.getDeExtractType() == DeTypeConstants.DE_STRING) {
// if (f.getDeType() == DeTypeConstants.DE_INT) {
// @Override fieldName = String.format(SqlServerSQLConstants.CONVERT, SqlServerSQLConstants.DEFAULT_INT_FORMAT, originField);
// public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields) { } else if (f.getDeType() == DeTypeConstants.DE_FLOAT) {
// return createQuerySQL(" (" + sqlFix(sql) + ") AS tmp ", fields); fieldName = String.format(SqlServerSQLConstants.CONVERT, SqlServerSQLConstants.DEFAULT_FLOAT_FORMAT, originField);
// } } else if (f.getDeType() == DeTypeConstants.DE_TIME) { //字符串转时间
// fieldName = String.format(SqlServerSQLConstants.STRING_TO_DATE, originField);
// @Override } else {
// public String createQuerySQLWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize) { fieldName = originField;
// return createQuerySQL(table, fields) + " LIMIT " + (page - 1) * pageSize + "," + realSize; }
// } } else {
// if (f.getDeType() == DeTypeConstants.DE_TIME) { // 数值转时间
// @Override String cast = String.format(SqlServerSQLConstants.LONG_TO_DATE, originField + "/1000");
// public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit) { fieldName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast);
// return createQuerySQL(table, fields) + " LIMIT 0," + limit; } else if (f.getDeType() == DeTypeConstants.DE_INT) {
// } fieldName = String.format(SqlServerSQLConstants.CONVERT, SqlServerSQLConstants.DEFAULT_INT_FORMAT, originField);
// } else {
// @Override fieldName = originField;
// public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit) { }
// return createQuerySQLAsTmp(sql, fields) + " LIMIT 0," + limit; }
// } xFields.add(SQLObj.builder()
// .fieldName(fieldName)
// @Override .fieldAlias(fieldAlias)
// public String createQuerySQLAsTmpWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize) { .build());
// return createQuerySQLAsTmp(sql, fields) + " LIMIT " + (page - 1) * pageSize + "," + realSize; }
// } }
//
// @Override STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
// public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) { ST st_sql = stg.getInstanceOf("previewSql");
// // 字段汇总 排序等 st_sql.add("isGroup", isGroup);
// String[] field = yAxis.stream().map(y -> { if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
// StringBuilder f = new StringBuilder(); if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
// if (StringUtils.equalsIgnoreCase(y.getOriginName(), "*")) { return st_sql.render();
// f.append(y.getSummary()).append("(").append(y.getOriginName()).append(")"); }
// } else {
// if (StringUtils.equalsIgnoreCase(y.getSummary(), "avg") || StringUtils.containsIgnoreCase(y.getSummary(), "pop")) { @Override
// f.append("CAST(") public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup) {
// .append(y.getSummary()).append("(") return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null);
// .append("CAST(`").append(y.getOriginName()).append("` AS ").append(y.getDeType() == 2 ? "DECIMAL(20,0)" : "DECIMAL(20,2)").append(")") }
// .append(") AS DECIMAL(20,2)").append(")");
// } else { @Override
// f.append(y.getSummary()).append("(") public String createQuerySQLWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds) {
// .append("CAST(`").append(y.getOriginName()).append("` AS ").append(y.getDeType() == 2 ? "DECIMAL(20,0)" : "DECIMAL(20,2)").append(")") return createQuerySQL(table, fields, isGroup, ds) + " ORDER BY \"" + fields.get(0).getOriginName() + "\" offset " + (page - 1) * pageSize + " rows fetch next " + realSize + " rows only";
// .append(")"); }
// }
// } @Override
// f.append(" AS `_").append(y.getSummary()).append("_").append(StringUtils.equalsIgnoreCase(y.getOriginName(), "*") ? "" : y.getOriginName()).append("`"); public String createQuerySQLAsTmpWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) {
// return f.toString(); return createQuerySQLAsTmp(sql, fields, isGroup) + " ORDER BY \"" + fields.get(0).getOriginName() + "\" offset " + (page - 1) * pageSize + " rows fetch next " + realSize + " rows only";
// }).toArray(String[]::new); }
// String[] groupField = xAxis.stream().map(x -> {
// StringBuilder stringBuilder = new StringBuilder(); @Override
// // 如果原始类型为时间 public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds) {
// if (x.getDeExtractType() == 1) { return createQuerySQL(table, fields, isGroup, ds) + " ORDER BY \"" + fields.get(0).getOriginName() + "\" offset 0 rows fetch next " + limit + " rows only";
// if (x.getDeType() == 2 || x.getDeType() == 3) { }
// stringBuilder.append("UNIX_TIMESTAMP(`").append(x.getOriginName()).append("`)*1000 AS `_").append(x.getOriginName()).append("`");
// } else if (x.getDeType() == 1) { @Override
// String format = transDateFormat(x.getDateStyle(), x.getDatePattern()); public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup) {
// stringBuilder.append("DATE_FORMAT(`").append(x.getOriginName()).append("`,'").append(format).append("') AS `_").append(x.getOriginName()).append("`"); return createQuerySQLAsTmp(sql, fields, isGroup) + " ORDER BY \"" + fields.get(0).getOriginName() + "\" offset 0 rows fetch next " + limit + " rows only";
// } else { }
// stringBuilder.append("`").append(x.getOriginName()).append("` AS `_").append(x.getOriginName()).append("`");
// } @Override
// } else { public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) {
// if (x.getDeType() == 1) { SQLObj tableObj = SQLObj.builder()
// String format = transDateFormat(x.getDateStyle(), x.getDatePattern()); .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(SqlServerSQLConstants.KEYWORD_TABLE, table))
// if (x.getDeExtractType() == 0) { .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
// stringBuilder.append("DATE_FORMAT(`").append(x.getOriginName()).append("`,'").append(format).append("') AS `_").append(x.getOriginName()).append("`"); .build();
// } else { List<SQLObj> xFields = new ArrayList<>();
// stringBuilder.append("DATE_FORMAT(").append("FROM_UNIXTIME(CAST(`").append(x.getOriginName()).append("` AS DECIMAL(20,0))/1000,'%Y-%m-%d %H:%i:%S')").append(",'").append(format).append("') AS `_").append(x.getOriginName()).append("`"); List<SQLObj> xWheres = new ArrayList<>();
// } List<SQLObj> xOrders = new ArrayList<>();
// } else { if (CollectionUtils.isNotEmpty(xAxis)) {
// stringBuilder.append("`").append(x.getOriginName()).append("` AS `_").append(x.getOriginName()).append("`"); for (int i = 0; i < xAxis.size(); i++) {
// } ChartViewFieldDTO x = xAxis.get(i);
// } String originField = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
// return stringBuilder.toString(); String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
// }).toArray(String[]::new); // 处理横轴字段
// String[] group = xAxis.stream().map(x -> "`_" + x.getOriginName() + "`").toArray(String[]::new); xFields.add(getXFields(x, originField, fieldAlias));
// String[] xOrder = xAxis.stream().filter(f -> StringUtils.isNotEmpty(f.getSort()) && !StringUtils.equalsIgnoreCase(f.getSort(), "none")) // 处理横轴过滤
// .map(f -> "`_" + f.getOriginName() + "` " + f.getSort()).toArray(String[]::new); // xWheres.addAll(getXWheres(x, originField, fieldAlias));
// String[] yOrder = yAxis.stream().filter(f -> StringUtils.isNotEmpty(f.getSort()) && !StringUtils.equalsIgnoreCase(f.getSort(), "none")) // 处理横轴排序
// .map(f -> "`_" + f.getSummary() + "_" + (StringUtils.equalsIgnoreCase(f.getOriginName(), "*") ? "" : f.getOriginName()) + "` " + f.getSort()).toArray(String[]::new); if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) {
// String[] order = Arrays.copyOf(xOrder, xOrder.length + yOrder.length); xOrders.add(SQLObj.builder()
// System.arraycopy(yOrder, 0, order, xOrder.length, yOrder.length); .orderField(originField)
// .orderAlias(fieldAlias)
// String[] xFilter = xAxis.stream().filter(x -> CollectionUtils.isNotEmpty(x.getFilter()) && x.getFilter().size() > 0) .orderDirection(x.getSort())
// .map(x -> { .build());
// String[] s = x.getFilter().stream().map(f -> { }
// StringBuilder filter = new StringBuilder(); }
// if (x.getDeType() == 1 && x.getDeExtractType() != 1) { }
// filter.append(" AND FROM_UNIXTIME(cast(`") List<SQLObj> yFields = new ArrayList<>();
// .append(x.getOriginName()) List<SQLObj> yWheres = new ArrayList<>();
// .append("` AS DECIMAL(20,0))/1000,'%Y-%m-%d %H:%i:%S') "); List<SQLObj> yOrders = new ArrayList<>();
// } else { if (CollectionUtils.isNotEmpty(yAxis)) {
// filter.append(" AND `").append(x.getOriginName()).append("`"); for (int i = 0; i < yAxis.size(); i++) {
// } ChartViewFieldDTO y = yAxis.get(i);
// filter.append(transMysqlFilterTerm(f.getTerm())); String originField = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
// if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i);
// filter.append("(null,'')"); // 处理纵轴字段
// } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) { yFields.add(getYFields(y, originField, fieldAlias));
// filter.append(" AND `").append(x.getOriginName()).append("`").append(" <> ''"); // 处理纵轴过滤
// } else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) { yWheres.addAll(getYWheres(y, originField, fieldAlias));
// filter.append("('").append(StringUtils.join(f.getValue(), "','")).append("')"); // 处理纵轴排序
// } else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) { if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
// filter.append("%").append(f.getValue()).append("%"); yOrders.add(SQLObj.builder()
// } else { .orderField(originField)
// filter.append("'").append(f.getValue()).append("'"); .orderAlias(fieldAlias)
// } .orderDirection(y.getSort())
// return filter.toString(); .build());
// }).toArray(String[]::new); }
// return StringUtils.join(s, " "); }
// }).toArray(String[]::new); }
// // 处理视图中字段过滤
// String sql = MessageFormat.format("SELECT {0},{1} FROM {2} WHERE 1=1 {3} GROUP BY {4} ORDER BY null,{5}", List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
// StringUtils.join(groupField, ","), // 处理仪表板字段过滤
// StringUtils.join(field, ","), List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
// table, // 构建sql所有参数
// (xFilter.length > 0 ? StringUtils.join(xFilter, " ") : "") + transCustomFilter(customFilter) + transExtFilter(extFilterRequestList),// origin field filter and panel field filter List<SQLObj> fields = new ArrayList<>();
// StringUtils.join(group, ","), fields.addAll(xFields);
// StringUtils.join(order, ",")); fields.addAll(yFields);
// if (sql.endsWith(",")) { List<SQLObj> wheres = new ArrayList<>();
// sql = sql.substring(0, sql.length() - 1); wheres.addAll(xWheres);
// } if (customWheres != null) wheres.addAll(customWheres);
// // 如果是对结果字段过滤，则再包裹一层sql if (extWheres != null) wheres.addAll(extWheres);
// String[] resultFilter = yAxis.stream().filter(y -> CollectionUtils.isNotEmpty(y.getFilter()) && y.getFilter().size() > 0) List<SQLObj> groups = new ArrayList<>();
// .map(y -> { groups.addAll(xFields);
// String[] s = y.getFilter().stream().map(f -> { // 外层再次套sql
// StringBuilder filter = new StringBuilder(); List<SQLObj> orders = new ArrayList<>();
// // 原始类型不是时间，在de中被转成时间的字段做处理 orders.addAll(xOrders);
// if (y.getDeType() == 1 && y.getDeExtractType() != 1) { orders.addAll(yOrders);
// filter.append(" AND FROM_UNIXTIME(CAST(`_") List<SQLObj> aggWheres = new ArrayList<>();
// .append(y.getSummary()).append("_").append(StringUtils.equalsIgnoreCase(y.getOriginName(), "*") ? "" : y.getOriginName()).append("`") aggWheres.addAll(yWheres);
// .append(" AS DECIMAL(20,0))/1000,'%Y-%m-%d %H:%i:%S') ");
// } else { STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
// filter.append(" AND `_").append(y.getSummary()).append("_").append(StringUtils.equalsIgnoreCase(y.getOriginName(), "*") ? "" : y.getOriginName()).append("`"); ST st_sql = stg.getInstanceOf("querySql");
// } if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
// filter.append(transMysqlFilterTerm(f.getTerm())); if (CollectionUtils.isNotEmpty(yFields)) st_sql.add("aggregators", yFields);
// if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) { if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
// filter.append("(null,'')"); if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
// } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) { String sql = st_sql.render();
// filter.append(" AND `_")
// .append(y.getSummary()).append("_").append(StringUtils.equalsIgnoreCase(y.getOriginName(), "*") ? "" : y.getOriginName()) ST st = stg.getInstanceOf("querySql");
// .append("`").append(" <> ''"); SQLObj tableSQL = SQLObj.builder()
// } else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) { .tableName(String.format(SqlServerSQLConstants.BRACKETS, sql))
// filter.append("('").append(StringUtils.join(f.getValue(), "','")).append("')"); .tableAlias(String.format(TABLE_ALIAS_PREFIX, 1))
// } else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) { .build();
// filter.append("%").append(f.getValue()).append("%"); if (CollectionUtils.isNotEmpty(aggWheres)) st.add("filters", aggWheres);
// } else { if (CollectionUtils.isNotEmpty(orders)) st.add("orders", orders);
// filter.append("'").append(f.getValue()).append("'"); if (ObjectUtils.isNotEmpty(tableSQL)) st.add("table", tableSQL);
// } return st.render();
// return filter.toString(); }
// }).toArray(String[]::new);
// return StringUtils.join(s, " ");
// }).toArray(String[]::new); @Override
// if (resultFilter.length == 0) { public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) {
// return sql; return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList);
// } else { }
// String filterSql = MessageFormat.format("SELECT * FROM {0} WHERE 1=1 {1} ORDER BY {2}",
// "(" + sql + ") AS tmp", @Override
// StringUtils.join(resultFilter, " "), public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) {
// ObjectUtils.isNotEmpty(yOrder) ? StringUtils.join(yOrder, ",") : "null"); SQLObj tableObj = SQLObj.builder()
// return filterSql; .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(SqlServerSQLConstants.KEYWORD_TABLE, table))
// } .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
// } .build();
// List<SQLObj> xFields = new ArrayList<>();
// @Override List<SQLObj> xWheres = new ArrayList<>();
// public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) { List<SQLObj> xOrders = new ArrayList<>();
// return getSQL(" (" + sqlFix(sql) + ") AS tmp ", xAxis, yAxis, customFilter, extFilterRequestList); List<ChartViewFieldDTO> xList = new ArrayList<>();
// } xList.addAll(xAxis);
// xList.addAll(extStack);
// @Override if (CollectionUtils.isNotEmpty(xList)) {
// public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) { for (int i = 0; i < xList.size(); i++) {
// return null; ChartViewFieldDTO x = xList.get(i);
// } String originField = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
// String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
// @Override // 处理横轴字段
// public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) { xFields.add(getXFields(x, originField, fieldAlias));
// return null; // 处理横轴过滤
// } // xWheres.addAll(getXWheres(x, originField, fieldAlias));
// // 处理横轴排序
// @Override if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) {
// public String searchTable(String table) { xOrders.add(SQLObj.builder()
// return "SELECT table_name FROM information_schema.TABLES WHERE table_name ='" + table + "'"; .orderField(originField)
// } .orderAlias(fieldAlias)
// .orderDirection(x.getSort())
// @Override .build());
// public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) { }
// // 字段汇总 排序等 }
// String[] field = yAxis.stream().map(y -> { }
// StringBuilder f = new StringBuilder(); List<SQLObj> yFields = new ArrayList<>();
// if (StringUtils.equalsIgnoreCase(y.getOriginName(), "*")) { List<SQLObj> yWheres = new ArrayList<>();
// f.append(y.getSummary()).append("(").append(y.getOriginName()).append(")"); List<SQLObj> yOrders = new ArrayList<>();
// } else { if (CollectionUtils.isNotEmpty(yAxis)) {
// if (StringUtils.equalsIgnoreCase(y.getSummary(), "avg") || StringUtils.containsIgnoreCase(y.getSummary(), "pop")) { for (int i = 0; i < yAxis.size(); i++) {
// f.append("CAST(") ChartViewFieldDTO y = yAxis.get(i);
// .append(y.getSummary()).append("(") String originField = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
// .append("CAST(`").append(y.getOriginName()).append("` AS ").append(y.getDeType() == 2 ? "DECIMAL(20,0)" : "DECIMAL(20,2)").append(")") String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i);
// .append(") AS DECIMAL(20,2)").append(")"); // 处理纵轴字段
// } else { yFields.add(getYFields(y, originField, fieldAlias));
// f.append(y.getSummary()).append("(") // 处理纵轴过滤
// .append("CAST(`").append(y.getOriginName()).append("` AS ").append(y.getDeType() == 2 ? "DECIMAL(20,0)" : "DECIMAL(20,2)").append(")") yWheres.addAll(getYWheres(y, originField, fieldAlias));
// .append(")"); // 处理纵轴排序
// } if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
// } yOrders.add(SQLObj.builder()
// f.append(" AS `_").append(y.getSummary()).append("_").append(StringUtils.equalsIgnoreCase(y.getOriginName(), "*") ? "" : y.getOriginName()).append("`"); .orderField(originField)
// return f.toString(); .orderAlias(fieldAlias)
// }).toArray(String[]::new); .orderDirection(y.getSort())
// .build());
// String[] order = yAxis.stream().filter(f -> StringUtils.isNotEmpty(f.getSort()) && !StringUtils.equalsIgnoreCase(f.getSort(), "none")) }
// .map(f -> "`_" + f.getSummary() + "_" + (StringUtils.equalsIgnoreCase(f.getOriginName(), "*") ? "" : f.getOriginName()) + "` " + f.getSort()).toArray(String[]::new); }
// }
// String sql = MessageFormat.format("SELECT {0} FROM {1} WHERE 1=1 {2} ORDER BY null,{3}", List<SQLObj> stackFields = new ArrayList<>();
// StringUtils.join(field, ","), List<SQLObj> stackOrders = new ArrayList<>();
// table, if (CollectionUtils.isNotEmpty(extStack)) {
// transCustomFilter(customFilter) + transExtFilter(extFilterRequestList),// origin field filter and panel field filter for (int i = 0; i < extStack.size(); i++) {
// StringUtils.join(order, ",")); ChartViewFieldDTO stack = extStack.get(i);
// if (sql.endsWith(",")) { String originField = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), stack.getOriginName());
// sql = sql.substring(0, sql.length() - 1); String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
// } // 处理横轴字段
// // 如果是对结果字段过滤，则再包裹一层sql stackFields.add(getXFields(stack, originField, fieldAlias));
// String[] resultFilter = yAxis.stream().filter(y -> CollectionUtils.isNotEmpty(y.getFilter()) && y.getFilter().size() > 0) // 处理横轴排序
// .map(y -> { if (StringUtils.isNotEmpty(stack.getSort()) && !StringUtils.equalsIgnoreCase(stack.getSort(), "none")) {
// String[] s = y.getFilter().stream().map(f -> { stackOrders.add(SQLObj.builder()
// StringBuilder filter = new StringBuilder(); .orderField(originField)
// // 原始类型不是时间，在de中被转成时间的字段做处理 .orderAlias(fieldAlias)
// if (y.getDeType() == 1 && y.getDeExtractType() != 1) { .orderDirection(stack.getSort())
// filter.append(" AND FROM_UNIXTIME(CAST(`_") .build());
// .append(y.getSummary()).append("_").append(StringUtils.equalsIgnoreCase(y.getOriginName(), "*") ? "" : y.getOriginName()).append("`") }
// .append(" AS DECIMAL(20,0))/1000,'%Y-%m-%d %H:%i:%S') "); }
}
// 处理视图中字段过滤
List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
// 处理仪表板字段过滤
List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
// 构建sql所有参数
List<SQLObj> fields = new ArrayList<>();
fields.addAll(xFields);
fields.addAll(yFields);
List<SQLObj> wheres = new ArrayList<>();
wheres.addAll(xWheres);
if (customWheres != null) wheres.addAll(customWheres);
if (extWheres != null) wheres.addAll(extWheres);
List<SQLObj> groups = new ArrayList<>();
groups.addAll(xFields);
// 外层再次套sql
List<SQLObj> orders = new ArrayList<>();
orders.addAll(xOrders);
orders.addAll(yOrders);
List<SQLObj> aggWheres = new ArrayList<>();
aggWheres.addAll(yWheres);
STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
ST st_sql = stg.getInstanceOf("querySql");
if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
if (CollectionUtils.isNotEmpty(yFields)) st_sql.add("aggregators", yFields);
if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
String sql = st_sql.render();
ST st = stg.getInstanceOf("querySql");
SQLObj tableSQL = SQLObj.builder()
.tableName(String.format(SqlServerSQLConstants.BRACKETS, sql))
.tableAlias(String.format(TABLE_ALIAS_PREFIX, 1))
.build();
if (CollectionUtils.isNotEmpty(aggWheres)) st.add("filters", aggWheres);
if (CollectionUtils.isNotEmpty(orders)) st.add("orders", orders);
if (ObjectUtils.isNotEmpty(tableSQL)) st.add("table", tableSQL);
return st.render();
}
@Override
public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) {
return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack);
}
@Override
public String searchTable(String table) {
return "SELECT table_name FROM information_schema.TABLES WHERE table_name ='" + table + "'";
}
@Override
public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) {
// 字段汇总 排序等
SQLObj tableObj = SQLObj.builder()
.tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(SqlServerSQLConstants.KEYWORD_TABLE, table))
.tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
.build();
List<SQLObj> yFields = new ArrayList<>();
List<SQLObj> yWheres = new ArrayList<>();
List<SQLObj> yOrders = new ArrayList<>();
if (CollectionUtils.isNotEmpty(yAxis)) {
for (int i = 0; i < yAxis.size(); i++) {
ChartViewFieldDTO y = yAxis.get(i);
String originField = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i);
// 处理纵轴字段
yFields.add(getYFields(y, originField, fieldAlias));
// 处理纵轴过滤
yWheres.addAll(getYWheres(y, originField, fieldAlias));
// 处理纵轴排序
if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
yOrders.add(SQLObj.builder()
.orderField(originField)
.orderAlias(fieldAlias)
.orderDirection(y.getSort())
.build());
}
}
}
// 处理视图中字段过滤
List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
// 处理仪表板字段过滤
List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
// 构建sql所有参数
List<SQLObj> fields = new ArrayList<>();
fields.addAll(yFields);
List<SQLObj> wheres = new ArrayList<>();
if (customWheres != null) wheres.addAll(customWheres);
if (extWheres != null) wheres.addAll(extWheres);
List<SQLObj> groups = new ArrayList<>();
// 外层再次套sql
List<SQLObj> orders = new ArrayList<>();
orders.addAll(yOrders);
List<SQLObj> aggWheres = new ArrayList<>();
aggWheres.addAll(yWheres);
STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
ST st_sql = stg.getInstanceOf("querySql");
if (CollectionUtils.isNotEmpty(yFields)) st_sql.add("aggregators", yFields);
if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
String sql = st_sql.render();
ST st = stg.getInstanceOf("querySql");
SQLObj tableSQL = SQLObj.builder()
.tableName(String.format(SqlServerSQLConstants.BRACKETS, sql))
.tableAlias(String.format(TABLE_ALIAS_PREFIX, 1))
.build();
if (CollectionUtils.isNotEmpty(aggWheres)) st.add("filters", aggWheres);
if (CollectionUtils.isNotEmpty(orders)) st.add("orders", orders);
if (ObjectUtils.isNotEmpty(tableSQL)) st.add("table", tableSQL);
return st.render();
}
@Override
public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) {
return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, customFilter, extFilterRequestList);
}
@Override
public String wrapSql(String sql) {
sql = sql.trim();
if (sql.lastIndexOf(";") == (sql.length() - 1)) {
sql = sql.substring(0, sql.length() - 1);
}
String tmpSql = "SELECT * FROM (" + sql + ") AS tmp " + " LIMIT 0";
return tmpSql;
}
@Override
public String createRawQuerySQL(String table, List<DatasetTableField> fields) {
String[] array = fields.stream().map(f -> {
StringBuilder stringBuilder = new StringBuilder();
// if (f.getDeExtractType() == 4) { // 处理 tinyint
// stringBuilder.append("concat(`").append(f.getOriginName()).append("`,'') AS ").append(f.getDataeaseName());
// } else { // } else {
// filter.append(" AND `_").append(y.getSummary()).append("_").append(StringUtils.equalsIgnoreCase(y.getOriginName(), "*") ? "" : y.getOriginName()).append("`");
// }
// filter.append(transMysqlFilterTerm(f.getTerm()));
// if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) {
// filter.append("(null,'')");
// } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) {
// filter.append(" AND `_")
// .append(y.getSummary()).append("_").append(StringUtils.equalsIgnoreCase(y.getOriginName(), "*") ? "" : y.getOriginName())
// .append("`").append(" <> ''");
// } else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) {
// filter.append("('").append(StringUtils.join(f.getValue(), "','")).append("')");
// } else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) {
// filter.append("%").append(f.getValue()).append("%");
// } else {
// filter.append("'").append(f.getValue()).append("'");
// }
// return filter.toString();
// }).toArray(String[]::new);
// return StringUtils.join(s, " ");
// }).toArray(String[]::new);
// if (resultFilter.length == 0) {
// return sql;
// } else {
// String filterSql = MessageFormat.format("SELECT * FROM {0} WHERE 1=1 {1} ORDER BY {2}",
// "(" + sql + ") AS tmp",
// StringUtils.join(resultFilter, " "),
// ObjectUtils.isNotEmpty(order) ? StringUtils.join(order, ",") : "null");
// return filterSql;
// }
// }
//
// @Override
// public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) {
// return getSQLSummary(" (" + sqlFix(sql) + ") AS tmp ", yAxis, customFilter, extFilterRequestList);
// }
//
// @Override
// public String wrapSql(String sql) {
// sql = sql.trim();
// if (sql.lastIndexOf(";") == (sql.length() - 1)) {
// sql = sql.substring(0, sql.length() - 1);
// }
// String tmpSql = "SELECT * FROM (" + sql + ") AS tmp " + " LIMIT 0";
// return tmpSql;
// }
//
// @Override
// public String createRawQuerySQL(String table, List<DatasetTableField> fields) {
// String[] array = fields.stream().map(f -> {
// StringBuilder stringBuilder = new StringBuilder();
// stringBuilder.append("`").append(f.getOriginName()).append("` AS ").append(f.getDataeaseName()); // stringBuilder.append("`").append(f.getOriginName()).append("` AS ").append(f.getDataeaseName());
// return stringBuilder.toString();
// }).toArray(String[]::new);
// return MessageFormat.format("SELECT {0} FROM {1} ORDER BY null", StringUtils.join(array, ","), table);
// }
//
// @Override
// public String createRawQuerySQLAsTmp(String sql, List<DatasetTableField> fields) {
// return createRawQuerySQL(" (" + sqlFix(sql) + ") AS tmp ", fields);
// }
//
// public String transMysqlFilterTerm(String term) {
// switch (term) {
// case "eq":
// return " = ";
// case "not_eq":
// return " <> ";
// case "lt":
// return " < ";
// case "le":
// return " <= ";
// case "gt":
// return " > ";
// case "ge":
// return " >= ";
// case "in":
// return " IN ";
// case "not in":
// return " NOT IN ";
// case "like":
// return " LIKE ";
// case "not like":
// return " NOT LIKE ";
// case "null":
// return " IN ";
// case "not_null":
// return " IS NOT NULL ";
// case "between":
// return " BETWEEN ";
// default:
// return "";
// }
// }
//
// public String transCustomFilter(List<ChartCustomFilterDTO> requestList) {
// if (CollectionUtils.isEmpty(requestList)) {
// return "";
// }
// StringBuilder filter = new StringBuilder();
// for (ChartCustomFilterDTO request : requestList) {
// String value = request.getValue();
// DatasetTableField field = request.getField();
// if (ObjectUtils.isEmpty(field)) {
// continue;
// }
// if (field.getDeType() == 1 && field.getDeExtractType() != 1) {
// filter.append(" AND FROM_UNIXTIME(CAST(`")
// .append(field.getOriginName())
// .append("` AS DECIMAL(20,0))/1000,'%Y-%m-%d %H:%i:%S') ");
// } else {
// filter.append(" AND `").append(field.getOriginName()).append("`");
// }
// filter.append(" ")
// .append(transMysqlFilterTerm(request.getTerm()))
// .append(" ");
// if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) {
// filter.append("(null,'')");
// } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) {
// filter.append(" AND `").append(field.getOriginName()).append("`").append(" <> ''");
// } else if (StringUtils.containsIgnoreCase(request.getTerm(), "in")) {
// filter.append("('").append(StringUtils.join(value, "','")).append("')");
// } else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) {
// filter.append("'%").append(value).append("%'");
// } else {
// filter.append("'").append(value).append("'");
// }
// }
// return filter.toString();
// }
//
// public String transExtFilter(List<ChartExtFilterRequest> requestList) {
// if (CollectionUtils.isEmpty(requestList)) {
// return "";
// }
// StringBuilder filter = new StringBuilder();
// for (ChartExtFilterRequest request : requestList) {
// List<String> value = request.getValue();
// if (CollectionUtils.isEmpty(value)) {
// continue;
// }
// DatasetTableField field = request.getDatasetTableField();
// if (field.getDeType() == 1 && field.getDeExtractType() != 1) {
// filter.append(" AND FROM_UNIXTIME(CAST(`")
// .append(field.getOriginName())
// .append("` AS DECIMAL(20,0))/1000,'%Y-%m-%d %H:%i:%S') ");
// } else {
// filter.append(" AND `").append(field.getOriginName()).append("`");
// }
// filter.append(" ")
// .append(transMysqlFilterTerm(request.getOperator()))
// .append(" ");
// if (StringUtils.containsIgnoreCase(request.getOperator(), "in")) {
// filter.append("('").append(StringUtils.join(value, "','")).append("')");
// } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
// filter.append("'%").append(value.get(0)).append("%'");
// } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
// String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
// filter.append("'").append(startTime).append("' AND '").append(endTime).append("'");
// } else {
// filter.append("'").append(value.get(0)).append("'");
// }
// }
// return filter.toString();
// }
//
// private String sqlFix(String sql) {
// if (sql.lastIndexOf(";") == (sql.length() - 1)) {
// sql = sql.substring(0, sql.length() - 1);
// }
// return sql;
// }
//
// private String transDateFormat(String dateStyle, String datePattern) {
// String split = "-";
// if (StringUtils.equalsIgnoreCase(datePattern, "date_sub")) {
// split = "-";
// } else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) {
// split = "/";
// }
//
// switch (dateStyle) {
// case "y":
// return "%Y";
// case "y_M":
// return "%Y" + split + "%m";
// case "y_M_d":
// return "%Y" + split + "%m" + split + "%d";
// case "H_m_s":
// return "%H:%i:%S";
// case "y_M_d_H_m":
// return "%Y" + split + "%m" + split + "%d" + " %H:%i";
// case "y_M_d_H_m_s":
// return "%Y" + split + "%m" + split + "%d" + " %H:%i:%S";
// default:
// return "%Y-%m-%d %H:%i:%S";
// }
// } // }
//} stringBuilder.append("\"").append(f.getOriginName()).append("\" AS ").append(f.getDataeaseName());
return stringBuilder.toString();
}).toArray(String[]::new);
return MessageFormat.format("SELECT {0} FROM {1}", StringUtils.join(array, ","), table);
}
@Override
public String createRawQuerySQLAsTmp(String sql, List<DatasetTableField> fields) {
return createRawQuerySQL(" (" + sqlFix(sql) + ") AS tmp ", fields);
}
public String transMysqlFilterTerm(String term) {
switch (term) {
case "eq":
return " = ";
case "not_eq":
return " <> ";
case "lt":
return " < ";
case "le":
return " <= ";
case "gt":
return " > ";
case "ge":
return " >= ";
case "in":
return " IN ";
case "not in":
return " NOT IN ";
case "like":
return " LIKE ";
case "not like":
return " NOT LIKE ";
case "null":
return " IN ";
case "not_null":
return " IS NOT NULL AND %s <> ''";
case "between":
return " BETWEEN ";
default:
return "";
}
}
public List<SQLObj> transCustomFilterList(SQLObj tableObj, List<ChartCustomFilterDTO> requestList) {
if (CollectionUtils.isEmpty(requestList)) {
return null;
}
List<SQLObj> list = new ArrayList<>();
for (ChartCustomFilterDTO request : requestList) {
DatasetTableField field = request.getField();
if (ObjectUtils.isEmpty(field)) {
continue;
}
String value = request.getValue();
String whereName = "";
String whereTerm = transMysqlFilterTerm(request.getTerm());
String whereValue = "";
String originName = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
if (field.getDeType() == DeTypeConstants.DE_TIME && field.getDeExtractType() != DeTypeConstants.DE_TIME) {
String cast = String.format(SqlServerSQLConstants.LONG_TO_DATE, originName + "/1000");
whereName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast);
} else {
whereName = originName;
}
if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) {
whereValue = SqlServerSQLConstants.WHERE_VALUE_NULL;
} else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) {
whereTerm = String.format(whereTerm, originName);
} else if (StringUtils.containsIgnoreCase(request.getTerm(), "in")) {
whereValue = "('" + StringUtils.join(value, "','") + "')";
} else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) {
whereValue = "'%" + value + "%'";
} else {
whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, value);
}
list.add(SQLObj.builder()
.whereField(whereName)
.whereTermAndValue(whereTerm + whereValue)
.build());
}
return list;
}
public List<SQLObj> transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
if (CollectionUtils.isEmpty(requestList)) {
return null;
}
List<SQLObj> list = new ArrayList<>();
for (ChartExtFilterRequest request : requestList) {
List<String> value = request.getValue();
DatasetTableField field = request.getDatasetTableField();
if (CollectionUtils.isEmpty(value) || ObjectUtils.isEmpty(field)) {
continue;
}
String whereName = "";
String whereTerm = transMysqlFilterTerm(request.getOperator());
String whereValue = "";
String originName = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
if (field.getDeType() == 1 && field.getDeExtractType() != 1) {
String cast = String.format(SqlServerSQLConstants.LONG_TO_DATE, originName + "/1000");
whereName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast);
} else {
whereName = originName;
}
if (StringUtils.containsIgnoreCase(request.getOperator(), "in")) {
whereValue = "('" + StringUtils.join(value, "','") + "')";
} else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
whereValue = "'%" + value.get(0) + "%'";
} else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
whereValue = String.format(SqlServerSQLConstants.WHERE_BETWEEN, startTime, endTime);
} else {
whereValue = String.format(SqlServerSQLConstants.WHERE_BETWEEN, value.get(0), value.get(1));
}
} else {
whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, value.get(0));
}
list.add(SQLObj.builder()
.whereField(whereName)
.whereTermAndValue(whereTerm + whereValue)
.build());
}
return list;
}
private String sqlFix(String sql) {
if (sql.lastIndexOf(";") == (sql.length() - 1)) {
sql = sql.substring(0, sql.length() - 1);
}
return sql;
}
//日期格式化
private String transDateFormat(String dateStyle, String datePattern, String originField) {
String split = "-";
if (StringUtils.equalsIgnoreCase(datePattern, "date_sub")) {
split = "-";
} else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) {
split = "/";
}
switch (dateStyle) {
case "y":
return "CONVERT(varchar(100), datepart(yy, " + originField + "))";
case "y_M":
if(split.equalsIgnoreCase("-")){
return "substring( convert(varchar," + originField + ",120),1,7)";
}else {
return "replace("+ "substring( convert(varchar," + originField + ",120),1,7), '-','/')";
}
case "y_M_d":
if(split.equalsIgnoreCase("-")){
return "CONVERT(varchar(100), " + originField + ", 23)";
}else {
return "CONVERT(varchar(100), " + originField + ", 111)";
}
case "H_m_s":
return "CONVERT(varchar(100), " + originField + ", 8)";
case "y_M_d_H_m":
if(split.equalsIgnoreCase("-")){
return "substring( convert(varchar," + originField + ",120),1,16)";
}else {
return "replace("+ "substring( convert(varchar," + originField + ",120),1,16), '-','/')";
}
case "y_M_d_H_m_s":
if(split.equalsIgnoreCase("-")){
return "convert(varchar," + originField + ",120)";
}else {
return "replace("+ "convert(varchar," + originField + ",120), '-','/')";
}
default:
return "convert(varchar," + originField + ",120)";
}
}
private String transStringToDateFormat(String dateStyle, String datePattern, String originField) {
String split = "-";
if (StringUtils.equalsIgnoreCase(datePattern, "date_sub")) {
split = "-";
} else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) {
split = "/";
}
switch (dateStyle) {
case "y":
return "CONVERT(varchar(100), datepart(yy, " + "SELECT CONVERT(datetime, " + originField + " ,120)" + "))";
case "y_M":
if(split.equalsIgnoreCase("-")){
return "substring( convert(varchar," + "SELECT CONVERT(datetime, " + originField + " ,120)" + ",120),1,7)";
}else {
return "replace("+ "substring( convert(varchar," + "SELECT CONVERT(datetime, " + originField + " ,120)" + ",120),1,7), '-','/')";
}
case "y_M_d":
if(split.equalsIgnoreCase("-")){
return "CONVERT(varchar(100), " + "SELECT CONVERT(datetime, " + originField + " ,120)" + ", 23)";
}else {
return "CONVERT(varchar(100), " + "SELECT CONVERT(datetime, " + originField + " ,120)" + ", 111)";
}
case "H_m_s":
return "CONVERT(varchar(100), " + "SELECT CONVERT(datetime, " + originField + " ,120)" + ", 24)";
case "y_M_d_H_m":
if(split.equalsIgnoreCase("-")){
return "substring( convert(varchar," + "SELECT CONVERT(datetime, " + originField + " ,120)" + ",120),1,16)";
}else {
return "replace("+ "substring( convert(varchar," + "SELECT CONVERT(datetime, " + originField + " ,120)" + ",120),1,16), '-','/')";
}
case "y_M_d_H_m_s":
if(split.equalsIgnoreCase("-")){
return "convert(varchar," + "SELECT CONVERT(datetime, " + originField + " ,120)" + ",120)";
}else {
return "replace("+ "convert(varchar," + "SELECT CONVERT(datetime, " + originField + " ,120)" + ",120), '-','/')";
}
default:
return "convert(varchar," + "SELECT CONVERT(datetime, " + originField + " ,120)" + ",120)";
}
}
private SQLObj getXFields(ChartViewFieldDTO x, String originField, String fieldAlias) {
String fieldName = "";
if (x.getDeExtractType() == DeTypeConstants.DE_TIME) {
if (x.getDeType() == DeTypeConstants.DE_INT || x.getDeType() == DeTypeConstants.DE_FLOAT) { //时间转数值
fieldName = String.format(SqlServerSQLConstants.UNIX_TIMESTAMP, originField);
} else if (x.getDeType() == DeTypeConstants.DE_TIME) { //时间格式化
fieldName = transDateFormat(x.getDateStyle(), x.getDatePattern(), originField);
} else {
fieldName = originField;
}
} else {
if (x.getDeType() == DeTypeConstants.DE_TIME) {
if (x.getDeExtractType() == DeTypeConstants.DE_STRING) {// 字符串转时间
String cast = String.format(SqlServerSQLConstants.STRING_TO_DATE, originField);
fieldName = transDateFormat(x.getDateStyle(), x.getDatePattern(), cast);
} else {// 数值转时间
String cast = String.format(SqlServerSQLConstants.LONG_TO_DATE, originField+ "/1000");
fieldName = transDateFormat(x.getDateStyle(), x.getDatePattern(), cast);
}
} else {
fieldName = originField;
}
}
return SQLObj.builder()
.fieldName(fieldName)
.fieldAlias(fieldAlias)
.build();
}
private SQLObj getYFields(ChartViewFieldDTO y, String originField, String fieldAlias) {
String fieldName = "";
if (StringUtils.equalsIgnoreCase(y.getOriginName(), "*")) {
fieldName = SqlServerSQLConstants.AGG_COUNT;
} else if (SQLConstants.DIMENSION_TYPE.contains(y.getDeType())) {
fieldName = String.format(SqlServerSQLConstants.AGG_FIELD, y.getSummary(), originField);
} else {
if (StringUtils.equalsIgnoreCase(y.getSummary(), "avg") || StringUtils.containsIgnoreCase(y.getSummary(), "pop")) {
String convert = String.format(SqlServerSQLConstants.CONVERT, y.getDeType() == DeTypeConstants.DE_INT ? SqlServerSQLConstants.DEFAULT_INT_FORMAT : SqlServerSQLConstants.DEFAULT_FLOAT_FORMAT, originField);
String agg = String.format(SqlServerSQLConstants.AGG_FIELD, y.getSummary(), convert);
fieldName = String.format(SqlServerSQLConstants.CONVERT, SqlServerSQLConstants.DEFAULT_FLOAT_FORMAT, agg);
} else {
String convert = String.format(SqlServerSQLConstants.CONVERT, y.getDeType() == 2 ? SqlServerSQLConstants.DEFAULT_INT_FORMAT : SqlServerSQLConstants.DEFAULT_FLOAT_FORMAT, originField);
fieldName = String.format(SqlServerSQLConstants.AGG_FIELD, y.getSummary(), convert);
}
}
return SQLObj.builder()
.fieldName(fieldName)
.fieldAlias(fieldAlias)
.build();
}
private List<SQLObj> getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
List<SQLObj> list = new ArrayList<>();
if (CollectionUtils.isNotEmpty(y.getFilter()) && y.getFilter().size() > 0) {
y.getFilter().forEach(f -> {
String whereTerm = transMysqlFilterTerm(f.getTerm());
String whereValue = "";
// 原始类型不是时间，在de中被转成时间的字段做处理
if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) {
whereValue = SqlServerSQLConstants.WHERE_VALUE_NULL;
} else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) {
whereTerm = String.format(whereTerm, originField);
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) {
whereValue = "('" + StringUtils.join(f.getValue(), "','") + "')";
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) {
whereValue = "'%" + f.getValue() + "%'";
} else {
whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, f.getValue());
}
list.add(SQLObj.builder()
.whereField(fieldAlias)
.whereAlias(fieldAlias)
.whereTermAndValue(whereTerm + whereValue)
.build());
});
}
return list;
}
}
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
浏览文件 @ 004e2f72
...@@ -377,7 +377,7 @@ public class DataSetTableService { ...@@ -377,7 +377,7 @@ public class DataSetTableService {
datasourceRequest.setDatasource(ds); datasourceRequest.setDatasource(ds);
String table = dataTableInfoDTO.getTable(); String table = dataTableInfoDTO.getTable();
QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize, false)); datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize, false, ds));
map.put("sql", datasourceRequest.getQuery()); map.put("sql", datasourceRequest.getQuery());
try { try {
data.addAll(datasourceProvider.getData(datasourceRequest)); data.addAll(datasourceProvider.getData(datasourceRequest));
...@@ -386,7 +386,7 @@ public class DataSetTableService { ...@@ -386,7 +386,7 @@ public class DataSetTableService {
DEException.throwException(e.getMessage()); DEException.throwException(e.getMessage());
} }
try { try {
datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false)); datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds));
dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size()); dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -403,7 +403,7 @@ public class DataSetTableService { ...@@ -403,7 +403,7 @@ public class DataSetTableService {
datasourceRequest.setDatasource(ds); datasourceRequest.setDatasource(ds);
String table = DorisTableUtils.dorisName(dataSetTableRequest.getId()); String table = DorisTableUtils.dorisName(dataSetTableRequest.getId());
QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize, false)); datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize, false, ds));
map.put("sql", datasourceRequest.getQuery()); map.put("sql", datasourceRequest.getQuery());
try { try {
data.addAll(jdbcProvider.getData(datasourceRequest)); data.addAll(jdbcProvider.getData(datasourceRequest));
...@@ -412,7 +412,7 @@ public class DataSetTableService { ...@@ -412,7 +412,7 @@ public class DataSetTableService {
DEException.throwException(e.getMessage()); DEException.throwException(e.getMessage());
} }
try { try {
datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false)); datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds));
dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size()); dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -458,7 +458,7 @@ public class DataSetTableService { ...@@ -458,7 +458,7 @@ public class DataSetTableService {
datasourceRequest.setDatasource(ds); datasourceRequest.setDatasource(ds);
String table = DorisTableUtils.dorisName(dataSetTableRequest.getId()); String table = DorisTableUtils.dorisName(dataSetTableRequest.getId());
QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize, false)); datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize, false, ds));
map.put("sql", datasourceRequest.getQuery()); map.put("sql", datasourceRequest.getQuery());
try { try {
data.addAll(jdbcProvider.getData(datasourceRequest)); data.addAll(jdbcProvider.getData(datasourceRequest));
...@@ -467,7 +467,7 @@ public class DataSetTableService { ...@@ -467,7 +467,7 @@ public class DataSetTableService {
DEException.throwException(e.getMessage()); DEException.throwException(e.getMessage());
} }
try { try {
datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false)); datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds));
dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size()); dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -485,7 +485,7 @@ public class DataSetTableService { ...@@ -485,7 +485,7 @@ public class DataSetTableService {
datasourceRequest.setDatasource(ds); datasourceRequest.setDatasource(ds);
String table = DorisTableUtils.dorisName(dataSetTableRequest.getId()); String table = DorisTableUtils.dorisName(dataSetTableRequest.getId());
QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize, false)); datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize, false, ds));
map.put("sql", datasourceRequest.getQuery()); map.put("sql", datasourceRequest.getQuery());
try { try {
data.addAll(jdbcProvider.getData(datasourceRequest)); data.addAll(jdbcProvider.getData(datasourceRequest));
...@@ -494,7 +494,7 @@ public class DataSetTableService { ...@@ -494,7 +494,7 @@ public class DataSetTableService {
DEException.throwException(e.getMessage()); DEException.throwException(e.getMessage());
} }
try { try {
datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false)); datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds));
dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size()); dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -537,7 +537,7 @@ public class DataSetTableService { ...@@ -537,7 +537,7 @@ public class DataSetTableService {
datasourceRequest.setDatasource(ds); datasourceRequest.setDatasource(ds);
String table = DorisTableUtils.dorisName(dataSetTableRequest.getId()); String table = DorisTableUtils.dorisName(dataSetTableRequest.getId());
QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize, false)); datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize, false, ds));
map.put("sql", datasourceRequest.getQuery()); map.put("sql", datasourceRequest.getQuery());
try { try {
data.addAll(jdbcProvider.getData(datasourceRequest)); data.addAll(jdbcProvider.getData(datasourceRequest));
...@@ -547,7 +547,7 @@ public class DataSetTableService { ...@@ -547,7 +547,7 @@ public class DataSetTableService {
} }
try { try {
datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false)); datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds));
dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size()); dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
......
backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
浏览文件 @ 004e2f72
...@@ -865,7 +865,7 @@ public class ExtractDataService { ...@@ -865,7 +865,7 @@ public class ExtractDataService {
textFileOutputMeta.setSeparator(separator); textFileOutputMeta.setSeparator(separator);
textFileOutputMeta.setExtension(extention); textFileOutputMeta.setExtension(extention);
if (datasource.getType().equalsIgnoreCase(DatasourceTypes.oracle.name())) { if (datasource.getType().equalsIgnoreCase(DatasourceTypes.oracle.name()) ) {
TextFileField[] outputFields = new TextFileField[datasetTableFields.size() + 1]; TextFileField[] outputFields = new TextFileField[datasetTableFields.size() + 1];
for(int i=0;i< datasetTableFields.size();i++){ for(int i=0;i< datasetTableFields.size();i++){
TextFileField textFileField = new TextFileField(); TextFileField textFileField = new TextFileField();
...@@ -878,6 +878,20 @@ public class ExtractDataService { ...@@ -878,6 +878,20 @@ public class ExtractDataService {
textFileField.setType("String"); textFileField.setType("String");
outputFields[datasetTableFields.size()] = textFileField; outputFields[datasetTableFields.size()] = textFileField;
textFileOutputMeta.setOutputFields(outputFields);
}else if (datasource.getType().equalsIgnoreCase(DatasourceTypes.sqlServer.name())){
TextFileField[] outputFields = new TextFileField[datasetTableFields.size() + 1];
for(int i=0;i< datasetTableFields.size();i++){
TextFileField textFileField = new TextFileField();
textFileField.setName(datasetTableFields.get(i).getDataeaseName());
textFileField.setType("String");
outputFields[i] = textFileField;
}
TextFileField textFileField = new TextFileField();
textFileField.setName("dataease_uuid");
textFileField.setType("String");
outputFields[datasetTableFields.size()] = textFileField;
textFileOutputMeta.setOutputFields(outputFields); textFileOutputMeta.setOutputFields(outputFields);
}else { }else {
textFileOutputMeta.setOutputFields(new TextFileField[0]); textFileOutputMeta.setOutputFields(new TextFileField[0]);
...@@ -891,6 +905,14 @@ public class ExtractDataService { ...@@ -891,6 +905,14 @@ public class ExtractDataService {
private StepMeta udjc(List<DatasetTableField> datasetTableFields, DatasourceTypes datasourceType) { private StepMeta udjc(List<DatasetTableField> datasetTableFields, DatasourceTypes datasourceType) {
String needToChangeColumnType = ""; String needToChangeColumnType = "";
String handleBinaryTypeCode = "";
for (DatasetTableField datasetTableField : datasetTableFields) {
if(datasetTableField.getDeExtractType() == 5){
handleBinaryTypeCode = handleBinaryTypeCode + "\n" + this.handleBinaryType.replace("FEILD", datasetTableField.getDataeaseName());
}
}
UserDefinedJavaClassMeta userDefinedJavaClassMeta = new UserDefinedJavaClassMeta(); UserDefinedJavaClassMeta userDefinedJavaClassMeta = new UserDefinedJavaClassMeta();
List<UserDefinedJavaClassMeta.FieldInfo> fields = new ArrayList<>(); List<UserDefinedJavaClassMeta.FieldInfo> fields = new ArrayList<>();
UserDefinedJavaClassMeta.FieldInfo fieldInfo = new UserDefinedJavaClassMeta.FieldInfo("dataease_uuid", ValueMetaInterface.TYPE_STRING, -1, -1); UserDefinedJavaClassMeta.FieldInfo fieldInfo = new UserDefinedJavaClassMeta.FieldInfo("dataease_uuid", ValueMetaInterface.TYPE_STRING, -1, -1);
...@@ -906,11 +928,15 @@ public class ExtractDataService { ...@@ -906,11 +928,15 @@ public class ExtractDataService {
} else { } else {
Column_Fields = String.join(",", datasetTableFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.toList())); Column_Fields = String.join(",", datasetTableFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.toList()));
} }
if (datasourceType.equals(DatasourceTypes.excel)) { if (datasourceType.equals(DatasourceTypes.excel)) {
tmp_code = tmp_code.replace("handleExcelIntColumn", handleExcelIntColumn).replace("Column_Fields", Column_Fields); tmp_code = tmp_code.replace("handleExcelIntColumn", handleExcelIntColumn).replace("Column_Fields", Column_Fields);
} else { } else {
tmp_code = tmp_code.replace("handleExcelIntColumn", "").replace("Column_Fields", Column_Fields); tmp_code = tmp_code.replace("handleExcelIntColumn", "").replace("Column_Fields", Column_Fields);
} }
tmp_code = tmp_code.replace("handleBinaryType", handleBinaryTypeCode);
UserDefinedJavaClassDef userDefinedJavaClassDef = new UserDefinedJavaClassDef(UserDefinedJavaClassDef.ClassType.TRANSFORM_CLASS, "Processor", tmp_code); UserDefinedJavaClassDef userDefinedJavaClassDef = new UserDefinedJavaClassDef(UserDefinedJavaClassDef.ClassType.TRANSFORM_CLASS, "Processor", tmp_code);
userDefinedJavaClassDef.setActive(true); userDefinedJavaClassDef.setActive(true);
...@@ -993,6 +1019,12 @@ public class ExtractDataService { ...@@ -993,6 +1019,12 @@ public class ExtractDataService {
} }
} }
private static String handleBinaryType = " \t\tif(\"FEILD\".equalsIgnoreCase(filed)){\n" +
" get(Fields.Out, filed).setValue(r, \"\");\n" +
" get(Fields.Out, filed).getValueMeta().setType(2);\n" +
" \t}";
private static String alterColumnTypeCode = " if(\"FILED\".equalsIgnoreCase(filed)){\n" + private static String alterColumnTypeCode = " if(\"FILED\".equalsIgnoreCase(filed)){\n" +
"\t if(tmp != null && tmp.equalsIgnoreCase(\"Y\")){\n" + "\t if(tmp != null && tmp.equalsIgnoreCase(\"Y\")){\n" +
" get(Fields.Out, filed).setValue(r, 1);\n" + " get(Fields.Out, filed).setValue(r, 1);\n" +
...@@ -1049,6 +1081,7 @@ public class ExtractDataService { ...@@ -1049,6 +1081,7 @@ public class ExtractDataService {
" String tmp = get(Fields.In, filed).getString(r);\n" + " String tmp = get(Fields.In, filed).getString(r);\n" +
"handleWraps \n" + "handleWraps \n" +
"alterColumnTypeCode \n" + "alterColumnTypeCode \n" +
"handleBinaryType \n" +
"handleExcelIntColumn \n" + "handleExcelIntColumn \n" +
" str = str + tmp;\n" + " str = str + tmp;\n" +
" }\n" + " }\n" +
......
backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java
浏览文件 @ 004e2f72
...@@ -67,7 +67,7 @@ public class DirectFieldService implements DataSetFieldService { ...@@ -67,7 +67,7 @@ public class DirectFieldService implements DataSetFieldService {
QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "db")) { if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "db")) {
datasourceRequest.setTable(dataTableInfoDTO.getTable()); datasourceRequest.setTable(dataTableInfoDTO.getTable());
datasourceRequest.setQuery(qp.createQuerySQL(dataTableInfoDTO.getTable(), Collections.singletonList(field), true)); datasourceRequest.setQuery(qp.createQuerySQL(dataTableInfoDTO.getTable(), Collections.singletonList(field), true, ds));
} else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "sql")) { } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "sql")) {
datasourceRequest.setQuery(qp.createQuerySQLAsTmp(dataTableInfoDTO.getSql(), Collections.singletonList(field), true)); datasourceRequest.setQuery(qp.createQuerySQLAsTmp(dataTableInfoDTO.getSql(), Collections.singletonList(field), true));
} else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "custom")) { } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "custom")) {
...@@ -85,7 +85,7 @@ public class DirectFieldService implements DataSetFieldService { ...@@ -85,7 +85,7 @@ public class DirectFieldService implements DataSetFieldService {
tableName = "ds_" + datasetTable.getId().replaceAll("-", "_"); tableName = "ds_" + datasetTable.getId().replaceAll("-", "_");
datasourceRequest.setTable(tableName); datasourceRequest.setTable(tableName);
QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
datasourceRequest.setQuery(qp.createQuerySQL(tableName, Collections.singletonList(field), true)); datasourceRequest.setQuery(qp.createQuerySQL(tableName, Collections.singletonList(field), true, null));
} }
try { try {
......
frontend/src/views/system/datasource/form.vue
浏览文件 @ 004e2f72
...@@ -63,6 +63,23 @@ ...@@ -63,6 +63,23 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.type=='sqlServer'">
<el-button icon="el-icon-plus" size="mini" @click="getSchema()">
{{ $t('datasource.get_schema') }}
</el-button>
</el-form-item>
<el-form-item v-if="form.type=='sqlServer'" :label="$t('datasource.schema')">
<el-select filterable v-model="form.configuration.schema" :placeholder="$t('datasource.please_choose_schema')" class="select-width">
<el-option
v-for="item in schemas"
:key="item"
:label="item"
:value="item"
/>
</el-select>
</el-form-item>
</el-form> </el-form>
<div v-if="canEdit" slot="footer" class="dialog-footer"> <div v-if="canEdit" slot="footer" class="dialog-footer">
<el-button v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)" @click="validaDatasource">{{ $t('commons.validate') }}</el-button> <el-button v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)" @click="validaDatasource">{{ $t('commons.validate') }}</el-button>
...@@ -105,7 +122,9 @@ export default { ...@@ -105,7 +122,9 @@ export default {
'configuration.host': [{ required: true, message: this.$t('datasource.please_input_host'), trigger: 'change' }], 'configuration.host': [{ required: true, message: this.$t('datasource.please_input_host'), trigger: 'change' }],
'configuration.port': [{ required: true, message: this.$t('datasource.please_input_port'), trigger: 'change' }] 'configuration.port': [{ required: true, message: this.$t('datasource.please_input_port'), trigger: 'change' }]
}, },
allTypes: [{ name: 'mysql', label: 'MySQL', type: 'jdbc' }, { name: 'oracle', label: 'Oracle', type: 'jdbc' }], allTypes: [{ name: 'mysql', label: 'MySQL', type: 'jdbc' },
{ name: 'oracle', label: 'Oracle', type: 'jdbc' },
{ name: 'sqlServer', label: 'SQLSERVER', type: 'jdbc' }],
schemas: [], schemas: [],
canEdit: false, canEdit: false,
originConfiguration: {} originConfiguration: {}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论