From 6f888b234148d1a4dbd1e6c28a8d9ed85ebfda09 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 29 一月 2026 18:11:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

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

diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index 82dc3b3..bf64b65 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -132,6 +132,41 @@
         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")
     @Log(title = "閿�鍞�-閲囪喘-搴撳瓨鏁版嵁", businessType = BusinessType.OTHER)

--
Gitblit v1.9.3