From 669906b87674d4b60a6fd5ea3a938c636952dbc2 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 19 六月 2025 21:08:36 +0800
Subject: [PATCH] 预警分析管理-主属性和分析属性

---
 src/main/java/com/whyc/controller/AlmParamController.java |   65 +++++++++++++++++++++++++++-----
 1 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/whyc/controller/AlmParamController.java b/src/main/java/com/whyc/controller/AlmParamController.java
index 664352f..09babd2 100644
--- a/src/main/java/com/whyc/controller/AlmParamController.java
+++ b/src/main/java/com/whyc/controller/AlmParamController.java
@@ -1,25 +1,25 @@
 package com.whyc.controller;
 
-import com.whyc.constant.BattStateEnum;
-import com.whyc.constant.DevAlarmEnum;
-import com.whyc.constant.PowerAlarmEnum;
+import com.whyc.constant.*;
 import com.whyc.dto.AlarmParam;
+import com.whyc.dto.Param.AlmAnalyseDto;
+import com.whyc.dto.Param.ParamAlmDto;
 import com.whyc.dto.Real.AlmDto;
 import com.whyc.dto.Response;
 import com.whyc.dto.Station.Power;
 import com.whyc.pojo.db_param.BattAlmparam;
 import com.whyc.pojo.db_param.DevAlmparam;
 import com.whyc.pojo.db_pwrdev_alarm.PwrdevAlarmParam;
-import com.whyc.service.BattAlmparamService;
-import com.whyc.service.DevAlmparamService;
-import com.whyc.service.PwrdevAlarmParamService;
+import com.whyc.service.*;
 import com.whyc.util.ActionUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @RestController
@@ -35,12 +35,31 @@
     @Autowired
     private PwrdevAlarmParamService pwrAlmparamService;
 
+    @Autowired
+    private BattalarmDataService battalarmDataService;
 
-    @PostMapping("getBattAlmParam")
+    @Autowired
+    private BattRealdataIdService battRealdataIdService;
+
+
+    /*@PostMapping("getBattAlmParam")
     @ApiOperation("鑾峰彇鐢垫睜鍛婅鍙傛暟")
     public Response getBattAlmParam(@RequestBody AlmDto almDto){
         almDto.setUid(ActionUtil.getUser().getId());
         return battAlmparamService.getBattAlmParam(almDto);
+    }*/
+
+    @PostMapping("getBattAlmParam")
+    @ApiOperation("鑾峰彇鐢垫睜鍛婅鍙傛暟")
+    public Response getBattAlmParam(@RequestBody ParamAlmDto dto){
+        return battAlmparamService.getBattAlmParam(dto);
+    }
+
+    @GetMapping("getBattAlmParamToExport")
+    @ApiOperation("鑾峰彇鐢垫睜鍛婅鍙傛暟(鏃犲弬鐢ㄤ簬瀵煎嚭)")
+    public Response getBattAlmParamToExport(){
+        Integer uid=ActionUtil.getUser().getId();
+        return battAlmparamService.getBattAlmParamToExport(uid);
     }
 
     @PostMapping("setBattAlmParam")
@@ -61,13 +80,25 @@
         return devAlmparamService.setDevAlmParam(almparamList);
     }
 
-    @PostMapping("getPwrAlmParam")
+    /*@PostMapping("getPwrAlmParam")
     @ApiOperation("鑾峰彇鐢垫簮鍛婅鍙傛暟")
     public Response getPwrAlmParam(@RequestBody AlmDto almDto){
         almDto.setUid(ActionUtil.getUser().getId());
         return pwrAlmparamService.getPwrAlmParam(almDto);
+    }*/
+
+    @PostMapping("getPwrAlmParam")
+    @ApiOperation("鑾峰彇鐢垫簮鍛婅鍙傛暟")
+    public Response getPwrAlmParam(@RequestBody ParamAlmDto dto){
+        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){
@@ -88,11 +119,25 @@
                 list.add(new AlarmParam(devAlarmEnum.getStateId(),devAlarmEnum.getStateName()));
             }
         }else{ //鐢垫睜鍛婅
-            for (BattStateEnum battStateEnum:BattStateEnum.values()){
-                list.add(new AlarmParam(battStateEnum.getStateId(),battStateEnum.getStateName()));
+            for (BattSingalIdEnum battSignalIdEnum:BattSingalIdEnum.values()){
+                list.add(new AlarmParam(battSignalIdEnum.getStateId(),battSignalIdEnum.getStateName()));
             }
         }
         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 almId) throws ParseException, InterruptedException {
+        return battRealdataIdService.getBattHisRealInAlm(battgroupId,startTime,almId);
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.9.1