From e81b4f46c2f0c48a4dc0efcc0f0d663db3354574 Mon Sep 17 00:00:00 2001
From: andy <1042025947@qq.com>
Date: Tue, 24 Feb 2026 16:23:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=88=E6=8D=A2=E8=B0=83=E6=95=B4=E6=8D=A2?=
 =?UTF-8?q?=E7=94=B5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                   | 11 +++++------
 .../evotech/hd/core/enums/SwapBatteryStepEnum.java    |  8 ++++----
 .../com/evotech/hd/webserver/mqtt/MessageTopic.java   |  9 +++++++--
 .../webserver/utils/sendCloud/CloudSendInfoUtils.java |  8 +++++++-
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d8ce25b..5d8db9a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,12 +5,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ec76006e-5a88-4766-9722-bc8eda172857" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/commoms/core/src/main/java/com/evotech/hd/core/dtos/system/MessageMqttDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/commoms/core/src/main/java/com/evotech/hd/core/dtos/system/MessageMqttDTO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/commoms/core/src/main/java/com/evotech/hd/core/entity/system/MessageMqtt.java" beforeDir="false" afterPath="$PROJECT_DIR$/commoms/core/src/main/java/com/evotech/hd/core/entity/system/MessageMqtt.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/commoms/core/src/main/java/com/evotech/hd/core/enums/SwapBatteryStepEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/commoms/core/src/main/java/com/evotech/hd/core/enums/SwapBatteryStepEnum.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/mqtt/MessageTopic.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/mqtt/MessageTopic.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/MessageMqttService.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/MessageMqttService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/impl/MessageMqttServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/impl/MessageMqttServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web-server/src/main/resources/mapper/MessageMqttMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/resources/mapper/MessageMqttMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/utils/sendCloud/CloudSendInfoUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/utils/sendCloud/CloudSendInfoUtils.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -381,7 +378,9 @@
       <workItem from="1768809252266" duration="601000" />
       <workItem from="1768955894610" duration="4133000" />
       <workItem from="1768987212149" duration="43024000" />
-      <workItem from="1769503255745" duration="89100000" />
+      <workItem from="1769503255745" duration="104829000" />
+      <workItem from="1771808159438" duration="2384000" />
+      <workItem from="1771813138867" duration="22007000" />
     </task>
     <servers />
   </component>
diff --git a/commoms/core/src/main/java/com/evotech/hd/core/enums/SwapBatteryStepEnum.java b/commoms/core/src/main/java/com/evotech/hd/core/enums/SwapBatteryStepEnum.java
index dd37660..1bfc3ee 100644
--- a/commoms/core/src/main/java/com/evotech/hd/core/enums/SwapBatteryStepEnum.java
+++ b/commoms/core/src/main/java/com/evotech/hd/core/enums/SwapBatteryStepEnum.java
@@ -18,13 +18,13 @@ public enum SwapBatteryStepEnum{
 
     INSTITUTIONS_FOR_CHINA(3, "对中机构"),
 
-    DISMANTLE_OLD_ELECTRICITY(4, "拆旧电"),
+    GET_NEW_ELECTRICITY(4, "取新电"),
 
-    DISCHARGE_OLD_ELECTRICITY(5, "放旧电"),
+    DISMANTLE_OLD_ELECTRICITY(5, "拆旧电"),
 
-    GET_NEW_ELECTRICITY(6, "取新电"),
+    INSTALL_NEW_ELECTRICITY(6, "装新电"),
 
-    INSTALL_NEW_ELECTRICITY(7, "装新电"),
+    DISCHARGE_OLD_ELECTRICITY(7, "放旧电"),
 
     COMPLETED(8, "完成"),
 
diff --git a/web-server/src/main/java/com/evotech/hd/webserver/mqtt/MessageTopic.java b/web-server/src/main/java/com/evotech/hd/webserver/mqtt/MessageTopic.java
index bfbdee6..e5eba60 100644
--- a/web-server/src/main/java/com/evotech/hd/webserver/mqtt/MessageTopic.java
+++ b/web-server/src/main/java/com/evotech/hd/webserver/mqtt/MessageTopic.java
@@ -26,7 +26,12 @@ public class MessageTopic implements Serializable {
 	public String toString() {
 		return businessType + "/" + stationCode + "/" + dataDirection + "/" + messageType;
 	}
-	
-	
 
+	public MessageTopic() {
+	}
+
+	public MessageTopic(String messageType, String requestMethod) {
+		this.messageType = messageType;
+		this.requestMethod = requestMethod;
+	}
 }
diff --git a/web-server/src/main/java/com/evotech/hd/webserver/utils/sendCloud/CloudSendInfoUtils.java b/web-server/src/main/java/com/evotech/hd/webserver/utils/sendCloud/CloudSendInfoUtils.java
index f15c0f0..a184002 100644
--- a/web-server/src/main/java/com/evotech/hd/webserver/utils/sendCloud/CloudSendInfoUtils.java
+++ b/web-server/src/main/java/com/evotech/hd/webserver/utils/sendCloud/CloudSendInfoUtils.java
@@ -8,7 +8,9 @@ import com.evotech.hd.core.dtos.Result;
 import com.evotech.hd.utils.Collections;
 import com.evotech.hd.webserver.logging.AsyncLogService;
 import com.evotech.hd.webserver.logging.LogUtils;
+import com.evotech.hd.webserver.mqtt.MessageTopic;
 import com.evotech.hd.webserver.mqtt.MqttPublishUtils;
+import com.evotech.hd.webserver.service.MessageMqttService;
 import com.evotech.hd.webserver.utils.ParamUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.HttpClient;
@@ -40,8 +42,11 @@ public class CloudSendInfoUtils {
 
     private static AsyncLogService asyncLogService;
 
-    public CloudSendInfoUtils(AsyncLogService asyncLogService) {
+    private static MessageMqttService messageMqttService;
+
+    public CloudSendInfoUtils(AsyncLogService asyncLogService, MessageMqttService messageMqttService) {
         this.asyncLogService = asyncLogService;
+        this.messageMqttService = messageMqttService;
     }
 
 
@@ -183,6 +188,7 @@ public class CloudSendInfoUtils {
             map.put("sign", sign);
             map.put("data", json.toString());
             JSONObject result = doPost(ParamUtils.getCloudRequestUrl(),  map, Collections.asMap("Content-Type", "application/json","Accept-Language", "zh-CN"));
+            messageMqttService.update(null,new MessageTopic(json.getString("method"), "HTTP"), "-1", 1, JSONUtil.parseObj(map));
             asyncLogService.saveLog(LogUtils.getSendCloudLog(functionName, (System.currentTimeMillis()-startTime), json, (result == null ? "" : result.toString()), null));
             return result;
         } catch (Exception e) {