Browse Source

MQTT 处理参数修改

master
sige 1 year ago
parent
commit
f5114a0e8f
  1. 14
      src/main/java/com/iflytop/digester/DigestionTaskTheadManager.java

14
src/main/java/com/iflytop/digester/DigestionTaskTheadManager.java

@ -113,13 +113,13 @@ public class DigestionTaskTheadManager {
assert actionJsonTree != null; assert actionJsonTree != null;
String actionName = actionJsonTree.get("action").asText(); String actionName = actionJsonTree.get("action").asText();
if ( "StartNewDigestion".equals(actionName) ) { if ( "StartNewDigestion".equals(actionName) ) {
this.startNewDigestion(actionJsonTree.get("params"));
this.startNewDigestion(actionJsonTree.get("parameters"));
return; return;
} }
Map<String, Object> actionParams = new HashMap<>(); 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 ) { for ( JsonNode paramNode : paramsJsonTree ) {
actionParams.put(paramNode.get("key").asText(), paramNode.get("value").asText()); actionParams.put(paramNode.get("key").asText(), paramNode.get("value").asText());
} }
@ -148,7 +148,11 @@ public class DigestionTaskTheadManager {
List<Map<String,Object>> tubes = new ArrayList<>(); List<Map<String,Object>> tubes = new ArrayList<>();
for ( JsonNode node : params.get("tubes") ) { for ( JsonNode node : params.get("tubes") ) {
Map<String, Object> tube = new HashMap<>(); 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); tubes.add(tube);
} }
@ -181,7 +185,7 @@ public class DigestionTaskTheadManager {
var message = Map.of( var message = Map.of(
"src", myTopic, "src", myTopic,
"action", action, "action", action,
"params", params
"parameters", params
); );
var messageJson = UfJsonHelper.objectToJson(message); var messageJson = UfJsonHelper.objectToJson(message);
MqttMessage mqttMessage = new MqttMessage(messageJson.getBytes()); MqttMessage mqttMessage = new MqttMessage(messageJson.getBytes());

Loading…
Cancel
Save