From 6f1a56eb02cb6eb7848e2df6773bc5abfee11efd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 08 十月 2024 15:13:03 +0800
Subject: [PATCH] 合併代碼
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TCarportController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TCarportController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TCarportController.java
index 86d307b..56e736a 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TCarportController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TCarportController.java
@@ -17,6 +17,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.Arrays;
import java.util.List;
/**
@@ -54,7 +55,7 @@
/**
* 添加车库管理
*/
- @Log(title = "添加车库", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
+ @Log(title = "【车库】添加车库", businessType = BusinessType.INSERT)
@ApiOperation(tags = {"后台-车库"},value = "添加车库")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@RequestBody TCarport dto) {
@@ -64,7 +65,7 @@
/**
* 修改车库
*/
- @Log(title = "修改车库", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
+ @Log(title = "【车库】修改车库", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-车库"},value = "修改车库")
@PostMapping(value = "/update")
public AjaxResult<Boolean> update(@RequestBody TCarport dto) {
@@ -83,7 +84,7 @@
/**
* 删除车库
*/
- @Log(title = "删除车库", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
+ @Log(title = "【车库】删除车库", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-车库"},value = "删除车库")
@DeleteMapping(value = "/deleteById")
public AjaxResult<Boolean> deleteById(@RequestParam("id") Integer id) {
@@ -96,14 +97,15 @@
/**
* 批量删除车库
*/
- @Log(title = "批量删除车库", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
+ @Log(title = "【车库】批量删除车库", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-车库"},value = "批量删除车库")
@DeleteMapping(value = "/deleteByIds")
- public AjaxResult<Boolean> deleteByIds(@RequestBody BaseDelete baseDelete) {
+ public AjaxResult<Boolean> deleteByIds(@RequestParam String ids) {
+ String[] split = ids.split(",");
// 刪除车道信息
vehicleRampService.remove(Wrappers.lambdaQuery(TVehicleRamp.class)
- .in(TVehicleRamp::getCarportId, baseDelete.getIds()));
- return AjaxResult.ok(carportService.removeByIds(baseDelete.getIds()));
+ .in(TVehicleRamp::getCarportId, Arrays.asList(split)));
+ return AjaxResult.ok(carportService.removeByIds(Arrays.asList(split)));
}
}
--
Gitblit v1.7.1