From 2aa0dd9c34c6be86e70b1d2d939d3660552cb514 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 17 九月 2025 14:44:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetWarehouseController.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetWarehouseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetWarehouseController.java
index a12aa88..071962b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetWarehouseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetWarehouseController.java
@@ -1,8 +1,26 @@
package com.ruoyi.web.controller.api;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.dto.asset.AssetWarehouseDTO;
+import com.ruoyi.system.query.AssetWarehousePageQuery;
+import com.ruoyi.system.service.AssetWarehouseService;
+import com.ruoyi.system.vo.asset.AssetWarehouseVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
/**
* <p>
@@ -12,9 +30,41 @@
* @author WuGuanFengYue
* @since 2025-09-15
*/
+@Api(tags = {"资产-仓库管理相关接口"})
+@Validated
@RestController
@RequestMapping("/asset-warehouse")
+@RequiredArgsConstructor
public class AssetWarehouseController {
+ private final AssetWarehouseService assetWarehouseService;
+
+ @ApiOperation("获取仓库分页列表")
+ @PostMapping("/page-list")
+ public R<IPage<AssetWarehouseVO>> getPageList(@RequestBody AssetWarehousePageQuery pageQuery) {
+ IPage<AssetWarehouseVO> page = assetWarehouseService.getPageList(pageQuery);
+ return R.ok(page);
+ }
+
+ @ApiOperation("新增仓库")
+ @PostMapping("/add")
+ public R<Void> addWarehouse(@Valid @RequestBody AssetWarehouseDTO dto) {
+ assetWarehouseService.add(dto);
+ return R.ok();
+ }
+
+ @ApiOperation("编辑仓库")
+ @PutMapping("/add")
+ public R<Void> editWarehouse(@Valid @RequestBody AssetWarehouseDTO dto) {
+ assetWarehouseService.edit(dto);
+ return R.ok();
+ }
+
+ @ApiOperation("删除仓库")
+ @DeleteMapping("/{id}")
+ public R<Void> deleteWarehouse(@ApiParam(name = "id", value = "仓库ID", required = true) @PathVariable Integer id) {
+ assetWarehouseService.delete(id);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1