From 82614438a300523cc13e22b6d175586a3ec8ed71 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 24 三月 2025 15:46:04 +0800
Subject: [PATCH] 电池告警实时和历史
---
src/main/java/com/whyc/controller/BattAlarmController.java | 40 ++++++++++++++++++----------------------
1 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BattAlarmController.java b/src/main/java/com/whyc/controller/BattAlarmController.java
index 95a2e77..33bd114 100644
--- a/src/main/java/com/whyc/controller/BattAlarmController.java
+++ b/src/main/java/com/whyc/controller/BattAlarmController.java
@@ -16,7 +16,7 @@
@RestController
@Api(tags = "鐢垫睜瀹炴椂鍛婅")
-@RequestMapping("battalarm")
+@RequestMapping("battAlarm")
public class BattAlarmController {
@Autowired
private BattAlarmService service;
@@ -24,39 +24,35 @@
@Autowired
private BattAlarmHisService hisService;
- @ApiOperation("鍦ㄧ敤鐢垫睜缁勫疄鏃舵帹閫佸憡璀︿俊鎭�")
+ /*@ApiOperation("鍦ㄧ敤鐢垫睜缁勫疄鏃舵帹閫佸憡璀︿俊鎭�")
@GetMapping("getResBattAlm")
- public Response getResBattAlm(@RequestParam(required = false) int binfId){
- Response res=service.getResBattAlm(binfId);
+ public Response getResBattAlm(@RequestParam(required = false) int battGroupId){
+ Response res=service.getResBattAlm(battGroupId);
return res;
- }
+ }*/
- @ApiOperation("鏌ヨ鐢垫睜鍛婅")
- @GetMapping("getBattAlarm")
- public Response getBattAlarm(@RequestParam(required = false) int almLevel,@RequestParam String startTime,@RequestParam String endTime
+ @ApiOperation("鏌ヨ鍛婅-鍒嗛〉")
+ @GetMapping("getPage")
+ public Response getPage(@RequestParam(required = false) Integer almLevel,@RequestParam String startTime,@RequestParam String endTime
,@RequestParam int pageNum,@RequestParam int pageSize){
- Response res=service.getBattAlarm(almLevel,startTime,endTime,pageNum,pageSize);
- return res;
+ return service.getPage(almLevel,startTime,endTime,pageNum,pageSize);
}
@ApiOperation("纭鍛婅")
@GetMapping("confirmAlarm")
public Response confirmAlarm(@RequestParam int num){
- Response res=service.confirmAlarm(num);
- return res;
+ return service.confirmAlarm(num);
}
- @ApiOperation("鍙栨秷鍛婅")
- @GetMapping("cancleAlarm")
- public Response cancleAlarm(@RequestParam int num){
- Response res=service.cancleAlarm(num);
- return res;
+ @ApiOperation("鍛婅纭鍙栨秷")
+ @GetMapping("cancelAlarm")
+ public Response cancelAlarm(@RequestParam int num){
+ return service.cancelAlarm(num);
}
- @ApiOperation("鏌ヨ鐢垫睜缁勫巻鍙叉椂闂村憡璀�")
- @GetMapping("getHisAlarm")
- public Response getHisAlarm(@RequestParam int binfId,@RequestParam String startTime,@RequestParam String endTime
+ @ApiOperation("鏌ヨ鐢垫睜鍛婅鍘嗗彶-鍒嗛〉")
+ @GetMapping("getHistoryPage")
+ public Response getHistoryPage(@RequestParam(required = false) Integer almLevel,@RequestParam String startTime,@RequestParam String endTime
, @RequestParam int pageNum, @RequestParam int pageSize) throws ParseException, InterruptedException {
- Response res=hisService.getHisAlarm(binfId,startTime,endTime,pageNum,pageSize);
- return res;
+ return hisService.getHistoryPage(almLevel,startTime,endTime,pageNum,pageSize);
}
}
\ No newline at end of file
--
Gitblit v1.9.1