From 035e9f78c08244199aa7e547bdb89da58eafcb8b Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Fri, 27 Mar 2026 17:55:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=9B=9E=E6=9F=A5?=
 =?UTF-8?q?=E4=B8=8D=E7=AE=A1=E6=98=AF=E5=90=A6=E6=88=90=E5=8A=9F=EF=BC=8C?=
 =?UTF-8?q?=E9=83=BD=E8=BF=94=E5=9B=9Etrue=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/intc/iot/controller/IotController.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/intc-modules/intc-iot/src/main/java/com/intc/iot/controller/IotController.java b/intc-modules/intc-iot/src/main/java/com/intc/iot/controller/IotController.java
index 7efe0b7..cf8ad8c 100644
--- a/intc-modules/intc-iot/src/main/java/com/intc/iot/controller/IotController.java
+++ b/intc-modules/intc-iot/src/main/java/com/intc/iot/controller/IotController.java
@@ -2698,7 +2698,7 @@ public class IotController extends BaseController {
                     Thread.sleep(1000L);
                 } catch (InterruptedException ie) {
                     Thread.currentThread().interrupt();
-                    return false;
+                    break;
                 }
                 try {
                     Map<String, Object> queryResult = iotCloudService.getDeviceProperties(device.getIotId());
@@ -2741,7 +2741,9 @@ public class IotController extends BaseController {
                                 if (actualIsValid == expectedIsValid) {
                                     log.info("[TimerCtrl] 回查确认设备已收到定时控制设置, iotId={}, key={}, isValid={}",
                                         device.getIotId(), propertyKey, actualIsValid);
-                                    return true;
+                                } else {
+                                    log.warn("[TimerCtrl] 回查属性未匹配预期, retry={}, expectedIsValid={}, actualIsValid={}",
+                                        retry, expectedIsValid, actualIsValid);
                                 }
                             }
                         } catch (Exception e2) {
@@ -2752,16 +2754,14 @@ public class IotController extends BaseController {
                     }
                     if (!matched) {
                         log.warn("[TimerCtrl] 回查未找到属性 key={}, retry={}", propertyKey, retry);
-                    } else {
-                        log.warn("[TimerCtrl] 回查属性未匹配预期, retry={}, expectedIsValid={}", retry, expectedIsValid);
                     }
+                    break;
                 } catch (Exception qe) {
                     log.warn("[TimerCtrl] 回查查询异常, retry={}, err={}", retry, qe.getMessage());
                 }
             }
 
-            log.warn("[TimerCtrl] 回查重试完毕仍未确认设备收到, iotId={}, key={}", device.getIotId(), propertyKey);
-            return false;
+            return true;
         } catch (Exception e) {
             log.error("设置定时控制属性失败: {}", e.getMessage(), e);
             return false;