From 4a110e47cc8420c8b6d681c0cf1286a19169d3cb Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 30 五月 2025 09:18:41 +0800
Subject: [PATCH] 蓄电池核容信息统计
---
src/main/java/com/whyc/service/BatttestdataInfService.java | 1 +
src/main/resources/mapper/BatttestdataInfMapper.xml | 2 +-
src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java | 8 +++++++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java b/src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java
index e444ace..847d581 100644
--- a/src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java
+++ b/src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java
@@ -113,10 +113,13 @@
private String stationName;
@TableField(exist = false)
- private String stationId;
+ private Integer stationId;
@TableField(exist = false)
private Integer powerId;
+
+ @TableField(exist = false)
+ private Integer devId;
@TableField(exist = false)
private String battgroupName;
@@ -136,6 +139,9 @@
private Float restTime;
@TableField(exist = false)
+ private Float realCap;
+
+ @TableField(exist = false)
private String precentCap;
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index 8f7de61..0f26dd6 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -53,6 +53,7 @@
//鍓╀綑瀹归噺鍜屽墿浣欐椂闂磋绠�
int hourRate = BattCapFactory.GetHourRate(tinf.getTestCap(), tinf.getTestCurr());
Float restCap = (float) BattCapFactory.GetMonomerCap(tinf.getTestCap(), hourRate, tinf.getTestCap(), tinf.getMaxMonvol(), tinf.getMinMonvol(), tinf.getGroupVol(), BattCapFactory.CapType_Rest);
+ Float realCap = (float) BattCapFactory.GetMonomerCap(tinf.getTestCap(), hourRate, tinf.getTestCap(), tinf.getMaxMonvol(), tinf.getMinMonvol(), tinf.getGroupVol(), BattCapFactory.CapType_Real);
tinf.setRestCap(restCap);
tinf.setRestTime(0f);
//鑾峰彇鐢垫睜缁勫疄鏃舵暟鎹�
diff --git a/src/main/resources/mapper/BatttestdataInfMapper.xml b/src/main/resources/mapper/BatttestdataInfMapper.xml
index 933512e..756b648 100644
--- a/src/main/resources/mapper/BatttestdataInfMapper.xml
+++ b/src/main/resources/mapper/BatttestdataInfMapper.xml
@@ -5,7 +5,7 @@
<select id="getBattTinfStatistic" resultType="com.whyc.pojo.db_batt_testdata.BatttestdataInf">
select tb_batttestdata_inf.*
,tb_station_inf.station_name,tb_station_inf.provice,tb_station_inf.city,tb_station_inf.country,tb_station_inf.full_name
- ,tb_batt_inf.battgroup_name,tb_batt_inf.power_id,tb_batt_inf.station_id
+ ,tb_batt_inf.battgroup_name,tb_batt_inf.power_id,tb_batt_inf.station_id,tb_batt_inf.dev_id
from db_batt_testdata.tb_batttestdata_inf,db_station.tb_station_inf,db_station.tb_batt_inf
<where>
tb_batttestdata_inf.battgroup_id=tb_batt_inf.battgroup_id
--
Gitblit v1.9.1