From 461761d4aeabd0f561a4d585a2a34e007e9cc016 Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Thu, 29 Jun 2023 15:17:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=91=E6=8E=A7=E7=82=B9?= =?UTF-8?q?=E4=BD=8D=E9=80=9A=E8=BF=87=E5=AE=9E=E9=AA=8C=E7=94=B0ID?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Filters/MonitorModeFilter.php | 6 ++++++ app/Http/Resources/MonitorModeResource.php | 1 + app/Models/MonitorMode.php | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/app/Filters/MonitorModeFilter.php b/app/Filters/MonitorModeFilter.php index ed7877c..c855987 100644 --- a/app/Filters/MonitorModeFilter.php +++ b/app/Filters/MonitorModeFilter.php @@ -7,6 +7,12 @@ use App\Models\Device; class MonitorModeFilter extends ModelFilter { + + public function region($region){ + return $this->whereHas('region', function($q)use($region){ + return $q->where('regions.id', $region); + }); + } /** * 类型 */ diff --git a/app/Http/Resources/MonitorModeResource.php b/app/Http/Resources/MonitorModeResource.php index 14d5769..bdf5a5a 100644 --- a/app/Http/Resources/MonitorModeResource.php +++ b/app/Http/Resources/MonitorModeResource.php @@ -16,6 +16,7 @@ class MonitorModeResource extends JsonResource { return [ 'id' => $this->id, + 'type' => $this->type, 'name' => $this->name ]; } diff --git a/app/Models/MonitorMode.php b/app/Models/MonitorMode.php index a77e5af..6a9ab57 100644 --- a/app/Models/MonitorMode.php +++ b/app/Models/MonitorMode.php @@ -122,6 +122,10 @@ class MonitorMode extends Model ); } + public function region(){ + return $this->belongsToMany(Region::class, RegionMonitor::class, 'monitor_id', 'region_id')->withTimestamps(); + } + public function devices(){ return $this->belongsToMany(Device::class, MonitorDevice::class, 'monitor_id', 'device_id')->withPivot('fields'); }