Kaynağa Gözat

mqtt指令发布

李进 2 yıl önce
ebeveyn
işleme
2a56a8f9be

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

@@ -166,7 +166,7 @@ public class DeviceQualityServiceImpl extends ServiceImpl<DeviceQualityMapper, D
             //发送mqtt指令
             CommandMqtt commandMqtt = new CommandMqtt()
                     .setDeviceId(deviceQuality.getDeviceId())
-                    .setTemplet(obj);
+                    .setTemplet(templet.getTemplet());
             commandMqtts.add(commandMqtt);
         }
         mqttService.senCommand(commandMqtts);

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

@@ -19,6 +19,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.time.LocalDateTime;
+
 import static com.xy.utils.Beans.copy;
 import static com.xy.utils.PlusBeans.toIPage;
 import static com.xy.utils.PlusBeans.toPageBean;
@@ -52,7 +54,8 @@ public class MqttAclServiceImpl extends ServiceImpl<MqttAclMapper, MqttAcl> impl
     @ApiOperation("查询对象")
     public R<MqttAclDto.Vo> get(@RequestBody MqttAclDto.Vo vo) {
         MqttAcl mqttAclInfo = getOne(new MybatisPlusQuery().eqWrapper(vo, MqttAcl.class).build());
-        return R.ok(copy(MqttAclDto.Vo.class, mqttAclInfo));
+        MqttAclDto.Vo v = copy(MqttAclDto.Vo.class, mqttAclInfo).setServerDateTime(LocalDateTime.now());
+        return R.ok(v);
     }
 
     @PostMapping("save")

+ 5 - 0
device-api/src/main/java/com/xy/dto/MqttAclDto.java

@@ -1,5 +1,6 @@
 package com.xy.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xy.utils.PageBean;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -7,6 +8,7 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -72,6 +74,9 @@ public class MqttAclDto {
         @ApiModelProperty(value = "队列(设备ID)")
         private String topic;
 
+        @ApiModelProperty("服务器时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime serverDateTime;
 
     }