相机管理优化

app/Services/ParkingCameraService.php

@@ -79,14 +79,14 @@ class ParkingCameraService extends BaseService
             ) {
                 throw new Exception(__('service.parking_camera.number_exists'));
             }
-
+            $floor_id = $data['floor_id'] ?? 0;
-            self::validateSpaceData($parking_space_data);
+            self::validateSpaceData($parking_space_data, $floor_id);
 
             $model = ParkingCamera::query()->create([
                 'number'            => $data['number'],
                 'camera_ip'         => $data['camera_ip'],
                 'server_ip'         => $data['server_ip'],
-                'floor_id'          => $data['floor_id'] ?? 0,
+                'floor_id'          => $floor_id,
                 'floor_region_id'   => $data['floor_region_id'] ?? 0,
                 'is_control_lights' => $data['is_control_lights'] ?? 1,
                 'is_external'       => $data['is_external'] ?? 0,
@@ -114,7 +114,7 @@ class ParkingCameraService extends BaseService
      * @return void
      * @throws CustomException
      */
-    private function validateSpaceData(&$data): void
+    private function validateSpaceData(&$data, $floor_id): void
     {
         foreach ($data as &$item) {
             $control_lights_ip = $item['control_lights_ip'] ?? '';
@@ -133,7 +133,7 @@ class ParkingCameraService extends BaseService
             if (!$space_id && $space_attr_id) {
                 // 创建车位
                 $spaceData = [
-                    'floor_id'      => $data['floor_id'],
+                    'floor_id'      => $floor_id,
                     'number'        => $item['space_number'],
                     'space_attr_id' => $space_attr_id
                 ];
@@ -212,7 +212,7 @@ class ParkingCameraService extends BaseService
             );
 
             // 删除再添加
-            $this->delAdminRoleMenu($id);
+            $this->delSpaceCamera($id);
             $this->addSpaceCamera($id, $parking_space_data);
 
             DB::commit();
@@ -224,8 +224,7 @@ class ParkingCameraService extends BaseService
     }
 
     // 删除车位空灯数据
-
+    private function delSpaceCamera(int $camera_id): void
-    private function delAdminRoleMenu(int $camera_id): void
     {
         $oldAdminRoleMenu = ParkingSpaceCamera::getData($camera_id);
         $this->logService->logDeletedData(
@@ -248,7 +247,7 @@ class ParkingCameraService extends BaseService
 
             $model->delete();
 
-            $this->delAdminRoleMenu($id);
+            $this->delSpaceCamera($id);
 
             DB::commit();
             return true;