From b81c329ac5c9885f7c1b79b7aea9f8a0a5c8d18a Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 24 三月 2025 16:23:46 +0800
Subject: [PATCH] 电源告警实时和历史
---
src/main/java/com/whyc/controller/PowerAlarmController.java | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/whyc/controller/PowerAlarmController.java b/src/main/java/com/whyc/controller/PowerAlarmController.java
index e6c9403..eef9e7f 100644
--- a/src/main/java/com/whyc/controller/PowerAlarmController.java
+++ b/src/main/java/com/whyc/controller/PowerAlarmController.java
@@ -14,8 +14,8 @@
import java.text.ParseException;
@RestController
-@Api(tags = "鐢垫簮瀹炴椂鍛婅")
-@RequestMapping("poweralarm")
+@Api(tags = "鐢垫簮鍛婅")
+@RequestMapping("powerAlarm")
public class PowerAlarmController {
@Autowired
@@ -24,40 +24,37 @@
@Autowired
private PowerAlarmHistoryService hisService;
- @ApiOperation("鍦ㄧ敤鐢垫簮瀹炴椂鎺ㄩ�佸憡璀︿俊鎭�")
+ /*@ApiOperation("鍦ㄧ敤鐢垫簮瀹炴椂鎺ㄩ�佸憡璀︿俊鎭�")
@GetMapping("getResPowerAlm")
public Response getResPowerAlm(@RequestParam(required = false) int pinfId){
Response res=service.getResPowerAlm(pinfId);
return res;
- }
+ }*/
- @ApiOperation("鏌ヨ鐢垫簮鍛婅")
- @GetMapping("getPowerAlarm")
- public Response getPowerAlarm(@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.getPowerAlarm(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 pinfId,@RequestParam String startTime,@RequestParam String endTime
+ @ApiOperation("鏌ヨ鍘嗗彶-鍒嗛〉")
+ @GetMapping("getHisPage")
+ public Response getHisPage(@RequestParam(required = false) Integer almLevel,@RequestParam String startTime,@RequestParam String endTime
, @RequestParam int pageNum, @RequestParam int pageSize) throws ParseException, InterruptedException {
- Response res=hisService.getHisAlarm(pinfId,startTime,endTime,pageNum,pageSize);
+ Response res=hisService.getHisPage(almLevel,startTime,endTime,pageNum,pageSize);
return res;
}
}
\ No newline at end of file
--
Gitblit v1.9.1