From f5114a0e8f245c993c4980ba3f92a4076d97bcf4 Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Wed, 29 May 2024 09:44:03 +0800
Subject: [PATCH] =?UTF-8?q?MQTT=20=E5=A4=84=E7=90=86=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/iflytop/digester/DigestionTaskTheadManager.java    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/iflytop/digester/DigestionTaskTheadManager.java b/src/main/java/com/iflytop/digester/DigestionTaskTheadManager.java
index 8693e7c..ac6aca2 100644
--- a/src/main/java/com/iflytop/digester/DigestionTaskTheadManager.java
+++ b/src/main/java/com/iflytop/digester/DigestionTaskTheadManager.java
@@ -113,13 +113,13 @@ public class DigestionTaskTheadManager {
         assert actionJsonTree != null;
         String actionName = actionJsonTree.get("action").asText();
         if ( "StartNewDigestion".equals(actionName) ) {
-            this.startNewDigestion(actionJsonTree.get("params"));
+            this.startNewDigestion(actionJsonTree.get("parameters"));
             return;
         }
 
         Map<String, Object> actionParams = new HashMap<>();
-        if ( actionJsonTree.has("params") ) {
-            var paramsJsonTree = actionJsonTree.get("params");
+        if ( actionJsonTree.has("parameters") ) {
+            var paramsJsonTree = actionJsonTree.get("parameters");
             for ( JsonNode paramNode : paramsJsonTree ) {
                 actionParams.put(paramNode.get("key").asText(), paramNode.get("value").asText());
             }
@@ -148,7 +148,11 @@ public class DigestionTaskTheadManager {
         List<Map<String,Object>> tubes = new ArrayList<>();
         for ( JsonNode node : params.get("tubes") ) {
             Map<String, Object> tube = new HashMap<>();
-            tube.put("no", node.get("no").asText());
+            if ( node.isNull() ) {
+                tube.put("no", "");
+            } else {
+                tube.put("no", node.get("no").asText());
+            }
             tubes.add(tube);
         }
 
@@ -181,7 +185,7 @@ public class DigestionTaskTheadManager {
             var message = Map.of(
                 "src", myTopic,
                 "action", action,
-                "params", params
+                "parameters", params
             );
             var messageJson = UfJsonHelper.objectToJson(message);
             MqttMessage mqttMessage = new MqttMessage(messageJson.getBytes());