From 4d7a208f388e42e7dd83dab0e38eadfa0847de1c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 11 十二月 2024 19:24:10 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java |   39 +++++++++++++++++++++++++++++++--------
 1 files changed, 31 insertions(+), 8 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 c6a43eb..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
@@ -15,6 +15,8 @@
 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;
@@ -134,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")
@@ -142,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) {
@@ -152,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)
@@ -267,7 +274,9 @@
         }
         return R.ok();
     }
-
+    
+    
+    @RequiresPermissions(value = {"/chargeBill/download"}, logical = Logical.OR)
     @ApiOperation(value = "下载-已出账", tags = {"管理后台-充电算账单"})
     @PutMapping("/downloadBill")
     @Log(title = "【充电算账单】下载算账单", businessType = BusinessType.EXPORT)
@@ -310,6 +319,10 @@
         }
         return R.ok();
     }
+    
+    
+    
+    @RequiresPermissions(value = {"/accountSettlementStatement/download"}, logical = Logical.OR)
     @ApiOperation(value = "下载", tags = {"管理后台-账户结算账单"})
     @PutMapping("/downloadAccount")
     @Log(title = "【账户结算账单】下载账单", businessType = BusinessType.EXPORT)
@@ -366,7 +379,10 @@
         }
         return R.ok();
     }
-
+    
+    
+    
+    @RequiresPermissions(value = {"/summarySettlement/export", "/balanceSheetRecord/download"}, logical = Logical.OR)
     @ApiOperation(value = "导出", tags = {"管理后台-结算汇总表"})
     @PutMapping("/downloadSettlementTotal")
     @Log(title = "【结算汇总表】下载汇总表", businessType = BusinessType.EXPORT)
@@ -402,6 +418,9 @@
         }
         return R.ok();
     }
+    
+    
+    
     @Resource
     private OtherClient otherClient;
     @Resource
@@ -689,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)
@@ -706,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