From dc99e8a28673af16796bdd434d7f47b434b6a4d6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 27 三月 2026 18:18:42 +0800
Subject: [PATCH] 决策分析---能耗单耗

---
 src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java b/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
index 10d0701..1316d94 100644
--- a/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
+++ b/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
@@ -77,9 +77,22 @@
     /*******************************************姹囨�荤粺璁�*****************************************************************************************************************************************************************************/
 
     @GetMapping("/statistics")
-    @ApiOperation("鎸夋棩鏈堝勾姹囨�荤粺璁�")
+    @ApiOperation("鑳借�楃鐞�---鑳借�楃粺璁�")
     public R statistics(EnergyStatisticsVo energyStatisticsVo) {
         return R.ok(energyConsumptionDetailService.statistics(energyStatisticsVo));
     }
 
+    @GetMapping("/account")
+    @ApiOperation("鎴愭湰鏍哥畻---鑳借�楁垚鏈牳绠�")
+    public R account(EnergyStatisticsVo energyStatisticsVo) {
+        energyStatisticsVo.setType(null);
+        return R.ok(energyConsumptionDetailService.account(energyStatisticsVo));
+    }
+
+    @GetMapping("/collectEnergy")
+    @ApiOperation("鍐崇瓥鍒嗘瀽---鑳借�楀崟鑰�")
+    public R collectEnergy(EnergyStatisticsVo energyStatisticsVo) {
+        return R.ok(energyConsumptionDetailService.collectEnergy(energyStatisticsVo));
+    }
+
 }

--
Gitblit v1.9.3