From f3b68732937ebfb165a21d082e2e03b81e42ed03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Wed, 11 Feb 2026 10:56:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B6=85=E6=97=B6=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/machine/vendor/tuoheng/TuohengVendorConfig.java | 2 +- .../tuoheng/instruction/TuohengPowerOffInstruction.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ruoyi/device/domain/impl/machine/vendor/tuoheng/TuohengVendorConfig.java b/src/main/java/com/ruoyi/device/domain/impl/machine/vendor/tuoheng/TuohengVendorConfig.java index 1607341..4c58432 100644 --- a/src/main/java/com/ruoyi/device/domain/impl/machine/vendor/tuoheng/TuohengVendorConfig.java +++ b/src/main/java/com/ruoyi/device/domain/impl/machine/vendor/tuoheng/TuohengVendorConfig.java @@ -98,7 +98,7 @@ public class TuohengVendorConfig implements VendorConfig { // 关机命令 Transaction powerOffTransaction = new Transaction("关机", CommandType.POWER_OFF) .root(new com.ruoyi.device.domain.impl.machine.vendor.tuoheng.instruction.TuohengPowerOffInstruction()) - .setTimeout(240000); + .setTimeout(66000); transactionMap.put(powerOffTransaction.getCommandType(), powerOffTransaction); log.info("拓恒厂家配置初始化完成，共配置{}个命令", transactionMap.size()); diff --git a/src/main/java/com/ruoyi/device/domain/impl/machine/vendor/tuoheng/instruction/TuohengPowerOffInstruction.java b/src/main/java/com/ruoyi/device/domain/impl/machine/vendor/tuoheng/instruction/TuohengPowerOffInstruction.java index 543258d..5241ca4 100644 --- a/src/main/java/com/ruoyi/device/domain/impl/machine/vendor/tuoheng/instruction/TuohengPowerOffInstruction.java +++ b/src/main/java/com/ruoyi/device/domain/impl/machine/vendor/tuoheng/instruction/TuohengPowerOffInstruction.java @@ -46,7 +46,7 @@ public class TuohengPowerOffInstruction extends AbstractInstruction { .topic("/topic/v1/airportNest/" + sn + "/control/confirm") .fieldPath("msg") .expectedValue("[综管]无人机关机指令接收成功") - .timeoutMs(60000) + .timeoutMs(6000) .build(); } @@ -61,12 +61,12 @@ public class TuohengPowerOffInstruction extends AbstractInstruction { .topic("/topic/v1/airportNest/" + sn + "/realTime/data") .fieldPath("droneBattery.data.bPowerON") .expectedValue("2") // 2表示已关机 - .timeoutMs(180000) + .timeoutMs(60000) .build(); } @Override public long getTimeoutMs() { - return 240000; // 总超时时间60秒 + return 66000; // 总超时时间60秒 } } \ No newline at end of file