diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/BatteryChargeReportService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/BatteryChargeReportService.java index 8af781be1..4ff5e9124 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/BatteryChargeReportService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/BatteryChargeReportService.java @@ -228,7 +228,7 @@ public class BatteryChargeReportService { .readBeforeCharge(transactionRecordsData.getAmmeterTotalStart()) .doorStatus(Constants.zero) .bmsChargeMode(Integer.parseInt(bmsDemandAndChargerOutputData.getBmsChargingModel())) - .vin(chargingHandshakeData.getVinCode()) + .vin(transactionRecordsData.getVinCode()) .batteryType(chargingHandshakeData.getBmsBatteryType()) .nominalEnergy(new BigDecimal(parameterConfigData.getBmsSumEnergy()).toBigInteger().toString()) .ratedCapacity(new BigDecimal(parameterConfigData.getBmsSumEnergy()).toBigInteger().toString()) @@ -426,7 +426,7 @@ public class BatteryChargeReportService { chargeData.setSingleMaxTemp(realTimeData_0x25.getBmsMaxBatteryTemperature()); chargeData.setSingleMinTemp(realTimeData_0x25.getMinBatteryTemperature()); chargeData.setMaxSingleVoltageNum(Integer.parseInt(realTimeData_0x25.getBmsMaxVoltageNum())); - chargeData.setMaxSingleVoltageGroupNum(Integer.parseInt(realTimeData_0x23.getBmsMaxVoltageAndGroup().replace(".", ""))); + chargeData.setMaxSingleVoltageGroupNum(Integer.parseInt(realTimeData_0x25.getBmsMaxVoltageNum())); chargeData.setMaxTempPointNum(Integer.parseInt(realTimeData_0x25.getMaxTemperatureDetectionNum())); chargeData.setMinTempPointNum(Integer.parseInt(realTimeData_0x25.getMinTemperatureDetectionNum())); chargeData.setBatteryInsulation(realTimeData_0x25.getBmsBatteryInsulationStatus());