From 74b0e0814e37d640596f44ec86d20fa9ecce9ed6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 二月 2025 10:42:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 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 d715cb8..ecf60cb 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
@@ -14,6 +14,9 @@
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 +136,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 +146,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 +158,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 +274,9 @@
}
return R.ok();
}
-
+
+
+ @RequiresPermissions(value = {"/chargeBill/download"}, logical = Logical.OR)
@ApiOperation(value = "下载-已出账", tags = {"管理后台-充电算账单"})
@PutMapping("/downloadBill")
@Log(title = "【充电算账单】下载算账单", businessType = BusinessType.EXPORT)
@@ -309,6 +319,10 @@
}
return R.ok();
}
+
+
+
+ @RequiresPermissions(value = {"/accountSettlementStatement/download"}, logical = Logical.OR)
@ApiOperation(value = "下载", tags = {"管理后台-账户结算账单"})
@PutMapping("/downloadAccount")
@Log(title = "【账户结算账单】下载账单", businessType = BusinessType.EXPORT)
@@ -365,13 +379,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");
@@ -400,6 +418,9 @@
}
return R.ok();
}
+
+
+
@Resource
private OtherClient otherClient;
@Resource
@@ -687,14 +708,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)
@@ -704,6 +727,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