From 350ad51d45f4a25f4d7ecbad8bbfb420f56708c6 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 08 四月 2025 14:40:54 +0800
Subject: [PATCH] 更新电池告警及历史接口
---
src/main/java/com/whyc/service/BattAlarmHisService.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattAlarmHisService.java b/src/main/java/com/whyc/service/BattAlarmHisService.java
index 92f3774..6e46ded 100644
--- a/src/main/java/com/whyc/service/BattAlarmHisService.java
+++ b/src/main/java/com/whyc/service/BattAlarmHisService.java
@@ -5,6 +5,7 @@
import com.whyc.pojo.db_alarm.BattAlarm;
import com.whyc.pojo.db_alarm.BattAlarmHistory;
import com.whyc.pojo.db_param.BattAlarmCfg;
+import com.whyc.pojo.db_param.BattAlarmParam;
import com.whyc.util.SubTablePageInfoUtil;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +20,7 @@
private SubTablePageInfoUtil util;
@Autowired
- private BattAlarmCfgService cfgService;
+ private BattAlarmParamService paramService;
//鏌ヨ鐢垫睜缁勫巻鍙叉椂闂村憡璀�
public Response getHistoryPage(Integer almLevel, String startTime, String endTime,int pageNum,int pageSize)throws ParseException, InterruptedException {
@@ -28,12 +29,17 @@
PageInfo pageInfo=util.getPageInfo(pageNum,pageSize, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1)
,"db_alarm","batt_alarm_history",his);
List<BattAlarmHistory> list = pageInfo.getList();
- List<BattAlarmCfg> cfgList = cfgService.getList();
+ List<BattAlarmParam> paramList = paramService.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());
+ Integer almType = item.getAlmType();
+ for (int i = 0; i < paramList.size(); i++) {
+ if(almId.intValue() == paramList.get(i).getAlmId()){
+ if(almType == 1){
+ item.setAlmName(paramList.get(i).getAlmName().replace("鍛婅","楂樺憡璀�"));
+ }else {
+ item.setAlmName(paramList.get(i).getAlmName().replace("鍛婅","浣庡憡璀�"));
+ }
break;
}
}
--
Gitblit v1.9.1