diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChangZhouPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChangZhouPlatformServiceImpl.java index b172e3699..1cab38bbb 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChangZhouPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChangZhouPlatformServiceImpl.java @@ -278,50 +278,18 @@ public class ChangZhouPlatformServiceImpl implements ThirdPartyPlatformService { List connectorStatusInfos = new ArrayList<>(); for (ConnectorInfoVO connectorInfoVO : list) { - String connectorStatus = connectorInfoVO.getConnectorStatus(); - if (StringUtils.equals(connectorStatus, PileConnectorDataBaseStatusEnum.OCCUPIED_CHARGING.getValue())) { - // 充电中 - ConnectorChargeStatusInfo info = new ConnectorChargeStatusInfo(); - OrderBasicInfo orderBasicInfo = orderBasicInfoService.queryChargingByPileConnectorCode(connectorInfoVO.getPileConnectorCode()); - if (orderBasicInfo == null) { - continue; - } - List 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); - } + // 其他 + ConnectorStatusInfo connectorStatusInfo = new ConnectorStatusInfo(); + connectorStatusInfo.setConnectorID(connectorInfoVO.getPileConnectorCode()); + connectorStatusInfo.setStatus(Integer.parseInt(connectorInfoVO.getConnectorStatus())); + connectorStatusInfos.add(connectorStatusInfo); } stationStatusInfo.setConnectorStatusInfos(connectorStatusInfos); stationStatusInfos.add(stationStatusInfo); } - int total = stationStatusInfos.size(); Map map = new LinkedHashMap<>(); - map.put("Total", total); map.put("StationStatusInfos", stationStatusInfos); log.info("返回参数:{}", JSON.toJSONString(map));