center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #12327 from dataease/pr@dev2@fixds

Browse Source 
Pr@dev2@fixds
This commit is contained in:
taojinlong 2024-09-20 14:03:45 +08:00 committed by GitHub
commit f9414ce140
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/core-backend/src/main/java/io/dataease/dataset/utils/FieldUtils.java
View File

@ -14,6 +14,22 @@ public class FieldUtils {
List<String> num = Arrays.asList("INT", "SMALLINT", "MEDIUMINT", "INTEGER", "BIGINT", "LONG", "INT2", "INT4", "INT8", "int2", "int4", "int8", "INT16", "INT32", "INT64", "UINT8", "UINT16", "UINT32", "UINT64");
List<String> doubleList = Arrays.asList("NUMBER", "FLOAT", "DOUBLE", "DECIMAL", "REAL", "MONEY", "NUMERIC", "float4", "float8", "FLOAT4", "FLOAT8", "DECFLOAT", "FLOAT32", "FLOAT64");
List<String> boolType = Arrays.asList("BIT", "TINYINT");
if (boolType.contains(type)) {
return 4;// 布尔
}
if (doubleList.contains(type)) {
return 3;// 浮点
}
if (num.contains(type)) {
return 2;// 整型
}
if (time.contains(type)) {
return 1;// 时间
}
if (text.contains(type)) {
return 0;// 文本
}
if (boolType.stream().anyMatch(l -> type.contains(l))) {
return 4;// 布尔
}

9
core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
View File

@ -96,7 +96,7 @@ public class ExportCenterManage implements BaseExportApi {
@Value("${dataease.export.max.size:10}")
private int max;
@Value("${dataease.export.dataset.limit:20}")
@Value("${dataease.export.dataset.limit:100000}")
private int limit;
private final static String DATA_URL_TITLE = "data:image/jpeg;base64,";
private static final String exportData_path = "/opt/dataease2.0/data/exportData/";
@ -506,9 +506,10 @@ public class ExportCenterManage implements BaseExportApi {
Workbook wb = new SXSSFWorkbook();
FileOutputStream fileOutputStream = new FileOutputStream(dataPath + "/" + request.getFilename() + ".xlsx");
Sheet detailsSheet = wb.createSheet("数据");
List<List<String>> details = new ArrayList<>();
for (Integer p = 0; p < totalPage; p++) {
String querySQL = SQLProvider.createQuerySQLWithLimit(sqlMeta, false, needOrder, false, p * extractPageSize, p * extractPageSize + extractPageSize);
String querySQL = SQLProvider.createQuerySQLWithLimit(sqlMeta, false, needOrder, false, p * extractPageSize + extractPageSize, extractPageSize);
if (totalPage == 1) {
querySQL = SQLProvider.createQuerySQLWithLimit(sqlMeta, false, needOrder, false, 0, totalCount.intValue());
}
@ -530,7 +531,7 @@ public class ExportCenterManage implements BaseExportApi {
for (DatasetTableFieldDTO field : allFields) {
header.add(field.getName());
}
List<List<String>> details = new ArrayList<>();
details.add(header);
for (Map<String, Object> obj : data) {
List<String> row = new ArrayList<>();
@ -559,7 +560,7 @@ public class ExportCenterManage implements BaseExportApi {
}
}
} else {
List<List<String>> details = new ArrayList<>();
details.clear();
for (Map<String, Object> obj : data) {
List<String> row = new ArrayList<>();
for (DatasetTableFieldDTO field : allFields) {