From a1d2d4dbf00ffc778003abefac9e643c6bb82059 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 10 六月 2025 14:01:18 +0800
Subject: [PATCH] 系统概述推送添加蓄电池组单体信息统计
---
src/main/java/com/whyc/service/BatttestdataInfService.java | 30 ++++++++----------------------
1 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index 0f96191..b8f010d 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -86,7 +86,7 @@
BattInf binf=battInfService.getBinfByBattgroupId(tinf.getBattgroupId());
//瀹炴椂缁勭鐢垫祦锛屽墿浣欏閲忥紝鏍囩О瀹归噺
if(battRtstate!=null){
- Float restTime= BattCapFactory.getTheoryTime(battRtstate.getGroupCurr(), restCap, binf.getMoncapstd());
+ Float restTime= BattCapFactory.getTheoryTime(battRtstate.getLoadCurr(), restCap, binf.getMoncapstd());
tinf.setRestTime(restTime);
}
//淇濈暀5浣嶅皬鏁�
@@ -572,7 +572,7 @@
dto.setMonCount(binf.getMoncount());
dto.setMonvolstd(binf.getMonvolstd());
if(battRtstate!=null){
- Float restTime= BattCapFactory.getTheoryTime(battRtstate.getGroupCurr(), realCap, binf.getMoncapstd());
+ Float restTime= BattCapFactory.getTheoryTime(battRtstate.getLoadCurr(), realCap, binf.getMoncapstd());
dto.setRestTime(restTime);
dto.setFloatchartVol(battRtstate.getGroupVol());
}else{
@@ -715,37 +715,23 @@
Map<String, Object> map=new HashMap<>();
//鏌ヨ鍑烘墍鏈夌殑鐝粍骞惰祴浜堝垵濮嬪��
setBanZuDefault(map);
- //鑾峰彇鏍稿浼樺姡锛屾崯鍧忓弬鏁�
- List<AppParam> paramList=appParamService.getHrParam();
- Float badValue=0f;
- Float damageValue=0f;
- if(paramList!=null){
- for (AppParam param:paramList) {
- if(param.getParamNamePsx().equals("batt_mon_deteriorate_val")){
- badValue=param.getParamValue();
- }
- if(param.getParamNamePsx().equals("batt_mon_damage_val")){
- damageValue=param.getParamValue();
- }
- }
- }
//1鏌ヨ绗﹀悎鏉′欢鐨勭數姹犵粍
- List<BattInf> binfList=battInfService.getDischr5Statistic(stic);
+ List<BattInf> binfList=battInfService.getDischr6Statistic(stic);
if(binfList==null||binfList.size()==0){
return new Response().set(1,false,"褰撳墠鐢ㄦ埛鏈鐞嗘弧瓒虫潯浠剁殑鐢垫睜缁�");
}
- List<SticDischarge5Res> reslist=new ArrayList<>();
- for (BattInf binf:binfList) {
+ List<SticDischarge6Res> reslist=new ArrayList<>();
+ /*for (BattInf binf:binfList) {
//鏌ヨ鐢垫睜缁勬墍鍦ㄧ殑鐝粍
String groupName=bjService.getGroupName(binf.getPowerId());
- SticDischarge5Res res=new SticDischarge5Res();
+ SticDischarge6Res res=new SticDischarge6Res();
res.setProvice(binf.getProvice());
res.setCity(binf.getCity());
res.setCountry(binf.getCountry());
res.setStationName(binf.getStationName());
res.setBattgroupName(binf.getBattgroupName());
- //2.鑾峰彇鐢垫睜缁勫湪缁欏畾鏃堕棿娈电殑鏀剧數璁板綍(鎸囧畾鏃堕棿娈电殑鏍囧噯鏍稿鏀剧數)
+ //2.鑾峰彇鐢垫睜缁勬湭鏀剧數璁板綍(鎸囧畾鏃堕棿娈电殑鏍囧噯鏍稿鏀剧數)
BatttestdataInf tinf =getLastStandardTestDataByTime(binf.getBattgroupId(),stic.getTestStartTime(),stic.getTestEndTime());
if(tinf==null){
res.setRealCap(0f);
@@ -794,7 +780,7 @@
reslist.add(res);
}
}
- }
+ }*/
PageInfo pageInfo=PageInfoUtils.list2PageInfo(reslist, stic.getPageNum(), stic.getPageSize());
return new Response().setII(1,reslist.size()>0,pageInfo,"鏈勾搴︽湭鏀剧數鏁伴噺缁熻");
}
--
Gitblit v1.9.1