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

update

Browse Source
This commit is contained in:
YAS\29473
2025-11-10 09:35:12 +08:00
parent 696d46044e
commit 8e5c193e77
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChangZhouPlatformServiceImpl.java vendored
View File

@@ -808,13 +808,16 @@ public class ChangZhouPlatformServiceImpl implements ThirdPartyPlatformService {
List<SupChargeDetails> chargeDetails = transformSupChargeDetails(orderDetail, billingList); List<SupChargeDetails> chargeDetails = transformSupChargeDetails(orderDetail, billingList);
BigDecimal totalElectricityAmount = orderDetail.getTotalElectricityAmount()
== null ? BigDecimal.ZERO : orderDetail.getTotalElectricityAmount().setScale(2 , BigDecimal.ROUND_HALF_UP);
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("StartChargeSeq", orderCode); json.put("StartChargeSeq", orderCode);
json.put("ConnectorID", orderBasicInfo.getPileConnectorCode()); json.put("ConnectorID", orderBasicInfo.getPileConnectorCode());
json.put("StartTime", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, chargeStartTime)); json.put("StartTime", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, chargeStartTime));
json.put("EndTime", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, chargeEndTime)); json.put("EndTime", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, chargeEndTime));
json.put("TotalPower", orderDetail.getTotalUsedElectricity().setScale(2, BigDecimal.ROUND_HALF_UP)); json.put("TotalPower", orderDetail.getTotalUsedElectricity().setScale(2, BigDecimal.ROUND_HALF_UP));
json.put("TotalElecMoney", orderDetail.getTotalElectricityAmount().setScale(2, BigDecimal.ROUND_HALF_UP)); json.put("TotalElecMoney", totalElectricityAmount);
json.put("TotalSeviceMoney", orderDetail.getTotalServiceAmount().setScale(2, BigDecimal.ROUND_HALF_UP)); json.put("TotalSeviceMoney", orderDetail.getTotalServiceAmount().setScale(2, BigDecimal.ROUND_HALF_UP));
json.put("TotalMoney", orderDetail.getTotalOrderAmount().setScale(2, BigDecimal.ROUND_HALF_UP)); json.put("TotalMoney", orderDetail.getTotalOrderAmount().setScale(2, BigDecimal.ROUND_HALF_UP));
json.put("StopReason", 2); // 2：BMS 停止充电 json.put("StopReason", 2); // 2：BMS 停止充电

8
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuiZhouPlatformServiceImpl.java vendored
View File

@@ -581,9 +581,9 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService {
// 充电完成 // 充电完成
orderStatus = "4"; orderStatus = "4";
} }
BigDecimal current = realTimeMonitorData.getOutputCurrent() == null ? BigDecimal.ZERO : info.getCurrent(); BigDecimal current = realTimeMonitorData.getOutputCurrent() == null ? BigDecimal.ZERO : new BigDecimal(realTimeMonitorData.getOutputCurrent());
BigDecimal voltage = realTimeMonitorData.getOutputVoltage() == null ? BigDecimal.ZERO : info.getVoltage(); BigDecimal voltage = realTimeMonitorData.getOutputVoltage() == null ? BigDecimal.ZERO : new BigDecimal(realTimeMonitorData.getOutputVoltage());
String soc = realTimeMonitorData.getSOC() == null ? Constants.ZERO : info.getSOC(); String soc = realTimeMonitorData.getSOC() == null ? Constants.ZERO : realTimeMonitorData.getSOC();
String dateTime = DateUtils.getDateTime(); String dateTime = DateUtils.getDateTime();
SupEquipChargeStatusInfo supEquipChargeStatusInfo = SupEquipChargeStatusInfo.builder() SupEquipChargeStatusInfo supEquipChargeStatusInfo = SupEquipChargeStatusInfo.builder()
@@ -596,7 +596,7 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService {
.orderStatus(Integer.parseInt(orderStatus)) .orderStatus(Integer.parseInt(orderStatus))
.equipmentClassification(Constants.one) .equipmentClassification(Constants.one)
.pushTimeStamp(dateTime) .pushTimeStamp(dateTime)
.connectorStatus(Integer.parseInt(realTimeMonitorData.getConnectorStatus())) // 3-充电中 .connectorStatus(3) // 3-充电中
.currentA(current.setScale(1, RoundingMode.HALF_UP)) .currentA(current.setScale(1, RoundingMode.HALF_UP))
.voltageA(voltage.setScale(1, RoundingMode.HALF_UP)) .voltageA(voltage.setScale(1, RoundingMode.HALF_UP))
.soc(new BigDecimal(soc)) .soc(new BigDecimal(soc))