'commit'

src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java

@@ -159,13 +159,14 @@ public class DataEaseController extends Controller {
      */
     @Before(GET.class)
     @IsLoginInterface({})
+    @IsNumericInterface({"id"})
     public void downSampleExcel(int id) throws IOException {
         String identity_idStr = CookieUtil.getValue(getRequest(), "identity_id");
         int identity_id = 1;
         if (!StrKit.isBlank(identity_idStr)) {
             identity_id = Integer.parseInt(identity_idStr);
         }
-        String area_name = "";
+        String area_name = "云南省";
         //获取他是哪个城市的管理员
         if (identity_id == 2) {
             area_name = "昆明市";
@@ -180,7 +181,7 @@ public class DataEaseController extends Controller {
         //导出excel
         String excelFileName = dm.exportExcel(identity_id, tableName, dataSetName, tempDir, area_name);
         //renderFile
-        renderFile(new File(excelFileName), "【" + area_name + "】" + dataSetName + "." + "xlsx");
+        renderFile(new File(excelFileName), "【样例:" + area_name + "】" + dataSetName + "." + "xlsx");
     }
 
     /**

src/main/java/com/dsideal/base/Util/ExcelCommonUtil.java

@@ -860,76 +860,73 @@ public class ExcelCommonUtil {
             }
         }
 
-        if (tableData == null || tableData.isEmpty()) {
-            //throw new IllegalArgumentException("The list of records must not be empty.");
-            return;
-        }
-
-        // 获取第一个Record的元数据以确定列名
-        Record firstRecord = tableData.getFirst();
-        String[] headers = firstRecord.getColumnNames();
-        int columnCount = headers.length;
-
         // 创建Excel工作簿
         Workbook workbook = new XSSFWorkbook();
         // 创建一个Excel工作表
         Sheet sheet = workbook.createSheet("Sheet1");
 
-        // 创建标题行
-        Row titleRow = sheet.createRow(0);
-        // 设置标题行的样式
-        CellStyle titleStyle = workbook.createCellStyle();
-        Font font = workbook.createFont();
-        font.setBold(true);
-        font.setFontHeightInPoints((short) 14);
-        titleStyle.setFont(font);
-        titleStyle.setBorderBottom(BorderStyle.THIN);
-        titleStyle.setBorderLeft(BorderStyle.THIN);
-        titleStyle.setBorderRight(BorderStyle.THIN);
-        titleStyle.setBorderTop(BorderStyle.THIN);
-
-        // 填充标题行
-        for (int i = 1; i <= columnCount; i++) {
-            Cell cell = titleRow.createCell(i - 1);
-            cell.setCellValue(headers[i - 1]);
-            cell.setCellStyle(titleStyle);
-        }
-
-        // 创建数据行的样式
-        CellStyle dataStyle = workbook.createCellStyle();
-        font = workbook.createFont();
-        font.setFontHeightInPoints((short) 14);
-        dataStyle.setFont(font);
-        dataStyle.setBorderBottom(BorderStyle.THIN);
-        dataStyle.setBorderLeft(BorderStyle.THIN);
-        dataStyle.setBorderRight(BorderStyle.THIN);
-        dataStyle.setBorderTop(BorderStyle.THIN);
-
-        // 填充数据行
-        int rowNum = 1;
-        for (Record record : tableData) {
-            Row row = sheet.createRow(rowNum++);
-            int cellNum = 0;
+        if(tableData!=null && !tableData.isEmpty() ){
+            // 获取第一个Record的元数据以确定列名
+            Record firstRecord = tableData.getFirst();
+            String[] headers = firstRecord.getColumnNames();
+            int columnCount = headers.length;
+
+            // 创建标题行
+            Row titleRow = sheet.createRow(0);
+            // 设置标题行的样式
+            CellStyle titleStyle = workbook.createCellStyle();
+            Font font = workbook.createFont();
+            font.setBold(true);
+            font.setFontHeightInPoints((short) 14);
+            titleStyle.setFont(font);
+            titleStyle.setBorderBottom(BorderStyle.THIN);
+            titleStyle.setBorderLeft(BorderStyle.THIN);
+            titleStyle.setBorderRight(BorderStyle.THIN);
+            titleStyle.setBorderTop(BorderStyle.THIN);
+
+            // 填充标题行
             for (int i = 1; i <= columnCount; i++) {
-                Cell cell = row.createCell(cellNum++);
-                Object value = record.get(headers[i - 1]);
-                cell.setCellValue(value == null ? "" : value.toString());
-                cell.setCellStyle(dataStyle);
+                Cell cell = titleRow.createCell(i - 1);
+                cell.setCellValue(headers[i - 1]);
+                cell.setCellStyle(titleStyle);
             }
-        }
 
-        // 设置最小列宽
-        int minColumnWidth = 100 * 256 / 7; // 将像素转换为字符单位（Excel的单位是1/256个字符宽度）
-        for (int i = 0; i < headers.length; i++) {
-            sheet.setColumnWidth(i, Math.max(minColumnWidth, sheet.getColumnWidth(i)));
-        }
+            // 创建数据行的样式
+            CellStyle dataStyle = workbook.createCellStyle();
+            font = workbook.createFont();
+            font.setFontHeightInPoints((short) 14);
+            dataStyle.setFont(font);
+            dataStyle.setBorderBottom(BorderStyle.THIN);
+            dataStyle.setBorderLeft(BorderStyle.THIN);
+            dataStyle.setBorderRight(BorderStyle.THIN);
+            dataStyle.setBorderTop(BorderStyle.THIN);
+
+            // 填充数据行
+            int rowNum = 1;
+            for (Record record : tableData) {
+                Row row = sheet.createRow(rowNum++);
+                int cellNum = 0;
+                for (int i = 1; i <= columnCount; i++) {
+                    Cell cell = row.createCell(cellNum++);
+                    Object value = record.get(headers[i - 1]);
+                    cell.setCellValue(value == null ? "" : value.toString());
+                    cell.setCellStyle(dataStyle);
+                }
+            }
 
-        // 自动调整列宽
-        for (int i = 0; i < headers.length; i++) {
-            sheet.autoSizeColumn(i);
-            int columnWidth = sheet.getColumnWidth(i);
-            int newColumnWidth = Math.max(minColumnWidth, columnWidth);
-            sheet.setColumnWidth(i, newColumnWidth);
+            // 设置最小列宽
+            int minColumnWidth = 100 * 256 / 7; // 将像素转换为字符单位（Excel的单位是1/256个字符宽度）
+            for (int i = 0; i < headers.length; i++) {
+                sheet.setColumnWidth(i, Math.max(minColumnWidth, sheet.getColumnWidth(i)));
+            }
+
+            // 自动调整列宽
+            for (int i = 0; i < headers.length; i++) {
+                sheet.autoSizeColumn(i);
+                int columnWidth = sheet.getColumnWidth(i);
+                int newColumnWidth = Math.max(minColumnWidth, columnWidth);
+                sheet.setColumnWidth(i, newColumnWidth);
+            }
         }
 
         // 将工作簿写入文件