ソースを参照

mqtt指令发布

李进 2 年 前
コミット
4f3212ffc7

+ 2 - 2
device-api-service/src/main/java/com/xy/service/DeviceQualityServiceImpl.java

@@ -171,7 +171,7 @@ public class DeviceQualityServiceImpl extends ServiceImpl<DeviceQualityMapper, D
         }
         CommandMqtt commandMqtt = new CommandMqtt()
                 .setDeviceId(deviceQuality.getDeviceId())
-                .setTemplet(obj.toString());
+                .setTemplet(obj);
         mqttService.senCommand(Arrays.asList(commandMqtt));
         return R.ok();
     }
@@ -251,7 +251,7 @@ public class DeviceQualityServiceImpl extends ServiceImpl<DeviceQualityMapper, D
         saves.forEach(deviceQuality -> {
             CommandMqtt commandMqtt = new CommandMqtt()
                     .setDeviceId(deviceQuality.getDeviceId())
-                    .setTemplet(jsonObject.toString());
+                    .setTemplet(jsonObject);
             commandMqtts.add(commandMqtt);
         });
         mqttService.senCommand(commandMqtts);

+ 1 - 1
device-api-service/src/main/java/com/xy/service/MqttServiceImpl.java

@@ -90,7 +90,7 @@ public class MqttServiceImpl implements MqttService {
     public R<Map<String, Boolean>> senCommand(List<CommandMqtt> commandMqtts) {
         List<MqttDto> mqttDtos = new ArrayList<>();
         for (CommandMqtt commandMqtt : commandMqtts) {
-            JSONObject templetObj = JSONUtil.parseObj(commandMqtt.getTemplet());
+            JSONObject templetObj = commandMqtt.getTemplet();
             String debug = templetObj.getStr(LambdaUtils.getProperty(MqttDto::getDebug));
             String level = templetObj.getStr(LambdaUtils.getProperty(MqttDto::getLevel));
             String delayTime = templetObj.getStr(LambdaUtils.getProperty(MqttDto::getDelayTime));

+ 2 - 1
device-api/src/main/java/com/xy/dto/CommandMqtt.java

@@ -1,5 +1,6 @@
 package com.xy.dto;
 
+import cn.hutool.json.JSONObject;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -12,5 +13,5 @@ public class CommandMqtt {
     private Long deviceId;
 
     @ApiModelProperty(value = "模板", required = true)
-    private String templet;
+    private JSONObject templet;
 }