From 28cf22aaff7f092256db2ad6df699e17426f62ea Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 30 四月 2026 16:34:27 +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/aftersalesservice/controller/AfterSalesServiceController.java | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
index fdbc447..5f4c3a8 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
@@ -15,14 +15,14 @@
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.service.ISalesLedgerService;
-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 jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -32,22 +32,18 @@
* @date : 2025/7/30 9:27
*/
@RestController
-@Api(tags = "鍞悗鏈嶅姟")
+@Tag(name = "鍞悗鏈嶅姟")
@RequestMapping("/afterSalesService")
+@AllArgsConstructor
public class AfterSalesServiceController extends BaseController {
- @Autowired
private AfterSalesServiceService afterSalesServiceService;
-
- @Autowired
private SysUserMapper sysUserMapper;
-
- @Autowired
private ISalesLedgerService salesLedgerService;
@GetMapping("/listPage")
- @ApiOperation("鍞悗鏈嶅姟-鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍞悗鏈嶅姟-鍒嗛〉鏌ヨ")
@Log(title = "鍞悗鏈嶅姟-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listPage(Page page, AfterSalesServiceNewDto afterSalesService) {
IPage<AfterSalesServiceNewDto> listPage = afterSalesServiceService.listPage(page, afterSalesService);
@@ -56,7 +52,7 @@
@Log(title = "鍞悗鏈嶅姟-鍙嶉鐧昏", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- @ApiOperation("鍞悗鏈嶅姟-鍙嶉鐧昏")
+ @Operation(summary = "鍞悗鏈嶅姟-鍙嶉鐧昏")
public void export(HttpServletResponse response) {
Page page = new Page(-1,-1);
AfterSalesServiceNewDto afterSalesService = new AfterSalesServiceNewDto();
@@ -74,7 +70,7 @@
@Log(title = "鍞悗鏈嶅姟-鍞悗澶勭悊", businessType = BusinessType.EXPORT)
@PostMapping("/exportTwo")
- @ApiOperation("鍞悗鏈嶅姟-鍞悗澶勭悊")
+ @Operation(summary = "鍞悗鏈嶅姟-鍞悗澶勭悊")
public void exportTwo(HttpServletResponse response) {
Page page = new Page(-1,-1);
AfterSalesServiceNewDto afterSalesService = new AfterSalesServiceNewDto();
@@ -87,14 +83,14 @@
}
@PostMapping("/add")
- @ApiOperation("鍞悗鏈嶅姟-鏂板")
+ @Operation(summary = "鍞悗鏈嶅姟-鏂板")
@Log(title = "鍞悗鏈嶅姟-鏂板", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody AfterSalesServiceNewDto afterSalesServiceNewDto) {
return afterSalesServiceService.addAfterSalesServiceDto(afterSalesServiceNewDto) ? AjaxResult.success() : AjaxResult.error();
}
@PostMapping("/update")
- @ApiOperation("鍞悗鏈嶅姟-淇敼")
+ @Operation(summary = "鍞悗鏈嶅姟-淇敼")
@Log(title = "鍞悗鏈嶅姟-淇敼", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody AfterSalesServiceNewDto afterSalesServiceNewDto) {
if (afterSalesServiceNewDto.getProductModelIdList() != null && afterSalesServiceNewDto.getProductModelIdList().isEmpty() ) {
@@ -108,7 +104,7 @@
}
@DeleteMapping("/delete")
- @ApiOperation("鍞悗鏈嶅姟-鍒犻櫎")
+ @Operation(summary = "鍞悗鏈嶅姟-鍒犻櫎")
@Log(title = "鍞悗鏈嶅姟-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
@@ -119,7 +115,7 @@
}
@PostMapping("/dispose")
- @ApiOperation("鍞悗鏈嶅姟-澶勭悊")
+ @Operation(summary = "鍞悗鏈嶅姟-澶勭悊")
@Log(title = "鍞悗鏈嶅姟-澶勭悊", businessType = BusinessType.UPDATE)
public AjaxResult dispose(@RequestBody AfterSalesService afterSalesService) {
AfterSalesService byId = afterSalesServiceService.getById(afterSalesService.getId());
@@ -135,7 +131,7 @@
@GetMapping("listSalesLedger")
- @ApiOperation("鍞悗鏈嶅姟-鑾峰彇閿�鍞彴璐�")
+ @Operation(summary = "鍞悗鏈嶅姟-鑾峰彇閿�鍞彴璐�")
public AjaxResult listSalesLedger(SalesLedgerDto salesLedgerDto, Page page) {
IPage<SalesLedgerDto> list = salesLedgerService.listSalesLedger(salesLedgerDto,page);
return AjaxResult.success(list);
@@ -143,12 +139,12 @@
@GetMapping("getById")
- @ApiOperation("鍞悗鏈嶅姟-鏍规嵁id鑾峰彇璇︽儏")
+ @Operation(summary = "鍞悗鏈嶅姟-鏍规嵁id鑾峰彇璇︽儏")
public AjaxResult getById(Long id) {
return AjaxResult.success(afterSalesServiceService.getAfterSalesServiceNewDtoById(id));
}
- @ApiOperation("鍞悗鏈嶅姟-缁熻宸ュ崟鎯呭喌")
+ @Operation(summary = "鍞悗鏈嶅姟-缁熻宸ュ崟鎯呭喌")
@GetMapping("count")
public AjaxResult count() {
return AjaxResult.success(afterSalesServiceService.countAfterSalesService());
--
Gitblit v1.9.3