This commit is contained in:
YAS\29473
2025-04-28 16:04:37 +08:00
parent 981acf89ca
commit caa2c1fe6b

View File

@@ -817,6 +817,13 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
chargingRealTimeData.add(realTimeMonitorData);
} else {
realTimeMonitorData = chargingRealTimeData.get(0);
//获取设备枪口状态
PileConnectorInfoVO info = pileConnectorInfoService.getPileConnectorInfoByConnectorCode(orderInfo.getPileConnectorCode());
if (info == null) {
realTimeMonitorData.setConnectorStatus("3");
}else {
realTimeMonitorData.setConnectorStatus(String.valueOf(info.getStatus()));
}
}
// String orderStatus = orderInfo.getOrderStatus();
@@ -843,9 +850,19 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
BigDecimal totalElectricityAmount = orderDetail.getTotalElectricityAmount() == null ? BigDecimal.ZERO : orderDetail.getTotalElectricityAmount();
BigDecimal totalServiceAmount = orderDetail.getTotalServiceAmount() == null ? BigDecimal.ZERO : orderDetail.getTotalServiceAmount();
//StartChargeSeqStat "1、启动中 2、充电中3、停止中4、已结束5、未知"
String orderStatus = orderInfo.getOrderStatus();
//转换订单状态
if (OrderStatusEnum.IN_THE_CHARGING.getValue().equals(orderStatus)) {
orderStatus = "2";
} else if (OrderStatusEnum.ORDER_COMPLETE.getValue().equals(orderStatus)) {
orderStatus = "4";
}else{
orderStatus = "5";
}
QueryChargingStatusVO vo = QueryChargingStatusVO.builder()
.startChargeSeq(orderInfo.getOrderCode()) // 订单号
.startChargeSeqStat(Integer.parseInt(orderInfo.getOrderStatus())) // 订单状态
.startChargeSeqStat(Integer.parseInt(orderStatus)) // 订单状态
.connectorID(orderInfo.getPileConnectorCode()) // 枪口编码
.connectorStatus(Integer.parseInt(realTimeMonitorData.getConnectorStatus())) // 枪口状态
.currentA(current) // 电流
@@ -1501,8 +1518,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
json.put("StartChargeSeq", orderCode);
json.put("StartChargeSeqStat", 4); // 只能给 4-已结束
json.put("ConnectorID", orderInfo.getPileConnectorCode());
json.put("SuccStat", 0);
json.put("FailReason", 0);
json.put("StartTime", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderInfo.getChargeStartTime()));
String jsonString = JSON.toJSONString(json);