From 85c4410b0948799a93f19f345b4ed18c253c89f3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 03 九月 2024 10:26:33 +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 | 56 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 10 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 f840ac9..22746d3 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
@@ -5,19 +5,30 @@
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;
+import com.ruoyi.common.core.web.domain.BaseDelete;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.log.enums.OperatorType;
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;
/**
@@ -36,6 +47,9 @@
private final TParkingLotService parkingLotService;
private final TVehicleRampService vehicleRampService;
private final TCarportService carportService;
+
+ @Resource
+ private TParkingRecordService parkingRecordService;
@Autowired
public TParkingLotController(TParkingLotService parkingLotService, TVehicleRampService vehicleRampService, TCarportService carportService) {
@@ -58,14 +72,14 @@
*/
@ApiOperation(tags = {"后台-停车场"},value = "查询停车场列表")
@PostMapping(value = "/list")
- public AjaxResult<List<TParkingLot>> list(@RequestBody TParkingLotQuery query) {
- return AjaxResult.ok(parkingLotService.list(Wrappers.lambdaQuery(TParkingLot.class)
- .eq(TParkingLot::getName,query.getName())));
+ public AjaxResult<List<TParkingLotVO>> list(@RequestBody TParkingLotQuery query) {
+ return AjaxResult.ok(parkingLotService.getList(query.getName()));
}
/**
* 添加停车场管理
*/
+ @Log(title = "添加停车场", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-停车场"},value = "添加停车场")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@RequestBody TParkingLotDTO dto) {
@@ -75,6 +89,7 @@
/**
* 修改停车场
*/
+ @Log(title = "修改停车场", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-停车场"},value = "修改停车场")
@PostMapping(value = "/update")
public AjaxResult<Boolean> update(@RequestBody TParkingLotDTO dto) {
@@ -86,16 +101,17 @@
*/
@ApiOperation(tags = {"后台-停车场"},value = "查看停车场详情")
@GetMapping(value = "/getDetailById")
- public AjaxResult<TParkingLot> getDetailById(@RequestParam Integer id) {
+ public AjaxResult<TParkingLot> getDetailById(@RequestParam("id") Integer id) {
return AjaxResult.ok(parkingLotService.getById(id));
}
/**
* 删除停车场
*/
+ @Log(title = "删除停车场", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-停车场"},value = "删除停车场")
@DeleteMapping(value = "/deleteById")
- public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
+ public AjaxResult<Boolean> deleteById(@RequestParam("id") Integer id) {
// 刪除车道信息
vehicleRampService.remove(Wrappers.lambdaQuery(TVehicleRamp.class)
.eq(TVehicleRamp::getParkingLotId, id));
@@ -108,17 +124,37 @@
/**
* 批量删除停车场
*/
+ @Log(title = "批量删除停车场", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-停车场"},value = "批量删除停车场")
@DeleteMapping(value = "/deleteByIds")
- public AjaxResult<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
+ public AjaxResult<Boolean> deleteByIds(@RequestParam String ids) {
+ String[] split = ids.split(",");
// 刪除车道信息
vehicleRampService.remove(Wrappers.lambdaQuery(TVehicleRamp.class)
- .in(TVehicleRamp::getParkingLotId, ids));
+ .in(TVehicleRamp::getParkingLotId, Arrays.asList(split)));
// 删除车库信息
carportService.remove(Wrappers.lambdaQuery(TCarport.class)
- .in(TCarport::getParkingLotId, ids));
- return AjaxResult.ok(parkingLotService.removeByIds(ids));
+ .in(TCarport::getParkingLotId, Arrays.asList(split)));
+ return AjaxResult.ok(parkingLotService.removeByIds(Arrays.asList(split)));
}
-
+
+ /**
+ * 通过站点id查询停车场信息
+ */
+ @PostMapping(value = "/getLotBySiteId")
+ public R<TParkingLot> getLotBySiteId(@RequestParam("siteId") Integer siteId){
+ return R.ok(parkingLotService.getOne(Wrappers.lambdaQuery(TParkingLot.class)
+ .eq(TParkingLot::getSiteId, siteId)));
+ }
+
+ @PostMapping(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();
+ }
}
--
Gitblit v1.7.1