From c244a88eccd730d52a9fd70597e930fa6c9116ec Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq.com>
Date: Fri, 26 Jun 2026 10:49:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E4=BD=8D=E7=9B=B8=E6=9C=BA=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Admin/ParkingCameraController.php | 15 +++++++++++++++
 app/Services/ParkingCameraService.php             | 11 ++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Admin/ParkingCameraController.php b/app/Http/Controllers/Admin/ParkingCameraController.php
index d149e99..2b92be3 100644
--- a/app/Http/Controllers/Admin/ParkingCameraController.php
+++ b/app/Http/Controllers/Admin/ParkingCameraController.php
@@ -53,6 +53,21 @@ class ParkingCameraController extends BaseController
                 }
             }
 
+            if ($request->has('parking_id')) {
+                $parking_id = $request->input('parking_id');
+                if ($parking_id) {
+                    $floor_ids = AdminFloor::query()->where(
+                        'building_floor',
+                        $parking_id
+                    )->pluck('id');
+                    if ($floor_ids) {
+                        $query->whereIn('floor_id', $floor_ids->toArray());
+                    } else {
+                        $query->where('id', 0);
+                    }
+                }
+            }
+
             if ($request->has('number')) {
                 $number = $request->input('number');
                 if ($number) {
diff --git a/app/Services/ParkingCameraService.php b/app/Services/ParkingCameraService.php
index b42858e..b02d36b 100644
--- a/app/Services/ParkingCameraService.php
+++ b/app/Services/ParkingCameraService.php
@@ -4,12 +4,11 @@ namespace App\Services;
 
 use App\Exceptions\CustomException;
 use App\Models\AdminFloor;
+use App\Models\Parking;
 use App\Models\ParkingCamera;
 use App\Models\ParkingSpace;
 use App\Models\ParkingSpaceCamera;
 use Exception;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 
 class ParkingCameraService extends BaseService
@@ -256,7 +255,13 @@ class ParkingCameraService extends BaseService
     // 处理列表数据
     public function optionItems($item)
     {
-        $item['floor'] = AdminFloor::getName($item['floor_id']);
+        $item['floor'] = '';
+        $item['parking'] = '';
+        $floor = AdminFloor::getFirst($item['floor_id']);
+        if ($floor) {
+            $item['floor'] = $floor['name'];
+            $item['parking'] = Parking::getName($floor['building_floor']);
+        }
         $item['parking_space_count']
             = ParkingSpaceCamera::getSpaceCount($item['id']);
         $item['parking_space_numbers']