From 600128eb020f4d162c27798d96b955406081855b Mon Sep 17 00:00:00 2001 From: yaowanxin <3588231647@qq.com> Date: 星期三, 20 八月 2025 09:15:10 +0800 Subject: [PATCH] 修改完善2 --- src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java index 5229292..bed5510 100644 --- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java +++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java @@ -1,5 +1,6 @@ package com.ruoyi.warehouse.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -7,6 +8,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.framework.web.controller.BaseController; import com.ruoyi.framework.web.domain.AjaxResult; +import com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto; import com.ruoyi.warehouse.pojo.WarehouseGoodsShelves; import com.ruoyi.warehouse.service.WarehouseGoodsShelvesService; import io.swagger.annotations.Api; @@ -22,33 +24,31 @@ public class WarehouseGoodsShelvesController extends BaseController { @Autowired private WarehouseGoodsShelvesService warehouseGoodsShelvesService; - @GetMapping("/listPage") - @ApiOperation("鍟嗗搧璐ф灦-鍒嗛〉鏌ヨ") - @Log(title = "鍟嗗搧璐ф灦-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER) - public AjaxResult listPage(Page page, WarehouseGoodsShelves warehouseGoodsShelves) { - IPage<WarehouseGoodsShelves> listPage = warehouseGoodsShelvesService.listPage(page, warehouseGoodsShelves); - return AjaxResult.success(listPage); + + @GetMapping("/listById") + @ApiOperation("鍟嗗搧璐ф灦-鏌ヨ") + @Log(title = "鍟嗗搧璐ф灦-鏌ヨ", businessType = BusinessType.OTHER) + public AjaxResult listById(WarehouseGoodsShelves warehouseGoodsShelves) { + List<WarehouseGoodsShelvesDto> list = warehouseGoodsShelvesService.findList(warehouseGoodsShelves); + return AjaxResult.success(list); } @PostMapping("/add") @ApiOperation("鍟嗗搧璐ф灦-娣诲姞") @Log(title = "鍟嗗搧璐ф灦-娣诲姞", businessType = BusinessType.INSERT) public AjaxResult add(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) { - boolean save = warehouseGoodsShelvesService.add(warehouseGoodsShelves); - return save ? AjaxResult.success("娣诲姞鎴愬姛") : AjaxResult.error("娣诲姞澶辫触"); + return AjaxResult.success(warehouseGoodsShelvesService.add(warehouseGoodsShelves)); } - @PostMapping("/update") + @PutMapping("/update") @ApiOperation("鍟嗗搧璐ф灦-鏇存柊") @Log(title = "鍟嗗搧璐ф灦-鏇存柊", businessType = BusinessType.UPDATE) public AjaxResult update(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) { - boolean update = warehouseGoodsShelvesService.updateRowcolById(warehouseGoodsShelves); - return update ? AjaxResult.success("鏇存柊鎴愬姛") : AjaxResult.error("鏇存柊澶辫触"); + return AjaxResult.success(warehouseGoodsShelvesService.updateRowcolById(warehouseGoodsShelves)); } @DeleteMapping("/delete") @ApiOperation("鍟嗗搧璐ф灦-鍒犻櫎") @Log(title = "鍟嗗搧璐ф灦-鍒犻櫎", businessType = BusinessType.DELETE) public AjaxResult delete(@RequestBody List<Long> ids) { if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D"); - boolean remove = warehouseGoodsShelvesService.deleteByIds(ids); - return remove ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触"); + return AjaxResult.success(warehouseGoodsShelvesService.deleteByIds(ids)); } } -- Gitblit v1.9.3