From 1aee70b4923250838c769a313e90a385f36b2a7c Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Wed, 25 Mar 2026 22:03:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E4=B8=8D=E5=A5=BD=E7=94=A8=EF=BC=8C=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E5=A4=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../intc/iot/controller/IotController.java    | 23 +++----------------
 1 file changed, 3 insertions(+), 20 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 a293ff1..7efe0b7 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
@@ -1260,18 +1260,6 @@ public class IotController extends BaseController {
         }
     }
 
-    /**
-     * 根据输入电压类型获取电压值
-     */
-    private Integer getVoltageValue(Integer inputVoltage) {
-        switch (inputVoltage) {
-            case 1: return 220;
-            case 2: return 380;
-            case 3: return 380;
-            case 4: return 380;
-            default: return null;
-        }
-    }
 
     /**
      * 解析开关电压电流数据
@@ -2594,7 +2582,7 @@ public class IotController extends BaseController {
      * @param timeCtrlId 当前操作的定时控制ID
      * @return 是否成功
      */
-    private boolean setPropertyTimeCtrl(
+    private boolean  setPropertyTimeCtrl(
         DeviceSwitch deviceSwitch,
         Device device,
         java.util.List<TimingCtrl> allTimingCtrls,
@@ -2851,13 +2839,8 @@ public class IotController extends BaseController {
                     .eq(TimingCtrl::getSwitchId, dbTimeCtrl.getSwitchId())
             );
 
-            // 从列表中移除要删除的定时控制，并将其 isOpen 设置为 0
-            for (TimingCtrl tc : allTimingCtrls) {
-                if (tc.getId().equals(request.getId())) {
-                    tc.setIsOpen(0L);
-                    break;
-                }
-            }
+            // 从列表中移除要删除的定时控制（删除场景直接移出列表，回查时 targetIdx < 0 直接返回成功）
+            allTimingCtrls.removeIf(tc -> tc.getId().equals(request.getId()));
 
             // 调用设置属性方法，将更新后的定时控制列表同步到设备
             boolean success = setPropertyTimeCtrl(deviceSwitch, device, allTimingCtrls, request.getId());