From c7372ea9e06ba1a2df85bbff1fe4d38a45693de8 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 03 九月 2024 17:55:18 +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/TVehicleRampController.java | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TVehicleRampController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TVehicleRampController.java index 11da8dd..f9bd40a 100644 --- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TVehicleRampController.java +++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TVehicleRampController.java @@ -3,12 +3,18 @@ import com.ruoyi.chargingPile.api.model.TVehicleRamp; import com.ruoyi.chargingPile.service.TVehicleRampService; +import com.ruoyi.common.core.utils.CodeGenerateUtils; import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.domain.BaseDelete; +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; /** @@ -34,15 +40,18 @@ /** * 添加车道管理 */ + @Log(title = "添加车道", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE) @ApiOperation(tags = {"后台-车道"},value = "添加车道") @PostMapping(value = "/add") public AjaxResult<Boolean> add(@RequestBody TVehicleRamp dto) { + dto.setCarportNum(CodeGenerateUtils.generateVolumeSn()); return AjaxResult.ok(vehicleRampService.save(dto)); } /** * 修改车道 */ + @Log(title = "修改车道", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE) @ApiOperation(tags = {"后台-车道"},value = "修改车道") @PostMapping(value = "/update") public AjaxResult<Boolean> update(@RequestBody TVehicleRamp dto) { @@ -54,31 +63,35 @@ */ @ApiOperation(tags = {"后台-车道"},value = "查看车道详情") @GetMapping(value = "/getDetailById") - public AjaxResult<TVehicleRamp> getDetailById(@RequestParam Integer id) { + public AjaxResult<TVehicleRamp> getDetailById(@RequestParam("id") Integer id) { return AjaxResult.ok(vehicleRampService.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) { return AjaxResult.ok(vehicleRampService.removeById(id)); } /** * 批量删除车道 */ + @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(vehicleRampService.removeByIds(ids)); + public AjaxResult<Boolean> deleteByIds(@RequestParam String ids) { + String[] split = ids.split(","); + return AjaxResult.ok(vehicleRampService.removeByIds(Arrays.asList(split))); } /** * 开关闸车道 */ + @Log(title = "开关闸车道", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE) @ApiOperation(tags = {"后台-车道"},value = "开关闸车道") @PostMapping(value = "/openOrDown") public AjaxResult<String> openOrDown(@RequestBody TVehicleRamp dto) { -- Gitblit v1.7.1