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/BattAlarmService.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattAlarmService.java b/src/main/java/com/whyc/service/BattAlarmService.java
index e4fef40..987a35e 100644
--- a/src/main/java/com/whyc/service/BattAlarmService.java
+++ b/src/main/java/com/whyc/service/BattAlarmService.java
@@ -7,6 +7,7 @@
import com.whyc.mapper.BattAlarmMapper;
import com.whyc.pojo.db_alarm.BattAlarm;
import com.whyc.pojo.db_param.BattAlarmCfg;
+import com.whyc.pojo.db_param.BattAlarmParam;
import com.whyc.util.ActionUtil;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +23,7 @@
private BattAlarmMapper mapper;
@Autowired
- private BattAlarmCfgService cfgService;
+ private BattAlarmParamService paramService;
/*
鍦ㄧ敤鐢垫睜缁勫疄鏃舵帹閫佸憡璀︿俊鎭�
@@ -35,12 +36,17 @@
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> 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