From d7cb7b413ca2388a213b6a0e574e02a967cf8fe9 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 12 九月 2024 08:41:32 +0800
Subject: [PATCH] 历史告警
---
src/main/java/com/whyc/util/SubTablePageInfoUtil.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/util/SubTablePageInfoUtil.java b/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
index 90596f9..d37d4b7 100644
--- a/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
+++ b/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
@@ -1,9 +1,13 @@
package com.whyc.util;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.DalmDto;
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.mapper.CommonMapper;
+import com.whyc.mapper.DevInfMapper;
+import com.whyc.pojo.db_alarm.DevalarmDataYear;
+import com.whyc.pojo.db_lithium_ram_db.DevInf;
import com.whyc.service.SubTablePageInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -25,6 +29,9 @@
@Autowired
private SubTablePageInfoService service;
+
+ @Autowired(required = false)
+ private DevInfMapper dinfMapper;
/**鎸夊勾浠借〃鍒嗛〉鏌ヨ*/
public PageInfo<Object> getPageInfo(int pageNum,int pageSize,
@@ -98,7 +105,15 @@
dto.setLimitStart(limitList.get(0));
dto.setLimitEnd(limitList.get(1));
dto.setTableName(tableName);
- List list = service.getListDevAlm(dto);
+ List<DevalarmDataYear> list = service.getListDevAlm(dto);
+ for (DevalarmDataYear year:list) {
+ int devId=year.getDevId();
+ QueryWrapper wrapper=new QueryWrapper();
+ wrapper.eq("dev_id",devId);
+ wrapper.last("limit 1");
+ DevInf dinf=dinfMapper.selectOne(wrapper);
+ year.setDevInf(dinf);
+ }
dataList.addAll(list);
}
}
--
Gitblit v1.9.1