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 ]); }