From 6e8bf72c3e029a22eaa266bf562af1f4737bf209 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 25 四月 2026 15:14:50 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/basic/controller/CustomerPrivatePoolController.java | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerPrivatePoolController.java b/src/main/java/com/ruoyi/basic/controller/CustomerPrivatePoolController.java
index 8b8edf7..83597cf 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerPrivatePoolController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerPrivatePoolController.java
@@ -3,21 +3,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.CustomerPrivatePoolDto;
-import com.ruoyi.basic.pojo.Customer;
-import com.ruoyi.basic.pojo.CustomerPrivatePool;
import com.ruoyi.basic.service.CustomerPrivatePoolService;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
/**
* <p>
@@ -28,16 +20,16 @@
* @since 2026-04-16 04:43:00
*/
@RestController
-@Api(tags = "瀹㈡埛锛堢娴凤級")
+@Tag(name = "瀹㈡埛锛堢娴凤級")
@RequestMapping("/customerPrivatePool")
+@AllArgsConstructor
public class CustomerPrivatePoolController {
- @Autowired
- private CustomerPrivatePoolService customerPrivatePoolService;
+ private final CustomerPrivatePoolService customerPrivatePoolService;
@GetMapping("/listPage")
- @ApiOperation("瀹㈡埛锛堢娴凤級鍒楄〃")
+ @Operation(summary = "瀹㈡埛锛堢娴凤級鍒楄〃")
public R listPage(CustomerPrivatePoolDto customerPrivatePoolDto, Page<CustomerPrivatePoolDto> page){
//鏌ヨ褰撳墠鐢ㄦ埛鐨勫鎴蜂俊鎭�
customerPrivatePoolDto.setBoundId(SecurityUtils.getUserId());
@@ -46,7 +38,7 @@
}
@PostMapping("/add")
- @ApiOperation("鍒嗛厤瀹㈡埛锛堢娴凤級")
+ @Operation(summary = "鍒嗛厤瀹㈡埛锛堢娴凤級")
public R add(@RequestBody CustomerPrivatePoolDto customerPrivatePool){
boolean result = customerPrivatePoolService.add(customerPrivatePool);
return R.ok(result);
@@ -59,28 +51,28 @@
@DeleteMapping("/delete/{id}")
- @ApiOperation("鍒犻櫎瀹㈡埛锛堢娴凤級")
+ @Operation(summary = "鍒犻櫎瀹㈡埛锛堢娴凤級")
public R delete(@PathVariable Long id){
boolean result = customerPrivatePoolService.deleteCustomerPrivatePool(id);
return R.ok(result);
}
@PostMapping("/together")
- @ApiOperation("鍏变韩")
+ @Operation(summary = "鍏变韩")
public R together( @RequestBody CustomerPrivatePoolDto customerPrivatePool){
boolean result = customerPrivatePoolService.together(customerPrivatePool);
return R.ok(result);
}
@GetMapping("/info/{id}")
- @ApiOperation("璇︽儏")
+ @Operation(summary = "璇︽儏")
public R getInfo(@PathVariable Long id){
CustomerPrivatePoolDto customerPrivatePool = customerPrivatePoolService.getInfo(id);
return R.ok(customerPrivatePool);
}
@GetMapping("/getbyId/{id}")
- @ApiOperation("璇︽儏")
+ @Operation(summary = "璇︽儏")
public R getbyId(@PathVariable Long id){
CustomerPrivatePoolDto customerPrivatePool = customerPrivatePoolService.getbyId(id);
return R.ok(customerPrivatePool);
--
Gitblit v1.9.3