From efc039cf695bc655684f3ccb35892da46608ef80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Thu, 7 Nov 2024 11:48:00 +0800 Subject: [PATCH] 'commit' --- .../377CF8A1-DAEA-4188-8730-F077FFAA3078.xlsx | Bin 0 -> 29704 bytes .../base/DataEase/Model/DataEaseModel.java | 12 ++++++------ .../com/dsideal/base/Util/ExcelCommonUtil.java | 14 ++++++-------- 3 files changed, 12 insertions(+), 14 deletions(-) create mode 100644 WebRoot/upload/377CF8A1-DAEA-4188-8730-F077FFAA3078.xlsx diff --git a/WebRoot/upload/377CF8A1-DAEA-4188-8730-F077FFAA3078.xlsx b/WebRoot/upload/377CF8A1-DAEA-4188-8730-F077FFAA3078.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..af774196d90d433c53381cc3e5db9be5a0242768 GIT binary patch literal 29704 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 getColumns(String tableName) { String sql = "SELECT COLUMN_NAME, DATA_TYPE, COLUMN_DEFAULT, IS_NULLABLE, COLUMN_TYPE, CHARACTER_MAXIMUM_LENGTH, NUMERIC_PRECISION, DATETIME_PRECISION, COLUMN_COMMENT FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ?"; List list = Db.find(sql, DataEaseModel.DB_NAME, tableName); - return list.stream().map(record -> record.getStr("COLUMN_NAME")).collect(Collectors.toList()); + List res = list.stream().map(record -> record.getStr("COLUMN_NAME")).collect(Collectors.toList()); + System.out.println(res); + return res; } // 检查表是否存在主键 @@ -448,13 +450,13 @@ public class DataEaseModel { sql = sql + "where `行政区划`='" + area_name + "'"; } //获取一下表有哪些列 - List columnNames = getColumns(tableName); + //List columnNames = getColumns(tableName); List tableData = Db.use(DataEaseModel.DB_NAME).find(sql); String excelFileName = UUID.randomUUID().toString().toUpperCase() + ".xlsx"; String filePath = exportPath + excelFileName; //导出 - ExcelCommonUtil.writeExcel(columnNames, tableData, filePath, true); + ExcelCommonUtil.writeExcel( tableData, filePath, true); return filePath; } @@ -680,14 +682,12 @@ public class DataEaseModel { //对此表中的数据进行直接导出EXCEL String sql = "select * from `" + tableName + "`"; sql = sql + "where `上级行政区划`='" + area_name + "'"; - //获取一下表有哪些列 - List columnNames = getColumns(tableName); List tableData = Db.use(DataEaseModel.DB_NAME).find(sql); String excelFileName = UUID.randomUUID().toString().toUpperCase() + ".xlsx"; String filePath = exportPath + excelFileName; //导出 - ExcelCommonUtil.writeExcel(columnNames, tableData, filePath, true); + ExcelCommonUtil.writeExcel(tableData, filePath, true); return filePath; } diff --git a/src/main/java/com/dsideal/base/Util/ExcelCommonUtil.java b/src/main/java/com/dsideal/base/Util/ExcelCommonUtil.java index 0548d66a..ed0c7c95 100644 --- a/src/main/java/com/dsideal/base/Util/ExcelCommonUtil.java +++ b/src/main/java/com/dsideal/base/Util/ExcelCommonUtil.java @@ -852,21 +852,19 @@ public class ExcelCommonUtil { * @param filePath * @throws IOException */ - public static void writeExcel(List columnNames, List tableData, String filePath, boolean killIdColumns) throws IOException { + public static void writeExcel(List tableData, String filePath, boolean killIdColumns) throws IOException { if (killIdColumns) { //表tableData中如果有一列叫id,那么去掉这一列 for (Record tableDatum : tableData) { tableDatum.remove("id"); } - columnNames.remove("id"); } - // 创建Excel工作簿 Workbook workbook = new XSSFWorkbook(); // 创建一个Excel工作表 Sheet sheet = workbook.createSheet("Sheet1"); // 获取第一个Record的元数据以确定列名 - int columnCount = columnNames.size(); + int columnCount = tableData.getFirst().size(); // 创建标题行 Row titleRow = sheet.createRow(0); // 设置标题行的样式 @@ -883,7 +881,7 @@ public class ExcelCommonUtil { // 填充标题行 for (int i = 1; i <= columnCount; i++) { Cell cell = titleRow.createCell(i - 1); - cell.setCellValue(columnNames.get(i - 1)); + cell.setCellValue(tableData.getFirst().getColumnNames()[i - 1]); cell.setCellStyle(titleStyle); } @@ -904,7 +902,7 @@ public class ExcelCommonUtil { int cellNum = 0; for (int i = 1; i <= columnCount; i++) { Cell cell = row.createCell(cellNum++); - Object value = record.get(columnNames.get(i - 1)); + Object value = record.get(tableData.getFirst().getColumnNames()[i - 1]); cell.setCellValue(value == null ? "" : value.toString()); cell.setCellStyle(dataStyle); } @@ -912,12 +910,12 @@ public class ExcelCommonUtil { // 设置最小列宽 int minColumnWidth = 100 * 256 / 7; // 将像素转换为字符单位(Excel的单位是1/256个字符宽度) - for (int i = 0; i < columnNames.size(); i++) { + for (int i = 0; i < tableData.getFirst().getColumnNames().length; i++) { sheet.setColumnWidth(i, Math.max(minColumnWidth, sheet.getColumnWidth(i))); } // 自动调整列宽 - for (int i = 0; i < columnNames.size(); i++) { + for (int i = 0; i < tableData.getFirst().getColumnNames().length; i++) { sheet.autoSizeColumn(i); int columnWidth = sheet.getColumnWidth(i); int newColumnWidth = Math.max(minColumnWidth, columnWidth);