diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java index 803bf273..9dbacff7 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java @@ -3,8 +3,8 @@ package com.xhpc.order.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.IoUtil; +import cn.hutool.poi.excel.BigExcelWriter; import cn.hutool.poi.excel.ExcelUtil; -import cn.hutool.poi.excel.ExcelWriter; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.service.BaseService; @@ -18,7 +18,6 @@ import com.xhpc.order.service.IXhpcHistoryOrderService; import com.xhpc.order.service.IXhpcStatisticsService; import com.xhpc.system.api.domain.SysUser; import com.xhpc.system.api.model.LoginUser; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -552,7 +551,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati List> list = getTimeIntervalPage(request,chargingStationIds, internetUserId, operatorId, startTime, endTime, userId, type); // 通过工具类创建writer,默认创建xls格式 - ExcelWriter writer = ExcelUtil.getWriter(true); + BigExcelWriter writer = ExcelUtil.getBigWriter("temp_" + System.currentTimeMillis() + ".xlsx"); writer.addHeaderAlias("time", "小时时段"); writer.addHeaderAlias("chargingDegree", "电量"); writer.addHeaderAlias("chargingTime", "充电时长(小时)"); @@ -617,7 +616,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati } } // 通过工具类创建writer,默认创建xls格式 - ExcelWriter writer = ExcelUtil.getWriter(true); + BigExcelWriter writer = ExcelUtil.getBigWriter("temp_" + System.currentTimeMillis() + ".xlsx"); writer.addHeaderAlias("createTime", "日期"); writer.addHeaderAlias("chargingDegree", "电量"); writer.addHeaderAlias("chargingTime", "充电时长(小时)"); @@ -688,7 +687,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati } // 通过工具类创建writer,默认创建xls格式 - ExcelWriter writer = ExcelUtil.getWriter(true); + BigExcelWriter writer = ExcelUtil.getBigWriter("temp_" + System.currentTimeMillis() + ".xlsx"); writer.addHeaderAlias("chargingStationName", "电站名称"); writer.addHeaderAlias("operatorName", "运营商名称"); writer.addHeaderAlias("chargingDegree", "电量"); @@ -756,7 +755,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati } } // 通过工具类创建writer,默认创建xls格式 - ExcelWriter writer = ExcelUtil.getWriter(true); + BigExcelWriter writer = ExcelUtil.getBigWriter("temp_" + System.currentTimeMillis() + ".xlsx"); writer.addHeaderAlias("operatorName", "运营商名称"); writer.addHeaderAlias("chargingDegree", "电量"); writer.addHeaderAlias("chargingTime", "充电时长(小时)"); @@ -803,7 +802,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati List> list = getSumSourceList(request,startTime, endTime, sourceIds, userId, type,chargingStationIds); // 通过工具类创建writer,默认创建xls格式 - ExcelWriter writer = ExcelUtil.getWriter(true); + BigExcelWriter writer = ExcelUtil.getBigWriter("temp_" + System.currentTimeMillis() + ".xlsx"); writer.addHeaderAlias("internetUserName", "流量方名称"); writer.addHeaderAlias("chargingDegree", "电量"); writer.addHeaderAlias("chargingTime", "充电时长(小时)"); @@ -863,7 +862,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati list =xhpcStatisticsServiceMapper.getTerminalIntervalPage(chargingStationId, terminalId, operatorId, startTime, endTime, 0,sysUserId,tenantId); } // 通过工具类创建writer,默认创建xls格式 - ExcelWriter writer = ExcelUtil.getWriter(true); + BigExcelWriter writer = ExcelUtil.getBigWriter("temp_" + System.currentTimeMillis() + ".xlsx"); writer.addHeaderAlias("chargingStationName", "电站名称"); writer.addHeaderAlias("terminalName", "终端名称"); writer.addHeaderAlias("chargingDegree", "电量"); @@ -934,7 +933,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati } } // 通过工具类创建writer,默认创建xls格式 - ExcelWriter writer = ExcelUtil.getWriter(true); + BigExcelWriter writer = ExcelUtil.getBigWriter("temp_" + System.currentTimeMillis() + ".xlsx"); writer.addHeaderAlias("internetUserName", "流量方名称"); writer.addHeaderAlias("chargingDegree", "电量"); writer.addHeaderAlias("chargingTime", "充电时长(小时)"); @@ -1240,7 +1239,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati map1.put("todayAmount",t1); map1.put("yesterdayAmount",t2); map1.put("weekNumber",t1-t2>0?divide1:divide2); - map1.put("type",t1-t2>0?true:false); + map1.put("type", t1 - t2 > 0); map.put("todayAmount", map1); } @@ -1252,7 +1251,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati BigDecimal divide1 = new BigDecimal(t1 - t2).divide(new BigDecimal(t1),2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)); BigDecimal divide2 = new BigDecimal(t2 - t1).divide(new BigDecimal(t1),2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)); todayStatusNUmber.put("weekNumber",t1-t2>0?divide1:divide2); - todayStatusNUmber.put("type",t1-t2>0?true:false); + todayStatusNUmber.put("type", t1 - t2 > 0); map.put("todayOrder",list); map.put("todayOrderWeek",todayStatusNUmber); } 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 05e02b0f..9d9263ae 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 @@ -1,8 +1,8 @@ package com.xhpc.payment.service.impl; import cn.hutool.core.io.IoUtil; +import cn.hutool.poi.excel.BigExcelWriter; import cn.hutool.poi.excel.ExcelUtil; -import cn.hutool.poi.excel.ExcelWriter; import com.xhpc.common.core.constant.StatusConstants; import com.xhpc.common.domain.XhpcRechargeOrder; import com.xhpc.common.security.service.TokenService; @@ -83,7 +83,7 @@ public class XhpcRechargeOrderServiceImpl implements IXhpcRechargeOrderService { List> list = xhpcRechargeOrderMapper.page(phone, rechargeOrderNumber, status, createTimeStart, createTimeEnd,type,source,userId,loginUser.getTenantId()); // 通过工具类创建writer,默认创建xls格式 - ExcelWriter writer = ExcelUtil.getWriter(true); + BigExcelWriter writer = ExcelUtil.getBigWriter("RechargeOrder_" + System.currentTimeMillis() + ".xlsx"); writer.addHeaderAlias("rechargeOrderId", "充值订单id"); writer.addHeaderAlias("rechargeOrderNumber", "充值订单编号"); writer.addHeaderAlias("userId", "C端用户id"); 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 f9837f4b..7180f191 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 @@ -1,18 +1,18 @@ package com.xhpc.payment.service.impl; import cn.hutool.core.io.IoUtil; +import cn.hutool.poi.excel.BigExcelWriter; import cn.hutool.poi.excel.ExcelUtil; -import cn.hutool.poi.excel.ExcelWriter; import com.xhpc.common.api.UserTypeService; import com.xhpc.common.core.constant.HttpStatus; import com.xhpc.common.core.constant.StatusConstants; import com.xhpc.common.core.domain.R; import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.domain.XhpcRefundOrder; import com.xhpc.common.security.service.TokenService; import com.xhpc.common.util.UserTypeUtil; import com.xhpc.payment.domain.XhpcAppUser; -import com.xhpc.common.domain.XhpcRefundOrder; import com.xhpc.payment.mapper.XhpcRefundOrderMapper; import com.xhpc.payment.mapper.XhpcUserAccountStatementMapper; import com.xhpc.payment.service.IXhpcRefundOrderService; @@ -92,7 +92,7 @@ public class XhpcRefundOrderServiceImpl implements IXhpcRefundOrderService { List> list = xhpcRefundOrderMapper.page(phone, refundOrderNumber, status, createTimeStart, createTimeEnd,type,source,userId,loginUser.getTenantId()); // 通过工具类创建writer,默认创建xls格式 - ExcelWriter writer = ExcelUtil.getWriter(true); + BigExcelWriter writer = ExcelUtil.getBigWriter("RefundOrder_" + System.currentTimeMillis() + ".xlsx"); writer.addHeaderAlias("refundOrderId", "退款订单id"); writer.addHeaderAlias("refundOrderNumber", "退款订单编号"); // writer.addHeaderAlias("alipayId", "电站名称");