From 96e6ab150c1be9bc144ccda6c4d9c6ef73dfde80 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 2 Aug 2021 14:30:35 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E6=94=AF=E6=8C=81=20sqlserver?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlserver/SqlServerSQLConstants.java | 41 + .../sqlserver/SqlserverQueryProvider.java | 1275 ++++++++++------- 2 files changed, 783 insertions(+), 533 deletions(-) create mode 100644 backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java diff --git a/backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java b/backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java new file mode 100644 index 0000000000..3a93536ecd --- /dev/null +++ b/backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java @@ -0,0 +1,41 @@ +package io.dataease.provider.sqlserver; + +import io.dataease.provider.SQLConstants; + +import static io.dataease.datasource.constants.DatasourceTypes.mysql; + +/** + * @Author gin + * @Date 2021/7/8 7:22 下午 + */ +public class SqlServerSQLConstants extends SQLConstants { + public static final String KEYWORD_TABLE = mysql.getKeywordPrefix() + "%s" + mysql.getKeywordSuffix(); + + public static final String KEYWORD_FIX = "%s." + mysql.getKeywordPrefix() + "%s" + mysql.getKeywordSuffix(); + + public static final String UNIX_TIMESTAMP = "UNIX_TIMESTAMP(%s)"; + + public static final String DATE_FORMAT = "DATE_FORMAT(%s,'%s')"; + + public static final String FROM_UNIXTIME = "FROM_UNIXTIME(%s,'%s')"; + + public static final String CAST = "CAST(%s AS %s)"; + + public static final String DEFAULT_DATE_FORMAT = "%Y-%m-%d %H:%i:%S"; + + 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)"; +} diff --git a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java index 2096399f82..7c81918cbb 100644 --- a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java @@ -1,533 +1,742 @@ -//package io.dataease.provider.sqlserver; -// -//import io.dataease.base.domain.DatasetTableField; -//import io.dataease.controller.request.chart.ChartExtFilterRequest; -//import io.dataease.dto.chart.ChartCustomFilterDTO; -//import io.dataease.dto.chart.ChartViewFieldDTO; -//import io.dataease.provider.QueryProvider; -//import org.apache.commons.collections4.CollectionUtils; -//import org.apache.commons.lang3.ObjectUtils; -//import org.apache.commons.lang3.StringUtils; -//import org.springframework.stereotype.Service; -// -//import java.text.MessageFormat; -//import java.text.SimpleDateFormat; -//import java.util.Arrays; -//import java.util.Date; -//import java.util.List; -// -///** -// * @Author gin -// * @Date 2021/5/17 2:43 下午 -// */ -//@Service("sqlServerQuery") -//public class SqlserverQueryProvider extends QueryProvider { -// @Override -// public Integer transFieldType(String field) { -// switch (field) { -// case "CHAR": -// case "VARCHAR": -// case "TEXT": -// case "TINYTEXT": -// case "MEDIUMTEXT": -// case "LONGTEXT": -// case "ENUM": -// return 0;// 文本 -// case "DATE": -// case "TIME": -// case "YEAR": -// case "DATETIME": -// case "TIMESTAMP": -// return 1;// 时间 -// case "INT": -// case "SMALLINT": -// case "MEDIUMINT": -// case "INTEGER": -// case "BIGINT": -// return 2;// 整型 -// case "FLOAT": -// case "DOUBLE": -// case "DECIMAL": -// return 3;// 浮点 -// case "BIT": -// case "TINYINT": -// return 4;// 布尔 -// default: -// return 0; -// } -// } -// -// @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 -// public String createSQLPreview(String sql, String orderBy) { -// return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp ORDER BY null " + " LIMIT 0,1000"; -// } -// -// @Override -// public String createQuerySQL(String table, List fields) { -// String[] array = fields.stream().map(f -> { -// StringBuilder stringBuilder = new StringBuilder(); -// // 如果原始类型为时间 -// if (f.getDeExtractType() == 1) { -// if (f.getDeType() == 2 || f.getDeType() == 3) { -// stringBuilder.append("UNIX_TIMESTAMP(`").append(f.getOriginName()).append("`)*1000 AS ").append(f.getDataeaseName()); -// } else { -// stringBuilder.append("`").append(f.getOriginName()).append("` AS ").append(f.getDataeaseName()); -// } -// } else if (f.getDeExtractType() == 0) { -// if (f.getDeType() == 2) { -// stringBuilder.append("CAST(`").append(f.getOriginName()).append("` AS DECIMAL(20,0)) AS ").append(f.getDataeaseName()); -// } else if (f.getDeType() == 3) { -// 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()); -// } else { -// stringBuilder.append("`").append(f.getOriginName()).append("` AS ").append(f.getDataeaseName()); -// } -// } else { -// if (f.getDeType() == 1) { -// stringBuilder.append("FROM_UNIXTIME(CAST(`").append(f.getOriginName()).append("` AS DECIMAL(20,0))/1000,'%Y-%m-%d %H:%i:%S') AS ").append(f.getDataeaseName()); -// } else { -// 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 createQuerySQLAsTmp(String sql, List fields) { -// return createQuerySQL(" (" + sqlFix(sql) + ") AS tmp ", fields); -// } -// -// @Override -// public String createQuerySQLWithPage(String table, List fields, Integer page, Integer pageSize, Integer realSize) { -// return createQuerySQL(table, fields) + " LIMIT " + (page - 1) * pageSize + "," + realSize; -// } -// -// @Override -// public String createQueryTableWithLimit(String table, List fields, Integer limit) { -// return createQuerySQL(table, fields) + " LIMIT 0," + limit; -// } -// -// @Override -// public String createQuerySqlWithLimit(String sql, List fields, Integer limit) { -// return createQuerySQLAsTmp(sql, fields) + " LIMIT 0," + limit; -// } -// -// @Override -// public String createQuerySQLAsTmpWithPage(String sql, List fields, Integer page, Integer pageSize, Integer realSize) { -// return createQuerySQLAsTmp(sql, fields) + " LIMIT " + (page - 1) * pageSize + "," + realSize; -// } -// -// @Override -// public String getSQL(String table, List xAxis, List yAxis, List customFilter, List extFilterRequestList) { -// // 字段汇总 排序等 -// String[] field = yAxis.stream().map(y -> { -// StringBuilder f = new StringBuilder(); -// if (StringUtils.equalsIgnoreCase(y.getOriginName(), "*")) { -// f.append(y.getSummary()).append("(").append(y.getOriginName()).append(")"); -// } else { -// if (StringUtils.equalsIgnoreCase(y.getSummary(), "avg") || StringUtils.containsIgnoreCase(y.getSummary(), "pop")) { -// f.append("CAST(") -// .append(y.getSummary()).append("(") -// .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 { -// f.append(y.getSummary()).append("(") -// .append("CAST(`").append(y.getOriginName()).append("` AS ").append(y.getDeType() == 2 ? "DECIMAL(20,0)" : "DECIMAL(20,2)").append(")") -// .append(")"); -// } -// } -// f.append(" AS `_").append(y.getSummary()).append("_").append(StringUtils.equalsIgnoreCase(y.getOriginName(), "*") ? "" : y.getOriginName()).append("`"); -// return f.toString(); -// }).toArray(String[]::new); -// String[] groupField = xAxis.stream().map(x -> { -// StringBuilder stringBuilder = new StringBuilder(); -// // 如果原始类型为时间 -// if (x.getDeExtractType() == 1) { -// 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) { -// String format = transDateFormat(x.getDateStyle(), x.getDatePattern()); -// stringBuilder.append("DATE_FORMAT(`").append(x.getOriginName()).append("`,'").append(format).append("') AS `_").append(x.getOriginName()).append("`"); -// } else { -// stringBuilder.append("`").append(x.getOriginName()).append("` AS `_").append(x.getOriginName()).append("`"); -// } -// } else { -// if (x.getDeType() == 1) { -// String format = transDateFormat(x.getDateStyle(), x.getDatePattern()); -// if (x.getDeExtractType() == 0) { -// stringBuilder.append("DATE_FORMAT(`").append(x.getOriginName()).append("`,'").append(format).append("') AS `_").append(x.getOriginName()).append("`"); -// } else { -// 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("`"); -// } -// } else { -// stringBuilder.append("`").append(x.getOriginName()).append("` AS `_").append(x.getOriginName()).append("`"); -// } -// } -// return stringBuilder.toString(); -// }).toArray(String[]::new); -// String[] group = xAxis.stream().map(x -> "`_" + x.getOriginName() + "`").toArray(String[]::new); -// String[] xOrder = xAxis.stream().filter(f -> StringUtils.isNotEmpty(f.getSort()) && !StringUtils.equalsIgnoreCase(f.getSort(), "none")) -// .map(f -> "`_" + f.getOriginName() + "` " + f.getSort()).toArray(String[]::new); -// 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); -// String[] order = Arrays.copyOf(xOrder, xOrder.length + yOrder.length); -// System.arraycopy(yOrder, 0, order, xOrder.length, yOrder.length); -// -// String[] xFilter = xAxis.stream().filter(x -> CollectionUtils.isNotEmpty(x.getFilter()) && x.getFilter().size() > 0) -// .map(x -> { -// String[] s = x.getFilter().stream().map(f -> { -// StringBuilder filter = new StringBuilder(); -// if (x.getDeType() == 1 && x.getDeExtractType() != 1) { -// filter.append(" AND FROM_UNIXTIME(cast(`") -// .append(x.getOriginName()) -// .append("` AS DECIMAL(20,0))/1000,'%Y-%m-%d %H:%i:%S') "); -// } else { -// filter.append(" AND `").append(x.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(x.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); -// -// String sql = MessageFormat.format("SELECT {0},{1} FROM {2} WHERE 1=1 {3} GROUP BY {4} ORDER BY null,{5}", -// StringUtils.join(groupField, ","), -// StringUtils.join(field, ","), -// table, -// (xFilter.length > 0 ? StringUtils.join(xFilter, " ") : "") + transCustomFilter(customFilter) + transExtFilter(extFilterRequestList),// origin field filter and panel field filter -// StringUtils.join(group, ","), -// StringUtils.join(order, ",")); -// if (sql.endsWith(",")) { -// sql = sql.substring(0, sql.length() - 1); -// } -// // 如果是对结果字段过滤，则再包裹一层sql -// String[] resultFilter = yAxis.stream().filter(y -> CollectionUtils.isNotEmpty(y.getFilter()) && y.getFilter().size() > 0) -// .map(y -> { -// String[] s = y.getFilter().stream().map(f -> { -// StringBuilder filter = new StringBuilder(); -// // 原始类型不是时间，在de中被转成时间的字段做处理 -// if (y.getDeType() == 1 && y.getDeExtractType() != 1) { -// filter.append(" AND FROM_UNIXTIME(CAST(`_") -// .append(y.getSummary()).append("_").append(StringUtils.equalsIgnoreCase(y.getOriginName(), "*") ? "" : y.getOriginName()).append("`") -// .append(" AS DECIMAL(20,0))/1000,'%Y-%m-%d %H:%i:%S') "); -// } 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(yOrder) ? StringUtils.join(yOrder, ",") : "null"); -// return filterSql; -// } -// } -// -// @Override -// public String getSQLAsTmp(String sql, List xAxis, List yAxis, List customFilter, List extFilterRequestList) { -// return getSQL(" (" + sqlFix(sql) + ") AS tmp ", xAxis, yAxis, customFilter, extFilterRequestList); -// } -// -// @Override -// public String getSQLStack(String table, List xAxis, List yAxis, List customFilter, List extFilterRequestList, List extStack) { -// return null; -// } -// -// @Override -// public String getSQLAsTmpStack(String table, List xAxis, List yAxis, List customFilter, List extFilterRequestList, List extStack) { -// return null; -// } -// -// @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 yAxis, List customFilter, List extFilterRequestList) { -// // 字段汇总 排序等 -// String[] field = yAxis.stream().map(y -> { -// StringBuilder f = new StringBuilder(); -// if (StringUtils.equalsIgnoreCase(y.getOriginName(), "*")) { -// f.append(y.getSummary()).append("(").append(y.getOriginName()).append(")"); -// } else { -// if (StringUtils.equalsIgnoreCase(y.getSummary(), "avg") || StringUtils.containsIgnoreCase(y.getSummary(), "pop")) { -// f.append("CAST(") -// .append(y.getSummary()).append("(") -// .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 { -// f.append(y.getSummary()).append("(") -// .append("CAST(`").append(y.getOriginName()).append("` AS ").append(y.getDeType() == 2 ? "DECIMAL(20,0)" : "DECIMAL(20,2)").append(")") -// .append(")"); -// } -// } -// f.append(" AS `_").append(y.getSummary()).append("_").append(StringUtils.equalsIgnoreCase(y.getOriginName(), "*") ? "" : y.getOriginName()).append("`"); -// return f.toString(); -// }).toArray(String[]::new); -// -// 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}", -// StringUtils.join(field, ","), -// table, -// transCustomFilter(customFilter) + transExtFilter(extFilterRequestList),// origin field filter and panel field filter -// StringUtils.join(order, ",")); -// if (sql.endsWith(",")) { -// sql = sql.substring(0, sql.length() - 1); -// } -// // 如果是对结果字段过滤，则再包裹一层sql -// String[] resultFilter = yAxis.stream().filter(y -> CollectionUtils.isNotEmpty(y.getFilter()) && y.getFilter().size() > 0) -// .map(y -> { -// String[] s = y.getFilter().stream().map(f -> { -// StringBuilder filter = new StringBuilder(); -// // 原始类型不是时间，在de中被转成时间的字段做处理 -// if (y.getDeType() == 1 && y.getDeExtractType() != 1) { -// filter.append(" AND FROM_UNIXTIME(CAST(`_") -// .append(y.getSummary()).append("_").append(StringUtils.equalsIgnoreCase(y.getOriginName(), "*") ? "" : y.getOriginName()).append("`") -// .append(" AS DECIMAL(20,0))/1000,'%Y-%m-%d %H:%i:%S') "); -// } 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 yAxis, List customFilter, List 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 fields) { -// String[] array = fields.stream().map(f -> { -// StringBuilder stringBuilder = new StringBuilder(); -// 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 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 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 requestList) { -// if (CollectionUtils.isEmpty(requestList)) { -// return ""; -// } -// StringBuilder filter = new StringBuilder(); -// for (ChartExtFilterRequest request : requestList) { -// List 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"; -// } -// } -//} +package io.dataease.provider.sqlserver; + +import io.dataease.base.domain.DatasetTableField; +import io.dataease.controller.request.chart.ChartExtFilterRequest; +import io.dataease.dto.chart.ChartCustomFilterDTO; +import io.dataease.dto.chart.ChartViewFieldDTO; +import io.dataease.dto.sqlObj.SQLObj; +import io.dataease.provider.QueryProvider; +import io.dataease.provider.SQLConstants; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.stringtemplate.v4.ST; +import org.stringtemplate.v4.STGroup; +import org.stringtemplate.v4.STGroupFile; + +import java.text.MessageFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX; + +@Service("sqlserverQuery") +public class SqlserverQueryProvider extends QueryProvider { + @Override + public Integer transFieldType(String field) { + switch (field) { + case "CHAR": + case "VARCHAR": + case "TEXT": + case "TINYTEXT": + case "MEDIUMTEXT": + case "LONGTEXT": + case "ENUM": + return 0;// 文本 + case "DATE": + case "TIME": + case "YEAR": + case "DATETIME": + case "TIMESTAMP": + return 1;// 时间 + case "INT": + case "SMALLINT": + case "MEDIUMINT": + case "INTEGER": + case "BIGINT": + return 2;// 整型 + case "FLOAT": + case "DOUBLE": + case "DECIMAL": + return 3;// 浮点 + case "BIT": + case "TINYINT": + return 4;// 布尔 + default: + return 0; + } + } + + @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 + public String createSQLPreview(String sql, String orderBy) { + return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp ORDER BY null " + " LIMIT 0,1000"; + } + + @Override + public String createQuerySQL(String table, List fields, boolean isGroup) { + 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 xFields = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(fields)) { + for (int i = 0; i < fields.size(); i++) { + DatasetTableField f = fields.get(i); + String originField = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), f.getOriginName()); + String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); + String fieldName = ""; + // 处理横轴字段 + if (f.getDeExtractType() == 1) { + if (f.getDeType() == 2 || f.getDeType() == 3) { + fieldName = String.format(SqlServerSQLConstants.UNIX_TIMESTAMP, originField) + "*1000"; + } else { + fieldName = originField; + } + } else if (f.getDeExtractType() == 0) { + if (f.getDeType() == 2) { + fieldName = String.format(SqlServerSQLConstants.CAST, originField, SqlServerSQLConstants.DEFAULT_INT_FORMAT); + } else if (f.getDeType() == 3) { + fieldName = String.format(SqlServerSQLConstants.CAST, originField, SqlServerSQLConstants.DEFAULT_FLOAT_FORMAT); + } else if (f.getDeType() == 1) { + fieldName = String.format(SqlServerSQLConstants.DATE_FORMAT, originField, SqlServerSQLConstants.DEFAULT_DATE_FORMAT); + } else { + fieldName = originField; + } + } else { + if (f.getDeType() == 1) { + String cast = String.format(SqlServerSQLConstants.CAST, originField, SqlServerSQLConstants.DEFAULT_INT_FORMAT) + "/1000"; + fieldName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast, SqlServerSQLConstants.DEFAULT_DATE_FORMAT); + } else if (f.getDeType() == 2) { + fieldName = String.format(SqlServerSQLConstants.CAST, originField, SqlServerSQLConstants.DEFAULT_INT_FORMAT); + } else { + fieldName = originField; + } + } + xFields.add(SQLObj.builder() + .fieldName(fieldName) + .fieldAlias(fieldAlias) + .build()); + } + } + + STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE); + ST st_sql = stg.getInstanceOf("previewSql"); + st_sql.add("isGroup", isGroup); + if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields); + if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj); + return st_sql.render(); + } + + @Override + public String createQuerySQLAsTmp(String sql, List fields, boolean isGroup) { + return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup); + } + + @Override + public String createQuerySQLWithPage(String table, List fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) { + return createQuerySQL(table, fields, isGroup) + " LIMIT " + (page - 1) * pageSize + "," + realSize; + } + + @Override + public String createQueryTableWithLimit(String table, List fields, Integer limit, boolean isGroup) { + return createQuerySQL(table, fields, isGroup) + " LIMIT 0," + limit; + } + + @Override + public String createQuerySqlWithLimit(String sql, List fields, Integer limit, boolean isGroup) { + return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT 0," + limit; + } + + @Override + public String createQuerySQLAsTmpWithPage(String sql, List fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) { + return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT " + (page - 1) * pageSize + "," + realSize; + } + + @Override + public String getSQL(String table, List xAxis, List yAxis, List customFilter, List 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 xFields = new ArrayList<>(); + List xWheres = new ArrayList<>(); + List xOrders = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(xAxis)) { + for (int i = 0; i < xAxis.size(); i++) { + ChartViewFieldDTO x = xAxis.get(i); + String originField = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); + // 处理横轴字段 + xFields.add(getXFields(x, originField, fieldAlias)); + // 处理横轴过滤 +// xWheres.addAll(getXWheres(x, originField, fieldAlias)); + // 处理横轴排序 + if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { + xOrders.add(SQLObj.builder() + .orderField(originField) + .orderAlias(fieldAlias) + .orderDirection(x.getSort()) + .build()); + } + } + } + List yFields = new ArrayList<>(); + List yWheres = new ArrayList<>(); + List 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 customWheres = transCustomFilterList(tableObj, customFilter); + // 处理仪表板字段过滤 + List extWheres = transExtFilterList(tableObj, extFilterRequestList); + // 构建sql所有参数 + List fields = new ArrayList<>(); + fields.addAll(xFields); + fields.addAll(yFields); + List wheres = new ArrayList<>(); + wheres.addAll(xWheres); + if (customWheres != null) wheres.addAll(customWheres); + if (extWheres != null) wheres.addAll(extWheres); + List groups = new ArrayList<>(); + groups.addAll(xFields); + // 外层再次套sql + List orders = new ArrayList<>(); + orders.addAll(xOrders); + orders.addAll(yOrders); + List 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 getSQLAsTmp(String sql, List xAxis, List yAxis, List customFilter, List extFilterRequestList) { + return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList); + } + + @Override + public String getSQLStack(String table, List xAxis, List yAxis, List customFilter, List extFilterRequestList, List extStack) { + 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 xFields = new ArrayList<>(); + List xWheres = new ArrayList<>(); + List xOrders = new ArrayList<>(); + List xList = new ArrayList<>(); + xList.addAll(xAxis); + xList.addAll(extStack); + if (CollectionUtils.isNotEmpty(xList)) { + for (int i = 0; i < xList.size(); i++) { + 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); + // 处理横轴字段 + xFields.add(getXFields(x, originField, fieldAlias)); + // 处理横轴过滤 +// xWheres.addAll(getXWheres(x, originField, fieldAlias)); + // 处理横轴排序 + if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { + xOrders.add(SQLObj.builder() + .orderField(originField) + .orderAlias(fieldAlias) + .orderDirection(x.getSort()) + .build()); + } + } + } + List yFields = new ArrayList<>(); + List yWheres = new ArrayList<>(); + List 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 stackFields = new ArrayList<>(); + List stackOrders = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(extStack)) { + for (int i = 0; i < extStack.size(); i++) { + ChartViewFieldDTO stack = extStack.get(i); + String originField = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), stack.getOriginName()); + String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); + // 处理横轴字段 + stackFields.add(getXFields(stack, originField, fieldAlias)); + // 处理横轴排序 + if (StringUtils.isNotEmpty(stack.getSort()) && !StringUtils.equalsIgnoreCase(stack.getSort(), "none")) { + stackOrders.add(SQLObj.builder() + .orderField(originField) + .orderAlias(fieldAlias) + .orderDirection(stack.getSort()) + .build()); + } + } + } + // 处理视图中字段过滤 + List customWheres = transCustomFilterList(tableObj, customFilter); + // 处理仪表板字段过滤 + List extWheres = transExtFilterList(tableObj, extFilterRequestList); + // 构建sql所有参数 + List fields = new ArrayList<>(); + fields.addAll(xFields); + fields.addAll(yFields); + List wheres = new ArrayList<>(); + wheres.addAll(xWheres); + if (customWheres != null) wheres.addAll(customWheres); + if (extWheres != null) wheres.addAll(extWheres); + List groups = new ArrayList<>(); + groups.addAll(xFields); + // 外层再次套sql + List orders = new ArrayList<>(); + orders.addAll(xOrders); + orders.addAll(yOrders); + List 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 xAxis, List yAxis, List customFilter, List extFilterRequestList, List 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 yAxis, List customFilter, List 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 yFields = new ArrayList<>(); + List yWheres = new ArrayList<>(); + List 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 customWheres = transCustomFilterList(tableObj, customFilter); + // 处理仪表板字段过滤 + List extWheres = transExtFilterList(tableObj, extFilterRequestList); + // 构建sql所有参数 + List fields = new ArrayList<>(); + fields.addAll(yFields); + List wheres = new ArrayList<>(); + if (customWheres != null) wheres.addAll(customWheres); + if (extWheres != null) wheres.addAll(extWheres); + List groups = new ArrayList<>(); + // 外层再次套sql + List orders = new ArrayList<>(); + orders.addAll(yOrders); + List 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 yAxis, List customFilter, List 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 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 { + 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 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 transCustomFilterList(SQLObj tableObj, List requestList) { + if (CollectionUtils.isEmpty(requestList)) { + return null; + } + List 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() == 1 && field.getDeExtractType() != 1) { + String cast = String.format(SqlServerSQLConstants.CAST, originName, SqlServerSQLConstants.DEFAULT_INT_FORMAT) + "/1000"; + whereName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast, SqlServerSQLConstants.DEFAULT_DATE_FORMAT); + } 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 transExtFilterList(SQLObj tableObj, List requestList) { + if (CollectionUtils.isEmpty(requestList)) { + return null; + } + List list = new ArrayList<>(); + for (ChartExtFilterRequest request : requestList) { + List 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.CAST, originName, SqlServerSQLConstants.DEFAULT_INT_FORMAT) + "/1000"; + whereName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast, SqlServerSQLConstants.DEFAULT_DATE_FORMAT); + } 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() == 1) { + 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 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"; + } + } + + private SQLObj getXFields(ChartViewFieldDTO x, String originField, String fieldAlias) { + String fieldName = ""; + if (x.getDeExtractType() == 1) { + if (x.getDeType() == 2 || x.getDeType() == 3) { + fieldName = String.format(SqlServerSQLConstants.UNIX_TIMESTAMP, originField) + "*1000"; + } else if (x.getDeType() == 1) { + String format = transDateFormat(x.getDateStyle(), x.getDatePattern()); + fieldName = String.format(SqlServerSQLConstants.DATE_FORMAT, originField, format); + } else { + fieldName = originField; + } + } else { + if (x.getDeType() == 1) { + String format = transDateFormat(x.getDateStyle(), x.getDatePattern()); + if (x.getDeExtractType() == 0) { + fieldName = String.format(SqlServerSQLConstants.DATE_FORMAT, originField, format); + } else { + String cast = String.format(SqlServerSQLConstants.CAST, originField, SqlServerSQLConstants.DEFAULT_INT_FORMAT) + "/1000"; + String from_unixtime = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast, SqlServerSQLConstants.DEFAULT_DATE_FORMAT); + fieldName = String.format(SqlServerSQLConstants.DATE_FORMAT, from_unixtime, format); + } + } else { + fieldName = originField; + } + } + return SQLObj.builder() + .fieldName(fieldName) + .fieldAlias(fieldAlias) + .build(); + } + + private List getXWheres(ChartViewFieldDTO x, String originField, String fieldAlias) { + List list = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(x.getFilter()) && x.getFilter().size() > 0) { + x.getFilter().forEach(f -> { + String whereName = ""; + String whereTerm = transMysqlFilterTerm(f.getTerm()); + String whereValue = ""; + if (x.getDeType() == 1 && x.getDeExtractType() != 1) { + String cast = String.format(SqlServerSQLConstants.CAST, originField, SqlServerSQLConstants.DEFAULT_INT_FORMAT) + "/1000"; + whereName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast, SqlServerSQLConstants.DEFAULT_DATE_FORMAT); + } else { + whereName = originField; + } + 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(whereName) + .whereAlias(fieldAlias) + .whereTermAndValue(whereTerm + whereValue) + .build()); + }); + } + return list; + } + + 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 cast = String.format(SqlServerSQLConstants.CAST, originField, y.getDeType() == 2 ? SqlServerSQLConstants.DEFAULT_INT_FORMAT : SqlServerSQLConstants.DEFAULT_FLOAT_FORMAT); + String agg = String.format(SqlServerSQLConstants.AGG_FIELD, y.getSummary(), cast); + fieldName = String.format(SqlServerSQLConstants.CAST, agg, SqlServerSQLConstants.DEFAULT_FLOAT_FORMAT); + } else { + String cast = String.format(SqlServerSQLConstants.CAST, originField, y.getDeType() == 2 ? SqlServerSQLConstants.DEFAULT_INT_FORMAT : SqlServerSQLConstants.DEFAULT_FLOAT_FORMAT); + fieldName = String.format(SqlServerSQLConstants.AGG_FIELD, y.getSummary(), cast); + } + } + return SQLObj.builder() + .fieldName(fieldName) + .fieldAlias(fieldAlias) + .build(); + } + + private List getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) { + List 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; + } +} From d86531967fa54418dfecbc604168bbba3d14e1e5 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 3 Aug 2021 17:29:38 +0800 Subject: [PATCH 02/16] feat: sqlserver --- .../datasource/provider/JdbcProvider.java | 2 +- .../io/dataease/provider/QueryProvider.java | 4 --- .../provider/doris/DorisQueryProvider.java | 10 ------- .../provider/mysql/MysqlQueryProvider.java | 10 ------- .../provider/oracle/OracleQueryProvider.java | 10 ------- .../sqlserver/SqlServerSQLConstants.java | 6 ++-- .../sqlserver/SqlserverQueryProvider.java | 30 ++++++++++--------- 7 files changed, 20 insertions(+), 52 deletions(-) diff --git a/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java b/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java index d2bc037a38..45f4854820 100644 --- a/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java +++ b/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java @@ -287,7 +287,7 @@ public class JdbcProvider extends DatasourceProvider { } tableFiled.setRemarks(remarks); tableFiled.setFieldSize(Integer.valueOf(resultSet.getString("COLUMN_SIZE"))); - String dbType = resultSet.getString("TYPE_NAME"); + String dbType = resultSet.getString("TYPE_NAME").toUpperCase(); tableFiled.setFieldType(dbType); if(dbType.equalsIgnoreCase("LONG")){tableFiled.setFieldSize(65533);} if(StringUtils.isNotEmpty(dbType) && dbType.toLowerCase().contains("date") && tableFiled.getFieldSize() < 50 ){ diff --git a/backend/src/main/java/io/dataease/provider/QueryProvider.java b/backend/src/main/java/io/dataease/provider/QueryProvider.java index b6c97d0a31..0847ed6dd2 100644 --- a/backend/src/main/java/io/dataease/provider/QueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/QueryProvider.java @@ -14,10 +14,6 @@ import java.util.List; public abstract class QueryProvider { public abstract Integer transFieldType(String field); - public abstract String createQueryCountSQL(String table); - - public abstract String createQueryCountSQLAsTmp(String sql); - public abstract String createSQLPreview(String sql, String orderBy); public abstract String createQuerySQL(String table, List fields, boolean isGroup); diff --git a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java index fc995d6e11..eb40e3cb96 100644 --- a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java @@ -70,16 +70,6 @@ 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 public String createSQLPreview(String sql, String orderBy) { return "SELECT * FROM (" + sql + ") AS tmp ORDER BY " + orderBy + " LIMIT 0,1000"; diff --git a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java index 13ba47b27f..fdbcb7d98d 100644 --- a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java @@ -70,16 +70,6 @@ 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 public String createSQLPreview(String sql, String orderBy) { return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp ORDER BY null " + " LIMIT 0,1000"; diff --git a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java index 124c383736..2e97ec068b 100644 --- a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java @@ -82,16 +82,6 @@ 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 public String createSQLPreview(String sql, String orderBy) { return "SELECT * FROM (" + sqlFix(sql) + ") DE_TMP " + " WHERE rownum <= 1000"; diff --git a/backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java b/backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java index 3a93536ecd..3f7a47d704 100644 --- a/backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java +++ b/backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java @@ -2,16 +2,16 @@ package io.dataease.provider.sqlserver; import io.dataease.provider.SQLConstants; -import static io.dataease.datasource.constants.DatasourceTypes.mysql; +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 = mysql.getKeywordPrefix() + "%s" + mysql.getKeywordSuffix(); + public static final String KEYWORD_TABLE = sqlServer.getKeywordPrefix() + "%s" + sqlServer.getKeywordSuffix(); - public static final String KEYWORD_FIX = "%s." + mysql.getKeywordPrefix() + "%s" + mysql.getKeywordSuffix(); + public static final String KEYWORD_FIX = "%s." + sqlServer.getKeywordPrefix() + "%s" + sqlServer.getKeywordSuffix(); public static final String UNIX_TIMESTAMP = "UNIX_TIMESTAMP(%s)"; diff --git a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java index 7c81918cbb..c70cb49ad7 100644 --- a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java @@ -29,28 +29,35 @@ public class SqlserverQueryProvider extends QueryProvider { public Integer transFieldType(String field) { switch (field) { case "CHAR": + case "NCHAR": + case "NTEXT": case "VARCHAR": case "TEXT": case "TINYTEXT": case "MEDIUMTEXT": case "LONGTEXT": case "ENUM": + case "XML": return 0;// 文本 case "DATE": case "TIME": case "YEAR": case "DATETIME": + case "DATETIME2": + case "DATETIMEOFFSET": case "TIMESTAMP": return 1;// 时间 case "INT": - case "SMALLINT": case "MEDIUMINT": case "INTEGER": case "BIGINT": + case "SMALLINT": return 2;// 整型 case "FLOAT": case "DOUBLE": case "DECIMAL": + case "MONEY": + case "NUMERIC": return 3;// 浮点 case "BIT": case "TINYINT": @@ -60,19 +67,14 @@ public class SqlserverQueryProvider 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 "); - } - + private static Integer DE_STRING = 0; + private static Integer DE_TIME = 1; + private static Integer DE_INT = 2; + private static Integer DE_FLOAT = 3; + private static Integer DE_BOOL = 4; @Override public String createSQLPreview(String sql, String orderBy) { - return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp ORDER BY null " + " LIMIT 0,1000"; + return "SELECT top 1000 * FROM (" + sqlFix(sql) + ") AS tmp"; } @Override @@ -89,8 +91,8 @@ public class SqlserverQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); String fieldName = ""; // 处理横轴字段 - if (f.getDeExtractType() == 1) { - if (f.getDeType() == 2 || f.getDeType() == 3) { + if (f.getDeExtractType() == DE_TIME) { // 时间 转为 数值 + if (f.getDeType() == DE_INT || f.getDeType() == DE_FLOAT) { fieldName = String.format(SqlServerSQLConstants.UNIX_TIMESTAMP, originField) + "*1000"; } else { fieldName = originField; From dfe654c547351e344271ec3ba99c4148d34ee69f Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 4 Aug 2021 21:27:37 +0800 Subject: [PATCH 03/16] feat: sqlserver --- .../sqlserver/SqlServerSQLConstants.java | 7 +- .../sqlserver/SqlserverQueryProvider.java | 175 +++++++++++++----- 2 files changed, 134 insertions(+), 48 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java b/backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java index 3f7a47d704..1f42fbee4a 100644 --- a/backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java +++ b/backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java @@ -13,14 +13,17 @@ public class SqlServerSQLConstants extends SQLConstants { public static final String KEYWORD_FIX = "%s." + sqlServer.getKeywordPrefix() + "%s" + sqlServer.getKeywordSuffix(); - public static final String UNIX_TIMESTAMP = "UNIX_TIMESTAMP(%s)"; + public static final String UNIX_TIMESTAMP = "(CAST(DATEDIFF(SS, '1970-01-01 00:00:00', s ) as bigint) - 8 * 3600 ) * 1000"; - public static final String DATE_FORMAT = "DATE_FORMAT(%s,'%s')"; + public static final String DATE_FORMAT = "CONVERT(varchar(100), %s, %s)"; public static final String FROM_UNIXTIME = "FROM_UNIXTIME(%s,'%s')"; public static final String CAST = "CAST(%s AS %s)"; + public static final String LONG_TO_DATE = "DATEADD(second,%s,'1970-01-01 08:00:00') ,120)"; + public static final String STRING_TO_DATE = "CONVERT(datetime, %s ,120)"; + public static final String DEFAULT_DATE_FORMAT = "%Y-%m-%d %H:%i:%S"; public static final String DEFAULT_INT_FORMAT = "DECIMAL(20,0)"; diff --git a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java index c70cb49ad7..63de709a80 100644 --- a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java @@ -93,26 +93,31 @@ public class SqlserverQueryProvider extends QueryProvider { // 处理横轴字段 if (f.getDeExtractType() == DE_TIME) { // 时间 转为 数值 if (f.getDeType() == DE_INT || f.getDeType() == DE_FLOAT) { - fieldName = String.format(SqlServerSQLConstants.UNIX_TIMESTAMP, originField) + "*1000"; + fieldName = String.format(SqlServerSQLConstants.UNIX_TIMESTAMP, originField); } else { fieldName = originField; } - } else if (f.getDeExtractType() == 0) { - if (f.getDeType() == 2) { - fieldName = String.format(SqlServerSQLConstants.CAST, originField, SqlServerSQLConstants.DEFAULT_INT_FORMAT); - } else if (f.getDeType() == 3) { - fieldName = String.format(SqlServerSQLConstants.CAST, originField, SqlServerSQLConstants.DEFAULT_FLOAT_FORMAT); - } else if (f.getDeType() == 1) { - fieldName = String.format(SqlServerSQLConstants.DATE_FORMAT, originField, SqlServerSQLConstants.DEFAULT_DATE_FORMAT); + } else if (f.getDeExtractType() == DE_STRING) { //字符串转时间 + if (f.getDeType() == DE_INT) { + fieldName = originField; +// String.format(SqlServerSQLConstants.CAST, originField, SqlServerSQLConstants.DEFAULT_INT_FORMAT); + } else if (f.getDeType() == DE_FLOAT) { + fieldName = originField; +// String.format(SqlServerSQLConstants.CAST, originField, SqlServerSQLConstants.DEFAULT_FLOAT_FORMAT); + } else if (f.getDeType() == DE_TIME) { + fieldName = originField; +// String.format(SqlServerSQLConstants.DATE_FORMAT, originField, SqlServerSQLConstants.DEFAULT_DATE_FORMAT); } else { fieldName = originField; } } else { - if (f.getDeType() == 1) { + if (f.getDeType() == DE_TIME) { // String cast = String.format(SqlServerSQLConstants.CAST, originField, SqlServerSQLConstants.DEFAULT_INT_FORMAT) + "/1000"; - fieldName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast, SqlServerSQLConstants.DEFAULT_DATE_FORMAT); - } else if (f.getDeType() == 2) { - fieldName = String.format(SqlServerSQLConstants.CAST, originField, SqlServerSQLConstants.DEFAULT_INT_FORMAT); + fieldName = originField; +// String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast, SqlServerSQLConstants.DEFAULT_DATE_FORMAT); + } else if (f.getDeType() == DE_INT) { + fieldName = originField; +// String.format(SqlServerSQLConstants.CAST, originField, SqlServerSQLConstants.DEFAULT_INT_FORMAT); } else { fieldName = originField; } @@ -139,22 +144,22 @@ public class SqlserverQueryProvider extends QueryProvider { @Override public String createQuerySQLWithPage(String table, List fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) { - return createQuerySQL(table, fields, isGroup) + " LIMIT " + (page - 1) * pageSize + "," + realSize; - } - - @Override - public String createQueryTableWithLimit(String table, List fields, Integer limit, boolean isGroup) { - return createQuerySQL(table, fields, isGroup) + " LIMIT 0," + limit; - } - - @Override - public String createQuerySqlWithLimit(String sql, List fields, Integer limit, boolean isGroup) { - return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT 0," + limit; + return createQuerySQL(table, fields, isGroup) + " ORDER BY " + fields.get(0).getOriginName() + " offset " + (page - 1) * pageSize + " rows fetch next " + realSize + " rows only"; } @Override public String createQuerySQLAsTmpWithPage(String sql, List fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) { - return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT " + (page - 1) * pageSize + "," + realSize; + return createQuerySQLAsTmp(sql, fields, isGroup) + " ORDER BY " + fields.get(0).getOriginName() + " offset " + (page - 1) * pageSize + " rows fetch next " + realSize + " rows only"; + } + + @Override + public String createQueryTableWithLimit(String table, List fields, Integer limit, boolean isGroup) { + return createQuerySQL(table, fields, isGroup) + " ORDER BY " + fields.get(0).getOriginName() + " offset 0 rows fetch next " + limit + " rows only"; + } + + @Override + public String createQuerySqlWithLimit(String sql, List fields, Integer limit, boolean isGroup) { + return createQuerySQLAsTmp(sql, fields, isGroup) + " ORDER BY " + fields.get(0).getOriginName() + " offset 0 rows fetch next " + limit + " rows only"; } @Override @@ -601,7 +606,34 @@ public class SqlserverQueryProvider extends QueryProvider { return sql; } - private String transDateFormat(String dateStyle, String datePattern) { + //日期格式化 +// 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 "yyyy"; +// case "y_M": +// return "yyyy" + split + "MM"; +// case "y_M_d": +// return "yyyy" + split + "MM" + split + "dd"; +// 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"; +// } +// } + //日期格式化 + private String transDateFormat(String dateStyle, String datePattern, String originField) { String split = "-"; if (StringUtils.equalsIgnoreCase(datePattern, "date_sub")) { split = "-"; @@ -611,42 +643,93 @@ public class SqlserverQueryProvider extends QueryProvider { switch (dateStyle) { case "y": - return "%Y"; + return "CONVERT(varchar(100), datepart(yy, " + originField + "))"; case "y_M": - return "%Y" + split + "%m"; + return "CONVERT(varchar(100), datepart(yy, " + originField + ")) N'" + split + "'CONVERT(varchar(100), datepart(mm, " + originField + "))"; case "y_M_d": - return "%Y" + split + "%m" + split + "%d"; + if(split.equalsIgnoreCase("-")){ + return "CONVERT(varchar(100), " + originField + ", 23)"; + }else { + return "CONVERT(varchar(100), " + originField + ", 111)"; + } case "H_m_s": - return "%H:%i:%S"; + return "CONVERT(varchar(100), " + originField + ", 24)"; case "y_M_d_H_m": - return "%Y" + split + "%m" + split + "%d" + " %H:%i"; + 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": - return "%Y" + split + "%m" + split + "%d" + " %H:%i:%S"; + if(split.equalsIgnoreCase("-")){ + return "convert(varchar," + originField + ",120)"; + }else { + return "replace("+ "convert(varchar," + originField + ",120), '-','/')"; + } default: - return "%Y-%m-%d %H:%i:%S"; + 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() == 1) { - if (x.getDeType() == 2 || x.getDeType() == 3) { - fieldName = String.format(SqlServerSQLConstants.UNIX_TIMESTAMP, originField) + "*1000"; - } else if (x.getDeType() == 1) { - String format = transDateFormat(x.getDateStyle(), x.getDatePattern()); - fieldName = String.format(SqlServerSQLConstants.DATE_FORMAT, originField, format); + if (x.getDeExtractType() == DE_TIME) { + if (x.getDeType() == DE_INT || x.getDeType() == DE_FLOAT) { //时间转数值 + fieldName = String.format(SqlServerSQLConstants.UNIX_TIMESTAMP, originField); + } else if (x.getDeType() == DE_TIME) { //时间格式化 + fieldName = transDateFormat(x.getDateStyle(), x.getDatePattern(), originField); } else { fieldName = originField; } } else { - if (x.getDeType() == 1) { - String format = transDateFormat(x.getDateStyle(), x.getDatePattern()); - if (x.getDeExtractType() == 0) { - fieldName = String.format(SqlServerSQLConstants.DATE_FORMAT, originField, format); - } else { - String cast = String.format(SqlServerSQLConstants.CAST, originField, SqlServerSQLConstants.DEFAULT_INT_FORMAT) + "/1000"; - String from_unixtime = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast, SqlServerSQLConstants.DEFAULT_DATE_FORMAT); - fieldName = String.format(SqlServerSQLConstants.DATE_FORMAT, from_unixtime, format); + if (x.getDeType() == DE_TIME) { + if (x.getDeExtractType() == 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; From ddb6e767fdfbc7b52fdd7c8fe1c70d68fe071d7d Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 5 Aug 2021 13:43:33 +0800 Subject: [PATCH 04/16] feat: sqlserver --- .../sqlserver/SqlServerSQLConstants.java | 6 +- .../sqlserver/SqlserverQueryProvider.java | 87 ++++--------------- 2 files changed, 18 insertions(+), 75 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java b/backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java index 1f42fbee4a..783c185082 100644 --- a/backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java +++ b/backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java @@ -17,11 +17,11 @@ public class SqlServerSQLConstants extends SQLConstants { public static final String DATE_FORMAT = "CONVERT(varchar(100), %s, %s)"; - public static final String FROM_UNIXTIME = "FROM_UNIXTIME(%s,'%s')"; + public static final String FROM_UNIXTIME = "convert(varchar, %s ,120)"; - public static final String CAST = "CAST(%s AS %s)"; + public static final String CONVERT = "CONVERT(%s, %s)"; - public static final String LONG_TO_DATE = "DATEADD(second,%s,'1970-01-01 08:00:00') ,120)"; + 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_DATE_FORMAT = "%Y-%m-%d %H:%i:%S"; diff --git a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java index 63de709a80..c1983357db 100644 --- a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java @@ -112,7 +112,7 @@ public class SqlserverQueryProvider extends QueryProvider { } } else { if (f.getDeType() == DE_TIME) { // - String cast = String.format(SqlServerSQLConstants.CAST, originField, SqlServerSQLConstants.DEFAULT_INT_FORMAT) + "/1000"; +// String cast = String.format(SqlServerSQLConstants.CAST, originField, SqlServerSQLConstants.DEFAULT_INT_FORMAT) + "/1000"; fieldName = originField; // String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast, SqlServerSQLConstants.DEFAULT_DATE_FORMAT); } else if (f.getDeType() == DE_INT) { @@ -511,6 +511,7 @@ public class SqlserverQueryProvider extends QueryProvider { } } + public List transCustomFilterList(SQLObj tableObj, List requestList) { if (CollectionUtils.isEmpty(requestList)) { return null; @@ -526,9 +527,9 @@ public class SqlserverQueryProvider extends QueryProvider { String whereTerm = transMysqlFilterTerm(request.getTerm()); 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.CAST, originName, SqlServerSQLConstants.DEFAULT_INT_FORMAT) + "/1000"; - whereName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast, SqlServerSQLConstants.DEFAULT_DATE_FORMAT); + if (field.getDeType() == DE_TIME && field.getDeExtractType() != DE_TIME) { + String cast = String.format(SqlServerSQLConstants.LONG_TO_DATE, originName + "/1000"); + whereName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast); } else { whereName = originName; } @@ -568,8 +569,8 @@ public class SqlserverQueryProvider extends QueryProvider { String originName = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName()); if (field.getDeType() == 1 && field.getDeExtractType() != 1) { - String cast = String.format(SqlServerSQLConstants.CAST, originName, SqlServerSQLConstants.DEFAULT_INT_FORMAT) + "/1000"; - whereName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast, SqlServerSQLConstants.DEFAULT_DATE_FORMAT); + String cast = String.format(SqlServerSQLConstants.LONG_TO_DATE, originName + "/1000"); + whereName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast); } else { whereName = originName; } @@ -580,7 +581,7 @@ public class SqlserverQueryProvider extends QueryProvider { } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) { whereValue = "'%" + value.get(0) + "%'"; } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) { - if (request.getDatasetTableField().getDeType() == 1) { + if (request.getDatasetTableField().getDeType() == 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)))); @@ -607,32 +608,6 @@ public class SqlserverQueryProvider extends QueryProvider { } //日期格式化 -// 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 "yyyy"; -// case "y_M": -// return "yyyy" + split + "MM"; -// case "y_M_d": -// return "yyyy" + split + "MM" + split + "dd"; -// 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"; -// } -// } - //日期格式化 private String transDateFormat(String dateStyle, String datePattern, String originField) { String split = "-"; if (StringUtils.equalsIgnoreCase(datePattern, "date_sub")) { @@ -741,40 +716,6 @@ public class SqlserverQueryProvider extends QueryProvider { .build(); } - private List getXWheres(ChartViewFieldDTO x, String originField, String fieldAlias) { - List list = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(x.getFilter()) && x.getFilter().size() > 0) { - x.getFilter().forEach(f -> { - String whereName = ""; - String whereTerm = transMysqlFilterTerm(f.getTerm()); - String whereValue = ""; - if (x.getDeType() == 1 && x.getDeExtractType() != 1) { - String cast = String.format(SqlServerSQLConstants.CAST, originField, SqlServerSQLConstants.DEFAULT_INT_FORMAT) + "/1000"; - whereName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast, SqlServerSQLConstants.DEFAULT_DATE_FORMAT); - } else { - whereName = originField; - } - 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(whereName) - .whereAlias(fieldAlias) - .whereTermAndValue(whereTerm + whereValue) - .build()); - }); - } - return list; - } - private SQLObj getYFields(ChartViewFieldDTO y, String originField, String fieldAlias) { String fieldName = ""; if (StringUtils.equalsIgnoreCase(y.getOriginName(), "*")) { @@ -783,12 +724,12 @@ public class SqlserverQueryProvider extends QueryProvider { fieldName = String.format(SqlServerSQLConstants.AGG_FIELD, y.getSummary(), originField); } else { if (StringUtils.equalsIgnoreCase(y.getSummary(), "avg") || StringUtils.containsIgnoreCase(y.getSummary(), "pop")) { - String cast = String.format(SqlServerSQLConstants.CAST, originField, y.getDeType() == 2 ? SqlServerSQLConstants.DEFAULT_INT_FORMAT : SqlServerSQLConstants.DEFAULT_FLOAT_FORMAT); - String agg = String.format(SqlServerSQLConstants.AGG_FIELD, y.getSummary(), cast); - fieldName = String.format(SqlServerSQLConstants.CAST, agg, SqlServerSQLConstants.DEFAULT_FLOAT_FORMAT); + String convert = String.format(SqlServerSQLConstants.CONVERT, y.getDeType() == 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 cast = String.format(SqlServerSQLConstants.CAST, originField, y.getDeType() == 2 ? SqlServerSQLConstants.DEFAULT_INT_FORMAT : SqlServerSQLConstants.DEFAULT_FLOAT_FORMAT); - fieldName = String.format(SqlServerSQLConstants.AGG_FIELD, y.getSummary(), cast); + 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() @@ -824,4 +765,6 @@ public class SqlserverQueryProvider extends QueryProvider { } return list; } + + } From 74b849d0b99e624cd8781c3e181e09786ac58e6d Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 6 Aug 2021 10:21:50 +0800 Subject: [PATCH 05/16] feat: sqlserver --- frontend/src/views/system/datasource/form.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue index 9fab06d9e5..bc8fb00755 100644 --- a/frontend/src/views/system/datasource/form.vue +++ b/frontend/src/views/system/datasource/form.vue @@ -105,7 +105,9 @@ export default { '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' }] }, - 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: [], canEdit: false, originConfiguration: {} From c983b661ff83a0f7583c096954aa51661cfd2402 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 6 Aug 2021 12:19:25 +0800 Subject: [PATCH 06/16] feat: sqlserver --- .../datasource/dto/SqlServerConfigration.java | 1 + .../datasource/provider/JdbcProvider.java | 46 ++++++++++++------- .../service/dataset/DataSetTableService.java | 1 + frontend/src/views/system/datasource/form.vue | 19 +++++++- 4 files changed, 50 insertions(+), 17 deletions(-) diff --git a/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java b/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java index 7282704586..1cbe90c83a 100644 --- a/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java +++ b/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java @@ -8,6 +8,7 @@ import lombok.Setter; @Setter public class SqlServerConfigration extends JdbcDTO { private String driver = "com.microsoft.sqlserver.jdbc.SQLServerDriver"; + private String schema; public String getJdbc(){ return "jdbc:sqlserver://HOSTNAME:PORT;DatabaseName=DATABASE".replace("HOSTNAME", getHost()).replace("PORT", getPort().toString()).replace("DATABASE", getDataBase()); diff --git a/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java b/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java index 45f4854820..a3e4c0deff 100644 --- a/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java +++ b/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java @@ -42,20 +42,25 @@ public class JdbcProvider extends DatasourceProvider { public List getData(DatasourceRequest dsr) throws Exception { List list = new LinkedList<>(); Connection connection = null; - try { - connection = getConnectionFromPool(dsr); - Statement stat = connection.createStatement(); - ResultSet rs = stat.executeQuery(dsr.getQuery()); - list = fetchResult(rs); - } catch (SQLException e) { - DataEaseException.throwException(e); - } catch (Exception e) { - DataEaseException.throwException(e); - } finally { - if(connection != null){ - connection.close(); - } - } + connection = getConnectionFromPool(dsr); + Statement stat = connection.createStatement(); + ResultSet rs = stat.executeQuery(dsr.getQuery()); + System.out.println(rs == null); + list = fetchResult(rs); +// try { +// connection = getConnectionFromPool(dsr); +// Statement stat = connection.createStatement(); +// ResultSet rs = stat.executeQuery(dsr.getQuery()); +// list = fetchResult(rs); +// } catch (SQLException e) { +// DataEaseException.throwException(e); +// } catch (Exception e) { +// DataEaseException.throwException(e); +// } finally { +// if(connection != null){ +// connection.close(); +// } +// } return list; } @@ -102,18 +107,23 @@ public class JdbcProvider extends DatasourceProvider { List list = new LinkedList<>(); ResultSetMetaData metaData = rs.getMetaData(); int columnCount = metaData.getColumnCount(); + System.out.println("columnCount: " + columnCount); while (rs.next()) { String[] row = new String[columnCount]; for (int j = 0; j < columnCount; j++) { int columType = metaData.getColumnType(j + 1); + switch (columType) { case Types.DATE: - row[j] = rs.getDate(j + 1).toString(); + if(rs.getDate(j + 1) != null){ + row[j] = rs.getDate(j + 1).toString(); + } break; default: row[j] = rs.getString(j + 1); break; } + System.out.println(j + " " + columType + " " + row[j]); } list.add(row); } @@ -506,7 +516,9 @@ public class JdbcProvider extends DatasourceProvider { return "show tables;"; case sqlServer: 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: OracleConfigration oracleConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), OracleConfigration.class); if(StringUtils.isEmpty(oracleConfigration.getSchema())){ @@ -523,6 +535,8 @@ public class JdbcProvider extends DatasourceProvider { switch (datasourceType) { case oracle: return "select * from all_users"; + case sqlServer: + return "select name from sys.schemas;"; default: return "show tables;"; } diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 2bb34dce5b..c8ae09aad9 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -378,6 +378,7 @@ public class DataSetTableService { String table = dataTableInfoDTO.getTable(); QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize, false)); + System.out.println(datasourceRequest.getQuery()); map.put("sql", datasourceRequest.getQuery()); try { data.addAll(datasourceProvider.getData(datasourceRequest)); diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue index bc8fb00755..e2ee45c109 100644 --- a/frontend/src/views/system/datasource/form.vue +++ b/frontend/src/views/system/datasource/form.vue @@ -63,6 +63,23 @@ + + + + {{ $t('datasource.get_schema') }} + + + + + + + +
{{ $t('commons.validate') }} @@ -107,7 +124,7 @@ export default { }, allTypes: [{ name: 'mysql', label: 'MySQL', type: 'jdbc' }, { name: 'oracle', label: 'Oracle', type: 'jdbc' }, - { name: 'sqlserver', label: 'SQLSERVER', type: 'jdbc' }], + { name: 'sqlServer', label: 'SQLSERVER', type: 'jdbc' }], schemas: [], canEdit: false, originConfiguration: {} From a5dd1e369808af7f70cd38b5ea1328741a59f6a9 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 9 Aug 2021 12:45:01 +0800 Subject: [PATCH 07/16] feat: sqlserver --- .../commons/constants/DeTypeConstants.java | 12 ++ .../io/dataease/commons/filter/SqlFilter.java | 1 - .../controller/sys/LicenseController.java | 1 - .../datasource/provider/JdbcProvider.java | 36 +++--- .../io/dataease/provider/QueryProvider.java | 8 +- .../provider/doris/DorisQueryProvider.java | 13 +- .../provider/mysql/MysqlQueryProvider.java | 13 +- .../provider/oracle/OracleQueryProvider.java | 11 +- .../sqlserver/SqlServerSQLConstants.java | 5 +- .../sqlserver/SqlserverQueryProvider.java | 118 +++++++++--------- .../service/dataset/DataSetTableService.java | 21 ++-- .../service/dataset/ExtractDataService.java | 35 +++++- .../impl/direct/DirectFieldService.java | 4 +- 13 files changed, 161 insertions(+), 117 deletions(-) create mode 100644 backend/src/main/java/io/dataease/commons/constants/DeTypeConstants.java diff --git a/backend/src/main/java/io/dataease/commons/constants/DeTypeConstants.java b/backend/src/main/java/io/dataease/commons/constants/DeTypeConstants.java new file mode 100644 index 0000000000..50a925c2ee --- /dev/null +++ b/backend/src/main/java/io/dataease/commons/constants/DeTypeConstants.java @@ -0,0 +1,12 @@ +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; + +} diff --git a/backend/src/main/java/io/dataease/commons/filter/SqlFilter.java b/backend/src/main/java/io/dataease/commons/filter/SqlFilter.java index 3a913cb270..2894857bef 100644 --- a/backend/src/main/java/io/dataease/commons/filter/SqlFilter.java +++ b/backend/src/main/java/io/dataease/commons/filter/SqlFilter.java @@ -68,7 +68,6 @@ public class SqlFilter implements Filter { } br.close(); } catch (IOException e) { - System.out.println("IOException: " + e); } return str; diff --git a/backend/src/main/java/io/dataease/controller/sys/LicenseController.java b/backend/src/main/java/io/dataease/controller/sys/LicenseController.java index 0e932cec62..d45745a8bb 100644 --- a/backend/src/main/java/io/dataease/controller/sys/LicenseController.java +++ b/backend/src/main/java/io/dataease/controller/sys/LicenseController.java @@ -32,7 +32,6 @@ public class LicenseController { return ResultHolder.success(null); } F2CLicenseResponse f2CLicenseResponse = defaultLicenseService.validateLicense(); - System.out.println(new Gson().toJson(f2CLicenseResponse)); switch (f2CLicenseResponse.getStatus()) { case no_record: return ResultHolder.success(f2CLicenseResponse); diff --git a/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java b/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java index a3e4c0deff..12e30186df 100644 --- a/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java +++ b/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java @@ -42,25 +42,20 @@ public class JdbcProvider extends DatasourceProvider { public List getData(DatasourceRequest dsr) throws Exception { List list = new LinkedList<>(); Connection connection = null; - connection = getConnectionFromPool(dsr); - Statement stat = connection.createStatement(); - ResultSet rs = stat.executeQuery(dsr.getQuery()); - System.out.println(rs == null); - list = fetchResult(rs); -// try { -// connection = getConnectionFromPool(dsr); -// Statement stat = connection.createStatement(); -// ResultSet rs = stat.executeQuery(dsr.getQuery()); -// list = fetchResult(rs); -// } catch (SQLException e) { -// DataEaseException.throwException(e); -// } catch (Exception e) { -// DataEaseException.throwException(e); -// } finally { -// if(connection != null){ -// connection.close(); -// } -// } + try { + connection = getConnectionFromPool(dsr); + Statement stat = connection.createStatement(); + ResultSet rs = stat.executeQuery(dsr.getQuery()); + list = fetchResult(rs); + } catch (SQLException e) { + DataEaseException.throwException(e); + } catch (Exception e) { + DataEaseException.throwException(e); + } finally { + if(connection != null){ + connection.close(); + } + } return list; } @@ -107,12 +102,10 @@ public class JdbcProvider extends DatasourceProvider { List list = new LinkedList<>(); ResultSetMetaData metaData = rs.getMetaData(); int columnCount = metaData.getColumnCount(); - System.out.println("columnCount: " + columnCount); while (rs.next()) { String[] row = new String[columnCount]; for (int j = 0; j < columnCount; j++) { int columType = metaData.getColumnType(j + 1); - switch (columType) { case Types.DATE: if(rs.getDate(j + 1) != null){ @@ -123,7 +116,6 @@ public class JdbcProvider extends DatasourceProvider { row[j] = rs.getString(j + 1); break; } - System.out.println(j + " " + columType + " " + row[j]); } list.add(row); } diff --git a/backend/src/main/java/io/dataease/provider/QueryProvider.java b/backend/src/main/java/io/dataease/provider/QueryProvider.java index 0847ed6dd2..ca76fab730 100644 --- a/backend/src/main/java/io/dataease/provider/QueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/QueryProvider.java @@ -1,6 +1,7 @@ package io.dataease.provider; import io.dataease.base.domain.DatasetTableField; +import io.dataease.base.domain.Datasource; import io.dataease.controller.request.chart.ChartExtFilterRequest; import io.dataease.dto.chart.ChartCustomFilterDTO; import io.dataease.dto.chart.ChartViewFieldDTO; @@ -12,17 +13,18 @@ import java.util.List; * @Date 2021/5/17 2:42 下午 */ public abstract class QueryProvider { + public abstract Integer transFieldType(String field); public abstract String createSQLPreview(String sql, String orderBy); - public abstract String createQuerySQL(String table, List fields, boolean isGroup); + public abstract String createQuerySQL(String table, List fields, boolean isGroup, Datasource ds); public abstract String createQuerySQLAsTmp(String sql, List fields, boolean isGroup); - public abstract String createQuerySQLWithPage(String table, List fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup); + public abstract String createQuerySQLWithPage(String table, List fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds); - public abstract String createQueryTableWithLimit(String table, List fields, Integer limit, boolean isGroup); + public abstract String createQueryTableWithLimit(String table, List fields, Integer limit, boolean isGroup, Datasource ds); public abstract String createQuerySqlWithLimit(String sql, List fields, Integer limit, boolean isGroup); diff --git a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java index eb40e3cb96..948f1a933d 100644 --- a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java @@ -2,6 +2,7 @@ package io.dataease.provider.doris; import io.dataease.base.domain.DatasetTableField; import io.dataease.base.domain.DatasetTableFieldExample; +import io.dataease.base.domain.Datasource; import io.dataease.base.mapper.DatasetTableFieldMapper; import io.dataease.controller.request.chart.ChartExtFilterRequest; import io.dataease.dto.chart.ChartCustomFilterDTO; @@ -76,7 +77,7 @@ public class DorisQueryProvider extends QueryProvider { } @Override - public String createQuerySQL(String table, List fields, boolean isGroup) { + public String createQuerySQL(String table, List fields, boolean isGroup, Datasource ds) { SQLObj tableObj = SQLObj.builder() .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(DorisConstants.KEYWORD_TABLE, table)) .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0)) @@ -149,17 +150,17 @@ public class DorisQueryProvider extends QueryProvider { @Override public String createQuerySQLAsTmp(String sql, List fields, boolean isGroup) { - return createQuerySQL("(" + sql + ")", fields, isGroup); + return createQuerySQL("(" + sql + ")", fields, isGroup, null); } @Override - public String createQuerySQLWithPage(String table, List fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) { - return createQuerySQL(table, fields, isGroup) + " LIMIT " + (page - 1) * pageSize + "," + realSize; + public String createQuerySQLWithPage(String table, List fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds) { + return createQuerySQL(table, fields, isGroup, null) + " LIMIT " + (page - 1) * pageSize + "," + realSize; } @Override - public String createQueryTableWithLimit(String table, List fields, Integer limit, boolean isGroup) { - return createQuerySQL(table, fields, isGroup) + " LIMIT 0," + limit; + public String createQueryTableWithLimit(String table, List fields, Integer limit, boolean isGroup, Datasource ds) { + return createQuerySQL(table, fields, isGroup, null) + " LIMIT 0," + limit; } @Override diff --git a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java index fdbcb7d98d..88798dbbb4 100644 --- a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java @@ -2,6 +2,7 @@ package io.dataease.provider.mysql; import io.dataease.base.domain.DatasetTableField; import io.dataease.base.domain.DatasetTableFieldExample; +import io.dataease.base.domain.Datasource; import io.dataease.base.mapper.DatasetTableFieldMapper; import io.dataease.controller.request.chart.ChartExtFilterRequest; import io.dataease.dto.chart.ChartCustomFilterDTO; @@ -76,7 +77,7 @@ public class MysqlQueryProvider extends QueryProvider { } @Override - public String createQuerySQL(String table, List fields, boolean isGroup) { + public String createQuerySQL(String table, List fields, boolean isGroup, Datasource ds) { SQLObj tableObj = SQLObj.builder() .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(MySQLConstants.KEYWORD_TABLE, table)) .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0)) @@ -140,17 +141,17 @@ public class MysqlQueryProvider extends QueryProvider { @Override public String createQuerySQLAsTmp(String sql, List fields, boolean isGroup) { - return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup); + return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null); } @Override - public String createQuerySQLWithPage(String table, List fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) { - return createQuerySQL(table, fields, isGroup) + " LIMIT " + (page - 1) * pageSize + "," + realSize; + public String createQuerySQLWithPage(String table, List fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds) { + return createQuerySQL(table, fields, isGroup, null) + " LIMIT " + (page - 1) * pageSize + "," + realSize; } @Override - public String createQueryTableWithLimit(String table, List fields, Integer limit, boolean isGroup) { - return createQuerySQL(table, fields, isGroup) + " LIMIT 0," + limit; + public String createQueryTableWithLimit(String table, List fields, Integer limit, boolean isGroup, Datasource ds) { + return createQuerySQL(table, fields, isGroup, null) + " LIMIT 0," + limit; } @Override diff --git a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java index 2e97ec068b..3690f3254f 100644 --- a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java @@ -2,6 +2,7 @@ package io.dataease.provider.oracle; import io.dataease.base.domain.DatasetTableField; import io.dataease.base.domain.DatasetTableFieldExample; +import io.dataease.base.domain.Datasource; import io.dataease.base.mapper.DatasetTableFieldMapper; import io.dataease.controller.request.chart.ChartExtFilterRequest; import io.dataease.dto.chart.ChartCustomFilterDTO; @@ -88,7 +89,7 @@ public class OracleQueryProvider extends QueryProvider { } @Override - public String createQuerySQL(String table, List fields, boolean isGroup) { + public String createQuerySQL(String table, List fields, boolean isGroup, Datasource ds) { SQLObj tableObj = SQLObj.builder() .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(OracleConstants.KEYWORD_TABLE, table)) .tableAlias(String.format(OracleConstants.ALIAS_FIX, String.format(TABLE_ALIAS_PREFIX, 0))) @@ -169,19 +170,19 @@ public class OracleQueryProvider extends QueryProvider { @Override public String createQuerySQLAsTmp(String sql, List fields, boolean isGroup) { - return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup); + return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null); } @Override - public String createQuerySQLWithPage(String table, List fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) { + public String createQuerySQLWithPage(String table, List fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds) { List 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} ", - 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 - public String createQueryTableWithLimit(String table, List fields, Integer limit, boolean isGroup) { + public String createQueryTableWithLimit(String table, List fields, Integer limit, boolean isGroup, Datasource ds) { return String.format("SELECT %s.* from %s WHERE rownum <= %s ", table, table, limit.toString()); } diff --git a/backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java b/backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java index 783c185082..4ea9eda683 100644 --- a/backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java +++ b/backend/src/main/java/io/dataease/provider/sqlserver/SqlServerSQLConstants.java @@ -13,7 +13,7 @@ public class SqlServerSQLConstants extends SQLConstants { public static final String KEYWORD_FIX = "%s." + sqlServer.getKeywordPrefix() + "%s" + sqlServer.getKeywordSuffix(); - public static final String UNIX_TIMESTAMP = "(CAST(DATEDIFF(SS, '1970-01-01 00:00:00', s ) as bigint) - 8 * 3600 ) * 1000"; + 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)"; @@ -22,9 +22,8 @@ public class SqlServerSQLConstants extends SQLConstants { 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_DATE_FORMAT = "%Y-%m-%d %H:%i:%S"; + public static final String STRING_TO_DATE = "CONVERT(datetime, %s ,120)"; public static final String DEFAULT_INT_FORMAT = "DECIMAL(20,0)"; diff --git a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java index c1983357db..1ceeb608b3 100644 --- a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java @@ -1,7 +1,11 @@ package io.dataease.provider.sqlserver; +import com.google.gson.Gson; import io.dataease.base.domain.DatasetTableField; +import io.dataease.base.domain.Datasource; +import io.dataease.commons.constants.DeTypeConstants; import io.dataease.controller.request.chart.ChartExtFilterRequest; +import io.dataease.datasource.dto.SqlServerConfigration; import io.dataease.dto.chart.ChartCustomFilterDTO; import io.dataease.dto.chart.ChartViewFieldDTO; import io.dataease.dto.sqlObj.SQLObj; @@ -38,51 +42,53 @@ public class SqlserverQueryProvider extends QueryProvider { case "LONGTEXT": case "ENUM": case "XML": - return 0;// 文本 - case "DATE": case "TIME": + return DeTypeConstants.DE_STRING;// 文本 + case "DATE": case "YEAR": case "DATETIME": case "DATETIME2": case "DATETIMEOFFSET": - case "TIMESTAMP": - return 1;// 时间 + return DeTypeConstants.DE_TIME;// 时间 case "INT": case "MEDIUMINT": case "INTEGER": case "BIGINT": case "SMALLINT": - return 2;// 整型 + return DeTypeConstants.DE_INT;// 整型 case "FLOAT": case "DOUBLE": case "DECIMAL": case "MONEY": case "NUMERIC": - return 3;// 浮点 + return DeTypeConstants.DE_FLOAT;// 浮点 case "BIT": case "TINYINT": - return 4;// 布尔 + return DeTypeConstants.DE_BOOL;// 布尔 + case "TIMESTAMP": + return DeTypeConstants.DE_Binary;// 二进制 default: - return 0; + return DeTypeConstants.DE_STRING; } } - private static Integer DE_STRING = 0; - private static Integer DE_TIME = 1; - private static Integer DE_INT = 2; - private static Integer DE_FLOAT = 3; - private static Integer DE_BOOL = 4; @Override public String createSQLPreview(String sql, String orderBy) { return "SELECT top 1000 * FROM (" + sqlFix(sql) + ") AS tmp"; } @Override - public String createQuerySQL(String table, List fields, boolean isGroup) { + public String createQuerySQL(String table, List fields, boolean isGroup, Datasource ds) { + SQLObj tableObj = SQLObj.builder() .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(SqlServerSQLConstants.KEYWORD_TABLE, table)) .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0)) .build(); + if(ds != null){ + String schema = new Gson().fromJson(ds.getConfiguration(), SqlServerConfigration.class).getSchema(); + tableObj.setTableName(schema + "." + tableObj.getTableName()); + } + List xFields = new ArrayList<>(); if (CollectionUtils.isNotEmpty(fields)) { for (int i = 0; i < fields.size(); i++) { @@ -91,33 +97,28 @@ public class SqlserverQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); String fieldName = ""; // 处理横轴字段 - if (f.getDeExtractType() == DE_TIME) { // 时间 转为 数值 - if (f.getDeType() == DE_INT || f.getDeType() == DE_FLOAT) { + if (f.getDeExtractType() == DeTypeConstants.DE_TIME) { // 时间 转为 数值 + if (f.getDeType() == DeTypeConstants.DE_INT || f.getDeType() == DeTypeConstants.DE_FLOAT) { fieldName = String.format(SqlServerSQLConstants.UNIX_TIMESTAMP, originField); } else { fieldName = originField; } - } else if (f.getDeExtractType() == DE_STRING) { //字符串转时间 - if (f.getDeType() == DE_INT) { - fieldName = originField; -// String.format(SqlServerSQLConstants.CAST, originField, SqlServerSQLConstants.DEFAULT_INT_FORMAT); - } else if (f.getDeType() == DE_FLOAT) { - fieldName = originField; -// String.format(SqlServerSQLConstants.CAST, originField, SqlServerSQLConstants.DEFAULT_FLOAT_FORMAT); - } else if (f.getDeType() == DE_TIME) { - fieldName = originField; -// String.format(SqlServerSQLConstants.DATE_FORMAT, originField, SqlServerSQLConstants.DEFAULT_DATE_FORMAT); + } else if (f.getDeExtractType() == DeTypeConstants.DE_STRING) { + if (f.getDeType() == DeTypeConstants.DE_INT) { + fieldName = String.format(SqlServerSQLConstants.CONVERT, SqlServerSQLConstants.DEFAULT_INT_FORMAT, originField); + } else if (f.getDeType() == DeTypeConstants.DE_FLOAT) { + 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); } else { fieldName = originField; } } else { - if (f.getDeType() == DE_TIME) { // -// String cast = String.format(SqlServerSQLConstants.CAST, originField, SqlServerSQLConstants.DEFAULT_INT_FORMAT) + "/1000"; - fieldName = originField; -// String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast, SqlServerSQLConstants.DEFAULT_DATE_FORMAT); - } else if (f.getDeType() == DE_INT) { - fieldName = originField; -// String.format(SqlServerSQLConstants.CAST, originField, SqlServerSQLConstants.DEFAULT_INT_FORMAT); + if (f.getDeType() == DeTypeConstants.DE_TIME) { // 数值转时间 + String cast = String.format(SqlServerSQLConstants.LONG_TO_DATE, originField + "/1000"); + fieldName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast); + } else if (f.getDeType() == DeTypeConstants.DE_INT) { + fieldName = String.format(SqlServerSQLConstants.CONVERT, SqlServerSQLConstants.DEFAULT_INT_FORMAT, originField); } else { fieldName = originField; } @@ -139,27 +140,27 @@ public class SqlserverQueryProvider extends QueryProvider { @Override public String createQuerySQLAsTmp(String sql, List fields, boolean isGroup) { - return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup); + return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null); } @Override - public String createQuerySQLWithPage(String table, List fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) { - return createQuerySQL(table, fields, isGroup) + " ORDER BY " + fields.get(0).getOriginName() + " offset " + (page - 1) * pageSize + " rows fetch next " + realSize + " rows only"; + public String createQuerySQLWithPage(String table, List fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds) { + return createQuerySQL(table, fields, isGroup, ds) + " ORDER BY \"" + fields.get(0).getOriginName() + "\" offset " + (page - 1) * pageSize + " rows fetch next " + realSize + " rows only"; } @Override public String createQuerySQLAsTmpWithPage(String sql, List fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) { - return createQuerySQLAsTmp(sql, fields, isGroup) + " ORDER BY " + fields.get(0).getOriginName() + " offset " + (page - 1) * pageSize + " rows fetch next " + realSize + " rows only"; + return createQuerySQLAsTmp(sql, fields, isGroup) + " ORDER BY \"" + fields.get(0).getOriginName() + "\" offset " + (page - 1) * pageSize + " rows fetch next " + realSize + " rows only"; } @Override - public String createQueryTableWithLimit(String table, List fields, Integer limit, boolean isGroup) { - return createQuerySQL(table, fields, isGroup) + " ORDER BY " + fields.get(0).getOriginName() + " offset 0 rows fetch next " + limit + " rows only"; + public String createQueryTableWithLimit(String table, List fields, Integer limit, boolean isGroup, Datasource ds) { + return createQuerySQL(table, fields, isGroup, ds) + " ORDER BY \"" + fields.get(0).getOriginName() + "\" offset 0 rows fetch next " + limit + " rows only"; } @Override public String createQuerySqlWithLimit(String sql, List fields, Integer limit, boolean isGroup) { - return createQuerySQLAsTmp(sql, fields, isGroup) + " ORDER BY " + fields.get(0).getOriginName() + " offset 0 rows fetch next " + limit + " rows only"; + return createQuerySQLAsTmp(sql, fields, isGroup) + " ORDER BY \"" + fields.get(0).getOriginName() + "\" offset 0 rows fetch next " + limit + " rows only"; } @Override @@ -463,14 +464,15 @@ public class SqlserverQueryProvider extends QueryProvider { public String createRawQuerySQL(String table, List 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 { - stringBuilder.append("`").append(f.getOriginName()).append("` AS ").append(f.getDataeaseName()); - } +// if (f.getDeExtractType() == 4) { // 处理 tinyint +// stringBuilder.append("concat(`").append(f.getOriginName()).append("`,'') AS ").append(f.getDataeaseName()); +// } else { +// 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); + return MessageFormat.format("SELECT {0} FROM {1}", StringUtils.join(array, ","), table); } @Override @@ -527,7 +529,7 @@ public class SqlserverQueryProvider extends QueryProvider { String whereTerm = transMysqlFilterTerm(request.getTerm()); String whereValue = ""; String originName = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName()); - if (field.getDeType() == DE_TIME && field.getDeExtractType() != DE_TIME) { + 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 { @@ -581,7 +583,7 @@ public class SqlserverQueryProvider extends QueryProvider { } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) { whereValue = "'%" + value.get(0) + "%'"; } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) { - if (request.getDatasetTableField().getDeType() == DE_TIME) { + 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)))); @@ -620,7 +622,11 @@ public class SqlserverQueryProvider extends QueryProvider { case "y": return "CONVERT(varchar(100), datepart(yy, " + originField + "))"; case "y_M": - return "CONVERT(varchar(100), datepart(yy, " + originField + ")) N'" + split + "'CONVERT(varchar(100), datepart(mm, " + originField + "))"; + 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)"; @@ -628,7 +634,7 @@ public class SqlserverQueryProvider extends QueryProvider { return "CONVERT(varchar(100), " + originField + ", 111)"; } case "H_m_s": - return "CONVERT(varchar(100), " + originField + ", 24)"; + return "CONVERT(varchar(100), " + originField + ", 8)"; case "y_M_d_H_m": if(split.equalsIgnoreCase("-")){ return "substring( convert(varchar," + originField + ",120),1,16)"; @@ -689,17 +695,17 @@ public class SqlserverQueryProvider extends QueryProvider { private SQLObj getXFields(ChartViewFieldDTO x, String originField, String fieldAlias) { String fieldName = ""; - if (x.getDeExtractType() == DE_TIME) { - if (x.getDeType() == DE_INT || x.getDeType() == DE_FLOAT) { //时间转数值 + 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() == DE_TIME) { //时间格式化 + } else if (x.getDeType() == DeTypeConstants.DE_TIME) { //时间格式化 fieldName = transDateFormat(x.getDateStyle(), x.getDatePattern(), originField); } else { fieldName = originField; } } else { - if (x.getDeType() == DE_TIME) { - if (x.getDeExtractType() == DE_STRING) {// 字符串转时间 + 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 {// 数值转时间 @@ -724,7 +730,7 @@ public class SqlserverQueryProvider extends QueryProvider { 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() == DE_INT ? SqlServerSQLConstants.DEFAULT_INT_FORMAT : SqlServerSQLConstants.DEFAULT_FLOAT_FORMAT, originField); + 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 { diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index c8ae09aad9..080882493f 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -377,8 +377,7 @@ public class DataSetTableService { datasourceRequest.setDatasource(ds); String table = dataTableInfoDTO.getTable(); QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); - datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize, false)); - System.out.println(datasourceRequest.getQuery()); + datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize, false, ds)); map.put("sql", datasourceRequest.getQuery()); try { data.addAll(datasourceProvider.getData(datasourceRequest)); @@ -387,7 +386,7 @@ public class DataSetTableService { DEException.throwException(e.getMessage()); } 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()); } catch (Exception e) { e.printStackTrace(); @@ -404,7 +403,7 @@ public class DataSetTableService { datasourceRequest.setDatasource(ds); String table = DorisTableUtils.dorisName(dataSetTableRequest.getId()); 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()); try { data.addAll(jdbcProvider.getData(datasourceRequest)); @@ -413,7 +412,7 @@ public class DataSetTableService { DEException.throwException(e.getMessage()); } 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()); } catch (Exception e) { e.printStackTrace(); @@ -459,7 +458,7 @@ public class DataSetTableService { datasourceRequest.setDatasource(ds); String table = DorisTableUtils.dorisName(dataSetTableRequest.getId()); 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()); try { data.addAll(jdbcProvider.getData(datasourceRequest)); @@ -468,7 +467,7 @@ public class DataSetTableService { DEException.throwException(e.getMessage()); } 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()); } catch (Exception e) { e.printStackTrace(); @@ -486,7 +485,7 @@ public class DataSetTableService { datasourceRequest.setDatasource(ds); String table = DorisTableUtils.dorisName(dataSetTableRequest.getId()); 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()); try { data.addAll(jdbcProvider.getData(datasourceRequest)); @@ -495,7 +494,7 @@ public class DataSetTableService { DEException.throwException(e.getMessage()); } 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()); } catch (Exception e) { e.printStackTrace(); @@ -538,7 +537,7 @@ public class DataSetTableService { datasourceRequest.setDatasource(ds); String table = DorisTableUtils.dorisName(dataSetTableRequest.getId()); 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()); try { data.addAll(jdbcProvider.getData(datasourceRequest)); @@ -548,7 +547,7 @@ public class DataSetTableService { } 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()); } catch (Exception e) { e.printStackTrace(); diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index 8aafc110d1..6c90cb0491 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -865,7 +865,7 @@ public class ExtractDataService { textFileOutputMeta.setSeparator(separator); textFileOutputMeta.setExtension(extention); - if (datasource.getType().equalsIgnoreCase(DatasourceTypes.oracle.name())) { + if (datasource.getType().equalsIgnoreCase(DatasourceTypes.oracle.name()) ) { TextFileField[] outputFields = new TextFileField[datasetTableFields.size() + 1]; for(int i=0;i< datasetTableFields.size();i++){ TextFileField textFileField = new TextFileField(); @@ -878,6 +878,20 @@ public class ExtractDataService { textFileField.setType("String"); 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); }else { textFileOutputMeta.setOutputFields(new TextFileField[0]); @@ -891,6 +905,14 @@ public class ExtractDataService { private StepMeta udjc(List datasetTableFields, DatasourceTypes datasourceType) { 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(); List fields = new ArrayList<>(); UserDefinedJavaClassMeta.FieldInfo fieldInfo = new UserDefinedJavaClassMeta.FieldInfo("dataease_uuid", ValueMetaInterface.TYPE_STRING, -1, -1); @@ -906,11 +928,15 @@ public class ExtractDataService { } else { Column_Fields = String.join(",", datasetTableFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.toList())); } + if (datasourceType.equals(DatasourceTypes.excel)) { tmp_code = tmp_code.replace("handleExcelIntColumn", handleExcelIntColumn).replace("Column_Fields", Column_Fields); } else { 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.setActive(true); @@ -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" + "\t if(tmp != null && tmp.equalsIgnoreCase(\"Y\")){\n" + " get(Fields.Out, filed).setValue(r, 1);\n" + @@ -1049,6 +1081,7 @@ public class ExtractDataService { " String tmp = get(Fields.In, filed).getString(r);\n" + "handleWraps \n" + "alterColumnTypeCode \n" + + "handleBinaryType \n" + "handleExcelIntColumn \n" + " str = str + tmp;\n" + " }\n" + diff --git a/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java b/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java index 3694d17c1a..e683bea423 100644 --- a/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java +++ b/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java @@ -67,7 +67,7 @@ public class DirectFieldService implements DataSetFieldService { QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "db")) { 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")) { datasourceRequest.setQuery(qp.createQuerySQLAsTmp(dataTableInfoDTO.getSql(), Collections.singletonList(field), true)); } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "custom")) { @@ -85,7 +85,7 @@ public class DirectFieldService implements DataSetFieldService { tableName = "ds_" + datasetTable.getId().replaceAll("-", "_"); datasourceRequest.setTable(tableName); 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 { From f521f2b7a1e6f86cc334328b54d4a44fc3378664 Mon Sep 17 00:00:00 2001 From: junjie Date: Mon, 9 Aug 2021 13:43:54 +0800 Subject: [PATCH 08/16] =?UTF-8?q?refactor:=20=E8=A7=86=E5=9B=BE=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=8F=82=E6=95=B0=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/dto/chart/AxisChartDataDTO.java | 17 ++ .../dataease/dto/chart/ChartDimensionDTO.java | 13 ++ .../io/dataease/dto/chart/ChartQuotaDTO.java | 12 ++ .../dto/chart/ScatterChartDataDTO.java | 17 ++ .../sqlserver/SqlserverQueryProvider.java | 10 + .../service/chart/ChartViewService.java | 187 ++++++++++++++++-- .../src/views/chart/chart/funnel/funnel.js | 10 +- frontend/src/views/chart/chart/pie/pie.js | 20 +- 8 files changed, 261 insertions(+), 25 deletions(-) create mode 100644 backend/src/main/java/io/dataease/dto/chart/AxisChartDataDTO.java create mode 100644 backend/src/main/java/io/dataease/dto/chart/ChartDimensionDTO.java create mode 100644 backend/src/main/java/io/dataease/dto/chart/ChartQuotaDTO.java create mode 100644 backend/src/main/java/io/dataease/dto/chart/ScatterChartDataDTO.java diff --git a/backend/src/main/java/io/dataease/dto/chart/AxisChartDataDTO.java b/backend/src/main/java/io/dataease/dto/chart/AxisChartDataDTO.java new file mode 100644 index 0000000000..1301169e90 --- /dev/null +++ b/backend/src/main/java/io/dataease/dto/chart/AxisChartDataDTO.java @@ -0,0 +1,17 @@ +package io.dataease.dto.chart; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * @Author gin + * @Date 2021/8/9 10:14 上午 + */ +@Data +public class AxisChartDataDTO { + private BigDecimal value; + private List dimensionList; + private List quotaList; +} diff --git a/backend/src/main/java/io/dataease/dto/chart/ChartDimensionDTO.java b/backend/src/main/java/io/dataease/dto/chart/ChartDimensionDTO.java new file mode 100644 index 0000000000..a0b139b75c --- /dev/null +++ b/backend/src/main/java/io/dataease/dto/chart/ChartDimensionDTO.java @@ -0,0 +1,13 @@ +package io.dataease.dto.chart; + +import lombok.Data; + +/** + * @Author gin + * @Date 2021/8/9 10:15 上午 + */ +@Data +public class ChartDimensionDTO { + private String id; + private String value; +} diff --git a/backend/src/main/java/io/dataease/dto/chart/ChartQuotaDTO.java b/backend/src/main/java/io/dataease/dto/chart/ChartQuotaDTO.java new file mode 100644 index 0000000000..3784df31cd --- /dev/null +++ b/backend/src/main/java/io/dataease/dto/chart/ChartQuotaDTO.java @@ -0,0 +1,12 @@ +package io.dataease.dto.chart; + +import lombok.Data; + +/** + * @Author gin + * @Date 2021/8/9 10:16 上午 + */ +@Data +public class ChartQuotaDTO { + private String id; +} diff --git a/backend/src/main/java/io/dataease/dto/chart/ScatterChartDataDTO.java b/backend/src/main/java/io/dataease/dto/chart/ScatterChartDataDTO.java new file mode 100644 index 0000000000..d8ee6cd6ef --- /dev/null +++ b/backend/src/main/java/io/dataease/dto/chart/ScatterChartDataDTO.java @@ -0,0 +1,17 @@ +package io.dataease.dto.chart; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * @Author gin + * @Date 2021/8/9 10:14 上午 + */ +@Data +public class ScatterChartDataDTO { + private Object[] value; + private List dimensionList; + private List quotaList; +} diff --git a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java index 1ceeb608b3..0565a2f982 100644 --- a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java @@ -376,6 +376,16 @@ public class SqlserverQueryProvider extends QueryProvider { return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack); } + @Override + public String getSQLScatter(String table, List xAxis, List yAxis, List customFilter, List extFilterRequestList, List extBubble) { + return null; + } + + @Override + public String getSQLAsTmpScatter(String table, List xAxis, List yAxis, List customFilter, List extFilterRequestList, List extBubble) { + return null; + } + @Override public String searchTable(String table) { return "SELECT table_name FROM information_schema.TABLES WHERE table_name ='" + table + "'"; diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 89c08d91e7..e9507c1796 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -365,6 +365,8 @@ public class ChartViewService { mapChart = transStackChartData(xAxis, yAxis, view, data, extStack); } else if (StringUtils.containsIgnoreCase(view.getType(), "scatter")) { mapChart = transScatterData(xAxis, yAxis, view, data, extBubble); + } else if (StringUtils.containsIgnoreCase(view.getType(), "radar")) { + mapChart = transRadarChartData(xAxis, yAxis, view, data); } else { mapChart = transChartData(xAxis, yAxis, view, data); } @@ -421,6 +423,63 @@ public class ChartViewService { private Map transChartData(List xAxis, List yAxis, ChartViewWithBLOBs view, List data) { Map map = new HashMap<>(); + List x = new ArrayList<>(); + List series = new ArrayList<>(); + for (ChartViewFieldDTO y : yAxis) { + Series series1 = new Series(); + series1.setName(y.getName()); + series1.setType(view.getType()); + series1.setData(new ArrayList<>()); + series.add(series1); + } + for (int i1 = 0; i1 < data.size(); i1++) { + String[] d = data.get(i1); + + StringBuilder a = new StringBuilder(); + for (int i = xAxis.size(); i < xAxis.size() + yAxis.size(); i++) { + List dimensionList = new ArrayList<>(); + List quotaList = new ArrayList<>(); + AxisChartDataDTO axisChartDataDTO = new AxisChartDataDTO(); + + for (int j = 0; j < xAxis.size(); j++) { + ChartDimensionDTO chartDimensionDTO = new ChartDimensionDTO(); + chartDimensionDTO.setId(xAxis.get(j).getId()); + chartDimensionDTO.setValue(d[j]); + dimensionList.add(chartDimensionDTO); + } + axisChartDataDTO.setDimensionList(dimensionList); + + int j = i - xAxis.size(); + ChartQuotaDTO chartQuotaDTO = new ChartQuotaDTO(); + chartQuotaDTO.setId(yAxis.get(j).getId()); + quotaList.add(chartQuotaDTO); + axisChartDataDTO.setQuotaList(quotaList); + try { + axisChartDataDTO.setValue(new BigDecimal(StringUtils.isEmpty(d[i]) ? "0" : d[i])); + } catch (Exception e) { + axisChartDataDTO.setValue(new BigDecimal(0)); + } + series.get(j).getData().add(axisChartDataDTO); + } + for (int i = 0; i < xAxis.size(); i++) { + if (i == xAxis.size() - 1) { + a.append(d[i]); + } else { + a.append(d[i]).append("\n"); + } + } + x.add(a.toString()); + } + + map.put("x", x); + map.put("series", series); + return map; + } + + // radar图 + private Map transRadarChartData(List xAxis, List yAxis, ChartViewWithBLOBs view, List data) { + Map map = new HashMap<>(); + List x = new ArrayList<>(); List series = new ArrayList<>(); for (ChartViewFieldDTO y : yAxis) { @@ -464,7 +523,9 @@ public class ChartViewService { List series = new ArrayList<>(); if (CollectionUtils.isNotEmpty(extStack)) { + AxisChartDataDTO defaultAxisChartDataDTO = new AxisChartDataDTO(); BigDecimal defaultValue = StringUtils.containsIgnoreCase(view.getType(), "line") ? new BigDecimal(0) : null; + defaultAxisChartDataDTO.setValue(defaultValue); // 构建横轴 for (String[] d : data) { StringBuilder a = new StringBuilder(); @@ -489,7 +550,7 @@ public class ChartViewService { series1.setType(view.getType()); List list = new ArrayList<>(); for (int i = 0; i < x.size(); i++) { - list.add(defaultValue); + list.add(defaultAxisChartDataDTO); } series1.setData(list); series.add(series1); @@ -509,9 +570,31 @@ public class ChartViewService { } if (StringUtils.equals(a.toString(), x.get(i))) { if (row.length > xAxis.size() + extStack.size()) { + List dimensionList = new ArrayList<>(); + List quotaList = new ArrayList<>(); + AxisChartDataDTO axisChartDataDTO = new AxisChartDataDTO(); + + ChartQuotaDTO chartQuotaDTO = new ChartQuotaDTO(); + chartQuotaDTO.setId(yAxis.get(0).getId()); + quotaList.add(chartQuotaDTO); + axisChartDataDTO.setQuotaList(quotaList); + + for (int k = 0; k < xAxis.size(); k++) { + ChartDimensionDTO chartDimensionDTO = new ChartDimensionDTO(); + chartDimensionDTO.setId(xAxis.get(k).getId()); + chartDimensionDTO.setValue(row[k]); + dimensionList.add(chartDimensionDTO); + } + ChartDimensionDTO chartDimensionDTO = new ChartDimensionDTO(); + chartDimensionDTO.setId(extStack.get(0).getId()); + chartDimensionDTO.setValue(row[xAxis.size()]); + dimensionList.add(chartDimensionDTO); + axisChartDataDTO.setDimensionList(dimensionList); + String s = row[xAxis.size() + extStack.size()]; if (StringUtils.isNotEmpty(s)) { - ss.getData().set(i, new BigDecimal(s)); + axisChartDataDTO.setValue(new BigDecimal(s)); + ss.getData().set(i, axisChartDataDTO); } } break; @@ -528,8 +611,35 @@ public class ChartViewService { series1.setData(new ArrayList<>()); series.add(series1); } - for (String[] d : data) { + for (int i1 = 0; i1 < data.size(); i1++) { + String[] d = data.get(i1); + StringBuilder a = new StringBuilder(); + for (int i = xAxis.size(); i < xAxis.size() + yAxis.size(); i++) { + List dimensionList = new ArrayList<>(); + List quotaList = new ArrayList<>(); + AxisChartDataDTO axisChartDataDTO = new AxisChartDataDTO(); + + for (int j = 0; j < xAxis.size(); j++) { + ChartDimensionDTO chartDimensionDTO = new ChartDimensionDTO(); + chartDimensionDTO.setId(xAxis.get(j).getId()); + chartDimensionDTO.setValue(d[j]); + dimensionList.add(chartDimensionDTO); + } + axisChartDataDTO.setDimensionList(dimensionList); + + int j = i - xAxis.size(); + ChartQuotaDTO chartQuotaDTO = new ChartQuotaDTO(); + chartQuotaDTO.setId(yAxis.get(j).getId()); + quotaList.add(chartQuotaDTO); + axisChartDataDTO.setQuotaList(quotaList); + try { + axisChartDataDTO.setValue(new BigDecimal(StringUtils.isEmpty(d[i]) ? "0" : d[i])); + } catch (Exception e) { + axisChartDataDTO.setValue(new BigDecimal(0)); + } + series.get(j).getData().add(axisChartDataDTO); + } for (int i = 0; i < xAxis.size(); i++) { if (i == xAxis.size() - 1) { a.append(d[i]); @@ -538,14 +648,6 @@ public class ChartViewService { } } x.add(a.toString()); - for (int i = xAxis.size(); i < xAxis.size() + yAxis.size(); i++) { - int j = i - xAxis.size(); - try { - series.get(j).getData().add(new BigDecimal(StringUtils.isEmpty(d[i]) ? "0" : d[i])); - } catch (Exception e) { - series.get(j).getData().add(new BigDecimal(0)); - } - } } } @@ -567,7 +669,66 @@ public class ChartViewService { series1.setData(new ArrayList<>()); series.add(series1); } - for (String[] d : data) { + for (int i1 = 0; i1 < data.size(); i1++) { + String[] d = data.get(i1); + + StringBuilder a = new StringBuilder(); + for (int i = 0; i < xAxis.size(); i++) { + if (i == xAxis.size() - 1) { + a.append(d[i]); + } else { + a.append(d[i]).append("\n"); + } + } + x.add(a.toString()); + for (int i = xAxis.size(); i < xAxis.size() + yAxis.size(); i++) { + List dimensionList = new ArrayList<>(); + List quotaList = new ArrayList<>(); + ScatterChartDataDTO scatterChartDataDTO = new ScatterChartDataDTO(); + + for (int j = 0; j < xAxis.size(); j++) { + ChartDimensionDTO chartDimensionDTO = new ChartDimensionDTO(); + chartDimensionDTO.setId(xAxis.get(j).getId()); + chartDimensionDTO.setValue(d[j]); + dimensionList.add(chartDimensionDTO); + } + scatterChartDataDTO.setDimensionList(dimensionList); + + int j = i - xAxis.size(); + ChartQuotaDTO chartQuotaDTO = new ChartQuotaDTO(); + chartQuotaDTO.setId(yAxis.get(j).getId()); + quotaList.add(chartQuotaDTO); + scatterChartDataDTO.setQuotaList(quotaList); +// try { +// axisChartDataDTO.setValue(new BigDecimal(StringUtils.isEmpty(d[i]) ? "0" : d[i])); +// } catch (Exception e) { +// axisChartDataDTO.setValue(new BigDecimal(0)); +// } + if (CollectionUtils.isNotEmpty(extBubble) && extBubble.size() > 0) { + try { + scatterChartDataDTO.setValue(new Object[]{ + a.toString(), + new BigDecimal(StringUtils.isEmpty(d[i]) ? "0" : d[i]), + new BigDecimal(StringUtils.isEmpty(d[xAxis.size() + yAxis.size()]) ? "0" : d[xAxis.size() + yAxis.size()]) + }); + } catch (Exception e) { + scatterChartDataDTO.setValue(new Object[]{a.toString(), new BigDecimal(0), new BigDecimal(0)}); + } + } else { + try { + scatterChartDataDTO.setValue(new Object[]{ + a.toString(), + new BigDecimal(StringUtils.isEmpty(d[i]) ? "0" : d[i]) + }); + } catch (Exception e) { + scatterChartDataDTO.setValue(new Object[]{a.toString(), new BigDecimal(0)}); + } + } + series.get(j).getData().add(scatterChartDataDTO); + } + } + + /*for (String[] d : data) { StringBuilder a = new StringBuilder(); for (int i = 0; i < xAxis.size(); i++) { if (i == xAxis.size() - 1) { @@ -600,7 +761,7 @@ public class ChartViewService { } } } - } + }*/ map.put("x", x); map.put("series", series); diff --git a/frontend/src/views/chart/chart/funnel/funnel.js b/frontend/src/views/chart/chart/funnel/funnel.js index 8a5c4fc9c2..736820378e 100644 --- a/frontend/src/views/chart/chart/funnel/funnel.js +++ b/frontend/src/views/chart/chart/funnel/funnel.js @@ -34,10 +34,12 @@ export function baseFunnelOption(chart_option, chart) { // max value chart_option.series[0].max = Math.max.apply(Math, valueArr) for (let i = 0; i < valueArr.length; i++) { - const y = { - name: chart.data.x[i], - value: valueArr[i] - } + // const y = { + // name: chart.data.x[i], + // value: valueArr[i] + // } + const y = valueArr[i] + y.name = chart.data.x[i] // color y.itemStyle = { color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha) diff --git a/frontend/src/views/chart/chart/pie/pie.js b/frontend/src/views/chart/chart/pie/pie.js index 0b8bb92469..d2afdd159d 100644 --- a/frontend/src/views/chart/chart/pie/pie.js +++ b/frontend/src/views/chart/chart/pie/pie.js @@ -33,10 +33,12 @@ export function basePieOption(chart_option, chart) { } const valueArr = chart.data.series[0].data for (let i = 0; i < valueArr.length; i++) { - const y = { - name: chart.data.x[i], - value: valueArr[i] - } + // const y = { + // name: chart.data.x[i], + // value: valueArr[i] + // } + const y = valueArr[i] + y.name = chart.data.x[i] // color y.itemStyle = { color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha), @@ -84,10 +86,12 @@ export function rosePieOption(chart_option, chart) { } const valueArr = chart.data.series[0].data for (let i = 0; i < valueArr.length; i++) { - const y = { - name: chart.data.x[i], - value: valueArr[i] - } + // const y = { + // name: chart.data.x[i], + // value: valueArr[i] + // } + const y = valueArr[i] + y.name = chart.data.x[i] // color y.itemStyle = { color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha), From cbe49654859bbc28613152a4df2984ca9041d133 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 9 Aug 2021 14:17:22 +0800 Subject: [PATCH 09/16] feat: sqlserver --- .../commons/utils/ExcelReaderUtil.java | 2 +- .../sqlserver/SqlserverQueryProvider.java | 151 +++++++++++++++++- 2 files changed, 148 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java b/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java index 41cddf3f21..2bfddcf3de 100644 --- a/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java +++ b/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java @@ -68,7 +68,7 @@ public class ExcelReaderUtil { } public static void main(String[] args) throws Exception { - String file ="全国现有确诊趋势.xlsx"; + String file ="下单渠道.xlsx"; ExcelReaderUtil.readExcel(file, new FileInputStream("/Users/taojinlong/Desktop/" + file)); } } diff --git a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java index 1ceeb608b3..2c8d0254ba 100644 --- a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java @@ -2,7 +2,9 @@ package io.dataease.provider.sqlserver; import com.google.gson.Gson; import io.dataease.base.domain.DatasetTableField; +import io.dataease.base.domain.DatasetTableFieldExample; import io.dataease.base.domain.Datasource; +import io.dataease.base.mapper.DatasetTableFieldMapper; import io.dataease.commons.constants.DeTypeConstants; import io.dataease.controller.request.chart.ChartExtFilterRequest; import io.dataease.datasource.dto.SqlServerConfigration; @@ -11,6 +13,7 @@ import io.dataease.dto.chart.ChartViewFieldDTO; import io.dataease.dto.sqlObj.SQLObj; import io.dataease.provider.QueryProvider; import io.dataease.provider.SQLConstants; +import io.dataease.provider.mysql.MySQLConstants; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -19,16 +22,20 @@ import org.stringtemplate.v4.ST; import org.stringtemplate.v4.STGroup; import org.stringtemplate.v4.STGroupFile; +import javax.annotation.Resource; import java.text.MessageFormat; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX; @Service("sqlserverQuery") public class SqlserverQueryProvider extends QueryProvider { + @Resource + private DatasetTableFieldMapper datasetTableFieldMapper; + @Override public Integer transFieldType(String field) { switch (field) { @@ -376,6 +383,120 @@ public class SqlserverQueryProvider extends QueryProvider { return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack); } + @Override + public String getSQLScatter(String table, List xAxis, List yAxis, List customFilter, List extFilterRequestList, List extBubble) { + SQLObj tableObj = SQLObj.builder() + .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(MySQLConstants.KEYWORD_TABLE, table)) + .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0)) + .build(); + List xFields = new ArrayList<>(); + List xWheres = new ArrayList<>(); + List xOrders = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(xAxis)) { + for (int i = 0; i < xAxis.size(); i++) { + ChartViewFieldDTO x = xAxis.get(i); + String originField; + if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originField = calcFieldRegex(x.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 1) { + originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + } else { + originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + } + String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); + // 处理横轴字段 + xFields.add(getXFields(x, originField, fieldAlias)); + // 处理横轴过滤 +// xWheres.addAll(getXWheres(x, originField, fieldAlias)); + // 处理横轴排序 + if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { + xOrders.add(SQLObj.builder() + .orderField(originField) + .orderAlias(fieldAlias) + .orderDirection(x.getSort()) + .build()); + } + } + } + List yFields = new ArrayList<>(); + List yWheres = new ArrayList<>(); + List yOrders = new ArrayList<>(); + List yList = new ArrayList<>(); + yList.addAll(yAxis); + yList.addAll(extBubble); + if (CollectionUtils.isNotEmpty(yList)) { + for (int i = 0; i < yList.size(); i++) { + ChartViewFieldDTO y = yList.get(i); + String originField; + if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originField = calcFieldRegex(y.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 1) { + originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + } else { + originField = String.format(MySQLConstants.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 customWheres = transCustomFilterList(tableObj, customFilter); + // 处理仪表板字段过滤 + List extWheres = transExtFilterList(tableObj, extFilterRequestList); + // 构建sql所有参数 + List fields = new ArrayList<>(); + fields.addAll(xFields); + fields.addAll(yFields); + List wheres = new ArrayList<>(); + wheres.addAll(xWheres); + if (customWheres != null) wheres.addAll(customWheres); + if (extWheres != null) wheres.addAll(extWheres); + List groups = new ArrayList<>(); + groups.addAll(xFields); + // 外层再次套sql + List orders = new ArrayList<>(); + orders.addAll(xOrders); + orders.addAll(yOrders); + List 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(MySQLConstants.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 getSQLAsTmpScatter(String table, List xAxis, List yAxis, List customFilter, List extFilterRequestList, List extBubble) { + return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble); + } + @Override public String searchTable(String table) { return "SELECT table_name FROM information_schema.TABLES WHERE table_name ='" + table + "'"; @@ -772,5 +893,27 @@ public class SqlserverQueryProvider extends QueryProvider { return list; } - + private String calcFieldRegex(String originField, SQLObj tableObj) { + originField = originField.replaceAll("[\\t\\n\\r]]", ""); + // 正则提取[xxx] + String regex = "\\[(.*?)]"; + Pattern pattern = Pattern.compile(regex); + Matcher matcher = pattern.matcher(originField); + Set ids = new HashSet<>(); + while (matcher.find()) { + String id = matcher.group(1); + ids.add(id); + } + if (CollectionUtils.isEmpty(ids)) { + return originField; + } + DatasetTableFieldExample datasetTableFieldExample = new DatasetTableFieldExample(); + datasetTableFieldExample.createCriteria().andIdIn(new ArrayList<>(ids)); + List calcFields = datasetTableFieldMapper.selectByExample(datasetTableFieldExample); + for (DatasetTableField ele : calcFields) { + originField = originField.replaceAll("\\[" + ele.getId() + "]", + String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), ele.getOriginName())); + } + return originField; + } } From bb711fb40645513e02e4e5762e99faafdda25a64 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 9 Aug 2021 16:01:29 +0800 Subject: [PATCH 10/16] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0ak,sk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/base/domain/UserKey.java | 21 + .../dataease/base/domain/UserKeyExample.java | 590 ++++++++++++++++++ .../dataease/base/mapper/UserKeyMapper.java | 30 + .../io/dataease/base/mapper/UserKeyMapper.xml | 228 +++++++ .../plugins/server/XUserKeysServer.java | 61 ++ frontend/src/lang/en.js | 3 +- frontend/src/lang/tw.js | 3 +- frontend/src/lang/zh.js | 3 +- frontend/src/layout/components/Topbar.vue | 5 + 9 files changed, 941 insertions(+), 3 deletions(-) create mode 100644 backend/src/main/java/io/dataease/base/domain/UserKey.java create mode 100644 backend/src/main/java/io/dataease/base/domain/UserKeyExample.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/UserKeyMapper.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/UserKeyMapper.xml create mode 100644 backend/src/main/java/io/dataease/plugins/server/XUserKeysServer.java diff --git a/backend/src/main/java/io/dataease/base/domain/UserKey.java b/backend/src/main/java/io/dataease/base/domain/UserKey.java new file mode 100644 index 0000000000..bd9aaab7c6 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/UserKey.java @@ -0,0 +1,21 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import lombok.Data; + +@Data +public class UserKey implements Serializable { + private Long id; + + private Long userId; + + private String accessKey; + + private String secretKey; + + private Long createTime; + + private String status; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/UserKeyExample.java b/backend/src/main/java/io/dataease/base/domain/UserKeyExample.java new file mode 100644 index 0000000000..eca0701de4 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/UserKeyExample.java @@ -0,0 +1,590 @@ +package io.dataease.base.domain; + +import java.util.ArrayList; +import java.util.List; + +public class UserKeyExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public UserKeyExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andUserIdIsNull() { + addCriterion("user_id is null"); + return (Criteria) this; + } + + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); + return (Criteria) this; + } + + public Criteria andUserIdEqualTo(Long value) { + addCriterion("user_id =", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotEqualTo(Long value) { + addCriterion("user_id <>", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThan(Long value) { + addCriterion("user_id >", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThanOrEqualTo(Long value) { + addCriterion("user_id >=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThan(Long value) { + addCriterion("user_id <", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThanOrEqualTo(Long value) { + addCriterion("user_id <=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdBetween(Long value1, Long value2) { + addCriterion("user_id between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotBetween(Long value1, Long value2) { + addCriterion("user_id not between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andAccessKeyIsNull() { + addCriterion("access_key is null"); + return (Criteria) this; + } + + public Criteria andAccessKeyIsNotNull() { + addCriterion("access_key is not null"); + return (Criteria) this; + } + + public Criteria andAccessKeyEqualTo(String value) { + addCriterion("access_key =", value, "accessKey"); + return (Criteria) this; + } + + public Criteria andAccessKeyNotEqualTo(String value) { + addCriterion("access_key <>", value, "accessKey"); + return (Criteria) this; + } + + public Criteria andAccessKeyGreaterThan(String value) { + addCriterion("access_key >", value, "accessKey"); + return (Criteria) this; + } + + public Criteria andAccessKeyGreaterThanOrEqualTo(String value) { + addCriterion("access_key >=", value, "accessKey"); + return (Criteria) this; + } + + public Criteria andAccessKeyLessThan(String value) { + addCriterion("access_key <", value, "accessKey"); + return (Criteria) this; + } + + public Criteria andAccessKeyLessThanOrEqualTo(String value) { + addCriterion("access_key <=", value, "accessKey"); + return (Criteria) this; + } + + public Criteria andAccessKeyLike(String value) { + addCriterion("access_key like", value, "accessKey"); + return (Criteria) this; + } + + public Criteria andAccessKeyNotLike(String value) { + addCriterion("access_key not like", value, "accessKey"); + return (Criteria) this; + } + + public Criteria andAccessKeyIn(List values) { + addCriterion("access_key in", values, "accessKey"); + return (Criteria) this; + } + + public Criteria andAccessKeyNotIn(List values) { + addCriterion("access_key not in", values, "accessKey"); + return (Criteria) this; + } + + public Criteria andAccessKeyBetween(String value1, String value2) { + addCriterion("access_key between", value1, value2, "accessKey"); + return (Criteria) this; + } + + public Criteria andAccessKeyNotBetween(String value1, String value2) { + addCriterion("access_key not between", value1, value2, "accessKey"); + return (Criteria) this; + } + + public Criteria andSecretKeyIsNull() { + addCriterion("secret_key is null"); + return (Criteria) this; + } + + public Criteria andSecretKeyIsNotNull() { + addCriterion("secret_key is not null"); + return (Criteria) this; + } + + public Criteria andSecretKeyEqualTo(String value) { + addCriterion("secret_key =", value, "secretKey"); + return (Criteria) this; + } + + public Criteria andSecretKeyNotEqualTo(String value) { + addCriterion("secret_key <>", value, "secretKey"); + return (Criteria) this; + } + + public Criteria andSecretKeyGreaterThan(String value) { + addCriterion("secret_key >", value, "secretKey"); + return (Criteria) this; + } + + public Criteria andSecretKeyGreaterThanOrEqualTo(String value) { + addCriterion("secret_key >=", value, "secretKey"); + return (Criteria) this; + } + + public Criteria andSecretKeyLessThan(String value) { + addCriterion("secret_key <", value, "secretKey"); + return (Criteria) this; + } + + public Criteria andSecretKeyLessThanOrEqualTo(String value) { + addCriterion("secret_key <=", value, "secretKey"); + return (Criteria) this; + } + + public Criteria andSecretKeyLike(String value) { + addCriterion("secret_key like", value, "secretKey"); + return (Criteria) this; + } + + public Criteria andSecretKeyNotLike(String value) { + addCriterion("secret_key not like", value, "secretKey"); + return (Criteria) this; + } + + public Criteria andSecretKeyIn(List values) { + addCriterion("secret_key in", values, "secretKey"); + return (Criteria) this; + } + + public Criteria andSecretKeyNotIn(List values) { + addCriterion("secret_key not in", values, "secretKey"); + return (Criteria) this; + } + + public Criteria andSecretKeyBetween(String value1, String value2) { + addCriterion("secret_key between", value1, value2, "secretKey"); + return (Criteria) this; + } + + public Criteria andSecretKeyNotBetween(String value1, String value2) { + addCriterion("secret_key not between", value1, value2, "secretKey"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Long value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Long value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Long value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Long value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Long value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Long value1, Long value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Long value1, Long value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andStatusIsNull() { + addCriterion("`status` is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("`status` is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(String value) { + addCriterion("`status` =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(String value) { + addCriterion("`status` <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(String value) { + addCriterion("`status` >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(String value) { + addCriterion("`status` >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(String value) { + addCriterion("`status` <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(String value) { + addCriterion("`status` <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLike(String value) { + addCriterion("`status` like", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotLike(String value) { + addCriterion("`status` not like", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("`status` in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("`status` not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(String value1, String value2) { + addCriterion("`status` between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(String value1, String value2) { + addCriterion("`status` not between", value1, value2, "status"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/UserKeyMapper.java b/backend/src/main/java/io/dataease/base/mapper/UserKeyMapper.java new file mode 100644 index 0000000000..0103fd1305 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/UserKeyMapper.java @@ -0,0 +1,30 @@ +package io.dataease.base.mapper; + +import io.dataease.base.domain.UserKey; +import io.dataease.base.domain.UserKeyExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface UserKeyMapper { + long countByExample(UserKeyExample example); + + int deleteByExample(UserKeyExample example); + + int deleteByPrimaryKey(Long id); + + int insert(UserKey record); + + int insertSelective(UserKey record); + + List selectByExample(UserKeyExample example); + + UserKey selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") UserKey record, @Param("example") UserKeyExample example); + + int updateByExample(@Param("record") UserKey record, @Param("example") UserKeyExample example); + + int updateByPrimaryKeySelective(UserKey record); + + int updateByPrimaryKey(UserKey record); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/UserKeyMapper.xml b/backend/src/main/java/io/dataease/base/mapper/UserKeyMapper.xml new file mode 100644 index 0000000000..c10a33dc45 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/UserKeyMapper.xml @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, user_id, access_key, secret_key, create_time, `status` + + + + + delete from user_key + where id = #{id,jdbcType=BIGINT} + + + delete from user_key + + + + + + insert into user_key (id, user_id, access_key, + secret_key, create_time, `status` + ) + values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{accessKey,jdbcType=VARCHAR}, + #{secretKey,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{status,jdbcType=VARCHAR} + ) + + + insert into user_key + + + id, + + + user_id, + + + access_key, + + + secret_key, + + + create_time, + + + `status`, + + + + + #{id,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{accessKey,jdbcType=VARCHAR}, + + + #{secretKey,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=BIGINT}, + + + #{status,jdbcType=VARCHAR}, + + + + + + update user_key + + + id = #{record.id,jdbcType=BIGINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + access_key = #{record.accessKey,jdbcType=VARCHAR}, + + + secret_key = #{record.secretKey,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=BIGINT}, + + + `status` = #{record.status,jdbcType=VARCHAR}, + + + + + + + + update user_key + set id = #{record.id,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + access_key = #{record.accessKey,jdbcType=VARCHAR}, + secret_key = #{record.secretKey,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=BIGINT}, + `status` = #{record.status,jdbcType=VARCHAR} + + + + + + update user_key + + + user_id = #{userId,jdbcType=BIGINT}, + + + access_key = #{accessKey,jdbcType=VARCHAR}, + + + secret_key = #{secretKey,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=BIGINT}, + + + `status` = #{status,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=BIGINT} + + + update user_key + set user_id = #{userId,jdbcType=BIGINT}, + access_key = #{accessKey,jdbcType=VARCHAR}, + secret_key = #{secretKey,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=BIGINT}, + `status` = #{status,jdbcType=VARCHAR} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/plugins/server/XUserKeysServer.java b/backend/src/main/java/io/dataease/plugins/server/XUserKeysServer.java new file mode 100644 index 0000000000..e3fb1e4ea6 --- /dev/null +++ b/backend/src/main/java/io/dataease/plugins/server/XUserKeysServer.java @@ -0,0 +1,61 @@ +package io.dataease.plugins.server; + +import io.dataease.commons.utils.AuthUtils; +import io.dataease.plugins.config.SpringContextUtil; +import io.dataease.plugins.xpack.ukey.dto.request.XpackUkeyDto; +import io.dataease.plugins.xpack.ukey.service.UkeyXpackService; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.ServletRequest; +import java.util.List; + +@RequestMapping("/plugin/ukey") +@RestController +public class XUserKeysServer { + + + @PostMapping("info") + public List getUserKeysInfo() { + + UkeyXpackService ukeyXpackService = SpringContextUtil.getBean(UkeyXpackService.class); + Long userId = AuthUtils.getUser().getUserId(); + return ukeyXpackService.getUserKeysInfo(userId); + } + + @PostMapping("validate") + public String validate(ServletRequest request) { + // return ApiKeyHandler.getUser(WebUtils.toHttp(request)); + return null; + } + + @PostMapping("generate") + public void generateUserKey() { + UkeyXpackService ukeyXpackService = SpringContextUtil.getBean(UkeyXpackService.class); + Long userId = AuthUtils.getUser().getUserId(); + ukeyXpackService.generateUserKey(userId); + } + + @PostMapping("delete/{id}") + public void deleteUserKey(@PathVariable Long id) { + UkeyXpackService ukeyXpackService = SpringContextUtil.getBean(UkeyXpackService.class); + ukeyXpackService.deleteUserKey(id); + } + + @PostMapping("changeStatus/{id}") + public void changeStatus(@PathVariable Long id) { + UkeyXpackService ukeyXpackService = SpringContextUtil.getBean(UkeyXpackService.class); + ukeyXpackService.switchStatus(id); + } + + /*@GetMapping("active/{id}") + public void activeUserKey(@PathVariable Long id) { + UkeyXpackService ukeyXpackService = SpringContextUtil.getBean(UkeyXpackService.class); + ukeyXpackService.activeUserKey(id); + } + + @GetMapping("disable/{id}") + public void disabledUserKey(@PathVariable Long id) { + UkeyXpackService ukeyXpackService = SpringContextUtil.getBean(UkeyXpackService.class); + ukeyXpackService.disableUserKey(id); + }*/ +} diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 954a4248ff..cee7d5cd93 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -337,7 +337,8 @@ export default { confirm: 'Confirm', ok: 'Confirm', cancel: 'Cancel' - } + }, + ukey_title: 'API Keys' }, documentation: { documentation: 'Documentation', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index e9461d3571..521eea1bc6 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -337,7 +337,8 @@ export default { confirm: '確認', ok: '確認', cancel: '取消' - } + }, + ukey_title: 'API Keys' }, documentation: { documentation: '文檔', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 8e2f3c2f25..025f3f854c 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -337,7 +337,8 @@ export default { confirm: '确认', ok: '确认', cancel: '取消' - } + }, + ukey_title: 'API Keys' }, documentation: { documentation: '文档', diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue index d74a84cdb6..29d097c2ee 100644 --- a/frontend/src/layout/components/Topbar.vue +++ b/frontend/src/layout/components/Topbar.vue @@ -53,6 +53,11 @@ {{ $t('commons.personal_info') }} + + + {{ $t('commons.ukey_title') }} + + {{ $t('user.change_password') }} From 55fc58fda95efbc695e7445422d5a0b2b17e7132 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 9 Aug 2021 16:25:46 +0800 Subject: [PATCH 11/16] =?UTF-8?q?fix:=20=E6=8A=BD=E5=8F=96=20oralce=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/provider/oracle/OracleQueryProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java index ee956c2a99..02af808450 100644 --- a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java @@ -632,10 +632,10 @@ public class OracleQueryProvider extends QueryProvider { public String createRawQuerySQL(String table, List fields) { String[] array = fields.stream().map(f -> { StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append(" ").append(f.getOriginName()); + stringBuilder.append(" \"").append(f.getOriginName()).append("\""); return stringBuilder.toString(); }).toArray(String[]::new); - return MessageFormat.format("SELECT {0} FROM {1} ORDER BY null", StringUtils.join(array, ","), table); + return MessageFormat.format("SELECT {0} FROM {1} ORDER BY null", StringUtils.join(array, ","), "\"" + table + "\""); } @Override From ed034e59f43c44af03915d3012304d7a3c28d79d Mon Sep 17 00:00:00 2001 From: junjie Date: Mon, 9 Aug 2021 16:37:15 +0800 Subject: [PATCH 12/16] =?UTF-8?q?feat:=20=E7=9F=A9=E5=BD=A2=E6=A0=91?= =?UTF-8?q?=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/chart/ChartViewService.java | 41 +++++++++++++ frontend/src/icons/svg/treemap.svg | 1 + frontend/src/lang/en.js | 6 +- frontend/src/lang/tw.js | 6 +- frontend/src/lang/zh.js | 6 +- frontend/src/views/chart/chart/chart.js | 36 +++++++++++ .../src/views/chart/chart/funnel/funnel.js | 4 +- .../src/views/chart/chart/treemap/treemap.js | 53 +++++++++++++++++ .../views/chart/components/ChartComponent.vue | 8 ++- frontend/src/views/chart/view/ChartEdit.vue | 59 +++++++++++-------- 10 files changed, 188 insertions(+), 32 deletions(-) create mode 100644 frontend/src/icons/svg/treemap.svg create mode 100644 frontend/src/views/chart/chart/treemap/treemap.js diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index e9507c1796..68fa644ab0 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -367,6 +367,9 @@ public class ChartViewService { mapChart = transScatterData(xAxis, yAxis, view, data, extBubble); } else if (StringUtils.containsIgnoreCase(view.getType(), "radar")) { mapChart = transRadarChartData(xAxis, yAxis, view, data); + } else if (StringUtils.containsIgnoreCase(view.getType(), "text") + || StringUtils.containsIgnoreCase(view.getType(), "gauge")) { + mapChart = transNormalChartData(xAxis, yAxis, view, data); } else { mapChart = transChartData(xAxis, yAxis, view, data); } @@ -476,6 +479,44 @@ public class ChartViewService { return map; } + // 常规图形 + private Map transNormalChartData(List xAxis, List yAxis, ChartViewWithBLOBs view, List data) { + Map map = new HashMap<>(); + + List x = new ArrayList<>(); + List series = new ArrayList<>(); + for (ChartViewFieldDTO y : yAxis) { + Series series1 = new Series(); + series1.setName(y.getName()); + series1.setType(view.getType()); + series1.setData(new ArrayList<>()); + series.add(series1); + } + for (String[] d : data) { + StringBuilder a = new StringBuilder(); + for (int i = 0; i < xAxis.size(); i++) { + if (i == xAxis.size() - 1) { + a.append(d[i]); + } else { + a.append(d[i]).append("\n"); + } + } + x.add(a.toString()); + for (int i = xAxis.size(); i < xAxis.size() + yAxis.size(); i++) { + int j = i - xAxis.size(); + try { + series.get(j).getData().add(new BigDecimal(StringUtils.isEmpty(d[i]) ? "0" : d[i])); + } catch (Exception e) { + series.get(j).getData().add(new BigDecimal(0)); + } + } + } + + map.put("x", x); + map.put("series", series); + return map; + } + // radar图 private Map transRadarChartData(List xAxis, List yAxis, ChartViewWithBLOBs view, List data) { Map map = new HashMap<>(); diff --git a/frontend/src/icons/svg/treemap.svg b/frontend/src/icons/svg/treemap.svg new file mode 100644 index 0000000000..e0fcce2b30 --- /dev/null +++ b/frontend/src/icons/svg/treemap.svg @@ -0,0 +1 @@ + diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index cee7d5cd93..5bd6a93874 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -832,7 +832,11 @@ export default { axis_label_rotate: 'Label Rotate', chart_scatter_bubble: 'Bubble', chart_scatter: 'Scatter', - bubble_size: 'Bubble Size' + bubble_size: 'Bubble Size', + chart_treemap: 'Tree Map', + drill: 'Drill', + drag_block_treemap_label: 'Color Label', + drag_block_treemap_size: 'Color Size' }, dataset: { sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 521eea1bc6..bd2899e2ce 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -832,7 +832,11 @@ export default { axis_label_rotate: '標簽角度', chart_scatter_bubble: '氣泡圖', chart_scatter: '散點圖', - bubble_size: '氣泡大小' + bubble_size: '氣泡大小', + chart_treemap: '矩形樹圖', + drill: '鉆取', + drag_block_treemap_label: '色塊標簽', + drag_block_treemap_size: '色塊大小' }, dataset: { sheet_warn: '有多個sheet頁面，默認抽取第一個', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 025f3f854c..29c62fea14 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -832,7 +832,11 @@ export default { axis_label_rotate: '标签角度', chart_scatter_bubble: '气泡图', chart_scatter: '散点图', - bubble_size: '气泡大小' + bubble_size: '气泡大小', + chart_treemap: '矩形树图', + drill: '钻取', + drag_block_treemap_label: '色块标签', + drag_block_treemap_size: '色块大小' }, dataset: { sheet_warn: '有多个 Sheet 页，默认抽取第一个', diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js index 1363562f7f..90e7c5134f 100644 --- a/frontend/src/views/chart/chart/chart.js +++ b/frontend/src/views/chart/chart/chart.js @@ -689,3 +689,39 @@ export const BASE_SCATTER = { } ] } + +export const BASE_TREEMAP = { + title: { + text: '', + textStyle: { + fontWeight: 'normal' + } + }, + grid: { + containLabel: true + }, + tooltip: {}, + legend: { + show: true, + type: 'scroll', + itemWidth: 10, + itemHeight: 10, + icon: 'rect' + }, + series: [ + { + // name: '', + type: 'treemap', + // radius: ['0%', '60%'], + // avoidLabelOverlap: false, + // emphasis: { + // itemStyle: { + // shadowBlur: 10, + // shadowOffsetX: 0, + // shadowColor: 'rgba(0, 0, 0, 0.5)' + // } + // }, + data: [] + } + ] +} diff --git a/frontend/src/views/chart/chart/funnel/funnel.js b/frontend/src/views/chart/chart/funnel/funnel.js index 736820378e..522016ecfe 100644 --- a/frontend/src/views/chart/chart/funnel/funnel.js +++ b/frontend/src/views/chart/chart/funnel/funnel.js @@ -31,8 +31,6 @@ export function baseFunnelOption(chart_option, chart) { chart_option.series[0].label = customAttr.label } const valueArr = chart.data.series[0].data - // max value - chart_option.series[0].max = Math.max.apply(Math, valueArr) for (let i = 0; i < valueArr.length; i++) { // const y = { // name: chart.data.x[i], @@ -44,7 +42,7 @@ export function baseFunnelOption(chart_option, chart) { y.itemStyle = { color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha) } - y.type = 'funnel' + // y.type = 'funnel' chart_option.series[0].data.push(y) } } diff --git a/frontend/src/views/chart/chart/treemap/treemap.js b/frontend/src/views/chart/chart/treemap/treemap.js new file mode 100644 index 0000000000..5ecca3ca82 --- /dev/null +++ b/frontend/src/views/chart/chart/treemap/treemap.js @@ -0,0 +1,53 @@ +import { hexColorToRGBA } from '@/views/chart/chart/util' +import { componentStyle } from '../common/common' + +export function baseTreemapOption(chart_option, chart) { + // 处理shape attr + let customAttr = {} + if (chart.customAttr) { + customAttr = JSON.parse(chart.customAttr) + if (customAttr.color) { + chart_option.color = customAttr.color.colors + } + // tooltip + if (customAttr.tooltip) { + const tooltip = JSON.parse(JSON.stringify(customAttr.tooltip)) + const reg = new RegExp('\n', 'g') + tooltip.formatter = tooltip.formatter.replace(reg, '
') + chart_option.tooltip = tooltip + } + } + // 处理data + if (chart.data) { + chart_option.title.text = chart.title + if (chart.data.series.length > 0) { + // chart_option.series[0].name = chart.data.series[0].name + // size + if (customAttr.size) { + // chart_option.series[0].radius = [customAttr.size.pieInnerRadius + '%', customAttr.size.pieOuterRadius + '%'] + } + // label + if (customAttr.label) { + // chart_option.series[0].label = customAttr.label + } + const valueArr = chart.data.series[0].data + for (let i = 0; i < valueArr.length; i++) { + // const y = { + // name: chart.data.x[i], + // value: valueArr[i] + // } + const y = valueArr[i] + y.name = chart.data.x[i] + // color + y.itemStyle = { + color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha) + } + // y.type = 'treemap' + chart_option.series[0].data.push(y) + } + } + } + // console.log(chart_option); + componentStyle(chart_option, chart) + return chart_option +} diff --git a/frontend/src/views/chart/components/ChartComponent.vue b/frontend/src/views/chart/components/ChartComponent.vue index 276ff69e26..4c2bb4803e 100644 --- a/frontend/src/views/chart/components/ChartComponent.vue +++ b/frontend/src/views/chart/components/ChartComponent.vue @@ -5,7 +5,7 @@