From af4b37529ace213471f3381c45efa2e86446660f Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 25 三月 2025 09:44:23 +0800
Subject: [PATCH] 告警类型对应
---
src/main/java/com/whyc/service/PowerAlarmService.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/service/PowerAlarmService.java b/src/main/java/com/whyc/service/PowerAlarmService.java
index 92abe99..1b57394 100644
--- a/src/main/java/com/whyc/service/PowerAlarmService.java
+++ b/src/main/java/com/whyc/service/PowerAlarmService.java
@@ -6,7 +6,9 @@
import com.whyc.dto.Response;
import com.whyc.mapper.PowerAlarmMapper;
import com.whyc.pojo.db_alarm.BattAlarm;
+import com.whyc.pojo.db_param.BattAlarmCfg;
import com.whyc.pojo.db_power_alarm.PowerAlarm;
+import com.whyc.pojo.db_power_alarm.PowerAlarmCfg;
import com.whyc.util.ActionUtil;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +22,9 @@
@Autowired(required = false)
private PowerAlarmMapper mapper;
+ @Autowired(required = false)
+ private PowerAlarmCfgService cfgService;
+
/*
鍦ㄧ敤鐢垫簮瀹炴椂鎺ㄩ�佸憡璀︿俊鎭�
**/
@@ -32,6 +37,16 @@
PageHelper.startPage(pageNum,pageSize);
List<PowerAlarm> list=mapper.getList(almLevel, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1));
PageInfo pageInfo=new PageInfo(list);
+ List<PowerAlarmCfg> cfgList = cfgService.getList();
+ list.stream().forEach(item->{
+ Integer almId = item.getAlmId();
+ for (int i = 0; i < cfgList.size(); i++) {
+ if(almId.intValue() == cfgList.get(i).getAlmId()){
+ item.setAlmName(cfgList.get(i).getAlmName());
+ break;
+ }
+ }
+ });
return new Response().setII(1,list!=null,pageInfo,"鏌ヨ-鍒嗛〉");
}
//纭鍛婅
--
Gitblit v1.9.1