From 3470b33466cfd9ce423a46220ff81f734fae9fb7 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 20 六月 2025 11:32:34 +0800
Subject: [PATCH] 预警分析管理-主属性和配置属性

---
 src/main/java/com/whyc/controller/AlmParamController.java |   37 +++++++++++++------------------------
 1 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/whyc/controller/AlmParamController.java b/src/main/java/com/whyc/controller/AlmParamController.java
index 5d4095c..6b6483b 100644
--- a/src/main/java/com/whyc/controller/AlmParamController.java
+++ b/src/main/java/com/whyc/controller/AlmParamController.java
@@ -35,11 +35,6 @@
     @Autowired
     private PwrdevAlarmParamService pwrAlmparamService;
 
-    @Autowired
-    private BattalarmDataService battalarmDataService;
-
-    @Autowired
-    private BattRealdataIdService battRealdataIdService;
 
 
     /*@PostMapping("getBattAlmParam")
@@ -52,9 +47,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 +85,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){
@@ -116,20 +119,6 @@
             }
         }
         return new Response<List<AlarmParam>>().set(1,list);
-    }
-
-    @PostMapping("getBattAlmAnalyse")
-    @ApiOperation("棰勮鍒嗘瀽绠$悊-鐢垫睜鍛婅")
-    public Response getBattAlmAnalyse(@RequestBody AlmAnalyseDto dto){
-        Integer uid=ActionUtil.getUser().getId();
-        dto.setUid(uid);
-        return battalarmDataService.getBattAlmAnalyse(dto);
-    }
-
-    @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);
     }
 
 }
\ No newline at end of file

--
Gitblit v1.9.1