From 1f0768c69e50a3596596ed9754dd556b6692b5ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Tue, 20 May 2025 17:14:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C=E5=BF=AB=E9=80=9F=E5=93=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/iot/service/impl/IotServiceImpl.java  | 3 ++-
 .../src/main/java/com/ruoyi/iot/util/IotUtil.java        | 9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/src/main/java/com/ruoyi/iot/service/impl/IotServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/iot/service/impl/IotServiceImpl.java
index b1b8bef..d346c02 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/iot/service/impl/IotServiceImpl.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/iot/service/impl/IotServiceImpl.java
@@ -263,7 +263,8 @@ public class IotServiceImpl implements IotService {
     private CommandResponse sendCommand(IotDevice device, String command, String reason, int tryCount) {
         if (tryCount > 0) {
             CommandResponse res = sendCommand(device, command, null, reason);
-            if (IotUtil.isSuccess(res) || tryCount <= 1) {
+            // 若操作成功 or 设备离线 or 尝试次数小于等于1，则直接返回结果
+            if (IotUtil.isSuccess(res) || IotUtil.isOffline(res) || tryCount <= 1) {
                 return res;
             }
             try {
diff --git a/ruoyi-service/src/main/java/com/ruoyi/iot/util/IotUtil.java b/ruoyi-service/src/main/java/com/ruoyi/iot/util/IotUtil.java
index 0abc01b..2daba9c 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/iot/util/IotUtil.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/iot/util/IotUtil.java
@@ -211,6 +211,13 @@ public class IotUtil {
         return result.isSuccess();
     }
 
+    public static boolean isOffline(CommandResponse result) {
+        if (result == null) {
+            return false;
+        }
+        return result.isNotOnline();
+    }
+
     public static String getMsg(CommandResponse result) {
         if (result == null) {
             return "未知错误";
@@ -229,7 +236,7 @@ public class IotUtil {
         if (sys.getBat() != null && sys.getBat().compareTo(BigDecimal.valueOf(100)) >= 0) {
             sys.setBat(sys.getBat().divide(BigDecimal.valueOf(10), 2, BigDecimal.ROUND_HALF_UP));
         }
-        
+
         return sys;
     }
 }

From b6403503d48dc3ebe2764180db408ecbb0bf489d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Tue, 20 May 2025 17:43:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml
index 58cc941..4190d97 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml
@@ -134,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.locationType != null and query.locationType != ''">and bd.location_type = #{query.locationType}</if>
         <if test="query.orderDeviceId != null">and bd.order_device_id = #{query.orderDeviceId}</if>
         <if test="query.modelEnableSeat != null">and bm.enable_seat = #{query.modelEnableSeat}</if>
+        <if test="query.softwareVersion != null">and bd.software_version like concat('%', #{query.softwareVersion}, '%')</if>
         <if test="query.keyword != null and query.keyword != ''">
             and (
                 bd.sn like concat('%', #{query.keyword}, '%')