Merge branch 'dev' into dev-g

This commit is contained in:
Guoqs
2025-04-16 13:12:23 +08:00

View File

@@ -241,15 +241,15 @@ public class ChargeAlgorithmService {
detailInfo.setReportTime(realTimeData_0x23.getDateTime().replaceAll("[^0-9]", "")); detailInfo.setReportTime(realTimeData_0x23.getDateTime().replaceAll("[^0-9]", ""));
detailInfo.setMaxAllowElectricity(new BigDecimal(parameterConfigData.getBmsMaxCurrent()).toBigInteger().toString()); detailInfo.setMaxAllowElectricity(new BigDecimal(parameterConfigData.getBmsMaxCurrent()).toBigInteger().toString());
detailInfo.setSingleMaxAllowVoltage(parameterConfigData.getBmsMaxVoltage()); detailInfo.setSingleMaxAllowVoltage(parameterConfigData.getBmsMaxVoltage());
detailInfo.setDcv(realTimeData_0x23.getPileVoltageOutput()); detailInfo.setDcv(new BigDecimal(realTimeData_0x23.getPileVoltageOutput()).toBigInteger().toString());
detailInfo.setDca(new BigDecimal(realTimeData_0x23.getPileCurrentOutput()).toBigInteger().toString()); detailInfo.setDca(new BigDecimal(realTimeData_0x23.getPileCurrentOutput()).toBigInteger().toString());
detailInfo.setBmsDemandVoltage(realTimeData_0x23.getBmsVoltageDemand()); detailInfo.setBmsDemandVoltage(new BigDecimal(realTimeData_0x23.getBmsVoltageDemand()).toBigInteger().toString());
detailInfo.setBmsDemandElectricity(realTimeData_0x23.getBmsCurrentDemand()); detailInfo.setBmsDemandElectricity(new BigDecimal(realTimeData_0x23.getBmsCurrentDemand()).toBigInteger().toString());
detailInfo.setChargePower(realTimeData_0x23.getOutputPower()); detailInfo.setChargePower(realTimeData_0x23.getOutputPower());
detailInfo.setSingleMaxVoltage(parameterConfigData.getPileMaxOutputVoltage()); detailInfo.setSingleMaxVoltage(parameterConfigData.getPileMaxOutputVoltage());
detailInfo.setSingleMinVoltage(parameterConfigData.getPileMinOutputVoltage()); detailInfo.setSingleMinVoltage(parameterConfigData.getPileMinOutputVoltage());
detailInfo.setMeasuringChargeVoltage(realTimeData_0x23.getBmsChargingVoltage()); detailInfo.setMeasuringChargeVoltage(new BigDecimal(realTimeData_0x23.getBmsChargingVoltage()).toBigInteger().toString());
detailInfo.setMeasuringChargeElectricity(new BigDecimal(realTimeData_0x23.getBmsChargingCurrent()).toBigInteger().toString()); detailInfo.setMeasuringChargeElectricity(new BigDecimal(realTimeData_0x23.getBmsChargingCurrent()).toBigInteger().toString());
detailInfo.setMaxSingleVoltageGroupNum(new BigDecimal(realTimeData_0x23.getBmsMaxVoltageAndGroup()).intValue()); detailInfo.setMaxSingleVoltageGroupNum(new BigDecimal(realTimeData_0x23.getBmsMaxVoltageAndGroup()).intValue());