From ae2815e13263d289e003a349c8f8a057f38bf998 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 17 八月 2024 15:55:48 +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 | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 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 2c51ccd..aca8121 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
@@ -11,8 +11,12 @@
import com.ruoyi.chargingPile.service.TCarportService;
import com.ruoyi.chargingPile.service.TParkingLotService;
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.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;
@@ -47,7 +51,7 @@
/**
* 查询停车场列表
*/
- @ApiOperation(value = "查询停车场分页列表")
+ @ApiOperation(tags = {"后台-停车场"},value = "查询停车场分页列表")
@PostMapping(value = "/pageList")
public AjaxResult<PageInfo<TParkingLotVO>> pageList(@RequestBody TParkingLotQuery query) {
return AjaxResult.ok(parkingLotService.pageList(query));
@@ -56,17 +60,17 @@
/**
* 查询停车场列表
*/
- @ApiOperation(value = "查询停车场列表")
+ @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()));
}
/**
* 添加停车场管理
*/
- @ApiOperation(value = "添加停车场")
+ @Log(title = "添加停车场", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
+ @ApiOperation(tags = {"后台-停车场"},value = "添加停车场")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@RequestBody TParkingLotDTO dto) {
return AjaxResult.ok(parkingLotService.save(dto));
@@ -75,7 +79,8 @@
/**
* 修改停车场
*/
- @ApiOperation(value = "修改停车场")
+ @Log(title = "修改停车场", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
+ @ApiOperation(tags = {"后台-停车场"},value = "修改停车场")
@PostMapping(value = "/update")
public AjaxResult<Boolean> update(@RequestBody TParkingLotDTO dto) {
return AjaxResult.ok(parkingLotService.updateById(dto));
@@ -84,18 +89,19 @@
/**
* 查看停车场详情
*/
- @ApiOperation(value = "查看停车场详情")
+ @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));
}
/**
* 删除停车场
*/
- @ApiOperation(value = "删除停车场")
+ @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,7 +114,8 @@
/**
* 批量删除停车场
*/
- @ApiOperation(value = "批量删除停车场")
+ @Log(title = "批量删除停车场", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
+ @ApiOperation(tags = {"后台-停车场"},value = "批量删除停车场")
@DeleteMapping(value = "/deleteByIds")
public AjaxResult<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
// 刪除车道信息
@@ -119,6 +126,14 @@
.in(TCarport::getParkingLotId, ids));
return AjaxResult.ok(parkingLotService.removeByIds(ids));
}
-
+
+ /**
+ * 通过站点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)));
+ }
}
--
Gitblit v1.7.1