From 13ea07ab466f32a15ab8fbd554a8ae243559f56a Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Thu, 7 Sep 2023 11:54:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/Admin/DeviceService.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Services/Admin/DeviceService.php b/app/Services/Admin/DeviceService.php index b929114..d23440f 100644 --- a/app/Services/Admin/DeviceService.php +++ b/app/Services/Admin/DeviceService.php @@ -357,9 +357,10 @@ class DeviceService extends BaseService } } if($config && $config['close_is_enable'] ){ + $rule = $config['close_config']; $res = $this->verifyRule($rule, $log); - + if($res['status'] && $airState){//如果判定成功,且设备当前是开启状态 $msg = ''; $column = $res['keys'][0]; @@ -424,11 +425,11 @@ class DeviceService extends BaseService $value = $log->$key ?? null; switch($rule['op']){ case 'less': - break; if($value < $rule['right']){ $res['status'] = true; $res['keys'][] = $key; } + break; case 'less_or_equal': if($value <= $rule['right']){ $res['status'] = true;