From c80c0184b6e560d41d5aa5691874e07b681fa18f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 一月 2025 18:41:24 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 4 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 7009be3..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
@@ -1,15 +1,18 @@
package com.ruoyi.chargingPile.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.chargingPile.api.dto.TParkingLotDTO;
import com.ruoyi.chargingPile.api.model.TCarport;
import com.ruoyi.chargingPile.api.model.TParkingLot;
+import com.ruoyi.chargingPile.api.model.TParkingRecord;
import com.ruoyi.chargingPile.api.model.TVehicleRamp;
import com.ruoyi.chargingPile.api.query.TParkingLotQuery;
import com.ruoyi.chargingPile.api.vo.TParkingLotVO;
import com.ruoyi.chargingPile.service.TCarportService;
import com.ruoyi.chargingPile.service.TParkingLotService;
+import com.ruoyi.chargingPile.service.TParkingRecordService;
import com.ruoyi.chargingPile.service.TVehicleRampService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -18,11 +21,16 @@
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;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.time.LocalDate;
import java.util.Arrays;
import java.util.List;
@@ -43,6 +51,9 @@
private final TVehicleRampService vehicleRampService;
private final TCarportService carportService;
+ @Resource
+ private TParkingRecordService parkingRecordService;
+
@Autowired
public TParkingLotController(TParkingLotService parkingLotService, TVehicleRampService vehicleRampService, TCarportService carportService) {
this.parkingLotService = parkingLotService;
@@ -53,6 +64,7 @@
/**
* 查询停车场列表
*/
+ @RequiresPermissions(value = {"/parkingLot"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-停车场"},value = "查询停车场分页列表")
@PostMapping(value = "/pageList")
public AjaxResult<PageInfo<TParkingLotVO>> pageList(@RequestBody TParkingLotQuery query) {
@@ -62,6 +74,7 @@
/**
* 查询停车场列表
*/
+ @RequiresPermissions(value = {"/parkingOperationAnalysis", "/workbench"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-停车场"},value = "查询停车场列表")
@PostMapping(value = "/list")
public AjaxResult<List<TParkingLotVO>> list(@RequestBody TParkingLotQuery query) {
@@ -71,7 +84,8 @@
/**
* 添加停车场管理
*/
- @Log(title = "添加停车场", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
+ @RequiresPermissions(value = {"/parkingLot/add"}, logical = Logical.OR)
+ @Log(title = "【停车场】添加停车场", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-停车场"},value = "添加停车场")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@RequestBody TParkingLotDTO dto) {
@@ -81,7 +95,8 @@
/**
* 修改停车场
*/
- @Log(title = "修改停车场", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
+ @RequiresPermissions(value = {"/parkingLot/update"}, logical = Logical.OR)
+ @Log(title = "【停车场】修改停车场", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-停车场"},value = "修改停车场")
@PostMapping(value = "/update")
public AjaxResult<Boolean> update(@RequestBody TParkingLotDTO dto) {
@@ -91,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) {
@@ -100,7 +116,8 @@
/**
* 删除停车场
*/
- @Log(title = "删除停车场", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
+ @RequiresPermissions(value = {"/parkingLot/del"}, logical = Logical.OR)
+ @Log(title = "【停车场】删除停车场", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-停车场"},value = "删除停车场")
@DeleteMapping(value = "/deleteById")
public AjaxResult<Boolean> deleteById(@RequestParam("id") Integer id) {
@@ -116,7 +133,8 @@
/**
* 批量删除停车场
*/
- @Log(title = "批量删除停车场", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
+ @RequiresPermissions(value = {"/parkingLot/batch_del"}, logical = Logical.OR)
+ @Log(title = "【停车场】批量删除停车场", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-停车场"},value = "批量删除停车场")
@DeleteMapping(value = "/deleteByIds")
public AjaxResult<Boolean> deleteByIds(@RequestParam String ids) {
@@ -138,5 +156,39 @@
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);
+ return R.ok(sum);
+ }
+
+
+ /**
+ * 根据停车场标识查询停车场
+ * @param appKey
+ * @return
+ */
+ @PostMapping(value = "/getParkingLotByAppKey")
+ public R<TParkingLot> getParkingLotByAppKey(@RequestParam("appKey") String appKey){
+ TParkingLot parkingLot = parkingLotService.getOne(new LambdaQueryWrapper<TParkingLot>()
+ .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