From 0ec581bd195ea9c06c38ef4f91ac7497a87b8ca3 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 22 四月 2026 17:49:54 +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/warehouse/controller/DocumentationController.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
index a525309..ce45642 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
@@ -6,18 +6,16 @@
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.DocumentationDto;
import com.ruoyi.warehouse.pojo.Documentation;
-import com.ruoyi.warehouse.pojo.Warehouse;
import com.ruoyi.warehouse.service.DocumentationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -25,9 +23,10 @@
@RestController
@RequestMapping("/documentation")
@Api(tags = "鏂囨。淇℃伅琛�")
+@AllArgsConstructor
public class DocumentationController extends BaseController {
- @Autowired
private DocumentationService documentationService;
+
@GetMapping("/listPage")
@ApiOperation("鏂囨。淇℃伅琛�-鍒嗛〉鏌ヨ")
@Log(title = "鏂囨。淇℃伅琛�-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@@ -35,6 +34,7 @@
IPage<DocumentationDto> list = documentationService.listPage(page, documentation);
return AjaxResult.success(list);
}
+
@GetMapping("/list")
@ApiOperation("鏂囨。淇℃伅琛ㄦ煡璇�")
@Log(title = "鏂囨。淇℃伅琛ㄦ煡璇�", businessType = BusinessType.OTHER)
@@ -42,32 +42,36 @@
List<DocumentationDto> list = documentationService.listAll();
return AjaxResult.success(list);
}
+
@PostMapping("/add")
@ApiOperation("鏂囨。淇℃伅琛�-娣诲姞")
@Log(title = "鏂囨。淇℃伅琛�-娣诲姞", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody Documentation documentation) {
return AjaxResult.success(documentationService.save(documentation));
}
+
@PutMapping("/update")
@ApiOperation("鏂囨。淇℃伅琛�-鏇存柊")
@Log(title = "鏂囨。淇℃伅琛�-鏇存柊", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody Documentation documentation) {
return AjaxResult.success(documentationService.updateById(documentation));
}
+
@DeleteMapping("/delete")
@ApiOperation("鏂囨。淇℃伅琛�-鍒犻櫎")
@Log(title = "鏂囨。淇℃伅琛�-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
return AjaxResult.success(documentationService.deleteByIds(ids));
}
@PostMapping("/export")
@ApiOperation("鏂囨。淇℃伅琛�-瀵煎嚭")
@Log(title = "鏂囨。淇℃伅琛�-瀵煎嚭", businessType = BusinessType.EXPORT)
- public void export(HttpServletResponse response,Documentation documentation ) {
- documentationService.export(response,documentation);
+ public void export(HttpServletResponse response, Documentation documentation) {
+ documentationService.export(response, documentation);
}
+
@ApiOperation("鏂囨。淇℃伅琛�-缁熻")
@GetMapping("/overview")
public AjaxResult getOverviewStatistics() {
@@ -78,11 +82,13 @@
result.put("monthlyAddedDocsCount", documentationService.getMonthlyAddedDocsCount());
return AjaxResult.success(result);
}
+
@ApiOperation("鏂囨。淇℃伅琛�-鍒嗙被缁熻")
@GetMapping("/category")
public AjaxResult getCategoryDistribution() {
return AjaxResult.success(documentationService.getCategoryDistribution());
}
+
@ApiOperation("鏂囨。淇℃伅琛�-鐘舵�佺粺璁�")
@GetMapping("/status")
public AjaxResult getStatusDistribution() {
--
Gitblit v1.9.3