From ccc9ebc5bc687331cd653fd65a1b1e2bfa5ca4b0 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 14 三月 2023 16:59:37 +0800
Subject: [PATCH] 站点结果
---
src/main/java/com/whyc/service/StationInfService.java | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/whyc/service/StationInfService.java b/src/main/java/com/whyc/service/StationInfService.java
index 362d1cd..1f35cfc 100644
--- a/src/main/java/com/whyc/service/StationInfService.java
+++ b/src/main/java/com/whyc/service/StationInfService.java
@@ -288,25 +288,22 @@
String stationId = inf.getStationId();
//鏌ヨ鍒嗙粍鐢垫睜淇℃伅
List<SystemGrdoupBatt> sgblist = rtstateMapper.selectSystemGrdoupBatt(stationId);
- for (int i = 0; i < sgblist.size(); i++) {
- int battGroupId = sgblist.get(i).getBattGroupId();
- //鏌ヨ鏈烘埧涓嬫渶澶х殑鍗曚綋鐢靛帇鍜屽崟浣�
- BattRtdata maxData = rtdataMapper.maxData(battGroupId);
- sgblist.get(i).setMaxVol(maxData.getMonVol());
- sgblist.get(i).setMaxNum(maxData.getMonNum());
- //鏌ヨ鏈烘埧涓嬫渶浣庣殑鍗曚綋鐢靛帇鍜屽崟浣�
- BattRtdata minData = rtdataMapper.minData(battGroupId);
- sgblist.get(i).setMinVol(maxData.getMonVol());
- sgblist.get(i).setMinNum(maxData.getMonNum());
- //鏌ヨ瀹炴椂鍛婅鎬绘暟
- int battAlm = battAlmMapper.getbattAlm(battGroupId);
- sgblist.get(i).setBattAlm(battAlm);
+ if (sgblist != null && sgblist.size() > 0) {
+ for (int i = 0; i < sgblist.size(); i++) {
+ //鍒ゆ柇鏄惁钀藉悗
+ int battGroupId = sgblist.get(i).getBattGroupId();
+ int badbattFlag = badMapper.judgeBatt(battGroupId);
+ sgblist.get(i).setBadbattFlag(badbattFlag);
+ }
+ inf.setSgbList(sgblist);
}
- inf.setSgbList(sgblist);
- int devAlm = devAlmMapper.getdevAlm(stationId);
- inf.setDevAlm(devAlm);
- int pwrAlm = pwrAlmMapper.getpwrAlm(stationId);
- inf.setPwrAlm(pwrAlm);
+ //鏌ヨ鍋滅數缁埅鏃堕棿
+ QueryWrapper wrapper = new QueryWrapper();
+ wrapper.eq("stationid", stationId);
+ BattEndurance endurance = endMapper.selectOne(wrapper);
+ if (endurance != null) {
+ inf.setEndurance(endurance);
+ }
}
map.put("data", list);
//绔欑偣缁熻
--
Gitblit v1.9.1