From f84de37b77f0bba4893d01c96d25906294bde9d5 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期四, 17 八月 2023 15:00:33 +0800
Subject: [PATCH] 更新告警手动消除
---
src/main/java/com/whyc/service/DevAlarmDataVerifyService.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/service/DevAlarmDataVerifyService.java b/src/main/java/com/whyc/service/DevAlarmDataVerifyService.java
index ad83d01..c8da319 100644
--- a/src/main/java/com/whyc/service/DevAlarmDataVerifyService.java
+++ b/src/main/java/com/whyc/service/DevAlarmDataVerifyService.java
@@ -6,6 +6,7 @@
import com.github.pagehelper.PageInfo;
import com.whyc.dto.AlarmDaoFactory;
import com.whyc.dto.Response;
+import com.whyc.dto.paramter.AlarmPar;
import com.whyc.dto.paramter.DevAlarmPar;
import com.whyc.mapper.DevAlarmDataVerifyMapper;
import com.whyc.pojo.BattAlarmDataVerify;
@@ -22,10 +23,10 @@
@Resource
private DevAlarmDataVerifyMapper mapper;
- public Response<Object> getPage(int pageNum, int pageSize) {
- int userId = ActionUtil.getUser().getUId().intValue();
- PageHelper.startPage(pageNum,pageSize);
- List<DevAlarmDataVerify> list = mapper.getList(userId);
+ public Response<Object> getPage(DevAlarmPar param) {
+ //int userId = ActionUtil.getUser().getUId().intValue();
+ PageHelper.startPage(param.getPage().getPageCurr(),param.getPage().getPageSize());
+ List<DevAlarmDataVerify> list = mapper.getList(param);
list.stream().forEach(data -> {
data.setAlarmName(AlarmDaoFactory.getAllAlarmName(data.getAlmType()));
});
@@ -41,11 +42,11 @@
mapper.deleteById(num);
}
- public Response getPageOfWebSocket(DevAlarmPar alarmPar) {
+ public Response getPageOfWebSocket(DevAlarmPar param) {
try {
- int userId = alarmPar.getUId();
- PageHelper.startPage(alarmPar.getPage().getPageCurr(), alarmPar.getPage().getPageSize());
- List<DevAlarmDataVerify> list = mapper.getList(userId);
+ //int userId = alarmPar.getUId();
+ PageHelper.startPage(param.getPage().getPageCurr(), param.getPage().getPageSize());
+ List<DevAlarmDataVerify> list = mapper.getList(param);
list.stream().forEach(data -> {
data.setAlarmName(AlarmDaoFactory.getAllAlarmName(data.getAlmType()));
});
--
Gitblit v1.9.1