From dfa9258c8879dbb0d1bfc00d7f939031d0bb623b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 29 一月 2026 18:32:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/java/com/ruoyi/home/controller/HomeController.java |   76 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index d6fe834..bf64b65 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -7,6 +7,7 @@
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.home.dto.*;
 import com.ruoyi.home.service.HomeService;
+import com.ruoyi.dto.MapDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -70,14 +71,14 @@
 
     @GetMapping("/supplierPurchaseRanking")
     @ApiOperation("渚涘簲鍟嗛噰璐帓鍚�")
-    public AjaxResult supplierPurchaseRanking(@RequestParam(value = "type", defaultValue = "0") Integer type) {
+    public AjaxResult supplierPurchaseRanking(@RequestParam(value = "type", defaultValue = "1") Integer type) {
         List<SupplierPurchaseRankingDto> list = homeService.supplierPurchaseRanking(type);
         return AjaxResult.success(list);
     }
 
     @GetMapping("/customerRevenueAnalysis")
     @ApiOperation("瀹㈡埛钀ユ敹璐＄尞鏁板�煎垎鏋�")
-    public AjaxResult customerRevenueAnalysis(@RequestParam("customerId") Long customerId, @RequestParam(value = "type", defaultValue = "0") Integer type) {
+    public AjaxResult customerRevenueAnalysis(@RequestParam("customerId") Long customerId, @RequestParam(value = "type", defaultValue = "1") Integer type) {
         CustomerRevenueAnalysisDto dto = homeService.customerRevenueAnalysis(customerId, type);
         return AjaxResult.success(dto);
     }
@@ -95,6 +96,76 @@
         List<CustomerContributionRankingDto> list = homeService.customerContributionRanking(type);
         return AjaxResult.success(list);
     }
+
+    @GetMapping("/productSalesAnalysis")
+    @ApiOperation("鍚勪骇鍝侀攢鍞噾棰濆垎鏋�")
+    public AjaxResult productSalesAnalysis() {
+        List<MapDto> list = homeService.productSalesAnalysis();
+        return AjaxResult.success(list);
+    }
+
+    @GetMapping("/rawMaterialPurchaseAmountRatio")
+    @ApiOperation("鍘熸潗鏂欓噰璐噾棰濆崰姣�")
+    public AjaxResult rawMaterialPurchaseAmountRatio(){
+        List<MapDto> list = homeService.rawMaterialPurchaseAmountRatio();
+        return AjaxResult.success(list);
+    }
+
+    @GetMapping("/salesPurchaseStorageProductCount")
+    @ApiOperation("閿�鍞�-閲囪喘-鍌ㄥ瓨浜у搧鏁�")
+    public AjaxResult salesPurchaseStorageProductCount(){
+        List<MapDto> list = homeService.salesPurchaseStorageProductCount();
+        return AjaxResult.success(list);
+    }
+
+    @GetMapping("/productInOutAnalysis")
+    @ApiOperation("浜у搧鍑哄叆搴撳垎鏋�")
+    public AjaxResult productInOutAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type){
+        List<Map<String, Object>> result = homeService.productInOutAnalysis(type);
+        return AjaxResult.success(result);
+    }
+
+    @GetMapping("/productTurnoverDays")
+    @ApiOperation("浜у搧鍛ㄨ浆澶╂暟")
+    public AjaxResult productTurnoverDays(){
+        List<MapDto> list = homeService.productTurnoverDays();
+        return AjaxResult.success(list);
+    }
+
+    @GetMapping("/incomeExpenseAnalysis")
+    @ApiOperation("鏀敹瀵规瘮鍒嗘瀽")
+    public AjaxResult incomeExpenseAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type) {
+        List<Map<String, Object>> result = homeService.incomeExpenseAnalysis(type);
+        return AjaxResult.success(result);
+    }
+
+    @GetMapping("/profitTrendAnalysis")
+    @ApiOperation("鍒╂鼎瓒嬪娍鍒嗘瀽")
+    public AjaxResult profitTrendAnalysis(){
+        List<MapDto> list = homeService.profitTrendAnalysis();
+        return AjaxResult.success(list);
+    }
+
+    @GetMapping("/expenseCompositionAnalysis")
+    @ApiOperation("鏋勬垚鍒嗘瀽")
+    public AjaxResult expenseCompositionAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type) {
+        List<MapDto> list = homeService.expenseCompositionAnalysis(type);
+        return AjaxResult.success(list);
+    }
+
+    @GetMapping("/monthlyIncome")
+    @ApiOperation("鏈堝害鏀跺叆")
+    public AjaxResult monthlyIncome(){
+        MonthlyIncomeDto dto = homeService.monthlyIncome();
+        return AjaxResult.success(dto);
+    }
+
+   @GetMapping("/monthlyExpenditure")
+   @ApiOperation("鏈堝害鏀嚭")
+   public AjaxResult monthlyExpenditure(){
+        MonthlyExpenditureDto dto = homeService.monthlyExpenditure();
+        return AjaxResult.success(dto);
+   }
 
     /********************************************************钀ラ攢閲囪喘绫�**************************************************/
     @GetMapping("/business")
@@ -130,6 +201,7 @@
     }
 
 
+    
     /********************************************************璐ㄩ噺绫�*****************************************************/
     @GetMapping("/qualityStatistics")
     @Log(title = "璐ㄩ噺鍒嗘瀽", businessType = BusinessType.OTHER)

--
Gitblit v1.9.3