提交 ad239360 authored 作者: junjie's avatar junjie

refactor: SQL拼接

上级 250b9b89
...@@ -391,7 +391,7 @@ public class DorisQueryProvider extends QueryProvider { ...@@ -391,7 +391,7 @@ public class DorisQueryProvider extends QueryProvider {
case "null": case "null":
return " IN "; return " IN ";
case "not_null": case "not_null":
return " NOT IN "; return " IS NOT NULL AND %s <> ''";
case "between": case "between":
return " BETWEEN "; return " BETWEEN ";
default: default:
...@@ -420,8 +420,10 @@ public class DorisQueryProvider extends QueryProvider { ...@@ -420,8 +420,10 @@ public class DorisQueryProvider extends QueryProvider {
} else { } else {
whereName = originName; whereName = originName;
} }
if (StringUtils.containsIgnoreCase(request.getTerm(), "null")) { if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) {
whereValue = DorisConstants.WHERE_VALUE_NULL; whereValue = DorisConstants.WHERE_VALUE_NULL;
} else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) {
whereTerm = String.format(whereTerm, originName);
} else if (StringUtils.containsIgnoreCase(request.getTerm(), "in")) { } else if (StringUtils.containsIgnoreCase(request.getTerm(), "in")) {
whereValue = "('" + StringUtils.join(value, "','") + "')"; whereValue = "('" + StringUtils.join(value, "','") + "')";
} else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) { } else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) {
...@@ -551,8 +553,10 @@ public class DorisQueryProvider extends QueryProvider { ...@@ -551,8 +553,10 @@ public class DorisQueryProvider extends QueryProvider {
} else { } else {
whereName = originField; whereName = originField;
} }
if (StringUtils.containsIgnoreCase(f.getTerm(), "null")) { if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) {
whereValue = DorisConstants.WHERE_VALUE_NULL; whereValue = DorisConstants.WHERE_VALUE_NULL;
} else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) {
whereTerm = String.format(whereTerm, originField);
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) { } else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) {
whereValue = "('" + StringUtils.join(f.getValue(), "','") + "')"; whereValue = "('" + StringUtils.join(f.getValue(), "','") + "')";
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) { } else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) {
...@@ -600,8 +604,10 @@ public class DorisQueryProvider extends QueryProvider { ...@@ -600,8 +604,10 @@ public class DorisQueryProvider extends QueryProvider {
String whereTerm = transMysqlFilterTerm(f.getTerm()); String whereTerm = transMysqlFilterTerm(f.getTerm());
String whereValue = ""; String whereValue = "";
// 原始类型不是时间,在de中被转成时间的字段做处理 // 原始类型不是时间,在de中被转成时间的字段做处理
if (StringUtils.containsIgnoreCase(f.getTerm(), "null")) { if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) {
whereValue = DorisConstants.WHERE_VALUE_NULL; whereValue = DorisConstants.WHERE_VALUE_NULL;
} else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) {
whereTerm = String.format(whereTerm, originField);
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) { } else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) {
whereValue = "('" + StringUtils.join(f.getValue(), "','") + "')"; whereValue = "('" + StringUtils.join(f.getValue(), "','") + "')";
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) { } else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) {
......
...@@ -340,9 +340,9 @@ public class MysqlQueryProvider extends QueryProvider { ...@@ -340,9 +340,9 @@ public class MysqlQueryProvider extends QueryProvider {
public String createRawQuerySQL(String table, List<DatasetTableField> fields) { public String createRawQuerySQL(String table, List<DatasetTableField> fields) {
String[] array = fields.stream().map(f -> { String[] array = fields.stream().map(f -> {
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
if(f.getDeExtractType() == 4){ // 处理 tinyint if (f.getDeExtractType() == 4) { // 处理 tinyint
stringBuilder.append("concat(`").append(f.getOriginName()).append("`,'') AS ").append(f.getDataeaseName()); stringBuilder.append("concat(`").append(f.getOriginName()).append("`,'') AS ").append(f.getDataeaseName());
}else { } else {
stringBuilder.append("`").append(f.getOriginName()).append("` AS ").append(f.getDataeaseName()); stringBuilder.append("`").append(f.getOriginName()).append("` AS ").append(f.getDataeaseName());
} }
return stringBuilder.toString(); return stringBuilder.toString();
...@@ -380,7 +380,7 @@ public class MysqlQueryProvider extends QueryProvider { ...@@ -380,7 +380,7 @@ public class MysqlQueryProvider extends QueryProvider {
case "null": case "null":
return " IN "; return " IN ";
case "not_null": case "not_null":
return " NOT IN "; return " IS NOT NULL AND %s <> ''";
case "between": case "between":
return " BETWEEN "; return " BETWEEN ";
default: default:
...@@ -409,8 +409,10 @@ public class MysqlQueryProvider extends QueryProvider { ...@@ -409,8 +409,10 @@ public class MysqlQueryProvider extends QueryProvider {
} else { } else {
whereName = originName; whereName = originName;
} }
if (StringUtils.containsIgnoreCase(request.getTerm(), "null")) { if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) {
whereValue = MySQLConstants.WHERE_VALUE_NULL; whereValue = MySQLConstants.WHERE_VALUE_NULL;
} else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) {
whereTerm = String.format(whereTerm, originName);
} else if (StringUtils.containsIgnoreCase(request.getTerm(), "in")) { } else if (StringUtils.containsIgnoreCase(request.getTerm(), "in")) {
whereValue = "('" + StringUtils.join(value, "','") + "')"; whereValue = "('" + StringUtils.join(value, "','") + "')";
} else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) { } else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) {
...@@ -547,8 +549,10 @@ public class MysqlQueryProvider extends QueryProvider { ...@@ -547,8 +549,10 @@ public class MysqlQueryProvider extends QueryProvider {
} else { } else {
whereName = originField; whereName = originField;
} }
if (StringUtils.containsIgnoreCase(f.getTerm(), "null")) { if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) {
whereValue = MySQLConstants.WHERE_VALUE_NULL; whereValue = MySQLConstants.WHERE_VALUE_NULL;
} else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) {
whereTerm = String.format(whereTerm, originField);
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) { } else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) {
whereValue = "('" + StringUtils.join(f.getValue(), "','") + "')"; whereValue = "('" + StringUtils.join(f.getValue(), "','") + "')";
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) { } else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) {
...@@ -595,8 +599,10 @@ public class MysqlQueryProvider extends QueryProvider { ...@@ -595,8 +599,10 @@ public class MysqlQueryProvider extends QueryProvider {
String whereTerm = transMysqlFilterTerm(f.getTerm()); String whereTerm = transMysqlFilterTerm(f.getTerm());
String whereValue = ""; String whereValue = "";
// 原始类型不是时间,在de中被转成时间的字段做处理 // 原始类型不是时间,在de中被转成时间的字段做处理
if (StringUtils.containsIgnoreCase(f.getTerm(), "null")) { if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) {
whereValue = MySQLConstants.WHERE_VALUE_NULL; whereValue = MySQLConstants.WHERE_VALUE_NULL;
} else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) {
whereTerm = String.format(whereTerm, originField);
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) { } else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) {
whereValue = "('" + StringUtils.join(f.getValue(), "','") + "')"; whereValue = "('" + StringUtils.join(f.getValue(), "','") + "')";
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) { } else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) {
......
...@@ -395,7 +395,7 @@ public class OracleQueryProvider extends QueryProvider { ...@@ -395,7 +395,7 @@ public class OracleQueryProvider extends QueryProvider {
case "null": case "null":
return " IN "; return " IN ";
case "not_null": case "not_null":
return " NOT IN "; return " IS NOT NULL AND %s <> ''";
case "between": case "between":
return " BETWEEN "; return " BETWEEN ";
default: default:
...@@ -424,8 +424,10 @@ public class OracleQueryProvider extends QueryProvider { ...@@ -424,8 +424,10 @@ public class OracleQueryProvider extends QueryProvider {
} else { } else {
whereName = originName; whereName = originName;
} }
if (StringUtils.containsIgnoreCase(request.getTerm(), "null")) { if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) {
whereValue = OracleConstants.WHERE_VALUE_NULL; whereValue = OracleConstants.WHERE_VALUE_NULL;
} else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) {
whereTerm = String.format(whereTerm, originName);
} else if (StringUtils.containsIgnoreCase(request.getTerm(), "in")) { } else if (StringUtils.containsIgnoreCase(request.getTerm(), "in")) {
whereValue = "('" + StringUtils.join(value, "','") + "')"; whereValue = "('" + StringUtils.join(value, "','") + "')";
} else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) { } else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) {
...@@ -575,8 +577,10 @@ public class OracleQueryProvider extends QueryProvider { ...@@ -575,8 +577,10 @@ public class OracleQueryProvider extends QueryProvider {
} else { } else {
whereName = originField; whereName = originField;
} }
if (StringUtils.containsIgnoreCase(f.getTerm(), "null")) { if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) {
whereValue = OracleConstants.WHERE_VALUE_NULL; whereValue = OracleConstants.WHERE_VALUE_NULL;
} else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) {
whereTerm = String.format(whereTerm, originField);
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) { } else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) {
whereValue = "('" + StringUtils.join(f.getValue(), "','") + "')"; whereValue = "('" + StringUtils.join(f.getValue(), "','") + "')";
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) { } else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) {
...@@ -623,8 +627,10 @@ public class OracleQueryProvider extends QueryProvider { ...@@ -623,8 +627,10 @@ public class OracleQueryProvider extends QueryProvider {
String whereTerm = transMysqlFilterTerm(f.getTerm()); String whereTerm = transMysqlFilterTerm(f.getTerm());
String whereValue = ""; String whereValue = "";
// 原始类型不是时间,在de中被转成时间的字段做处理 // 原始类型不是时间,在de中被转成时间的字段做处理
if (StringUtils.containsIgnoreCase(f.getTerm(), "null")) { if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) {
whereValue = OracleConstants.WHERE_VALUE_NULL; whereValue = OracleConstants.WHERE_VALUE_NULL;
} else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) {
whereTerm = String.format(whereTerm, originField);
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) { } else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) {
whereValue = "('" + StringUtils.join(f.getValue(), "','") + "')"; whereValue = "('" + StringUtils.join(f.getValue(), "','") + "')";
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) { } else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) {
......
...@@ -186,7 +186,6 @@ export default { ...@@ -186,7 +186,6 @@ export default {
} }
}, },
openChartDetailsDialog(chartInfo) { openChartDetailsDialog(chartInfo) {
debugger
this.showChartInfo = chartInfo.chart this.showChartInfo = chartInfo.chart
this.showChartTableInfo = chartInfo.tableChart this.showChartTableInfo = chartInfo.tableChart
this.chartDetailsVisible = true this.chartDetailsVisible = true
......
...@@ -40,7 +40,6 @@ export default { ...@@ -40,7 +40,6 @@ export default {
}, },
methods: { methods: {
exportExcel() { exportExcel() {
debugger
const excelHeader = JSON.parse(JSON.stringify(this.chart.data.fields)).map(item => item.name) const excelHeader = JSON.parse(JSON.stringify(this.chart.data.fields)).map(item => item.name)
const excelHeaderKeys = JSON.parse(JSON.stringify(this.chart.data.fields)).map(item => item.dataeaseName) const excelHeaderKeys = JSON.parse(JSON.stringify(this.chart.data.fields)).map(item => item.dataeaseName)
const excelData = JSON.parse(JSON.stringify(this.chart.data.tableRow)).map(item => excelHeaderKeys.map(i => item[i])) const excelData = JSON.parse(JSON.stringify(this.chart.data.tableRow)).map(item => excelHeaderKeys.map(i => item[i]))
......
...@@ -108,7 +108,6 @@ export default { ...@@ -108,7 +108,6 @@ export default {
}) })
}, },
initData() { initData() {
debugger
const that = this const that = this
let datas = [] let datas = []
if (this.chart.data) { if (this.chart.data) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论