From af1e0c0989ddbf2e65e84c60c07f9459f6599caa Mon Sep 17 00:00:00 2001 From: lzh Date: Sat, 7 Mar 2026 22:32:16 +0800 Subject: [PATCH] =?UTF-8?q?fix(iot):=20=E6=9A=82=E6=97=B6=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E4=BD=9C=E4=B8=9A=E6=97=B6=E9=95=BF=E4=B8=8D=E8=B6=B3?= =?UTF-8?q?=E6=8A=91=E5=88=B6=E8=87=AA=E5=8A=A8=E5=AE=8C=E6=88=90=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 信号丢失超时后不再校验最小有效作业时长，所有情况均直接触发自动完成。 Co-Authored-By: Claude Opus 4.6 --- .../processor/SignalLossRuleProcessor.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/viewsh-module-iot/viewsh-module-iot-server/src/main/java/com/viewsh/module/iot/service/rule/clean/processor/SignalLossRuleProcessor.java b/viewsh-module-iot/viewsh-module-iot-server/src/main/java/com/viewsh/module/iot/service/rule/clean/processor/SignalLossRuleProcessor.java index 5b2dd29..492427f 100644 --- a/viewsh-module-iot/viewsh-module-iot-server/src/main/java/com/viewsh/module/iot/service/rule/clean/processor/SignalLossRuleProcessor.java +++ b/viewsh-module-iot/viewsh-module-iot-server/src/main/java/com/viewsh/module/iot/service/rule/clean/processor/SignalLossRuleProcessor.java @@ -191,15 +191,16 @@ public class SignalLossRuleProcessor { long minValidWorkMillis = exitConfig.getMinValidWorkMinutes() * 60000L; // 6. 分支处理：有效 vs 无效作业 - if (durationMs < minValidWorkMillis) { - // 作业时长不足，抑制完成 - handleInvalidWork(deviceId, badgeDeviceKey, areaId, - durationMs, minValidWorkMillis, exitConfig); - } else { - // 作业时长有效，触发完成 - handleTimeoutComplete(deviceId, badgeDeviceKey, areaId, - durationMs, lastLossTime); - } + // TODO 暂时取消作业时长不足抑制自动完成的逻辑，所有情况均触发完成 + // if (durationMs < minValidWorkMillis) { + // // 作业时长不足，抑制完成 + // handleInvalidWork(deviceId, badgeDeviceKey, areaId, + // durationMs, minValidWorkMillis, exitConfig); + // } else { + // 作业时长有效，触发完成 + handleTimeoutComplete(deviceId, badgeDeviceKey, areaId, + durationMs, lastLossTime); + // } } /**