diff --git a/src/main/java/com/ruoyi/device/domain/impl/machine/vendor/tuoheng/instruction/TuohengPowerOnInstruction.java b/src/main/java/com/ruoyi/device/domain/impl/machine/vendor/tuoheng/instruction/TuohengPowerOnInstruction.java index db39b9f..ea2d9ac 100644 --- a/src/main/java/com/ruoyi/device/domain/impl/machine/vendor/tuoheng/instruction/TuohengPowerOnInstruction.java +++ b/src/main/java/com/ruoyi/device/domain/impl/machine/vendor/tuoheng/instruction/TuohengPowerOnInstruction.java @@ -29,7 +29,7 @@ public class TuohengPowerOnInstruction extends AbstractInstruction { payload.put("value", "1"); // 1=开机, 0=关机 payload.put("channel", 1); - String topic = "/topic/v1/airportControl/" + sn; + String topic = "/topic/v1/airportNest/" + sn + "/control"; context.getMqttClient().sendMessage(topic, payload.toJSONString()); log.info("拓恒开机指令发送成功: topic={}, payload={}", topic, payload.toJSONString()); @@ -38,10 +38,9 @@ public class TuohengPowerOnInstruction extends AbstractInstruction { @Override public CallbackConfig getMethodCallbackConfig(InstructionContext context) { String sn = context.getSn(); - // 监听机场确认消息 return CallbackConfig.builder() - .topic("/topic/v1/airportNest/" + sn + "/confirm") + .topic("/topic/v1/airportNest/" + sn + "/control/confirm") .fieldPath("code") .expectedValue("DronePower") .timeoutMs(10000) diff --git a/src/main/java/com/ruoyi/device/domain/impl/tuohengmqtt/service/TuohengMqttClientService.java b/src/main/java/com/ruoyi/device/domain/impl/tuohengmqtt/service/TuohengMqttClientService.java index ad1eabb..8a6d23e 100644 --- a/src/main/java/com/ruoyi/device/domain/impl/tuohengmqtt/service/TuohengMqttClientService.java +++ b/src/main/java/com/ruoyi/device/domain/impl/tuohengmqtt/service/TuohengMqttClientService.java @@ -22,7 +22,7 @@ public class TuohengMqttClientService { private static final String AIRPORT_NEST_REALTIME_TOPIC = "/topic/v1/airportNest/+/realTime/data"; private static final String AIRPORT_NEST_BASIC_TOPIC = "/topic/v1/airportNest/+/realTime/basic"; - private static final String AIRPORT_NEST_CONFIRM_TOPIC = "/topic/v1/airportNest/+/confirm"; + private static final String AIRPORT_NEST_CONFIRM_TOPIC = "/topic/v1/airportNest/+/control/confirm"; private static final String AIRPORT_DRONE_REALTIME_TOPIC = "/topic/v1/airportDrone/+/realTime/data"; private static final String PRODUCT_OSD_TOPIC = "thing/product/+/osd"; private static final String PRODUCT_EVENTS_TOPIC = "thing/product/+/events";