From bd1e1c6a99c228ece8ece17be462b81d5494c7a1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 24 六月 2025 21:01:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/ChargingMessage.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/ChargingMessage.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/ChargingMessage.java
index 149cd59..d19924e 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/ChargingMessage.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/ChargingMessage.java
@@ -1,12 +1,18 @@
package com.ruoyi.integration.rocket.model;
+import com.ruoyi.integration.drainage.model.ConnectorStatusInfo;
+import com.ruoyi.integration.drainage.model.SupChargeOrderInfo;
+import com.ruoyi.integration.drainage.model.SupEquipChargeStatus;
import com.ruoyi.integration.rocket.base.BaseMessage;
import lombok.Data;
import org.apache.poi.ss.formula.functions.T;
@Data
public class ChargingMessage extends BaseMessage {
-
+ // 充电设备状态message
+ private GunStatusMessage gunStatusMessage;
+ // 推送充电订单状态/充电订单信息message
+ private ChargingOrderMessage orderMessage;
private AcquisitionBillingModeMessage acquisitionBillingModeMessage;
private BillingModeVerifyMessage billingModeVerifyMessage;
private BmsAbortMessage bmsAbortMessage;
--
Gitblit v1.7.1