From 8f4db901aa772a808c243f8a4e39522f6f09d5da Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 21 八月 2025 13:10:22 +0800
Subject: [PATCH] 修改完善3

---
 src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java |   48 ++++++++++++++++++++++++++++++++++--------------
 1 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
index e70cce9..586c330 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
@@ -8,6 +8,7 @@
 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;
@@ -17,7 +18,9 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/documentation")
@@ -29,43 +32,60 @@
     @ApiOperation("鏂囨。淇℃伅琛�-鍒嗛〉鏌ヨ")
     @Log(title = "鏂囨。淇℃伅琛�-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
     public AjaxResult listPage(Page page, Documentation documentation) {
-        IPage<Documentation> listPage = documentationService.listPage(page, documentation);
-        return AjaxResult.success(listPage);
+        IPage<DocumentationDto> list = documentationService.listPage(page, documentation);
+        return AjaxResult.success(list);
     }
     @GetMapping("/list")
-    @ApiOperation("鏂囨。淇℃伅琛�")
-    @Log(title = "鏂囨。淇℃伅琛�", businessType = BusinessType.OTHER)
+    @ApiOperation("鏂囨。淇℃伅琛ㄦ煡璇�")
+    @Log(title = "鏂囨。淇℃伅琛ㄦ煡璇�", businessType = BusinessType.OTHER)
     public AjaxResult list() {
-        List<Documentation> list = documentationService.list();
+        List<DocumentationDto> list = documentationService.listAll();
         return AjaxResult.success(list);
     }
     @PostMapping("/add")
     @ApiOperation("鏂囨。淇℃伅琛�-娣诲姞")
     @Log(title = "鏂囨。淇℃伅琛�-娣诲姞", businessType = BusinessType.INSERT)
     public AjaxResult add(@RequestBody Documentation documentation) {
-        boolean save = documentationService.save(documentation);
-        return save ? AjaxResult.success("娣诲姞鎴愬姛") : AjaxResult.error("娣诲姞澶辫触");
+        return AjaxResult.success(documentationService.save(documentation));
     }
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation("鏂囨。淇℃伅琛�-鏇存柊")
     @Log(title = "鏂囨。淇℃伅琛�-鏇存柊", businessType = BusinessType.UPDATE)
     public AjaxResult update(@RequestBody Documentation documentation) {
         return AjaxResult.success(documentationService.updateById(documentation));
     }
-    @PostMapping("/delete")
+    @DeleteMapping("/delete")
     @ApiOperation("鏂囨。淇℃伅琛�-鍒犻櫎")
     @Log(title = "鏂囨。淇℃伅琛�-鍒犻櫎", businessType = BusinessType.DELETE)
     public AjaxResult delete(@RequestBody List<Long> ids) {
         if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
-        boolean remove = documentationService.removeBatchByIds(ids);
-//        boolean remove = documentationService.deleteByIds(ids);
-        return remove ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
+        return AjaxResult.success(documentationService.deleteByIds(ids));
     }
 
     @PostMapping("/export")
     @ApiOperation("鏂囨。淇℃伅琛�-瀵煎嚭")
     @Log(title = "鏂囨。淇℃伅琛�-瀵煎嚭", businessType = BusinessType.EXPORT)
-    public void export(HttpServletResponse response) {
-        documentationService.export(response);
+    public void export(HttpServletResponse response,Documentation documentation ) {
+        documentationService.export(response,documentation);
+    }
+    @ApiOperation("鏂囨。淇℃伅琛�-缁熻")
+    @GetMapping("/overview")
+    public AjaxResult getOverviewStatistics() {
+        Map<String, Object> result = new HashMap<>();
+        result.put("totalDocsCount", documentationService.getTotalDocsCount());
+        result.put("categoryNumCount", documentationService.getCategoryNumCount());
+        result.put("borrowedDocsCount", documentationService.getBorrowedDocsCount());
+        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() {
+        return AjaxResult.success(documentationService.getStatusDistribution());
     }
 }

--
Gitblit v1.9.3