From 3488ec0f26ea2593526f24bdb1294b026fc40de3 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 21 Feb 2024 18:20:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20DataEas?= =?UTF-8?q?e=20v1.18.14=EF=BC=8Csimple=20=E6=A8=A1=E5=BC=8F=E9=83=A8?= =?UTF-8?q?=E7=BD=B2=EF=BC=8CExcel=20=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=20#7534?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dataset/DataSetTableService.java | 13 +++---------- .../service/dataset/ExtractDataService.java | 9 +-------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 98763a4824..09438ee0b5 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -8,6 +8,7 @@ import com.alibaba.excel.metadata.CellData; import com.alibaba.excel.read.metadata.ReadSheet; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; +import com.alibaba.fastjson.parser.Feature; import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -2355,7 +2356,7 @@ public class DataSetTableService { } String json = JSON.toJSONString(noModelDataListener.getData()); List> data = JSON.parseObject(json, new TypeReference>>() { - }); + }, Feature.IgnoreNotMatch); data = (isPreview && noModelDataListener.getData().size() > 1000 ? new ArrayList<>(data.subList(0, 1000)) : data); if (isPreview) { for (int i = 0; i < data.size(); i++) { @@ -2379,15 +2380,7 @@ public class DataSetTableService { public List parseExcel(String filename, InputStream inputStream, boolean isPreview) throws Exception { List excelSheetDataList = new ArrayList<>(); String suffix = filename.substring(filename.lastIndexOf(".") + 1); - if (StringUtils.equalsIgnoreCase(suffix, "xls")) { - ExcelXlsReader excelXlsReader = new ExcelXlsReader(); - excelXlsReader.setObtainedNum(1000); - excelXlsReader.process(inputStream); - excelSheetDataList = excelXlsReader.totalSheets; - } - if (StringUtils.equalsIgnoreCase(suffix, "xlsx")) { - excelSheetDataList = excelSheetDataList(inputStream, isPreview); - } + excelSheetDataList = excelSheetDataList(inputStream, isPreview); if (StringUtils.equalsIgnoreCase(suffix, "csv")) { List fields = new ArrayList<>(); diff --git a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index 9e69f6618c..fea4504926 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -757,14 +757,7 @@ public class ExtractDataService { for (ExcelSheetData excelSheetData : excelSheetDataList) { String suffix = excelSheetData.getPath().substring(excelSheetData.getPath().lastIndexOf(".") + 1); List totalSheets = new ArrayList<>(); - if (StringUtils.equalsIgnoreCase(suffix, "xls")) { - ExcelXlsReader excelXlsReader = new ExcelXlsReader(); - excelXlsReader.process(new FileInputStream(excelSheetData.getPath())); - totalSheets = excelXlsReader.totalSheets; - } - if (StringUtils.equalsIgnoreCase(suffix, "xlsx")) { - totalSheets = dataSetTableService.excelSheetDataList(new FileInputStream(excelSheetData.getPath()), false); - } + totalSheets = dataSetTableService.excelSheetDataList(new FileInputStream(excelSheetData.getPath()), false); if (StringUtils.equalsIgnoreCase(suffix, "csv")) { List fields = new ArrayList<>(); From 81e05b6b2818141af7b3f01a9c403d8a1b3dc066 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 26 Feb 2024 12:27:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20PG?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E4=BD=BF=E7=94=A8=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=EF=BC=8C=E6=95=B0=E6=8D=AE=E9=87=8F=E8=B6=85?= =?UTF-8?q?=E8=BF=8750000=E6=97=B6=EF=BC=8C=E6=9C=89=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E4=BC=9A=E4=B8=A2=E5=A4=B1=E6=95=B0=E6=8D=AE=20#6177?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/provider/datasource/JdbcProvider.java | 11 ++++++----- .../dataease/provider/query/pg/PgQueryProvider.java | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java index d65859da8e..80218717d1 100644 --- a/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java @@ -436,6 +436,7 @@ public class JdbcProvider extends DefaultJdbcProvider { int queryTimeout = jdbcConfiguration.getQueryTimeout() > 0 ? jdbcConfiguration.getQueryTimeout() : 0; try (Connection con = getConnection(datasourceRequest); Statement statement = getStatement(con, queryTimeout); ResultSet resultSet = statement.executeQuery(queryStr)) { } catch (Exception e) { + e.printStackTrace(); LogUtil.error("Datasource is invalid: " + datasourceRequest.getDatasource().getName(), e); DataEaseException.throwException(e.getMessage()); } @@ -580,11 +581,11 @@ public class JdbcProvider extends DefaultJdbcProvider { if (isDefaultClassLoader(customDriver)) { driverClassName = defaultDriver; jdbcClassLoader = extendedJdbcClassLoader; - for (DataSourceType value : SpringContextUtil.getApplicationContext().getBeansOfType(DataSourceType.class).values()) { - if (value.getType().equalsIgnoreCase(datasourceRequest.getDatasource().getType())) { - surpportVersions = value.getSurpportVersions(); - } - } +// for (DataSourceType value : SpringContextUtil.getApplicationContext().getBeansOfType(DataSourceType.class).values()) { +// if (value.getType().equalsIgnoreCase(datasourceRequest.getDatasource().getType())) { +// surpportVersions = value.getSurpportVersions(); +// } +// } } else { if (deDriver == null) { deDriver = deDriverMapper.selectByPrimaryKey(customDriver); diff --git a/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java index 2ed3b324b6..641f59acdb 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java @@ -993,7 +993,7 @@ public class PgQueryProvider extends QueryProvider { String tableWithSchema = String.format(PgConstants.KEYWORD_TABLE, schema) + "." + String.format(PgConstants.KEYWORD_TABLE, sql); return "SELECT COUNT(*) from " + tableWithSchema; } else { - return "SELECT COUNT(*) from ( " + sqlFix(sql) + " ) DE_COUNT_TEMP"; + return null; } }