From d7cc2b01b0f747a109dea8d8710baeb92a51c1d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Mon, 24 Apr 2023 09:20:07 +0800 Subject: [PATCH] 'commit' --- .../Index/Controller/IndexController.java | 4 +- .../FengHuang/Util/ExcelExportUtil.java | 36 +++++++++--------- .../FengHuang/Yp/Controller/YpController.java | 2 +- .../0EEC3E38-B206-4F0B-8813-9B1D0DF88776.xls | Bin 0 -> 4608 bytes .../756F0316-EDD8-4EC9-AEE2-A54B06374725.xls | Bin 0 -> 4608 bytes .../ECFB0D4D-F43C-4C3E-8DB0-D73585F71274.xls | Bin 0 -> 4608 bytes 测试文档.txt | 4 +- 7 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 target/classes/ExcelExportTemplate/excelTemp/0EEC3E38-B206-4F0B-8813-9B1D0DF88776.xls create mode 100644 target/classes/ExcelExportTemplate/excelTemp/756F0316-EDD8-4EC9-AEE2-A54B06374725.xls create mode 100644 target/classes/ExcelExportTemplate/excelTemp/ECFB0D4D-F43C-4C3E-8DB0-D73585F71274.xls 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 0000000000000000000000000000000000000000..f4d332d180527d749dcc1611969e7bb55975a816 GIT binary patch literal 4608 zcmeHKO>A355T1R0j-T5)jT4iGK$C|`^TloB^?3PgbxIq3l@ z1@m_be-h$=R3Y`ifg+&gP$E&Gh7*S(pgACckWwU$IUtoEiKdTlX5YrosS_atLX?a( zyF1^^{=A*p-SJmn#urYWX}v@%sFy-?)r(SH09S!FH4s^l8N2Fv9;>*G<~sd{c3^;x z;x|Pu-AhMMm*{DB<)5Zz3M=!uRq?UL2qEasJKA6fvzKUsin5N0HG0)nHIlVFKd+;< z)wSp;fBtJV|1X5k?h=@58=oEq^O=u;8C$38dk6T;@;%OHa;5+Ih(y5~z#GAvz%g(= zcrzGJ0L8(L;3jYad;_={yan6>z7gCCz6pFYcq_OK+zxiZw}6x2^;r9N;w*{o?^fEjXgPjWPEa}G&*&(+j1 z;)xO5`Y4;E{7|&#v?Vl;t9o_d?oT^*!Gd#={Z?M=UXd~>Wj#toA4{Ka1=)_s{T%k* zv#;}!0EMZqG(P&o->OJpb-_6-_4V8P`nTicvbQjXSDbr53+3oNm&YVG@9UeG5_DImg#RZQeX-sbKt{MX(hUp}S+?6)fBWc5( zl%Z~-0#A@}&5C?6C33pg7n8Rov7SOIU%(7mO4By(80?jCD_t^fmHlqY65JY`NUywV zE?!h%x?HX@;hoe)cLXLhz0I6{SDCibZ$WN0qMto%$1LF1-)G8HK^qtKivH@XRWBv?k8^kmA$SLgd&Ep2!~YJKvLn?~2C- zx0?lzti)mehGkPjIplF2FV{)kShl5ZDo3QIGD)2%hrNSxFTI5K_PG50vef?K;^fPC zpA~)|D5>o&IG!AROjqbFd7=50ZYI@(F}zWk<#OWC1|*hx+x_TZDIQFBtEAD;&LBz7S( z2bsTiqs3{2CjU01L&!v8a%FEqIfmqeukScYPC^{I^6pO;?^h3sVUTr4Ecu5=ZxEX9oc2p-| zL@codf&rzL6eKp+k_CyAJ}reH@xExuhQxudr7$G+jF##kagb{%0*UulOAaJX7_}6I x#9sae7N4O`;Q7ACYNWFg)OjF=w!)*l7LdQw^rQa)j74Rb+W8Ud*XghCz#o*&t;qlY literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f7e712d76078fa093fd8aa170d5a903affea5e67 GIT binary patch literal 4608 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 F{smsK=AHlm literal 0 HcmV?d00001 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