From 3545d8ba5978ddd6a520daf3f8a9d267a1893309 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Fri, 20 Sep 2024 10:16:43 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=94=B5=E5=8D=95=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../electricbicycles/PowerHeartbeatHandler.java | 14 ++++++++------ .../ebike/deviceupload/EBikeMessageCmd06.java | 3 +++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/PowerHeartbeatHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/PowerHeartbeatHandler.java index 2b2a6e5cb..359040b5b 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/PowerHeartbeatHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/PowerHeartbeatHandler.java @@ -84,13 +84,15 @@ public class PowerHeartbeatHandler extends AbstractEBikeHandler { realTimeMonitorData.setConnectorStatus(portStatus); realTimeMonitorData.setOutputPower(message.getRealTimePower()); realTimeMonitorData.setBatteryMaxTemperature(message.getAmbientTemperature()); - realTimeMonitorData.setSumChargingTime(message.getChargingTime()); - realTimeMonitorData.setTimeRemaining(message.getTimePeriodElectricity()); - realTimeMonitorData.setChargingDegree(message.getMaxPower()); + // 充电时长, 单位: min + String chargingTime = Integer.parseInt(message.getChargingTime()) / 60 + ""; + realTimeMonitorData.setSumChargingTime(chargingTime); + // realTimeMonitorData.setTimeRemaining(message.getTimePeriodElectricity()); + + // 充电度数 + realTimeMonitorData.setChargingDegree(message.getTotalUsedElectricity()); realTimeMonitorData.setLossDegree(message.getMinPower()); - realTimeMonitorData.setChargingAmount(message.getTotalUsedElectricity()); - realTimeMonitorData.setHomingFlag(message.getStartMode()); - realTimeMonitorData.setGunLineTemperature(message.getPortTemperature()); + realTimeMonitorData.setGunLineTemperature(message.getAmbientTemperature()); pileBasicInfoService.saveRealTimeMonitorData2Redis(realTimeMonitorData); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd06.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd06.java index e9b9e0423..17a20212c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd06.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd06.java @@ -9,6 +9,9 @@ import lombok.ToString; import java.math.BigDecimal; +/** + * 端口充电时功率心跳包 + */ @Getter @Setter @ToString(callSuper = true)