From fb8167f93d2ccde7bff1721bc345b45e3a862202 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 21 May 2025 11:10:05 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E6=B7=B1=E5=9C=B3=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ShenZhenPlatformServiceImpl.java | 32 ++++++------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ShenZhenPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ShenZhenPlatformServiceImpl.java index 911286fd1..013783bce 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ShenZhenPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ShenZhenPlatformServiceImpl.java @@ -473,7 +473,7 @@ public class ShenZhenPlatformServiceImpl implements ThirdPartyPlatformService { String connectorStatus = connectorInfoVO.getConnectorStatus(); if (StringUtils.equals(connectorStatus, PileConnectorDataBaseStatusEnum.OCCUPIED_CHARGING.getValue())) { // 充电中 - ConnectorChargeStatusInfo info = new ConnectorChargeStatusInfo(); + ConnectorStatusInfo info = new ConnectorStatusInfo(); OrderBasicInfo orderBasicInfo = orderBasicInfoService.queryChargingByPileConnectorCode(connectorInfoVO.getPileConnectorCode()); if (orderBasicInfo == null) { continue; @@ -482,18 +482,14 @@ public class ShenZhenPlatformServiceImpl implements ThirdPartyPlatformService { 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())); + info.setStatus(Integer.valueOf(connectorInfoVO.getConnectorStatus())); + info.setCurrentA(new BigDecimal(realTimeMonitorData.getOutputCurrent()).intValue()); + info.setVoltageA(new BigDecimal(realTimeMonitorData.getOutputVoltage()).intValue()); + info.setSoc(new BigDecimal(realTimeMonitorData.getSOC()).intValue()); + info.setAcquireDateTime(DateUtils.getDateTime()); // 本次采样时间 + info.setChargeElectricity(new BigDecimal(realTimeMonitorData.getChargingDegree())); // 累计充电量 + info.setDischargeElectricity(BigDecimal.ZERO); // 累计放电量 ConnectorStatusInfos.add(info); } @@ -509,20 +505,10 @@ public class ShenZhenPlatformServiceImpl implements ThirdPartyPlatformService { stationStatusInfo.setConnectorStatusInfos(ConnectorStatusInfos); StationStatusInfos.add(stationStatusInfo); } - // 将 StationStatusInfos 分页 - int pageNum = 1; - int pageSize = 10; - List collect = StationStatusInfos.stream() - .skip((pageNum - 1) * pageSize) - .limit(pageSize) - .collect(Collectors.toList()); - int total = StationStatusInfos.size(); - int pages = PageUtil.totalPage(total, pageSize); - Map map = new LinkedHashMap<>(); map.put("Total", total); - map.put("StationStatusInfos", collect); + map.put("StationStatusInfos", StationStatusInfos); Map resultMap = ThirdPartyPlatformUtils.generateResultMapV2(map, thirdPartySecretInfoVO.getOurDataSecret(), thirdPartySecretInfoVO.getOurDataSecretIv(), thirdPartySecretInfoVO.getTheirSigSecret());