From 34d58277ab36f8c0df339ff58bf7a45002984a5e Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 2 Jun 2021 15:35:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8A=BD=E5=8F=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E6=94=AF=E6=8C=81=E6=95=B0=E6=8D=AE=E6=BA=90=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=20column=20name=20=E4=B8=BA=E4=B8=AD=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/commons/utils/DorisTableUtils.java | 2 +- .../io/dataease/service/dataset/DataSetTableService.java | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/io/dataease/commons/utils/DorisTableUtils.java b/backend/src/main/java/io/dataease/commons/utils/DorisTableUtils.java index 4f6757bcd3..a027f10e89 100644 --- a/backend/src/main/java/io/dataease/commons/utils/DorisTableUtils.java +++ b/backend/src/main/java/io/dataease/commons/utils/DorisTableUtils.java @@ -18,7 +18,7 @@ public class DorisTableUtils { return "f_" + Md5Utils.md5(dorisName); } - public static String excelColumnName(String filedName) { + public static String columnName(String filedName) { return "C_" + Md5Utils.md5(filedName); } } 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 71fd2a9f7b..45b4303c4f 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -541,11 +541,7 @@ public class DataSetTableService { datasetTableField.setTableId(datasetTable.getId()); datasetTableField.setOriginName(filed.getFieldName()); datasetTableField.setName(filed.getRemarks()); - if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "excel")) { - datasetTableField.setDataeaseName(DorisTableUtils.excelColumnName(filed.getFieldName())); - } else { - datasetTableField.setDataeaseName(filed.getFieldName()); - } + datasetTableField.setDataeaseName(DorisTableUtils.columnName(filed.getFieldName())); datasetTableField.setType(filed.getFieldType()); if (ObjectUtils.isEmpty(ds)) { datasetTableField.setDeType(transFieldType(filed.getFieldType()));