From dbd69e15d838171e42888b39e28fdc9458169254 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Thu, 17 Nov 2022 09:28:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AD=A6=E6=8A=A5=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/DeviceWarningService.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Services/DeviceWarningService.php b/app/Services/DeviceWarningService.php
index 5963ffa..5da2c6a 100644
--- a/app/Services/DeviceWarningService.php
+++ b/app/Services/DeviceWarningService.php
@@ -9,6 +9,7 @@ use App\Models\WaterQualityMonitoringLog;
 use App\Models\SoilMonitoringLog;
 use Carbon\Carbon;
 use App\Models\Device;
+use App\Models\AgriculturalBase;
 
 class DeviceWarningService
 {
@@ -93,19 +94,20 @@ class DeviceWarningService
             }
 
             if($_warning){//插入警报内容
-                $this->inLog($device->sn, $reportedAt, $log, $_lv, $key);
+                $this->inLog($device, $reportedAt, $log, $_lv, $key);
             }
         }
     }
 
 
-    private function inLog(string $deviceSn, Carbon $reportedAt, Model $log, $lv, $column){
+    private function inLog(Device $device, Carbon $reportedAt, Model $log, $lv, $column){
+        $base = AgriculturalBase::find($log->agricultural_base_id);
         DeviceWarning::create([
             'device_id' => $log->device_id,
             'base_id' => $log->agricultural_base_id,
             'lv'    => $lv,
-            'content' => $this->columnTexts[$column] . '达到' .$log->$column. $this->columnUnit[$column],
-            'linkos_device_id' => $deviceSn,
+            'content' => '【'.($base?->name ?? '').'-'.$device->monitoring_point.'】'.$this->columnTexts[$column] . '达到' .$log->$column. $this->columnUnit[$column],
+            'linkos_device_id' => $device->sn,
             'linkos_reported_at' => $reportedAt
         ]);
     }