From 7be2dc09841ef3fc2772e556383e240306a12235 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 9 Jan 2026 15:20:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?bugfix=20=E7=94=B5=E6=B1=A0=E5=85=85?= =?UTF-8?q?=E7=94=B5=E6=8A=A5=E5=91=8A=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thirdparty/platform/domain/BatteryChargeReportData.java | 3 +++ .../platform/service/impl/BatteryChargeReportService.java | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/BatteryChargeReportData.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/BatteryChargeReportData.java index 7db1a8735..dcf26c673 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/BatteryChargeReportData.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/BatteryChargeReportData.java @@ -69,6 +69,9 @@ public class BatteryChargeReportData { private Integer bmsVoltageFault; private String gunTemp; private String singleMaxAllowVoltage; + private String readBeforeCharge; + private Integer doorStatus; + private Integer bmsChargeMode; private String beforeChargeTotalVoltage; private String readCurrentCharge; private String singleMinVoltage; 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 db7932dab..78bce0d0a 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 @@ -219,7 +219,7 @@ public class BatteryChargeReportService { .siteAddress(stationVO.getAddress()) .siteLongitude(stationVO.getStationLng()) .siteLatitude(stationVO.getStationLat()) - .businessHours(stationVO.getBusinessHours()) + .businessHours(stationVO.getBusinessHours() == null ? "00:00-24:00" : stationVO.getBusinessHours()) .serviceHotline(stationVO.getStationTel()) .businessStatus(Constants.ZERO) // 营业状态 0-正常; 1-停运 .sitePileNumber(snList.size()) // 桩数量 @@ -393,6 +393,9 @@ public class BatteryChargeReportService { chargeData.setCurrentSoc(new BigDecimal(realTimeData_0x23.getSoc()).intValue()); chargeData.setSocStatus(new BigDecimal(realTimeData_0x23.getSoc()).intValue()); } + chargeData.setReadBeforeCharge(transactionRecordsData.getAmmeterTotalStart()); + chargeData.setDoorStatus(Constants.zero); + chargeData.setBmsChargeMode(Constants.two); chargeData.setDcv(new BigDecimal(realTimeData_0x23.getPileVoltageOutput()).toBigInteger().toString()); chargeData.setDca(new BigDecimal(realTimeData_0x23.getPileCurrentOutput()).toBigInteger().toString()); chargeData.setMeasuringChargeVoltage(new BigDecimal(realTimeData_0x23.getBmsChargingVoltage()).toBigInteger().toString()); From 17bba3a0891c057069636f71dccf1ae50695d4df Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 9 Jan 2026 15:35:18 +0800 Subject: [PATCH 2/2] update --- .../service/impl/BatteryChargeReportService.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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 78bce0d0a..6625bb53b 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 @@ -172,11 +172,14 @@ public class BatteryChargeReportService { public static void main(String[] args) { - String taskId = "1e6e42aa613947bf863bc455c2f3357e"; - String url = "https://wx.btiger.net/jeecg-boot" + "/api/docking/report/" + "web/" + taskId; - String result = HttpRequest.get(url).execute().body(); + String a = "03"; + System.out.println(String.valueOf(Integer.parseInt(a))); - System.out.println(result); + // String taskId = "1e6e42aa613947bf863bc455c2f3357e"; + // String url = "https://wx.btiger.net/jeecg-boot" + "/api/docking/report/" + "web/" + taskId; + // String result = HttpRequest.get(url).execute().body(); + // + // System.out.println(result); } /** @@ -232,7 +235,7 @@ public class BatteryChargeReportService { .doorStatus(Constants.zero) .bmsChargeMode(Integer.parseInt(bmsDemandAndChargerOutputData.getBmsChargingModel())) .vin(transactionRecordsData.getVinCode()) - .batteryType(chargingHandshakeData.getBmsBatteryType()) + .batteryType(String.valueOf(Integer.parseInt(chargingHandshakeData.getBmsBatteryType()))) .nominalEnergy(new BigDecimal(parameterConfigData.getBmsSumEnergy()).toBigInteger().toString()) .ratedCapacity(new BigDecimal(parameterConfigData.getBmsSumEnergy()).toBigInteger().toString()) .ratedVoltage(chargingHandshakeData.getBmsBatteryVoltage())