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/TParkingLotController.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java
index 7db9f8c..f3c6b43 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java
@@ -21,6 +21,8 @@
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.log.enums.OperatorType;
+import com.ruoyi.common.security.annotation.Logical;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -62,6 +64,7 @@
/**
* 查询停车场列表
*/
+ @RequiresPermissions(value = {"/parkingLot"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-停车场"},value = "查询停车场分页列表")
@PostMapping(value = "/pageList")
public AjaxResult<PageInfo<TParkingLotVO>> pageList(@RequestBody TParkingLotQuery query) {
@@ -71,6 +74,7 @@
/**
* 查询停车场列表
*/
+ @RequiresPermissions(value = {"/parkingOperationAnalysis", "/workbench"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-停车场"},value = "查询停车场列表")
@PostMapping(value = "/list")
public AjaxResult<List<TParkingLotVO>> list(@RequestBody TParkingLotQuery query) {
@@ -80,6 +84,7 @@
/**
* 添加停车场管理
*/
+ @RequiresPermissions(value = {"/parkingLot/add"}, logical = Logical.OR)
@Log(title = "【停车场】添加停车场", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-停车场"},value = "添加停车场")
@PostMapping(value = "/add")
@@ -90,6 +95,7 @@
/**
* 修改停车场
*/
+ @RequiresPermissions(value = {"/parkingLot/update"}, logical = Logical.OR)
@Log(title = "【停车场】修改停车场", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-停车场"},value = "修改停车场")
@PostMapping(value = "/update")
@@ -100,6 +106,7 @@
/**
* 查看停车场详情
*/
+ @RequiresPermissions(value = {"/parkingLot/select", "/parkingLot/update"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-停车场"},value = "查看停车场详情")
@GetMapping(value = "/getDetailById")
public AjaxResult<TParkingLot> getDetailById(@RequestParam("id") Integer id) {
@@ -109,6 +116,7 @@
/**
* 删除停车场
*/
+ @RequiresPermissions(value = {"/parkingLot/del"}, logical = Logical.OR)
@Log(title = "【停车场】删除停车场", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-停车场"},value = "删除停车场")
@DeleteMapping(value = "/deleteById")
@@ -125,6 +133,7 @@
/**
* 批量删除停车场
*/
+ @RequiresPermissions(value = {"/parkingLot/batch_del"}, logical = Logical.OR)
@Log(title = "【停车场】批量删除停车场", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-停车场"},value = "批量删除停车场")
@DeleteMapping(value = "/deleteByIds")
@@ -147,11 +156,16 @@
return R.ok(parkingLotService.getOne(Wrappers.lambdaQuery(TParkingLot.class)
.eq(TParkingLot::getSiteId, siteId)));
}
-
+
+
+ @RequiresPermissions(value = {"/paymentOrder/order"}, logical = Logical.OR)
@GetMapping(value = "/getRecordById")
public R<TParkingRecord> getRecordById(@RequestParam("id") Long id){
return R.ok(parkingRecordService.getById(id));
}
+
+
+
@PostMapping(value = "/getRecordAmount")
public R<BigDecimal> getRecordAmount(@RequestParam("sixBefore") LocalDate sixBefore){
BigDecimal sum = parkingRecordService.getSum(sixBefore);
@@ -170,5 +184,11 @@
.eq(TParkingLot::getAppKey, appKey).eq(TParkingLot::getDelFlag, 0));
return R.ok(parkingLot);
}
+ @PostMapping(value = "/getSiteIdByOrderId")
+ R<Integer> getSiteIdByOrderId(@RequestParam("id") Long id){
+ TParkingRecord byId = parkingRecordService.getById(id);
+ TParkingLot parkingLot = parkingLotService.getById(byId.getParkingLotId());
+ return R.ok(parkingLot.getId());
+ }
}
--
Gitblit v1.7.1