From 6abb96680b59b744203d68c94c9ffb5424e98e08 Mon Sep 17 00:00:00 2001 From: panshulin Date: Thu, 25 Nov 2021 10:44:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XhpcHistoryOrderController.java | 24 +++++++++---------- .../impl/XhpcHistoryOrderServiceImpl.java | 12 ++++++---- .../XhpcRechargeOrderController.java | 15 ++++++------ .../controller/XhpcRefundOrderController.java | 16 ++++++------- .../impl/XhpcRechargeOrderServiceImpl.java | 11 +++++---- .../impl/XhpcRefundOrderServiceImpl.java | 11 +++++---- 6 files changed, 45 insertions(+), 44 deletions(-) diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java index 1dc68bb6..fa89d32f 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java @@ -96,21 +96,19 @@ public class XhpcHistoryOrderController extends BaseController { * @throws IOException 文件创建异常 */ @PostMapping("/export") - public void getListPage(HttpServletResponse response, @RequestBody Map map) throws IOException { - - String phone = map.get("phone").toString(); - String transactionNumber = map.get("transactionNumber").toString(); - Integer status = StringUtils.isNotEmpty(map.get("transactionNumber").toString())? Integer.valueOf(map.get("transactionNumber").toString()) : null ; - String chargingStationName = map.get("chargingStationName").toString(); - Long operatorId = StringUtils.isNotEmpty(map.get("operatorId").toString())? Long.parseLong(map.get("operatorId").toString()) : null; - Integer source = StringUtils.isNotEmpty(map.get("source").toString())? Integer.valueOf(map.get("source").toString()): null; - String startTime = map.get("startTime").toString(); - String endTime = map.get("endTime").toString(); - Long userId = StringUtils.isNotEmpty(map.get("userId").toString())? Long.parseLong(map.get("userId").toString()): null; - Integer type = StringUtils.isNotEmpty(map.get("type").toString())? Integer.valueOf(map.get("type").toString()): null; + public void getExport(HttpServletResponse response, + String phone, + String transactionNumber, + @RequestParam("status")Integer status, + String chargingStationName, + Long operatorId, + Integer source, + String startTime, + String endTime, + @RequestParam("userId") Long userId, + Integer type) throws IOException { xhpcHistoryOrderService.export(response, phone, transactionNumber, status, chargingStationName, operatorId, source, startTime, endTime, userId, type); - } /** diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java index 02d1204f..b166b5b2 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java @@ -18,6 +18,7 @@ import com.xhpc.order.mapper.XhpcHistoryOrderMapper; import com.xhpc.order.service.IXhpcChargeOrderService; import com.xhpc.order.service.IXhpcHistoryOrderService; import com.xhpc.order.service.IXhpcRealTimeOrderService; +import org.apache.poi.util.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -156,11 +157,12 @@ public class XhpcHistoryOrderServiceImpl implements IXhpcHistoryOrderService { // 一次性写出内容，使用默认样式，强制输出标题 writer.write(list, true); //out为OutputStream，需要写出到的目标流 - - //response为HttpServletResponse对象 - response.setContentType("application/vnd.ms-excel;charset=utf-8"); - //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码 - response.setHeader("Content-Disposition", "attachment;filename=历史订单列表.xls"); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setCharacterEncoding("utf-8"); +// //response为HttpServletResponse对象 +// response.setContentType("application/vnd.ms-excel;charset=utf-8"); +// //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码 +// response.setHeader("Content-Disposition", "attachment;filename=历史订单列表.xls"); ServletOutputStream out = response.getOutputStream(); writer.flush(out, true); diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRechargeOrderController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRechargeOrderController.java index bedb6b26..c245657a 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRechargeOrderController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRechargeOrderController.java @@ -63,14 +63,13 @@ public class XhpcRechargeOrderController extends BaseController { */ //@PreAuthorize(hasPermi = "refund:order:page") @PostMapping("/export") - public void page(HttpServletResponse response, @RequestBody Map map) throws IOException { - - String phone = map.get("phone").toString(); - String rechargeOrderNumber= map.get("rechargeOrderNumber").toString(); - String status= map.get("status").toString(); - String createTimeStart= map.get("createTimeStart").toString(); - String createTimeEnd= map.get("createTimeEnd").toString(); - Integer type= StringUtils.isNotEmpty(map.get("type").toString())? Integer.valueOf(map.get("type").toString()): null; + public void page(HttpServletResponse response, + String phone, + String rechargeOrderNumber, + String status, + String createTimeStart, + String createTimeEnd, + Integer type) throws IOException { iXhpcRechargeOrderService.export(response, phone, rechargeOrderNumber, status, createTimeStart, createTimeEnd,type); diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java index dff15329..2dd5a392 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java @@ -112,15 +112,13 @@ public class XhpcRefundOrderController extends BaseController { @PostMapping("/export") - public void export(HttpServletResponse response, @RequestBody Map map) throws IOException { - - String phone = map.get("phone").toString(); - String refundOrderNumber= map.get("refundOrderNumber").toString(); - String status= map.get("status").toString(); - String createTimeStart= map.get("createTimeStart").toString(); - String createTimeEnd= map.get("createTimeEnd").toString(); - Integer type= StringUtils.isNotEmpty(map.get("type").toString())? Integer.valueOf(map.get("type").toString()): null; - + public void export(HttpServletResponse response, + String phone, + String refundOrderNumber, + String status, + String createTimeStart, + String createTimeEnd, + Integer type) throws IOException { iXhpcRefundOrderService.export(response, phone, refundOrderNumber, status, createTimeStart, createTimeEnd,type); } diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRechargeOrderServiceImpl.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRechargeOrderServiceImpl.java index 84e1006e..0879506e 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRechargeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRechargeOrderServiceImpl.java @@ -97,10 +97,13 @@ public class XhpcRechargeOrderServiceImpl implements IXhpcRechargeOrderService { writer.write(list, true); //out为OutputStream，需要写出到的目标流 - //response为HttpServletResponse对象 - response.setContentType("application/vnd.ms-excel;charset=utf-8"); - //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码 - response.setHeader("Content-Disposition", "attachment;filename=充值订单列表.xls"); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setCharacterEncoding("utf-8"); + +// //response为HttpServletResponse对象 +// response.setContentType("application/vnd.ms-excel;charset=utf-8"); +// //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码 +// response.setHeader("Content-Disposition", "attachment;filename=充值订单列表.xls"); ServletOutputStream out = response.getOutputStream(); writer.flush(out, true); diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundOrderServiceImpl.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundOrderServiceImpl.java index 2d689dae..0370078c 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundOrderServiceImpl.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundOrderServiceImpl.java @@ -99,11 +99,12 @@ public class XhpcRefundOrderServiceImpl implements IXhpcRefundOrderService { // 一次性写出内容，使用默认样式，强制输出标题 writer.write(list, true); //out为OutputStream，需要写出到的目标流 - - //response为HttpServletResponse对象 - response.setContentType("application/vnd.ms-excel;charset=utf-8"); - //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码 - response.setHeader("Content-Disposition", "attachment;filename=退款订单列表.xls"); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setCharacterEncoding("utf-8"); +// //response为HttpServletResponse对象 +// response.setContentType("application/vnd.ms-excel;charset=utf-8"); +// //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码 +// response.setHeader("Content-Disposition", "attachment;filename=退款订单列表.xls"); ServletOutputStream out = response.getOutputStream(); writer.flush(out, true);