autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-19 18:45:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
YAS\29473
2026-01-09 15:40:06 +08:00
parent 5b6342da69 17bba3a089
commit 4adf76ff6c
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/BatteryChargeReportData.java vendored
View File

@@ -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;

18
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/BatteryChargeReportService.java vendored
View File

@@ -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);
}
/**
@@ -219,7 +222,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()) // 桩数量
@@ -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())
@@ -393,6 +396,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());