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/service/PowerAlarmService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/service/PowerAlarmService.java b/src/main/java/com/whyc/service/PowerAlarmService.java
index 0c43814..92abe99 100644
--- a/src/main/java/com/whyc/service/PowerAlarmService.java
+++ b/src/main/java/com/whyc/service/PowerAlarmService.java
@@ -28,11 +28,11 @@
return new Response().setII(1,list!=null,list,"鍦ㄧ敤鐢垫簮瀹炴椂鎺ㄩ�佸憡璀︿俊鎭�");
}
//鏌ヨ鐢垫簮鍛婅
- public Response getPowerAlarm(int almLevel, String startTime, String endTime ,int pageNum, int pageSize) {
+ public Response getPage(Integer almLevel, String startTime, String endTime ,int pageNum, int pageSize) {
PageHelper.startPage(pageNum,pageSize);
- List<PowerAlarm> list=mapper.getPowerAlarm(almLevel, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1));
+ List<PowerAlarm> list=mapper.getList(almLevel, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1));
PageInfo pageInfo=new PageInfo(list);
- return new Response().setII(1,list!=null,pageInfo,"鏌ヨ鐢垫簮鍛婅");
+ return new Response().setII(1,list!=null,pageInfo,"鏌ヨ-鍒嗛〉");
}
//纭鍛婅
public Response confirmAlarm(int num) {
@@ -43,7 +43,7 @@
return new Response().set(1,flag>0);
}
//鍙栨秷鍛婅
- public Response cancleAlarm(int num) {
+ public Response cancelAlarm(int num) {
UpdateWrapper wrapper=new UpdateWrapper();
wrapper.eq("num",num);
wrapper.set("alm_confirm",0);
--
Gitblit v1.9.1