From cfc5a86060b10ee7984eab1e628d8704c3828474 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 11 九月 2024 10:47:05 +0800
Subject: [PATCH] 修改枪状态
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
index 29c62c9..2314df7 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
@@ -8,8 +8,10 @@
import com.ruoyi.common.core.utils.WebUtils;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.model.ExportUidDto;
+import com.ruoyi.order.api.feignClient.OrderClient;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TSettlementConfirm;
+import com.ruoyi.order.api.vo.AccountListVO;
import com.ruoyi.order.api.vo.ChargingBillListVO;
@@ -82,6 +84,8 @@
@Resource
private ChargingOrderClient chargingOrderClient;
@Resource
+ private OrderClient orderClient;
+ @Resource
private SiteClient siteClient;
@Autowired
@@ -99,7 +103,12 @@
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@RequestBody TApplyChargingPileDTO dto) {
// 验证验证码
- String code = redisService.getCacheObject(dto.getLandlordPhone() + Constants.APPLY_CHARGING);
+ String code;
+ if(dto.getLandlordHandling().equals(1)){
+ code = redisService.getCacheObject(dto.getLandlordPhone() + Constants.APPLY_CHARGING);
+ }else {
+ code = redisService.getCacheObject(dto.getAgentPhone() + Constants.APPLY_CHARGING);
+ }
if(StringUtils.isEmpty(code)){
return AjaxResult.error("验证码已过期,请重新获取验证码!");
}
@@ -283,6 +292,40 @@
}
return R.ok();
}
+ @ApiOperation(value = "下载", tags = {"管理后台-账户结算账单"})
+ @PutMapping("/downloadAccount")
+ public R downloadAccount(@RequestBody ChargingListQuery dto,HttpServletResponse response)
+ { dto.setPageCurr(1);
+ dto.setPageSize(99999999);
+ AccountListVO data = orderClient.accountBillList(dto).getData();
+ try {
+ response.setCharacterEncoding(Constants.UTF8);
+ response.setContentType("application/vnd.ms-excel");
+ response.setHeader("Access-Control-Expose-Headers", "Content-disposition");
+ response.setHeader("Content-Disposition", "attachment;filename=" +
+ URLEncoder.encode("账户结算账单", CharEncoding.UTF_8) + ".xlsx");
+ } catch (UnsupportedEncodingException e) {
+ return R.fail("excel导出失败！");
+ }
+ try {
+ // excel模板封装
+ ExcelWriterBuilder excelWriterBuilder = EasyExcelFactory.write(response.getOutputStream());
+ InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream("template/" +"账户结算账单" + ".xlsx");
+ // 自动释放资源
+ try (ExcelWriter excelWriter = excelWriterBuilder.withTemplate(stream).build()) {
+ WriteSheet writeSheet = EasyExcel.writerSheet().build();
+ FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).build();
+ excelWriter.fill(new FillWrapper("data1", data.getList().getRecords()), fillConfig, writeSheet);
+ excelWriter.finish();
+ } catch (Exception e) {
+ return R.fail("excel导出失败！");
+ }
+ } catch (IOException e) {
+ return R.fail("excel导出失败！");
+ }
+ return R.ok();
+ }
+
@ApiOperation(value = "导出", tags = {"管理后台-结算汇总表"})
@PutMapping("/downloadSettlementTotal")
public R downloadSettlementTotal(@RequestBody ExportUidDto uid,HttpServletResponse response)
@@ -302,7 +345,7 @@
try {
// excel模板封装
ExcelWriterBuilder excelWriterBuilder = EasyExcelFactory.write(response.getOutputStream());
- InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream("template/" +"运营商名称1-充电桩名称1-结算对账单明细-结算月份1" + ".xlsx");
+ InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream("template/" +"结算汇总" + ".xlsx");
// 自动释放资源
try (ExcelWriter excelWriter = excelWriterBuilder.withTemplate(stream).build()) {
WriteSheet writeSheet = EasyExcel.writerSheet().build();
--
Gitblit v1.7.1