From 156efbab6aadd61ad54d2aefc32a227d7e9f675b Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 25 三月 2025 09:34:32 +0800
Subject: [PATCH] 更新
---
src/main/java/com/whyc/service/BattAlarmService.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattAlarmService.java b/src/main/java/com/whyc/service/BattAlarmService.java
index 2f9122a..8f22ae5 100644
--- a/src/main/java/com/whyc/service/BattAlarmService.java
+++ b/src/main/java/com/whyc/service/BattAlarmService.java
@@ -34,7 +34,16 @@
public Response getPage(Integer almLevel, String startTime, String endTime ,int pageNum, int pageSize) {
PageHelper.startPage(pageNum,pageSize);
List<BattAlarm> list=mapper.getList(almLevel, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1));
- List<BattAlarmCfg> cfg = cfgService.getList();
+ List<BattAlarmCfg> 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;
+ }
+ }
+ });
PageInfo pageInfo=new PageInfo(list);
return new Response().setII(1,list!=null,pageInfo,"鏌ヨ鍒嗛〉");
--
Gitblit v1.9.1