From 386e8bd28c0a95a13acae8b3c731d3674e99e1ea Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 25 Sep 2024 15:56:55 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E8=8B=8F=E5=B7=9E=E5=B8=82?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thirdparty/platform/domain/SupEquipChargeStatusInfo.java | 5 +++++ .../platform/service/impl/SuZhouPlatformServiceImpl.java | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupEquipChargeStatusInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupEquipChargeStatusInfo.java index 7a99e1457..52b7f05e0 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupEquipChargeStatusInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupEquipChargeStatusInfo.java @@ -1,12 +1,14 @@ package com.jsowell.thirdparty.platform.domain; import com.alibaba.fastjson2.annotation.JSONField; +import com.jsowell.thirdparty.platform.common.ChargeDetail; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import java.math.BigDecimal; +import java.util.List; /** * 充电状态信息 @@ -159,4 +161,7 @@ public class SupEquipChargeStatusInfo { @JSONField(name = "StartChargeSeqStat") private Integer startChargeSeqStat; + + @JSONField(name = "ChargeDetails") + private List chargeDetails; } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/SuZhouPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/SuZhouPlatformServiceImpl.java index d43cea708..61c3eedbf 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/SuZhouPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/SuZhouPlatformServiceImpl.java @@ -226,7 +226,7 @@ public class SuZhouPlatformServiceImpl implements ThirdPartyPlatformService { // 查询相关配置信息 ThirdPartySecretInfoVO suZhouSecretInfo = getSuZhouSecretInfo(); - String operatorId = suZhouSecretInfo.getTheirOperatorId(); + String operatorId = suZhouSecretInfo.getOurOperatorId(); String operatorSecret = suZhouSecretInfo.getTheirOperatorSecret(); String signSecret = suZhouSecretInfo.getTheirSigSecret(); String dataSecret = suZhouSecretInfo.getTheirDataSecret(); @@ -377,6 +377,7 @@ public class SuZhouPlatformServiceImpl implements ThirdPartyPlatformService { .startTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderInfo.getChargeStartTime())) .endTime(dateTimeNow) .totalPower(connectorInfo.getInstantPower()) + .chargeDetails(new ArrayList<>()) .build(); if (StringUtils.isNotBlank(connectorInfo.getSOC())) {