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

update 深圳平台

Browse Source
This commit is contained in:
Lemon
2025-05-21 11:10:05 +08:00
parent b9debe8258
commit fb8167f93d
1 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ShenZhenPlatformServiceImpl.java vendored
View File

@@ -473,7 +473,7 @@ public class ShenZhenPlatformServiceImpl implements ThirdPartyPlatformService {
String connectorStatus = connectorInfoVO.getConnectorStatus(); String connectorStatus = connectorInfoVO.getConnectorStatus();
if (StringUtils.equals(connectorStatus, PileConnectorDataBaseStatusEnum.OCCUPIED_CHARGING.getValue())) { if (StringUtils.equals(connectorStatus, PileConnectorDataBaseStatusEnum.OCCUPIED_CHARGING.getValue())) {
// 充电中 // 充电中
ConnectorChargeStatusInfo info = new ConnectorChargeStatusInfo(); ConnectorStatusInfo info = new ConnectorStatusInfo();
OrderBasicInfo orderBasicInfo = orderBasicInfoService.queryChargingByPileConnectorCode(connectorInfoVO.getPileConnectorCode()); OrderBasicInfo orderBasicInfo = orderBasicInfoService.queryChargingByPileConnectorCode(connectorInfoVO.getPileConnectorCode());
if (orderBasicInfo == null) { if (orderBasicInfo == null) {
continue; continue;
@@ -482,18 +482,14 @@ public class ShenZhenPlatformServiceImpl implements ThirdPartyPlatformService {
if (CollectionUtils.isNotEmpty(chargingRealTimeData)) { if (CollectionUtils.isNotEmpty(chargingRealTimeData)) {
RealTimeMonitorData realTimeMonitorData = chargingRealTimeData.get(0); RealTimeMonitorData realTimeMonitorData = chargingRealTimeData.get(0);
info.setStartChargeSeq(orderBasicInfo.getOrderCode());
info.setConnectorID(orderBasicInfo.getPileConnectorCode()); info.setConnectorID(orderBasicInfo.getPileConnectorCode());
info.setConnectorStatus(Integer.valueOf(connectorInfoVO.getConnectorStatus())); info.setStatus(Integer.valueOf(connectorInfoVO.getConnectorStatus()));
info.setCurrentA(new BigDecimal(realTimeMonitorData.getOutputCurrent())); info.setCurrentA(new BigDecimal(realTimeMonitorData.getOutputCurrent()).intValue());
info.setVoltageA(new BigDecimal(realTimeMonitorData.getOutputVoltage())); info.setVoltageA(new BigDecimal(realTimeMonitorData.getOutputVoltage()).intValue());
info.setSoc(new BigDecimal(realTimeMonitorData.getSOC())); info.setSoc(new BigDecimal(realTimeMonitorData.getSOC()).intValue());
info.setStartTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeStartTime())); info.setAcquireDateTime(DateUtils.getDateTime()); // 本次采样时间
info.setEndTime(DateUtils.getDateTime()); // 本次采样时间 info.setChargeElectricity(new BigDecimal(realTimeMonitorData.getChargingDegree())); // 累计充电量
info.setTotalPower(new BigDecimal(realTimeMonitorData.getChargingDegree())); // 累计充电量 info.setDischargeElectricity(BigDecimal.ZERO); // 累计放电量
// info.setElecMoney(); // 累计电费
// info.setSeviceMoney(); // 累计服务费
info.setTotalMoney(new BigDecimal(realTimeMonitorData.getChargingAmount()));
ConnectorStatusInfos.add(info); ConnectorStatusInfos.add(info);
} }
@@ -509,20 +505,10 @@ public class ShenZhenPlatformServiceImpl implements ThirdPartyPlatformService {
stationStatusInfo.setConnectorStatusInfos(ConnectorStatusInfos); stationStatusInfo.setConnectorStatusInfos(ConnectorStatusInfos);
StationStatusInfos.add(stationStatusInfo); StationStatusInfos.add(stationStatusInfo);
} }
// 将 StationStatusInfos 分页
int pageNum = 1;
int pageSize = 10;
List<StationStatusInfo> collect = StationStatusInfos.stream()
.skip((pageNum - 1) * pageSize)
.limit(pageSize)
.collect(Collectors.toList());
int total = StationStatusInfos.size(); int total = StationStatusInfos.size();
int pages = PageUtil.totalPage(total, pageSize);
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
map.put("Total", total); map.put("Total", total);
map.put("StationStatusInfos", collect); map.put("StationStatusInfos", StationStatusInfos);
Map<String, String> resultMap = ThirdPartyPlatformUtils.generateResultMapV2(map, thirdPartySecretInfoVO.getOurDataSecret(), Map<String, String> resultMap = ThirdPartyPlatformUtils.generateResultMapV2(map, thirdPartySecretInfoVO.getOurDataSecret(),
thirdPartySecretInfoVO.getOurDataSecretIv(), thirdPartySecretInfoVO.getTheirSigSecret()); thirdPartySecretInfoVO.getOurDataSecretIv(), thirdPartySecretInfoVO.getTheirSigSecret());