From e0fc8f7e2230b51e3bbe8dea43790cf11b7170e9 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期一, 04 十一月 2024 15:39:01 +0800 Subject: [PATCH] merge --- ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TMonitoringEquipmentController.java | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TMonitoringEquipmentController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TMonitoringEquipmentController.java index 528ce32..2fdedd8 100644 --- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TMonitoringEquipmentController.java +++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TMonitoringEquipmentController.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; /** @@ -51,7 +52,7 @@ /** * 添加监控管理 */ - @Log(title = "添加监控", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE) + @Log(title = "【监控管理 】添加监控", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE) @ApiOperation(tags = {"后台-监控"},value = "添加监控") @PostMapping(value = "/add") public AjaxResult<Boolean> add(@RequestBody TMonitoringEquipmentDTO dto) { @@ -61,7 +62,7 @@ /** * 修改监控 */ - @Log(title = "修改监控", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE) + @Log(title = "【监控管理 】修改监控", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE) @ApiOperation(tags = {"后台-监控"},value = "修改监控") @PostMapping(value = "/update") public AjaxResult<Boolean> update(@RequestBody TMonitoringEquipmentDTO dto) { @@ -80,7 +81,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) { @@ -90,11 +91,12 @@ /** * 批量删除监控 */ - @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) { - return AjaxResult.ok(monitoringEquipmentService.removeByIds(baseDelete.getIds())); + public AjaxResult<Boolean> deleteByIds(@RequestParam String ids) { + String[] split = ids.split(","); + return AjaxResult.ok(monitoringEquipmentService.removeByIds(Arrays.asList(split))); } } -- Gitblit v1.7.1