From fc2737a192783725b547ef6a3de0384b606b79a0 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期二, 15 八月 2023 14:23:48 +0800
Subject: [PATCH] 更新告警是否允许消失设置
---
src/main/java/com/whyc/service/AlarmManualClearService.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/AlarmManualClearService.java b/src/main/java/com/whyc/service/AlarmManualClearService.java
index 548eda6..5edec94 100644
--- a/src/main/java/com/whyc/service/AlarmManualClearService.java
+++ b/src/main/java/com/whyc/service/AlarmManualClearService.java
@@ -2,6 +2,8 @@
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;
import com.whyc.dto.Response;
import com.whyc.mapper.AlarmManualClearMapper;
@@ -12,6 +14,8 @@
import javax.annotation.Resource;
import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
@Service
public class AlarmManualClearService {
@@ -67,8 +71,18 @@
}
- public Response getAll() {
+ public Response getPage(int pageNum,int pageSize) {
int userId = ActionUtil.getUser().getUId().intValue();
- return null;
+ //鏌ヨ鎵�鏈夌殑璁板綍鍒嗛〉
+ PageHelper.startPage(pageNum,pageSize);
+ List<AlarmManualClear> list = mapper.getAll(userId);
+ PageInfo<AlarmManualClear> pageInfo = new PageInfo<>(list);
+ ////瑁呴厤鐢垫睜/璁惧/鐢垫簮淇℃伅
+ //List<AlarmManualClear> dataList = pageInfo.getList();
+ //List<Integer> battGroupIdList = dataList.stream().filter(data -> data.getAlarmType() == 1).map(AlarmManualClear::getBattGroupId).collect(Collectors.toList());
+ //List<Integer> deviceIdList = dataList.stream().filter(data -> data.getAlarmType() == 2).map(AlarmManualClear::getDeviceId).collect(Collectors.toList());
+ //List<Integer> powerDeviceIdList = dataList.stream().filter(data -> data.getAlarmType() == 3).map(AlarmManualClear::getPowerDeviceId).collect(Collectors.toList());
+
+ return new Response().set(1,pageInfo);
}
}
--
Gitblit v1.9.1