From e77384436e2f6d454bcf2c4bb66f70bb6a2024a6 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 19 六月 2025 16:39:26 +0800
Subject: [PATCH] 3.1预警设置界面用于导出的查询

---
 src/main/java/com/whyc/controller/AlmParamController.java |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/whyc/controller/AlmParamController.java b/src/main/java/com/whyc/controller/AlmParamController.java
index 04445f4..b3552d3 100644
--- a/src/main/java/com/whyc/controller/AlmParamController.java
+++ b/src/main/java/com/whyc/controller/AlmParamController.java
@@ -2,22 +2,24 @@
 
 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
@@ -33,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")
@@ -59,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){
@@ -93,4 +126,18 @@
         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