From c7ce756b2d25b5862ff8446b1b3d2b8a08bb4f8e Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期六, 08 二月 2025 11:26:45 +0800
Subject: [PATCH] 实时界面点击查看历史信息
---
src/main/java/com/whyc/util/SubTablePageInfoUtil.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/util/SubTablePageInfoUtil.java b/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
index f61b95b..16f9353 100644
--- a/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
+++ b/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
@@ -3,6 +3,9 @@
import com.github.pagehelper.PageInfo;
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.mapper.CommonMapper;
+import com.whyc.mapper.LockInfMapper;
+import com.whyc.pojo.db_area.LockInf;
+import com.whyc.pojo.db_lock_alarm.LockAlarm;
import com.whyc.pojo.db_lock_alarm.LockAlarmHis;
import com.whyc.pojo.db_lock_his.LockHis;
import com.whyc.service.SubTableService;
@@ -27,6 +30,9 @@
@Autowired
private SubTableService service;
+
+ @Autowired(required = false)
+ private LockInfMapper linfMapper;
@@ -97,7 +103,11 @@
List<Integer> limitList = tableAndLimitMap.get(key);
his.setLimitStart(limitList.get(0));
his.setLimitEnd(limitList.get(1));
- List<LockHis> list = service.getLockAlmHisList(his);
+ List<LockAlarmHis> list = service.getLockAlmHisList(his);
+ for (LockAlarmHis alm:list) {
+ LockInf linf=linfMapper.getlinfBylockId(alm.getLockId());
+ alm.setLinf(linf);
+ }
dataList.addAll(list);
}
--
Gitblit v1.9.1