From a9413f69dd00ae9285bb6bd4d00855ad274a6552 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 七月 2025 19:25:18 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java | 68 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 20 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 d4bd89b..918eaeb 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
@@ -11,9 +11,13 @@
import com.ruoyi.chargingPile.api.model.Partner;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
+import com.ruoyi.chargingPile.util.mongodb.service.UploadRealTimeMonitoringDataService;
import com.ruoyi.common.core.utils.WebUtils;
import com.ruoyi.common.core.web.domain.BasePojo;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.common.security.annotation.Logical;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.order.api.model.ExportUidDto;
@@ -133,7 +137,9 @@
dto.setAppUserId(userId);
return AjaxResult.ok(applyChargingPileService.save(dto));
}
-
+
+
+ @RequiresPermissions(value = {"/pileApplication/add"}, logical = Logical.OR)
@Log(title = "【申请建桩】添加建桩申请", businessType = BusinessType.INSERT)
@ApiOperation(tags = {"后台-申请表单-申请建桩"},value = "建桩申请")
@PostMapping(value = "/manage/add")
@@ -141,7 +147,9 @@
return AjaxResult.ok(applyChargingPileService.save(dto));
}
-
+
+
+ @RequiresPermissions(value = {"/pileApplication"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-申请表单-申请建桩"},value = "列表")
@PostMapping(value = "/page")
public AjaxResult<Page<TApplyChargingPile>> page(@RequestBody ApplyChargingQuery applyChargingQuery) {
@@ -151,8 +159,9 @@
.page(Page.of(applyChargingQuery.getPageCurr(), applyChargingQuery.getPageSize()));
return AjaxResult.ok(page);
}
-
-
+
+
+ @RequiresPermissions(value = {"/pileApplication/export"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-申请表单-申请建桩"},value = "导出")
@PutMapping(value = "/export")
@Log(title = "【申请建桩】导出建桩申请列表", businessType = BusinessType.EXPORT)
@@ -266,7 +275,9 @@
}
return R.ok();
}
-
+
+
+ @RequiresPermissions(value = {"/chargeBill/download"}, logical = Logical.OR)
@ApiOperation(value = "下载-已出账", tags = {"管理后台-充电算账单"})
@PutMapping("/downloadBill")
@Log(title = "【充电算账单】下载算账单", businessType = BusinessType.EXPORT)
@@ -275,7 +286,7 @@
ChargingListQuery chargingListQuery = new ChargingListQuery();
chargingListQuery.setUid(uid.getUid());
chargingListQuery.setPageCurr(1);
- chargingListQuery.setPageSize(99999);
+ chargingListQuery.setPageSize(9999999);
ChargingBillVO data = chargingOrderClient.chargingBillListR(chargingListQuery).getData();
List<ChargingBillVO> chargingBillVOS = new ArrayList<>();
@@ -298,8 +309,9 @@
try (ExcelWriter excelWriter = excelWriterBuilder.withTemplate(stream).build()) {
WriteSheet writeSheet = EasyExcel.writerSheet().build();
FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.HORIZONTAL).build();
+ FillConfig fillConfig2 = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).build();
excelWriter.fill(new FillWrapper("data1", chargingBillVOS), fillConfig, writeSheet);
- excelWriter.fill(new FillWrapper("data2", data.getExportList()), fillConfig, writeSheet);
+ excelWriter.fill(new FillWrapper("data2", data.getExportList()), fillConfig2, writeSheet);
excelWriter.finish();
} catch (Exception e) {
return R.fail("excel导出失败！");
@@ -309,6 +321,10 @@
}
return R.ok();
}
+
+
+
+ @RequiresPermissions(value = {"/accountSettlementStatement/download"}, logical = Logical.OR)
@ApiOperation(value = "下载", tags = {"管理后台-账户结算账单"})
@PutMapping("/downloadAccount")
@Log(title = "【账户结算账单】下载账单", businessType = BusinessType.EXPORT)
@@ -321,7 +337,7 @@
BigDecimal bigDecimal = new BigDecimal("0");
for (TChargingOrder chargingOrder : collect) {
- bigDecimal = bigDecimal.add(chargingOrder.getPaymentAmount());
+ bigDecimal = bigDecimal.add(chargingOrder.getRefundAmount());
if (chargingOrder.getRechargePaymentType()!=null){
switch (chargingOrder.getRechargePaymentType()){
case 1:
@@ -365,15 +381,17 @@
}
return R.ok();
}
-
+
+
+
+ @RequiresPermissions(value = {"/summarySettlement/export", "/balanceSheetRecord/download"}, logical = Logical.OR)
@ApiOperation(value = "导出", tags = {"管理后台-结算汇总表"})
@PutMapping("/downloadSettlementTotal")
@Log(title = "【结算汇总表】下载汇总表", businessType = BusinessType.EXPORT)
public R downloadSettlementTotal(@RequestBody ExportUidDto uid,HttpServletResponse response)
{
- SettlementTotalVO data = chargingOrderClient.settlementTotalR(uid.getTime()).getData();
-
-
+ Long userId = tokenService.getLoginUser().getUserid();
+ SettlementTotalVO data = chargingOrderClient.settlementTotalR(uid.getTime(),userId).getData();
try {
response.setCharacterEncoding(Constants.UTF8);
response.setContentType("application/vnd.ms-excel");
@@ -392,7 +410,7 @@
WriteSheet writeSheet = EasyExcel.writerSheet().build();
FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).build();
excelWriter.fill(new FillWrapper("data1", data.getList1()), fillConfig, writeSheet);
-// excelWriter.fill(new FillWrapper("data2", data.getList2()), fillConfig, writeSheet);
+ excelWriter.fill(new FillWrapper("data2", data.getList2()), fillConfig, writeSheet);
excelWriter.finish();
} catch (Exception e) {
return R.fail("excel导出失败！");
@@ -402,10 +420,13 @@
}
return R.ok();
}
+
+
+
@Resource
private OtherClient otherClient;
@Resource
- private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient;
+ private UploadRealTimeMonitoringDataService uploadRealTimeMonitoringDataService;
@ApiOperation(value = "下载", tags = {"管理后台-结算表记录"})
@PutMapping("/downloadSettlement")
@Log(title = "【结算表记录】下载结算表", businessType = BusinessType.EXPORT)
@@ -436,6 +457,8 @@
settlementExportVO.setVehicleBrand(data5.get(0).getVehicleBrand());
}
+ }else{
+ settlementExportVO.setLicensePlate(chargingOrder.getPlateNum());
}
settlementExportVO.setSiteCode(data3.get(0).getCode());
settlementExportVO.setSiteName(data3.get(0).getName());
@@ -537,7 +560,7 @@
settlementExportVO.setAverageServiceChargeReal("");
settlementExportVO.setAverageServiceCharge("");
// 获取充电时间
- UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData();
+ UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataService.getLastDataById(chargingOrder.getCode());
if (data5!=null){
if (data5.getCumulative_charging_time()!=null){
settlementExportVO.setChargingSecond(data5.getCumulative_charging_time()+"");
@@ -546,7 +569,7 @@
}
// 获取开始SOC 结束soc
if (chargingOrder.getCode()!=null){
- List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataClient.getDataByOrderCode(chargingOrder.getCode()).getData();
+ List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataService.getDataByOrderCode(chargingOrder.getCode());
if (data6!=null && !data6.isEmpty()){
int min = 100;
int max = 0;
@@ -647,7 +670,7 @@
ChargingListQuery chargingListQuery = new ChargingListQuery();
chargingListQuery.setUid(uid.getUid());
chargingListQuery.setPageCurr(1);
- chargingListQuery.setPageSize(99999);
+ chargingListQuery.setPageSize(9999999);
ChargingBillVO data = chargingOrderClient.chargingBillListR(chargingListQuery).getData();
List<ChargingBillVO> chargingBillVOS = new ArrayList<>();
@@ -657,7 +680,8 @@
response.setContentType("application/vnd.ms-excel");
response.setHeader("Access-Control-Expose-Headers", "Content-disposition");
response.setHeader("Content-Disposition", "attachment;filename=" +
- URLEncoder.encode("月账单-"+data.getCategory()+data.getBillWeek()+data.getSiteName(), CharEncoding.UTF_8) + ".xlsx");
+// URLEncoder.encode("月账单-"+data.getCategory()+data.getBillWeek()+data.getSiteName(), CharEncoding.UTF_8) + ".xlsx");
+ URLEncoder.encode("月账单", CharEncoding.UTF_8) + ".xlsx");
} catch (UnsupportedEncodingException e) {
return R.fail("excel导出失败！");
}
@@ -688,14 +712,16 @@
);
return pattern.matcher(url).matches();
}
-
+
+ @RequiresPermissions(value = {"/pileApplication/select"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-申请表单-申请建桩"},value = "详情")
@PostMapping(value = "/detail/{id}")
public AjaxResult<TApplyChargingPile> detail(@PathVariable Integer id) {
return AjaxResult.ok(applyChargingPileService.getById(id));
}
-
+
+ @RequiresPermissions(value = {"/pileApplication/remark"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-申请表单-申请建桩"},value = "修改备注")
@PostMapping(value = "/remark")
@Log(title = "【申请建桩】修改备注", businessType = BusinessType.UPDATE)
@@ -705,6 +731,8 @@
applyChargingPileService.updateById(byId);
return AjaxResult.success();
}
+
+ @RequiresPermissions(value = {"/pileApplication/del"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-申请表单-申请建桩"},value = "删除")
@DeleteMapping(value = "/remark")
@Log(title = "【申请建桩】删除建桩申请", businessType = BusinessType.DELETE)
--
Gitblit v1.7.1