From 284b4d65d136bea10f58b2eb8cab9189fa2f6a6f Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 13 六月 2025 16:47:46 +0800
Subject: [PATCH] 1.2.8/9/10添加id
---
src/main/java/com/whyc/service/BatttestdataInfService.java | 8 ++++++++
src/main/java/com/whyc/dto/Statistic/PerformanceRes.java | 4 ++++
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/dto/Statistic/PerformanceRes.java b/src/main/java/com/whyc/dto/Statistic/PerformanceRes.java
index 4c931cb..8a62411 100644
--- a/src/main/java/com/whyc/dto/Statistic/PerformanceRes.java
+++ b/src/main/java/com/whyc/dto/Statistic/PerformanceRes.java
@@ -16,4 +16,8 @@
private Integer inuseYear;
private Float realCap; //瀹為檯瀹归噺
private String capperformance; //鎬ц兘
+ private Integer stationId;
+ private Integer powerId;
+ private Integer battgroupId;
+ private Integer devId;
}
\ 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 c3320f3..99079af 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -850,6 +850,10 @@
res.setMonvolstd(binf.getMonvolstd());
res.setMoncapstd(binf.getMoncapstd());
res.setMoncount(binf.getMoncount());
+ res.setStationId(binf.getStationId());
+ res.setPowerId(binf.getPowerId());
+ res.setBattgroupId(binf.getBattgroupId());
+ res.setDevId(binf.getDevId());
//2.鑾峰彇鐢垫睜缁勫湪缁欏畾鏃堕棿娈电殑鏀剧數璁板綍(鎸囧畾鏃堕棿娈电殑鏍囧噯鏍稿鏀剧數)
BatttestdataInf tinf =getLastStandardTestDataByTime(binf.getBattgroupId(),stic.getTestStartTime(),stic.getTestEndTime());
if(tinf==null){
@@ -904,6 +908,10 @@
res.setMonvolstd(binf.getMonvolstd());
res.setMoncapstd(binf.getMoncapstd());
res.setMoncount(binf.getMoncount());
+ res.setStationId(binf.getStationId());
+ res.setPowerId(binf.getPowerId());
+ res.setBattgroupId(binf.getBattgroupId());
+ res.setDevId(binf.getDevId());
//2.鑾峰彇鐢垫睜缁勫湪缁欏畾鏃堕棿娈电殑鏀剧數璁板綍(鎸囧畾鏃堕棿娈电殑鏍囧噯鏍稿鏀剧數)
BatttestdataInf tinf =getLastStandardTestDataByTime(binf.getBattgroupId(),stic.getTestStartTime(),stic.getTestEndTime());
if(tinf==null){
--
Gitblit v1.9.1