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/service/BattAlarmService.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattAlarmService.java b/src/main/java/com/whyc/service/BattAlarmService.java
index b5231b2..014518e 100644
--- a/src/main/java/com/whyc/service/BattAlarmService.java
+++ b/src/main/java/com/whyc/service/BattAlarmService.java
@@ -22,16 +22,16 @@
/*
鍦ㄧ敤鐢垫睜缁勫疄鏃舵帹閫佸憡璀︿俊鎭�
**/
- public Response getResBattAlm(int binfId) {
- List<BattAlarm> list=mapper.getResBattAlm(binfId);
+ public Response getResBattAlm(int battGroupId) {
+ List<BattAlarm> list=mapper.getResBattAlm(battGroupId);
return new Response().setII(1,list!=null,list,"鍦ㄧ敤鐢垫睜缁勫疄鏃舵帹閫佸憡璀︿俊鎭�");
}
//鏌ヨ鐢垫睜鍛婅
- public Response getBattAlarm(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<BattAlarm> list=mapper.getBattAlarm(almLevel, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1));
+ List<BattAlarm> 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) {
@@ -42,7 +42,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