From 6c57ce1158cf0189b44c3ef2caf39e12d6f6224d Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Thu, 7 Sep 2023 11:31:35 +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  | 2 +-
 app/Services/DeviceWarningService.php | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Services/Admin/DeviceService.php b/app/Services/Admin/DeviceService.php
index 007294f..b929114 100644
--- a/app/Services/Admin/DeviceService.php
+++ b/app/Services/Admin/DeviceService.php
@@ -484,7 +484,7 @@ class DeviceService extends BaseService
             'type' => 1,
             'content' => $msg,
         ]);
-        //编号，-todo
+        //编号
         $httpClient = app(HttpClient::class);
         $httpClient->deviceDataDownlink($device->sn, 'switch_control', ['switch_state' => 1]);
         return ;
diff --git a/app/Services/DeviceWarningService.php b/app/Services/DeviceWarningService.php
index ab18d3e..daf5487 100644
--- a/app/Services/DeviceWarningService.php
+++ b/app/Services/DeviceWarningService.php
@@ -136,12 +136,16 @@ class DeviceWarningService
             if(strpos($column, ',')){//看是否是并联条件
                 $_columns = explode(',',$column);
                 foreach($_columns as $cc){
-                    $msg.= $fieldNameMap[$cc].'达到'.($log->$cc ?? 0).$fieldUnitMap[$cc].'值，且';
+                    if(isset($fieldNameMap[$cc]) && isset($fieldUnitMap[$cc])){
+                        $msg.= $fieldNameMap[$cc].'达到'.($log->$cc ?? 0).$fieldUnitMap[$cc].'值，且';
+                    }
                 }
             
                 $msg = mb_substr($msg, 0, -2);
             }else{
-                $msg = $fieldNameMap[$column].'达到'.($log->$column ?? 0).$fieldUnitMap[$column].'值';
+                if(isset($fieldNameMap[$column]) && isset($fieldUnitMap[$column])){
+                    $msg = $fieldNameMap[$column].'达到'.($log->$column ?? 0).$fieldUnitMap[$column].'值'; 
+                }
             }
 
             $notices[] = [