Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
YAS\29473
2026-01-09 15:55:01 +08:00

View File

@@ -246,7 +246,7 @@ public class BatteryChargeReportService {
.totalChargeTime(Math.toIntExact(chargingTime)) .totalChargeTime(Math.toIntExact(chargingTime))
.remainChargeTime(Constants.zero) .remainChargeTime(Constants.zero)
.totalCharge(orderVO.getTotalPower()) .totalCharge(orderVO.getTotalPower())
.alarmCode(Constants.ZERO) .alarmCode(Constants.DOUBLE_ZERO)
.bmsVersion("V1.1") .bmsVersion("V1.1")
.build(); .build();
@@ -438,7 +438,7 @@ public class BatteryChargeReportService {
chargeData.setMaxSingleVoltageGroupNum(Integer.parseInt(realTimeData_0x25.getBmsMaxVoltageNum())); chargeData.setMaxSingleVoltageGroupNum(Integer.parseInt(realTimeData_0x25.getBmsMaxVoltageNum()));
chargeData.setMaxTempPointNum(Integer.parseInt(realTimeData_0x25.getMaxTemperatureDetectionNum())); chargeData.setMaxTempPointNum(Integer.parseInt(realTimeData_0x25.getMaxTemperatureDetectionNum()));
chargeData.setMinTempPointNum(Integer.parseInt(realTimeData_0x25.getMinTemperatureDetectionNum())); chargeData.setMinTempPointNum(Integer.parseInt(realTimeData_0x25.getMinTemperatureDetectionNum()));
chargeData.setBatteryInsulation(realTimeData_0x25.getBmsBatteryInsulationStatus()); chargeData.setBatteryInsulation(Constants.DOUBLE_ZERO);
// detailInfo.setVentTemp(); // detailInfo.setVentTemp();
// detailInfo.setEnvironmentTemp(); // detailInfo.setEnvironmentTemp();