From 1b3d13f691957d4fffdfb3671dc09f66b6e3dfd0 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 23 四月 2026 10:15:33 +0800
Subject: [PATCH] yaml

---
 src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java |   22 ++++++----------------
 1 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
index f373b88..fa40a50 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
@@ -1,18 +1,16 @@
 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;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 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;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -20,23 +18,15 @@
 @RestController
 @Api(tags = "鍟嗗搧璐ф灦")
 @RequestMapping("/warehouse/goodsShelves")
+@AllArgsConstructor
 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(Long warehouseId) {
-        List<WarehouseGoodsShelves> list = warehouseGoodsShelvesService.list(new QueryWrapper<WarehouseGoodsShelves>().lambda()
-                .eq(WarehouseGoodsShelves::getWarehouseId, warehouseId));
+    public AjaxResult listById(WarehouseGoodsShelves warehouseGoodsShelves) {
+        List<WarehouseGoodsShelvesDto> list = warehouseGoodsShelvesService.findList(warehouseGoodsShelves);
         return AjaxResult.success(list);
     }
     @PostMapping("/add")
@@ -45,7 +35,7 @@
     public AjaxResult add(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
         return AjaxResult.success(warehouseGoodsShelvesService.add(warehouseGoodsShelves));
     }
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation("鍟嗗搧璐ф灦-鏇存柊")
     @Log(title = "鍟嗗搧璐ф灦-鏇存柊", businessType = BusinessType.UPDATE)
     public AjaxResult update(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {

--
Gitblit v1.9.3