From 13ea6d7b90be2a829330886000bee95114cde75a Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq.com>
Date: Mon, 29 Jun 2026 14:02:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8E=A7=E5=88=B6=E8=BD=A6?=
 =?UTF-8?q?=E4=BD=8D=E7=9B=B8=E6=9C=BA=E7=81=AF=EF=BC=8C=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=BD=A6=E4=BD=8D=E7=9B=B8=E6=9C=BA=E7=8A=B6?=
 =?UTF-8?q?=E6=80=812?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Device/CameraApiController.php            | 52 ++++++++++---------
 app/Services/HikParkingCameraService.php      |  2 +-
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/app/Http/Controllers/Device/CameraApiController.php b/app/Http/Controllers/Device/CameraApiController.php
index f0f62ed..6b7ba43 100644
--- a/app/Http/Controllers/Device/CameraApiController.php
+++ b/app/Http/Controllers/Device/CameraApiController.php
@@ -24,27 +24,6 @@ class CameraApiController extends BaseController
     }
 
     public function getCameraData(): JsonResponse
-    {
-        $data = ParkingCamera::query()->select(['id', 'camera_ip', 'status'])
-            ->get()
-            ->toArray();
-        return $this->responseService->success(['list' => $data]);
-    }
-
-    public function updateCameraStatus(Request $request): JsonResponse
-    {
-        $data = $request->all();
-        $list = $data['list'];
-        foreach ($list as $item) {
-            $id = $item['id'] ?? 0;
-            $camera_ip = $item['camera_ip'] ?? '';
-            $status = $item['status'] ?? 0;
-            $this->service->updateStatus($id, $camera_ip, $status);
-        }
-        return $this->responseService->success([], 'SUCCESS');
-    }
-
-    public function getCameraBody(): JsonResponse
     {
         $body = [
             "lampType"        => "internal",
@@ -56,12 +35,12 @@ class CameraApiController extends BaseController
                         "VehicleNoExist" => [
                             "enabled"      => true,
                             "flashEnabled" => false,
-                            "lampColor"    => 'green'
+                            "lampColor"    => 'red'
                         ],
                         "VehicleExist"   => [
                             "enabled"      => true,
                             "flashEnabled" => false,
-                            "lampColor"    => 'green'
+                            "lampColor"    => 'red'
                         ]
                     ]
                 ]
@@ -96,11 +75,34 @@ class CameraApiController extends BaseController
                 ]
             ]
         ];
+        Cache::put('camera_body', json_encode($body), 300);
+        $data = ParkingCamera::query()->select(['id', 'camera_ip', 'status'])
+            ->get()
+            ->toArray();
+        return $this->responseService->success(['list' => $data]);
+    }
+
+    public function updateCameraStatus(Request $request): JsonResponse
+    {
+        $data = $request->all();
+        $list = $data['list'];
+        foreach ($list as $item) {
+            $id = $item['id'] ?? 0;
+            $camera_ip = $item['camera_ip'] ?? '';
+            $status = $item['status'] ?? 0;
+            $this->service->updateStatus($id, $camera_ip, $status);
+        }
+        return $this->responseService->success([], 'SUCCESS');
+    }
+
+    public function getCameraBody(): JsonResponse
+    {
+        $body = Cache::get('camera_body');
         if (!$body) {
             return $this->responseService->error('empty');
         } else {
-//            $bodyArr = json_decode($body);
-//            Cache::delete('camera_body');
+            $bodyArr = json_decode($body);
+            Cache::delete('camera_body');
         }
         return $this->responseService->success($body, 'SUCCESS');
     }
diff --git a/app/Services/HikParkingCameraService.php b/app/Services/HikParkingCameraService.php
index c69035f..5ec9d71 100644
--- a/app/Services/HikParkingCameraService.php
+++ b/app/Services/HikParkingCameraService.php
@@ -187,7 +187,7 @@ class HikParkingCameraService
 //            ->withDigestAuth($this->device['username'], $this->device['password'])
 //            ->put($url, $body);
 
-        Cache::put('camera_body', json_encode($body));
+        Cache::put('camera_body', json_encode($body), 300);
         //dd($response->json(), $response->body(), $response->object(), $response);
     }
 }