diff --git a/app/Services/ParkingGateControlService.php b/app/Services/ParkingGateControlService.php index 16f326a..b0ea563 100644 --- a/app/Services/ParkingGateControlService.php +++ b/app/Services/ParkingGateControlService.php @@ -25,12 +25,16 @@ class ParkingGateControlService extends BaseService { $typeArr = $this->getType(); - $item['reserve_id'] = ParkingReservation::query()->where( - 'id', - $item['reservation_id'] - )->value( - 'reserve_id' - ); + $item['reserve_id'] = ''; + if ($item['reservation_id']) { + $item['reserve_id'] = ParkingReservation::query()->where( + 'id', + $item['reservation_id'] + )->value( + 'reserve_id' + ); + } + $item['member_type'] = ParkingSpaceType::getName($item['member_type']); $item['license_plate'] = ParkingLicensePlate::getNumber( $item['license_plate_id'] @@ -46,12 +50,13 @@ class ParkingGateControlService extends BaseService $item['leave_type_str'] = $typeArr[$item['leave_type']] ?? ''; $item['dwell_time'] = get_time_difference_str( $item['enter_at'], - $item['leave_at'] + $item['leave_at'] ?: '' ); $item['enter_img'] = get_image_url($item['enter_img']); $item['leave_img'] = get_image_url($item['leave_img']); - $item['admin_username'] = $item['admin_user_id'] ? AdminUsers::getUsername($item['admin_user_id']) : ''; + $item['admin_username'] = $item['admin_user_id'] + ? AdminUsers::getUsername($item['admin_user_id']) : ''; unset($item['license_plate_id'], $item['channel_id'], $item['reservation_id'], $item['free_passage'], $item['admin_user_id']); return $item; } diff --git a/app/Services/ParkingSpaceService.php b/app/Services/ParkingSpaceService.php index 7ebdfa3..2ee8199 100644 --- a/app/Services/ParkingSpaceService.php +++ b/app/Services/ParkingSpaceService.php @@ -294,7 +294,7 @@ class ParkingSpaceService extends BaseService $this->logService->logUpdated( $model, $oldValues, - 'parking_space.update_status' + 'space_attributes.update' ); DB::commit(); return $model; @@ -344,13 +344,11 @@ class ParkingSpaceService extends BaseService $this->getLogDescription('space_type_id') ); // 切换车位类型,同步切换车位灯颜色 - if ($oldValues['status'] != 2) { - $this->changeSpaceCameraColor($oldValues['number'], $type_id, $oldValues['space_attr_id']); - } + $this->changeSpaceCameraColor($oldValues['number'], $type_id, $oldValues['space_attr_id']); } // 切换模式更改车位类型 后 更改车位灯颜色 - public function changeSpaceCameraColor($number, $space_type_id, $space_attr, $is_repair = false) + protected function changeSpaceCameraColor($number, $space_type_id, $space_attr) { if ($number == '1-1') { $SpaceType = ParkingSpaceType::query()->find($space_type_id); @@ -364,12 +362,6 @@ 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);