From 264240b768d7c5fc66ab0ebff76b14b5be1156ac Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 13 六月 2025 10:59:33 +0800
Subject: [PATCH] 1.2.5和1.2.6修改添加机房电源电池组设备id
---
src/main/java/com/whyc/service/BatttestdataInfService.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index 19b4222..378a4c7 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -658,6 +658,10 @@
res.setCountry(binf.getCountry());
res.setStationName(binf.getStationName());
res.setBattgroupName(binf.getBattgroupName());
+ 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){
@@ -748,6 +752,10 @@
res.setMonvolstd(binf.getMonvolstd());
res.setMoncount(binf.getMoncount());
res.setProduct(binf.getProduct());
+ res.setStationId(binf.getStationId());
+ res.setPowerId(binf.getPowerId());
+ res.setBattgroupId(binf.getBattgroupId());
+ res.setDevId(binf.getDevId());
//鑾峰彇鐢垫睜缁勬湭鏀剧數璁板綍(鎸囧畾鏃堕棿娈电殑鏍囧噯鏍稿鏀剧數)
getNoDischargeData(binf.getBattgroupId(),stic.getTestStartTime(),stic.getTestEndTime(),stic.getTypeList(),res);
if(stic.getStopReasonType()==0){
--
Gitblit v1.9.1