From 64f046ed41c2ae607dc065c82b6d454f64e90584 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 19 六月 2025 21:52:33 +0800
Subject: [PATCH] 预警分析管理-电源告警

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

diff --git a/src/main/java/com/whyc/controller/AlmParamController.java b/src/main/java/com/whyc/controller/AlmParamController.java
index 5d4095c..a2bc13e 100644
--- a/src/main/java/com/whyc/controller/AlmParamController.java
+++ b/src/main/java/com/whyc/controller/AlmParamController.java
@@ -39,6 +39,9 @@
     private BattalarmDataService battalarmDataService;
 
     @Autowired
+    private PwrdevAlarmService pwrdevAlarmService;
+
+    @Autowired
     private BattRealdataIdService battRealdataIdService;
 
 
@@ -52,9 +55,14 @@
     @PostMapping("getBattAlmParam")
     @ApiOperation("鑾峰彇鐢垫睜鍛婅鍙傛暟")
     public Response getBattAlmParam(@RequestBody ParamAlmDto dto){
-        Integer uid=ActionUtil.getUser().getId();
-        dto.setUid(uid);
         return battAlmparamService.getBattAlmParam(dto);
+    }
+
+    @GetMapping("getBattAlmParamToExport")
+    @ApiOperation("鑾峰彇鐢垫睜鍛婅鍙傛暟(鏃犲弬鐢ㄤ簬瀵煎嚭)")
+    public Response getBattAlmParamToExport(){
+        Integer uid=ActionUtil.getUser().getId();
+        return battAlmparamService.getBattAlmParamToExport(uid);
     }
 
     @PostMapping("setBattAlmParam")
@@ -85,12 +93,15 @@
     @PostMapping("getPwrAlmParam")
     @ApiOperation("鑾峰彇鐢垫簮鍛婅鍙傛暟")
     public Response getPwrAlmParam(@RequestBody ParamAlmDto dto){
-        Integer uid=ActionUtil.getUser().getId();
-        dto.setUid(uid);
         return pwrAlmparamService.getPwrAlmParam(dto);
     }
 
-
+    @GetMapping("getPwrAlmParamToExport")
+    @ApiOperation("鑾峰彇鐢垫簮鍛婅鍙傛暟(鏃犲弬鐢ㄤ簬瀵煎嚭)")
+    public Response getPwrAlmParamToExport(){
+        Integer uid=ActionUtil.getUser().getId();
+        return pwrAlmparamService.getPwrAlmParamToExport(uid);
+    }
     @PostMapping("setPwrAlmParam")
     @ApiOperation("淇敼鐢垫簮鍛婅鍙傛暟")
     public Response setPwrAlmParam(@RequestBody List<PwrdevAlarmParam> almparamList){
@@ -127,9 +138,17 @@
     }
 
     @GetMapping("getBattHisRealInAlm")
-    @ApiOperation("鐢垫睜鍛婅鐐瑰嚮鍏蜂綋鍛婅淇℃伅鏌ョ湅浠庡憡璀﹀紑濮嬫椂闂村埌鐜板湪鐨勫巻鍙插疄鏃舵暟鎹�")
-    public Response getBattHisRealInAlm(@RequestParam Integer battgroupId,@RequestParam String startTime,@RequestParam(required = false) Integer monNum) throws ParseException, InterruptedException {
-        return battRealdataIdService.getBattHisRealInAlm(battgroupId,startTime,monNum);
+    @ApiOperation("棰勮鍒嗘瀽绠$悊-涓诲睘鎬у拰鍒嗘瀽灞炴��")
+    public Response getBattHisRealInAlm(@RequestParam Integer battgroupId,@RequestParam String startTime,@RequestParam(required = false) Integer almId) throws ParseException, InterruptedException {
+        return battRealdataIdService.getBattHisRealInAlm(battgroupId,startTime,almId);
+    }
+
+    @PostMapping("getPwrtAlmAnalyse")
+    @ApiOperation("棰勮鍒嗘瀽绠$悊-鐢垫簮鍛婅")
+    public Response getPwrtAlmAnalyse(@RequestBody AlmAnalyseDto dto){
+        Integer uid=ActionUtil.getUser().getId();
+        dto.setUid(uid);
+        return pwrdevAlarmService.getPwrtAlmAnalyse(dto);
     }
 
 }
\ No newline at end of file

--
Gitblit v1.9.1