From cd16fbf658641ef8b1be4e161e7abb343ae822f4 Mon Sep 17 00:00:00 2001
From: Jing Li <lym125@gmail.com>
Date: Fri, 4 Aug 2023 09:38:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8E=82=E5=AE=B6=E5=92=8C?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/DeviceController.php | 23 ++++++++++++-----------
 app/Http/Resources/DeviceResource.php     | 12 ++++++++++++
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/DeviceController.php b/app/Http/Controllers/DeviceController.php
index 216665f..da72241 100644
--- a/app/Http/Controllers/DeviceController.php
+++ b/app/Http/Controllers/DeviceController.php
@@ -4,29 +4,29 @@ namespace App\Http\Controllers;
 
 use App\Enums\DeviceStatus;
 use App\Enums\DeviceType;
+use App\Enums\OperationType;
 use App\Helpers\Paginator;
 use App\Http\Requestes\DeviceRequest;
 use App\Http\Resources\DeviceResource;
-use App\Models\Device;
-use App\Models\MeteorologicalMonitoringLog;
-use App\Models\MeteorologicalMonitoringDailyLog;
-use App\Models\SoilMonitoringLog;
-use App\Models\SoilMonitoringDailyLog;
-use App\Models\WaterQualityMonitoringLog;
-use App\Models\WaterQualityMonitoringDailyLog;
 use App\Models\AgriculturalBase;
+use App\Models\Device;
+use App\Models\MeteorologicalMonitoringDailyLog;
+use App\Models\MeteorologicalMonitoringLog;
+use App\Models\SoilMonitoringDailyLog;
+use App\Models\SoilMonitoringLog;
+use App\Models\WaterQualityMonitoringDailyLog;
+use App\Models\WaterQualityMonitoringLog;
+use App\Services\OperationLogService;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
-use Carbon\Carbon;
-use App\Services\OperationLogService;
-use App\Enums\OperationType;
 use Peidikeji\Setting\Models\Setting;
 
 class DeviceController extends Controller
 {
     public function index(Request $request)
     {
-        $query = Device::with('base')->filter($request->input())->orderBy('sort', 'desc');
+        $query = Device::with(['base', 'supplier', 'project'])->filter($request->input())->orderBy('sort', 'desc');
         $list = $query->paginate(Paginator::resolvePerPage('per_page', 20, 50));
 
         return $this->json(DeviceResource::collection($list));
@@ -51,6 +51,7 @@ class DeviceController extends Controller
 
     public function show(Device $device)
     {
+        $device->loadMissing(['base', 'supplier', 'project']);
         return $this->json(DeviceResource::make($device));
     }
 
diff --git a/app/Http/Resources/DeviceResource.php b/app/Http/Resources/DeviceResource.php
index 953ab5b..e626942 100644
--- a/app/Http/Resources/DeviceResource.php
+++ b/app/Http/Resources/DeviceResource.php
@@ -31,6 +31,18 @@ class DeviceResource extends JsonResource
             'created_at' => strtotime($this->created_at) ?? 0, //录入时间
             'is_recommend' => $this->is_recommend,
             'sort'  => $this->sort ?? 0,
+            'supplier' => $this->whenLoaded('supplier', function () {
+                return $this->supplier ? [
+                    'id' => $this->supplier->key,
+                    'name' => $this->supplier->name,
+                ] : null;
+            }),
+            'project' => $this->whenLoaded('project', function () {
+                return $this->project ? [
+                    'id' => $this->project->key,
+                    'name' => $this->project->name,
+                ] : null;
+            }),
         ];
     }
 }