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 ++++++++++-
src/main/java/com/whyc/service/BattAlarmHisService.java | 19 ++++++++++++++++++-
src/main/resources/mapper/StationInfMapper.xml | 2 +-
3 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattAlarmHisService.java b/src/main/java/com/whyc/service/BattAlarmHisService.java
index a20114d..67a1c58 100644
--- a/src/main/java/com/whyc/service/BattAlarmHisService.java
+++ b/src/main/java/com/whyc/service/BattAlarmHisService.java
@@ -2,18 +2,24 @@
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
+import com.whyc.pojo.db_alarm.BattAlarm;
import com.whyc.pojo.db_alarm.BattAlarmHistory;
+import com.whyc.pojo.db_param.BattAlarmCfg;
import com.whyc.util.SubTablePageInfoUtil;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.ParseException;
+import java.util.List;
@Service
public class BattAlarmHisService {
@Autowired
private SubTablePageInfoUtil util;
+
+ @Autowired
+ private BattAlarmCfgService cfgService;
//鏌ヨ鐢垫睜缁勫巻鍙叉椂闂村憡璀�
public Response getHistoryPage(Integer almLevel, String startTime, String endTime,int pageNum,int pageSize)throws ParseException, InterruptedException {
@@ -21,6 +27,17 @@
his.setAlmLevel(almLevel);
PageInfo pageInfo=util.getPageInfo(pageNum,pageSize, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1)
,"db_alarm","batt_alarm_history",his);
- return new Response().setII(1,pageInfo.getList()!=null,pageInfo,"鏌ヨ鐢垫睜鍛婅鍘嗗彶-鍒嗛〉");
+ List<BattAlarm> list = pageInfo.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;
+ }
+ }
+ });
+ return new Response().setII(1, list !=null,pageInfo,"鏌ヨ鐢垫睜鍛婅鍘嗗彶-鍒嗛〉");
}
}
\ No newline at end of file
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,"鏌ヨ鍒嗛〉");
diff --git a/src/main/resources/mapper/StationInfMapper.xml b/src/main/resources/mapper/StationInfMapper.xml
index 0d3fc56..18fc975 100644
--- a/src/main/resources/mapper/StationInfMapper.xml
+++ b/src/main/resources/mapper/StationInfMapper.xml
@@ -13,7 +13,7 @@
</select>
<select id="selectPinfList" resultType="powerInf">
- select power_inf.* from db_batt.power_inf,db_batt.sinf_pinf
+ select power_inf.*,power_inf.binf_id as battGroupId,power_inf.binf_name as battGroupName from db_batt.power_inf,db_batt.sinf_pinf
<where>
power_inf.power_id=sinf_pinf.pinf_id
and sinf_pinf.sinf_id=#{sinfId}
--
Gitblit v1.9.1