From e7a970151c40925eefa1fe837ac06e93594fcf82 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 26 五月 2026 09:56:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_娌冲崡楣ゅ' into dev_pro_娌冲崡楣ゅ
---
src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java b/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java
index f0c8310..7fdc5ca 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java
@@ -3,12 +3,14 @@
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.procurementrecord.pojo.InboundManagement;
import com.ruoyi.procurementrecord.service.InboundManagementService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -21,7 +23,7 @@
* @date : 2025/9/16 16:38
*/
@RestController
-@Api(tags = "鍒拌揣绠＄悊")
+@Tag(name = "鍒拌揣绠＄悊")
@RequestMapping("/inboundManagement")
@AllArgsConstructor
public class InboundManagementController extends BaseController {
@@ -29,14 +31,15 @@
private InboundManagementService inboundManagementService;
@GetMapping("/listPage")
- @ApiOperation("鍒拌揣绠＄悊-鏌ヨ")
+ @Operation(summary = "鍒拌揣绠＄悊-鏌ヨ")
public AjaxResult listPage(Page page, InboundManagement inboundManagement) {
IPage<InboundManagement> result = inboundManagementService.listPage(page, inboundManagement);
return AjaxResult.success(result);
}
+ @Log(title = "鏂板鍒拌揣绠＄悊", businessType = BusinessType.INSERT)
@PostMapping("/add")
- @ApiOperation("鍒拌揣绠＄悊-娣诲姞")
+ @Operation(summary = "鍒拌揣绠＄悊-娣诲姞")
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody InboundManagement inboundManagement) {
inboundManagement.setArrivalTime(new Date());
@@ -44,16 +47,18 @@
return result ? AjaxResult.success() : AjaxResult.error();
}
+ @Log(title = "淇敼鍒拌揣绠＄悊", businessType = BusinessType.UPDATE)
@PostMapping("/update")
- @ApiOperation("鍒拌揣绠＄悊-淇敼")
+ @Operation(summary = "鍒拌揣绠＄悊-淇敼")
@Transactional(rollbackFor = Exception.class)
public AjaxResult update(@RequestBody InboundManagement inboundManagement) {
boolean result = inboundManagementService.updateById(inboundManagement);
return result ? AjaxResult.success() : AjaxResult.error();
}
+ @Log(title = "鍒犻櫎鍒拌揣绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/del")
- @ApiOperation("鍒拌揣绠＄悊-鍒犻櫎")
+ @Operation(summary = "鍒拌揣绠＄悊-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
public AjaxResult del(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
--
Gitblit v1.9.3