From 088999bbeb6c54c1363fbbc836aebc7757dff3f0 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Thu, 17 Nov 2022 09:21:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8A=A5=E8=AD=A6=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/DeviceWarningService.php   | 2 ++
 app/Services/LinkosDeviceLogService.php | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/Services/DeviceWarningService.php b/app/Services/DeviceWarningService.php
index 74163f5..5963ffa 100644
--- a/app/Services/DeviceWarningService.php
+++ b/app/Services/DeviceWarningService.php
@@ -58,6 +58,8 @@ class DeviceWarningService
         $rule = Setting::where('slug', $slug)->value('value');
         if($rule){
             $rule = json_decode($rule, true);
+        }else{
+            $rule = [];
         }
 
         foreach($rule as $key => $values){
diff --git a/app/Services/LinkosDeviceLogService.php b/app/Services/LinkosDeviceLogService.php
index 2ac1074..40c3656 100644
--- a/app/Services/LinkosDeviceLogService.php
+++ b/app/Services/LinkosDeviceLogService.php
@@ -236,8 +236,6 @@ class LinkosDeviceLogService
 
         $log->save();
         
-        //验证是否警报
-        (new DeviceWarningService())->judgeLog($device, $log, $reportedAt);
     }
 
     /**
@@ -373,6 +371,9 @@ class LinkosDeviceLogService
         }
 
         $log->save();
+
+        //验证是否警报
+        (new DeviceWarningService())->judgeLog($device, $log, $reportedAt);
     }
 
     /**