From 0d4c9f50ee2bc3e4a03abd91ac7c9e03891d37f2 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 20 二月 2025 17:41:19 +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/TParkingLotController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 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 3d0e9e0..f03adee 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;
@@ -31,6 +33,7 @@
import java.time.LocalDate;
import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -62,6 +65,7 @@
/**
* 查询停车场列表
*/
+ @RequiresPermissions(value = {"/parkingLot"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-停车场"},value = "查询停车场分页列表")
@PostMapping(value = "/pageList")
public AjaxResult<PageInfo<TParkingLotVO>> pageList(@RequestBody TParkingLotQuery query) {
@@ -71,6 +75,7 @@
/**
* 查询停车场列表
*/
+ @RequiresPermissions(value = {"/parkingOperationAnalysis", "/workbench"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-停车场"},value = "查询停车场列表")
@PostMapping(value = "/list")
public AjaxResult<List<TParkingLotVO>> list(@RequestBody TParkingLotQuery query) {
@@ -80,6 +85,7 @@
/**
* 添加停车场管理
*/
+ @RequiresPermissions(value = {"/parkingLot/add"}, logical = Logical.OR)
@Log(title = "【停车场】添加停车场", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-停车场"},value = "添加停车场")
@PostMapping(value = "/add")
@@ -90,6 +96,7 @@
/**
* 修改停车场
*/
+ @RequiresPermissions(value = {"/parkingLot/update"}, logical = Logical.OR)
@Log(title = "【停车场】修改停车场", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-停车场"},value = "修改停车场")
@PostMapping(value = "/update")
@@ -100,6 +107,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 +117,7 @@
/**
* 删除停车场
*/
+ @RequiresPermissions(value = {"/parkingLot/del"}, logical = Logical.OR)
@Log(title = "【停车场】删除停车场", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-停车场"},value = "删除停车场")
@DeleteMapping(value = "/deleteById")
@@ -125,6 +134,7 @@
/**
* 批量删除停车场
*/
+ @RequiresPermissions(value = {"/parkingLot/batch_del"}, logical = Logical.OR)
@Log(title = "【停车场】批量删除停车场", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-停车场"},value = "批量删除停车场")
@DeleteMapping(value = "/deleteByIds")
@@ -147,15 +157,33 @@
return R.ok(parkingLotService.getOne(Wrappers.lambdaQuery(TParkingLot.class)
.eq(TParkingLot::getSiteId, siteId)));
}
-
- @PostMapping(value = "/getRecordById")
+
+
+ /**
+ * 获取所有停车场数据
+ */
+ @PostMapping(value = "/getAllParkingLot")
+ public R<List<TParkingLot>> getAllParkingLot(){
+ List<TParkingLot> list = parkingLotService.list(new LambdaQueryWrapper<TParkingLot>()
+ .eq(TParkingLot::getDelFlag, 0));
+ return R.fail(list);
+ }
+
+
+
+
+ @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);
- return R.ok();
+ return R.ok(sum);
}
@@ -170,5 +198,22 @@
.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.getSiteId());
+ }
+ @PostMapping(value = "/getSiteIdAll")
+ R<List<TParkingRecord>> getSiteIdAll(){
+ List<TParkingRecord> list = parkingRecordService.list();
+ for (TParkingRecord tParkingRecord : list) {
+ TParkingLot parkingLot = parkingLotService.getById(tParkingRecord.getParkingLotId());
+ if (parkingLot!=null){
+ tParkingRecord.setSiteId(parkingLot.getSiteId());
+ }
+ }
+ return R.ok(list);
+ }
}
--
Gitblit v1.7.1