From 97077ac44fd580ff783d3c5a7567a29cc060dda7 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期四, 17 八月 2023 14:21:07 +0800
Subject: [PATCH] 更新告警手动消除
---
src/main/java/com/whyc/service/BattAlarmDataVerifyService.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattAlarmDataVerifyService.java b/src/main/java/com/whyc/service/BattAlarmDataVerifyService.java
index 861bf96..ecd625f 100644
--- a/src/main/java/com/whyc/service/BattAlarmDataVerifyService.java
+++ b/src/main/java/com/whyc/service/BattAlarmDataVerifyService.java
@@ -1,7 +1,5 @@
package com.whyc.service;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.AlarmDaoFactory;
@@ -23,10 +21,10 @@
private BattAlarmDataVerifyMapper mapper;
- public Response<Object> getPage(int pageNum, int pageSize) {
- int userId = ActionUtil.getUser().getUId().intValue();
- PageHelper.startPage(pageNum,pageSize);
- List<BattAlarmDataVerify> list = mapper.getList(userId);
+ public Response<Object> getPage(AlarmPar param) {
+ //int userId = ActionUtil.getUser().getUId().intValue();
+ PageHelper.startPage(param.getPage().getPageCurr(),param.getPage().getPageSize());
+ List<BattAlarmDataVerify> list = mapper.getList(param);
list.stream().forEach(data -> {
data.setAlarmName(AlarmDaoFactory.getAllAlarmName(data.getAlmSignalId()));
});
@@ -44,9 +42,8 @@
public Response getPageOfWebSocket(AlarmPar alarmPar, String lang) {
try {
- int userId = alarmPar.getUId();
PageHelper.startPage(alarmPar.getPage().getPageCurr(), alarmPar.getPage().getPageSize());
- List<BattAlarmDataVerify> list = mapper.getList(userId);
+ List<BattAlarmDataVerify> list = mapper.getList(alarmPar);
list.stream().forEach(data -> {
data.setAlarmName(MessageUtils.getMessageSocket(AlarmDaoFactory.getAlarmName(data.getAlmSignalId()), lang));
});
--
Gitblit v1.9.1