From 9b85345450e2e194a84679bb6612f58a3124aee8 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 20 六月 2025 08:45:13 +0800
Subject: [PATCH] 预警分析管理-电源告警

---
 src/main/java/com/whyc/controller/AlmParamController.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/whyc/controller/AlmParamController.java b/src/main/java/com/whyc/controller/AlmParamController.java
index a2bc13e..d0ea906 100644
--- a/src/main/java/com/whyc/controller/AlmParamController.java
+++ b/src/main/java/com/whyc/controller/AlmParamController.java
@@ -138,9 +138,9 @@
     }
 
     @GetMapping("getBattHisRealInAlm")
-    @ApiOperation("棰勮鍒嗘瀽绠$悊-涓诲睘鎬у拰鍒嗘瀽灞炴��")
-    public Response getBattHisRealInAlm(@RequestParam Integer battgroupId,@RequestParam String startTime,@RequestParam(required = false) Integer almId) throws ParseException, InterruptedException {
-        return battRealdataIdService.getBattHisRealInAlm(battgroupId,startTime,almId);
+    @ApiOperation("棰勮鍒嗘瀽绠$悊-鐢垫睜缁勪富灞炴�у拰鍒嗘瀽灞炴��")
+    public Response getBattHisRealInAlm(@RequestParam Integer battgroupId,@RequestParam String startTime,@RequestParam(required = false) Integer almId,@RequestParam(required = false) Integer intervalTime) throws ParseException, InterruptedException {
+        return battRealdataIdService.getBattHisRealInAlm(battgroupId,startTime,almId,intervalTime);
     }
 
     @PostMapping("getPwrtAlmAnalyse")
@@ -151,4 +151,9 @@
         return pwrdevAlarmService.getPwrtAlmAnalyse(dto);
     }
 
+    @GetMapping("getPwrHisRealInAlm")
+    @ApiOperation("棰勮鍒嗘瀽绠$悊-鐢垫簮涓诲睘鎬у拰鍒嗘瀽灞炴��")
+    public Response getPwrHisRealInAlm(@RequestParam Integer powerId,@RequestParam String startTime,@RequestParam(required = false) Integer almId,@RequestParam(required = false) Integer intervalTime) throws ParseException, InterruptedException {
+        return pwrdevAlarmService.getPwrHisRealInAlm(powerId,startTime,almId,intervalTime);
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.1