mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-05-15 07:18:31 +08:00
update
This commit is contained in:
@@ -278,50 +278,18 @@ public class ChangZhouPlatformServiceImpl implements ThirdPartyPlatformService {
|
|||||||
List<Object> connectorStatusInfos = new ArrayList<>();
|
List<Object> connectorStatusInfos = new ArrayList<>();
|
||||||
|
|
||||||
for (ConnectorInfoVO connectorInfoVO : list) {
|
for (ConnectorInfoVO connectorInfoVO : list) {
|
||||||
String connectorStatus = connectorInfoVO.getConnectorStatus();
|
// 其他
|
||||||
if (StringUtils.equals(connectorStatus, PileConnectorDataBaseStatusEnum.OCCUPIED_CHARGING.getValue())) {
|
ConnectorStatusInfo connectorStatusInfo = new ConnectorStatusInfo();
|
||||||
// 充电中
|
connectorStatusInfo.setConnectorID(connectorInfoVO.getPileConnectorCode());
|
||||||
ConnectorChargeStatusInfo info = new ConnectorChargeStatusInfo();
|
connectorStatusInfo.setStatus(Integer.parseInt(connectorInfoVO.getConnectorStatus()));
|
||||||
OrderBasicInfo orderBasicInfo = orderBasicInfoService.queryChargingByPileConnectorCode(connectorInfoVO.getPileConnectorCode());
|
connectorStatusInfos.add(connectorStatusInfo);
|
||||||
if (orderBasicInfo == null) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
List<RealTimeMonitorData> chargingRealTimeData = orderBasicInfoService.getChargingRealTimeData(orderBasicInfo.getTransactionCode());
|
|
||||||
if(CollectionUtils.isNotEmpty(chargingRealTimeData)) {
|
|
||||||
RealTimeMonitorData realTimeMonitorData = chargingRealTimeData.get(0);
|
|
||||||
|
|
||||||
info.setStartChargeSeq(orderBasicInfo.getOrderCode());
|
|
||||||
info.setConnectorID(orderBasicInfo.getPileConnectorCode());
|
|
||||||
info.setConnectorStatus(Integer.valueOf(connectorInfoVO.getConnectorStatus()));
|
|
||||||
info.setCurrentA(new BigDecimal(realTimeMonitorData.getOutputCurrent()));
|
|
||||||
info.setVoltageA(new BigDecimal(realTimeMonitorData.getOutputVoltage()));
|
|
||||||
info.setSoc(new BigDecimal(realTimeMonitorData.getSOC()));
|
|
||||||
info.setStartTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeStartTime()));
|
|
||||||
info.setEndTime(DateUtils.getDateTime()); // 本次采样时间
|
|
||||||
info.setTotalPower(new BigDecimal(realTimeMonitorData.getChargingDegree())); // 累计充电量
|
|
||||||
// info.setElecMoney(); // 累计电费
|
|
||||||
// info.setSeviceMoney(); // 累计服务费
|
|
||||||
info.setTotalMoney(new BigDecimal(realTimeMonitorData.getChargingAmount()));
|
|
||||||
|
|
||||||
connectorStatusInfos.add(info);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// 其他
|
|
||||||
ConnectorStatusInfo connectorStatusInfo = new ConnectorStatusInfo();
|
|
||||||
connectorStatusInfo.setConnectorID(connectorInfoVO.getPileConnectorCode());
|
|
||||||
connectorStatusInfo.setStatus(Integer.parseInt(connectorInfoVO.getConnectorStatus()));
|
|
||||||
|
|
||||||
connectorStatusInfos.add(connectorStatusInfo);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
stationStatusInfo.setConnectorStatusInfos(connectorStatusInfos);
|
stationStatusInfo.setConnectorStatusInfos(connectorStatusInfos);
|
||||||
stationStatusInfos.add(stationStatusInfo);
|
stationStatusInfos.add(stationStatusInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
int total = stationStatusInfos.size();
|
|
||||||
|
|
||||||
Map<String, Object> map = new LinkedHashMap<>();
|
Map<String, Object> map = new LinkedHashMap<>();
|
||||||
map.put("Total", total);
|
|
||||||
map.put("StationStatusInfos", stationStatusInfos);
|
map.put("StationStatusInfos", stationStatusInfos);
|
||||||
|
|
||||||
log.info("返回参数:{}", JSON.toJSONString(map));
|
log.info("返回参数:{}", JSON.toJSONString(map));
|
||||||
|
|||||||
Reference in New Issue
Block a user