From 82a21bb53a43dd62fb2e999dac43391ac118bc95 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 05 六月 2025 09:47:14 +0800
Subject: [PATCH] 蓄电池组对比分析界面统计15，16，17
---
src/main/java/com/whyc/dto/Statistic/SticCompare16Res.java | 4 ++++
src/main/java/com/whyc/service/BatttestdataInfService.java | 18 ++++++++++++++++--
src/main/java/com/whyc/dto/Statistic/SticCompare15Res.java | 5 +++++
src/main/java/com/whyc/dto/Statistic/SticCompare17Res.java | 4 ++++
4 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/dto/Statistic/SticCompare15Res.java b/src/main/java/com/whyc/dto/Statistic/SticCompare15Res.java
index d40903a..7a5ccd6 100644
--- a/src/main/java/com/whyc/dto/Statistic/SticCompare15Res.java
+++ b/src/main/java/com/whyc/dto/Statistic/SticCompare15Res.java
@@ -1,6 +1,7 @@
package com.whyc.dto.Statistic;
import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@@ -22,4 +23,8 @@
private Float realCap; //瀹為檯瀹归噺
private String precentCap; //瀹归噺鐧惧垎姣�
private String capperformance; //鎬ц兘
+ private Integer stationId;
+ private Integer powerId;
+ private Integer devId;
+ private Integer battgroupId;
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/dto/Statistic/SticCompare16Res.java b/src/main/java/com/whyc/dto/Statistic/SticCompare16Res.java
index 97b76c0..5ec1f6f 100644
--- a/src/main/java/com/whyc/dto/Statistic/SticCompare16Res.java
+++ b/src/main/java/com/whyc/dto/Statistic/SticCompare16Res.java
@@ -23,4 +23,8 @@
private Float realCap; //瀹為檯瀹归噺
private String precentCap; //瀹归噺鐧惧垎姣�
private String capperformance; //鎬ц兘
+ private Integer stationId;
+ private Integer powerId;
+ private Integer devId;
+ private Integer battgroupId;
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/dto/Statistic/SticCompare17Res.java b/src/main/java/com/whyc/dto/Statistic/SticCompare17Res.java
index ceb519d..8ef4c2f 100644
--- a/src/main/java/com/whyc/dto/Statistic/SticCompare17Res.java
+++ b/src/main/java/com/whyc/dto/Statistic/SticCompare17Res.java
@@ -21,4 +21,8 @@
private Float monrealCap; //鍗曚綋瀹為檯瀹归噺
private String monprecentCap; //鍗曚綋瀹归噺鐧惧垎姣�
private String moncapperformance; //鍗曚綋鎬ц兘
+ private Integer stationId;
+ private Integer powerId;
+ private Integer devId;
+ private Integer battgroupId;
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index f38297c..ac8a26e 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -268,6 +268,10 @@
res.setProduct(binf.getProduct());
res.setInuseTime(binf.getInuseTime());
res.setMonvolstd(binf.getMonvolstd());
+ res.setStationId(binf.getStationId());
+ res.setPowerId(binf.getPowerId());
+ res.setDevId(binf.getDevId());
+ res.setBattgroupId(binf.getBattgroupId());
//2.鑾峰彇鐢垫睜缁勫湪缁欏畾鏃堕棿娈电殑鏀剧數璁板綍(鎸囧畾鏃堕棿娈电殑鏍囧噯鏍稿鏀剧數)
BatttestdataInf tinf =getLastStandardTestDataByTime(binf.getBattgroupId(),stic.getTestStartTime(),stic.getTestEndTime());
if(tinf==null){
@@ -357,6 +361,10 @@
res.setInuseTime(binf.getInuseTime());
res.setMonvolstd(binf.getMonvolstd());
res.setMoncapstd(binf.getMoncapstd());
+ res.setStationId(binf.getStationId());
+ res.setPowerId(binf.getPowerId());
+ res.setDevId(binf.getDevId());
+ res.setBattgroupId(binf.getBattgroupId());
//2.鑾峰彇鐢垫睜缁勫湪缁欏畾鏃堕棿娈电殑鏀剧數璁板綍(鎸囧畾鏃堕棿娈电殑鏍囧噯鏍稿鏀剧數)
BatttestdataInf tinf =getLastStandardTestDataByTime(binf.getBattgroupId(),stic.getTestStartTime(),stic.getTestEndTime());
if(tinf==null){
@@ -422,7 +430,6 @@
}
List<SticCompare17Res> reslist=new ArrayList<>();
for (BattInf binf:binfList) {
-
//2.鑾峰彇鐢垫睜缁勫湪缁欏畾鏃堕棿娈电殑鏀剧數璁板綍(鎸囧畾鏃堕棿娈电殑鏍囧噯鏍稿鏀剧數)
BatttestdataInf tinf =getLastStandardTestDataByTime(binf.getBattgroupId(),stic.getTestStartTime(),stic.getTestEndTime());
if(tinf==null){
@@ -451,6 +458,10 @@
res.setInuseTime(binf.getInuseTime());
res.setMonvolstd(binf.getMonvolstd());
res.setMonNum(data.getMonNum());
+ res.setStationId(binf.getStationId());
+ res.setPowerId(binf.getPowerId());
+ res.setDevId(binf.getDevId());
+ res.setBattgroupId(binf.getBattgroupId());
Float monrealCap = (float) BattCapFactory.GetMonomerCap(tinf.getTestCap(), hourRate, tinf.getTestCap(), tinf.getMaxMonvol(), data.getMonVol(), tinf.getGroupVol(), BattCapFactory.CapType_Real);
res.setMonrealCap(monrealCap);
//淇濈暀5浣嶅皬鏁�
@@ -490,6 +501,10 @@
res.setProduct(binf.getProduct());
res.setInuseTime(binf.getInuseTime());
res.setMonvolstd(binf.getMonvolstd());
+ res.setStationId(binf.getStationId());
+ res.setPowerId(binf.getPowerId());
+ res.setDevId(binf.getDevId());
+ res.setBattgroupId(binf.getBattgroupId());
res.setMonNum(i+1);
res.setMonrealCap(0f);
res.setMonprecentCap("0");
@@ -501,7 +516,6 @@
reslist.add(res);
}
}
- reslist.add(res);
}
}
}
\ No newline at end of file
--
Gitblit v1.9.1