From cd3954fe19e320856894bef2c21b565ace05451d Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 12 九月 2024 08:53:43 +0800
Subject: [PATCH] 实时告警历史告警加确认人
---
src/main/java/com/whyc/util/SubTablePageInfoUtil.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/util/SubTablePageInfoUtil.java b/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
index d37d4b7..d0d4c43 100644
--- a/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
+++ b/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
@@ -8,7 +8,10 @@
import com.whyc.mapper.DevInfMapper;
import com.whyc.pojo.db_alarm.DevalarmDataYear;
import com.whyc.pojo.db_lithium_ram_db.DevInf;
+import com.whyc.pojo.db_user.UserInf;
+import com.whyc.service.DevInfService;
import com.whyc.service.SubTablePageInfoService;
+import com.whyc.service.UserInfService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -31,7 +34,10 @@
private SubTablePageInfoService service;
@Autowired(required = false)
- private DevInfMapper dinfMapper;
+ private DevInfService dinfService;
+
+ @Autowired(required = false)
+ private UserInfService uinfService;
/**鎸夊勾浠借〃鍒嗛〉鏌ヨ*/
public PageInfo<Object> getPageInfo(int pageNum,int pageSize,
@@ -108,11 +114,11 @@
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);
+ int uid=year.getConfirmedUid();
+ DevInf dinf=dinfService.getDinfByDevId(devId);
+ UserInf uinf=uinfService.getUinfByUId(uid);
year.setDevInf(dinf);
+ year.setConfirmedUname(uinf!=null?uinf.getUname():"");
}
dataList.addAll(list);
}
--
Gitblit v1.9.1