闸机管理5

app/Models/ParkingSpaceType.php

@@ -34,7 +34,15 @@ class ParkingSpaceType extends Model
 
     public static function getName($id)
     {
-        return self::query()->where('id', $id)->value('name') ?? '';
+        $name = self::query()->where('id', $id)->value('name') ?? '';
+        if ($name) {
+            $name = AdminTranslationService::getTranslationTypeName(
+                $id,
+                1,
+                $name
+            );
+        }
+        return $name;
     }
 
     public static function getData($ids = []): array

app/Services/ParkingSpaceService.php

@@ -294,7 +294,7 @@ class ParkingSpaceService extends BaseService
             $this->logService->logUpdated(
                 $model,
                 $oldValues,
-                'space_attributes.update'
+                'parking_space.update_status'
             );
             DB::commit();
             return $model;
@@ -344,11 +344,13 @@ class ParkingSpaceService extends BaseService
             $this->getLogDescription('space_type_id')
         );
         // 切换车位类型，同步切换车位灯颜色
-        $this->changeSpaceCameraColor($oldValues['number'], $type_id, $oldValues['space_attr_id']);
+        if ($oldValues['status'] != 2) {
+            $this->changeSpaceCameraColor($oldValues['number'], $type_id, $oldValues['space_attr_id']);
+        }
     }
 
     // 切换模式更改车位类型 后 更改车位灯颜色
-    protected function changeSpaceCameraColor($number, $space_type_id, $space_attr)
+    public function changeSpaceCameraColor($number, $space_type_id, $space_attr, $is_repair = false)
     {
         if ($number == '1-1') {
             $SpaceType = ParkingSpaceType::query()->find($space_type_id);
@@ -362,6 +364,12 @@ class ParkingSpaceService extends BaseService
                 $color_vacant = $SpaceTypeAttr['color_vacant'];
                 $is_flicker = $SpaceTypeAttr['is_warning'];
             }
+            // 维修灯
+            if ($is_repair) {
+                $color_occupy = $SpaceType['repair_light'];
+                $color_vacant = $SpaceType['repair_light'];
+                $is_flicker = false;
+            }
             $HikParkingCameraService = new HikParkingCameraService($this->logService);
             $body = $HikParkingCameraService->getBody($color_occupy, $color_vacant, $is_flicker);
             $HikParkingCameraService->updatelight($body);