diff --git a/src/main/java/com/dsideal/FengHuang/Index/Controller/IndexController.java b/src/main/java/com/dsideal/FengHuang/Index/Controller/IndexController.java index bdf9801..93ed48b 100644 --- a/src/main/java/com/dsideal/FengHuang/Index/Controller/IndexController.java +++ b/src/main/java/com/dsideal/FengHuang/Index/Controller/IndexController.java @@ -23,12 +23,12 @@ public class IndexController extends Controller { private static final Logger log = LoggerFactory.getLogger(IndexController.class); @Before({GET.class}) - public void index() { + public void apply() { redirect("/html/ypzs/view/apply.html"); } @Before({GET.class}) - public void admin() { + public void index() { redirect("/html/login.html"); } diff --git a/src/main/java/com/dsideal/FengHuang/Util/ExcelExportUtil.java b/src/main/java/com/dsideal/FengHuang/Util/ExcelExportUtil.java index d0923db..e5887c1 100644 --- a/src/main/java/com/dsideal/FengHuang/Util/ExcelExportUtil.java +++ b/src/main/java/com/dsideal/FengHuang/Util/ExcelExportUtil.java @@ -12,6 +12,10 @@ import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.usermodel.XSSFCell; +import org.apache.poi.xssf.usermodel.XSSFRow; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import java.io.*; import java.util.ArrayList; @@ -60,17 +64,17 @@ public class ExcelExportUtil { page = new Page(list, page.getPageNumber(), page.getPageSize(), page.getTotalPage(), page.getTotalRow()); } - HSSFWorkbook hssfWorkbook = new HSSFWorkbook(); - HSSFSheet hssfSheet = hssfWorkbook.createSheet(sheetName); + XSSFWorkbook xssfWorkbook = new XSSFWorkbook(); + XSSFSheet xssfSheet = xssfWorkbook.createSheet(sheetName); int count = 0; - HSSFRow row = hssfSheet.createRow(count++); - HSSFCell cell; + XSSFRow row = xssfSheet.createRow(count++); + XSSFCell cell; //设置标题字体 - Font fontTitle = hssfWorkbook.createFont(); + Font fontTitle = xssfWorkbook.createFont(); fontTitle.setFontHeightInPoints((short) 18); //字体大小 fontTitle.setFontName("黑体"); //字体 - CellStyle cellStyleTitle = hssfWorkbook.createCellStyle(); + CellStyle cellStyleTitle = xssfWorkbook.createCellStyle(); cellStyleTitle.setFont(fontTitle); cellStyleTitle.setVerticalAlignment(VerticalAlignment.CENTER); cellStyleTitle.setAlignment(HorizontalAlignment.CENTER); @@ -82,15 +86,15 @@ public class ExcelExportUtil { //合并前N列,写上标题 CellRangeAddress region = new CellRangeAddress(0, 0, 0, colInfo.size() - 1);// 下标从0开始 起始行号,终止行号, 起始列号,终止列号 //在sheet里增加合并单元格 - hssfSheet.addMergedRegion(region); + xssfSheet.addMergedRegion(region); //设置标题的高度 row.setHeight(titleHeight); - Font txtFont = hssfWorkbook.createFont(); + Font txtFont = xssfWorkbook.createFont(); txtFont.setFontHeightInPoints((short) 14); //字体大小 txtFont.setFontName("宋体"); //字体 txtFont.setBold(true); - CellStyle cellStyleTxt = hssfWorkbook.createCellStyle(); + CellStyle cellStyleTxt = xssfWorkbook.createCellStyle(); cellStyleTxt.setFont(txtFont); cellStyleTxt.setAlignment(HorizontalAlignment.CENTER); cellStyleTxt.setFillForegroundColor(IndexedColors.LIME.getIndex()); @@ -102,10 +106,8 @@ public class ExcelExportUtil { cellStyleTxt.setBorderTop(BorderStyle.THIN); // 上边边框 cellStyleTxt.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex()); cellStyleTxt.setFillPattern(FillPatternType.SOLID_FOREGROUND); - - //写入表头 - row = hssfSheet.createRow(count++); + row = xssfSheet.createRow(count++); for (int i = 0; i < colInfo.size(); i++) { //创建传入进来的表头的个数 cell = row.createCell(i); @@ -116,13 +118,13 @@ public class ExcelExportUtil { cell.setCellValue(jsonObject2.getString("show_column_name")); cell.setCellStyle(cellStyleTxt); //调转宽度 - hssfSheet.setColumnWidth(i, 256 * width + 184); + xssfSheet.setColumnWidth(i, 256 * width + 184); } //正文与表头不是一个颜色 - txtFont = hssfWorkbook.createFont(); + txtFont = xssfWorkbook.createFont(); txtFont.setFontHeightInPoints((short) 14); //字体大小 txtFont.setFontName("宋体"); //字体 - cellStyleTxt = hssfWorkbook.createCellStyle(); + cellStyleTxt = xssfWorkbook.createCellStyle(); cellStyleTxt.setFont(txtFont); cellStyleTxt.setAlignment(HorizontalAlignment.CENTER); cellStyleTxt.setFillForegroundColor(IndexedColors.LIME.getIndex()); @@ -134,7 +136,7 @@ public class ExcelExportUtil { cellStyleTxt.setBorderTop(BorderStyle.THIN); // 上边边框 //导出数据 for (int i = 0; i < page.getList().size(); i++) { - row = hssfSheet.createRow(count++); + row = xssfSheet.createRow(count++); Record record = (Record) page.getList().get(i); for (int j = 0; j < colInfo.size(); j++) { JSONObject jsonObject2 = colInfo.getJSONObject(j); @@ -149,7 +151,7 @@ public class ExcelExportUtil { File file = new File(fileName); try { FileOutputStream fileOutputStreane = new FileOutputStream(file); - hssfWorkbook.write(fileOutputStreane); + xssfWorkbook.write(fileOutputStreane); fileOutputStreane.flush(); fileOutputStreane.close(); } catch (FileNotFoundException e) { diff --git a/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java b/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java index 5e30a10..d6c81ed 100644 --- a/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java +++ b/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java @@ -243,7 +243,7 @@ public class YpController extends Controller { JSONObject jo = FileUtil.readJsonFile(filePath); //导出 Page rs = model.getTaskInfo(task_id, bx_id, 1, 99999); - String excelFile = excelPath + "excelTemp/" + UUID.randomUUID().toString().toUpperCase() + ".xls"; + String excelFile = excelPath + "excelTemp/" + UUID.randomUUID().toString().toUpperCase() + ".xlsx"; ExcelExportUtil.export(rs, jo, excelFile, task_name + "申报结果(" + bx_name + ")"); mergeList.add(excelFile); } diff --git a/target/classes/ExcelExportTemplate/excelTemp/0EEC3E38-B206-4F0B-8813-9B1D0DF88776.xls b/target/classes/ExcelExportTemplate/excelTemp/0EEC3E38-B206-4F0B-8813-9B1D0DF88776.xls new file mode 100644 index 0000000..f4d332d Binary files /dev/null and b/target/classes/ExcelExportTemplate/excelTemp/0EEC3E38-B206-4F0B-8813-9B1D0DF88776.xls differ diff --git a/target/classes/ExcelExportTemplate/excelTemp/756F0316-EDD8-4EC9-AEE2-A54B06374725.xls b/target/classes/ExcelExportTemplate/excelTemp/756F0316-EDD8-4EC9-AEE2-A54B06374725.xls new file mode 100644 index 0000000..f7e712d Binary files /dev/null and b/target/classes/ExcelExportTemplate/excelTemp/756F0316-EDD8-4EC9-AEE2-A54B06374725.xls differ diff --git a/target/classes/ExcelExportTemplate/excelTemp/ECFB0D4D-F43C-4C3E-8DB0-D73585F71274.xls b/target/classes/ExcelExportTemplate/excelTemp/ECFB0D4D-F43C-4C3E-8DB0-D73585F71274.xls new file mode 100644 index 0000000..6f98350 Binary files /dev/null and b/target/classes/ExcelExportTemplate/excelTemp/ECFB0D4D-F43C-4C3E-8DB0-D73585F71274.xls differ diff --git a/测试文档.txt b/测试文档.txt index d82564d..06aed69 100644 --- a/测试文档.txt +++ b/测试文档.txt @@ -1,9 +1,9 @@ #家长申报页面 -http://10.10.21.20:9000/FengHuang +http://10.10.21.20:9000/FengHuang/apply #管理页面 -http://10.10.21.20:9000/FengHuang/admin +http://10.10.21.20:9000/FengHuang/ # 业务管理员 admin 123456