From 1244252b672f0ef0e83ad0671c1150f538572f0b Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 17 二月 2025 15:13:37 +0800
Subject: [PATCH] 告警操作
---
src/main/java/com/whyc/service/LockAlarmService.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/LockAlarmService.java b/src/main/java/com/whyc/service/LockAlarmService.java
index d9fde0d..1787bee 100644
--- a/src/main/java/com/whyc/service/LockAlarmService.java
+++ b/src/main/java/com/whyc/service/LockAlarmService.java
@@ -14,8 +14,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
@Service
public class LockAlarmService {
@@ -24,17 +26,34 @@
@Autowired(required = false)
private LockInfMapper linfMapper;
+
+ @Autowired
+ private AreaInfService areaInfService;
//鏌ヨ閿佸疄鏃跺憡璀︿俊鎭�
- public Response getLockAlm(Integer lockId, String almIds,int pageNum, int pageSize) {
+ public Response getLockAlm(Integer areaId, String almIds,Integer confirmFlag,int pageNum, int pageSize) {
PageHelper.startPage(pageNum,pageSize);
QueryWrapper wrapper=new QueryWrapper();
- if(lockId!=null){
- wrapper.eq("lock_id",lockId);
+ if(areaId!=null){
+ List<Integer> areaList=new ArrayList();
+ areaList.add(areaId);
+ areaInfService.getAllAreaId(areaId,areaList);
+ if(areaList!=null){
+ QueryWrapper wrapper1=new QueryWrapper();
+ wrapper1.in("area_id",areaList);
+ List<LockInf> lockInfList=linfMapper.selectList(wrapper1);
+ List<Integer> lockIdList = lockInfList.stream()
+ .map(LockInf::getLockId) // 鎻愬彇id鍊�
+ .collect(Collectors.toList()); // 杞崲涓哄垪琛�*/
+ wrapper.in("lock_id",lockIdList);
+ }
}
if(almIds!=null){
String[] almId=almIds.split(",");
wrapper.in("alm_id",almId);
}
+ if(confirmFlag!=null){
+ wrapper.eq("alm_is_confirmed",confirmFlag);
+ }
List<LockAlarm> list=mapper.selectList(wrapper);
for (LockAlarm alm:list) {
LockInf linf=linfMapper.getlinfBylockId(alm.getLockId());
--
Gitblit v1.9.1