From c51df4155f0b97129d4783a15fd5837683c1c386 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 12 二月 2025 09:33:00 +0800
Subject: [PATCH] 历史告警采用areaId不使用lockId
---
src/main/java/com/whyc/service/LockAlarmHisService.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/LockAlarmHisService.java b/src/main/java/com/whyc/service/LockAlarmHisService.java
index 5876ea7..815610c 100644
--- a/src/main/java/com/whyc/service/LockAlarmHisService.java
+++ b/src/main/java/com/whyc/service/LockAlarmHisService.java
@@ -1,7 +1,10 @@
package com.whyc.service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
+import com.whyc.mapper.LockInfMapper;
+import com.whyc.pojo.db_area.LockInf;
import com.whyc.pojo.db_lock_alarm.LockAlarmHis;
import com.whyc.pojo.db_lock_his.LockHis;
import com.whyc.util.SubTablePageInfoUtil;
@@ -10,16 +13,40 @@
import org.springframework.stereotype.Service;
import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
@Service
public class LockAlarmHisService {
@Autowired
private SubTablePageInfoUtil util;
+ @Autowired
+ private AreaInfService areaInfService;
+
+ @Autowired(required = false)
+ private LockInfMapper lockInfMapper;
+
+
//鏌ヨ閿佸憡璀︾殑鍘嗗彶鐘舵��
- public Response getLockAlmHis(Integer lockId, Integer almId,String startTime, String endTime, int pageNum, int pageSize) throws ParseException {
+ public Response getLockAlmHis(Integer areaId, Integer almId,String startTime, String endTime, int pageNum, int pageSize) throws ParseException {
LockAlarmHis his=new LockAlarmHis();
- his.setLockId(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=lockInfMapper.selectList(wrapper1);
+ List<Integer> lockIdList = lockInfList.stream()
+ .map(LockInf::getLockId) // 鎻愬彇id鍊�
+ .collect(Collectors.toList()); // 杞崲涓哄垪琛�*/
+ his.setLids(lockIdList);
+ }
+ }
his.setAlmId(almId);
PageInfo pageInfo=util.getPageInfo(pageNum,pageSize, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1)
,"db_lock_alarm","tb_lock_alarm",his);
--
Gitblit v1.9.1