From c925f20112afa2245a994d0d1bc5b02c9f527356 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 23 八月 2024 10:45:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TMonitoringEquipmentController.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 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 d1a015c..f062ac2 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
@@ -7,12 +7,17 @@
import com.ruoyi.chargingPile.api.vo.TMonitoringEquipmentVO;
import com.ruoyi.chargingPile.service.TMonitoringEquipmentService;
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 java.util.Arrays;
import java.util.List;
/**
@@ -38,7 +43,7 @@
/**
* 查询监控列表
*/
- @ApiOperation(value = "查询监控分页列表")
+ @ApiOperation(tags = {"后台-监控"},value = "查询监控分页列表")
@PostMapping(value = "/pageList")
public AjaxResult<PageInfo<TMonitoringEquipmentVO>> pageList(@RequestBody TMonitoringEquipmentQuery query) {
return AjaxResult.ok(monitoringEquipmentService.pageList(query));
@@ -47,7 +52,8 @@
/**
* 添加监控管理
*/
- @ApiOperation(value = "添加监控")
+ @Log(title = "添加监控", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
+ @ApiOperation(tags = {"后台-监控"},value = "添加监控")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@RequestBody TMonitoringEquipmentDTO dto) {
return AjaxResult.ok(monitoringEquipmentService.save(dto));
@@ -56,7 +62,8 @@
/**
* 修改监控
*/
- @ApiOperation(value = "修改监控")
+ @Log(title = "修改监控", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
+ @ApiOperation(tags = {"后台-监控"},value = "修改监控")
@PostMapping(value = "/update")
public AjaxResult<Boolean> update(@RequestBody TMonitoringEquipmentDTO dto) {
return AjaxResult.ok(monitoringEquipmentService.updateById(dto));
@@ -65,28 +72,31 @@
/**
* 查看监控详情
*/
- @ApiOperation(value = "查看监控详情")
+ @ApiOperation(tags = {"后台-监控"},value = "查看监控详情")
@GetMapping(value = "/getDetailById")
- public AjaxResult<TMonitoringEquipment> getDetailById(@RequestParam Integer id) {
+ public AjaxResult<TMonitoringEquipment> getDetailById(@RequestParam("id") Integer id) {
return AjaxResult.ok(monitoringEquipmentService.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) {
return AjaxResult.ok(monitoringEquipmentService.removeById(id));
}
/**
* 批量删除监控
*/
- @ApiOperation(value = "批量删除监控")
+ @Log(title = "批量删除监控", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
+ @ApiOperation(tags = {"后台-监控"},value = "批量删除监控")
@DeleteMapping(value = "/deleteByIds")
- public AjaxResult<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
- return AjaxResult.ok(monitoringEquipmentService.removeByIds(ids));
+ public AjaxResult<Boolean> deleteByIds(@RequestParam String ids) {
+ String[] split = ids.split(",");
+ return AjaxResult.ok(monitoringEquipmentService.removeByIds(Arrays.asList(split)));
}
}
--
Gitblit v1.7.1