diff --git a/app/Http/Controllers/Device/CameraApiController.php b/app/Http/Controllers/Device/CameraApiController.php index 246618e..533bf8d 100644 --- a/app/Http/Controllers/Device/CameraApiController.php +++ b/app/Http/Controllers/Device/CameraApiController.php @@ -136,13 +136,15 @@ class CameraApiController extends BaseController $license_plate = $item['license_plate_number'] ?? ''; $date_time = $item['date_time'] ?? date("Y-m-d H:i:s", time()); $image_data = $item['image_data'] ?? ''; + $confidenceLevel = $item['confidenceLevel'] ?? '0'; if ($camera_ip && $number) { ParkingAccessRecordService::query()->enterOrLeave( $camera_ip, $number, $license_plate, $date_time, - $image_data + $image_data, + $confidenceLevel ); } } diff --git a/app/Services/LicensePlateRecognitionService.php b/app/Services/LicensePlateRecognitionService.php index d84a4c9..9b83864 100644 --- a/app/Services/LicensePlateRecognitionService.php +++ b/app/Services/LicensePlateRecognitionService.php @@ -29,7 +29,7 @@ class LicensePlateRecognitionService extends BaseService public function createData($data) { $model = LicensePlateRecognition::query()->create([ - 'time_slot' => get_datetime('date'), + 'time_slot' => $data['time_slot'], 'manual_modification' => $data['manual_modification'], 'license_plate' => $data['license_plate'], 'recognition' => $data['recognition'], @@ -41,7 +41,7 @@ class LicensePlateRecognitionService extends BaseService public function getCount($time_slot) { - $manualWhere = $highWhere = $middleWhere = $where = [ + $manualWhere = $where = [ 'time_slot' => $time_slot ]; $where['manual_modification'] = 0; diff --git a/app/Services/ParkingAccessRecordService.php b/app/Services/ParkingAccessRecordService.php index ecd5e3b..d2349c6 100644 --- a/app/Services/ParkingAccessRecordService.php +++ b/app/Services/ParkingAccessRecordService.php @@ -58,7 +58,14 @@ class ParkingAccessRecordService extends BaseService } // 车辆进入车位 - public function enterOrLeave($camera_ip, $space_number, $license_plate, $now_time, $image_data = '') + public function enterOrLeave( + $camera_ip, + $space_number, + $license_plate, + $now_time, + $image_data = '', + $confidenceLevel = 0 + ) { $camera_id = ParkingCamera::query()->where('camera_ip', $camera_ip) ->value('id'); @@ -148,7 +155,8 @@ class ParkingAccessRecordService extends BaseService $now_time, $data['license_plate_id'], $data['scene_image'], - empty($id) + empty($id), + $confidenceLevel ); // 判断是否为VIP 并添加入场 ParkingVipListService::enter( @@ -158,6 +166,15 @@ class ParkingAccessRecordService extends BaseService $now_time, $data['license_plate_id'] ); + + $RecognitionService = new LicensePlateRecognitionService($this->logService); + $RecognitionService->createData([ + 'time_slot' => date("Y-m-d", strtotime($now_time)), + 'manual_modification' => 0, + 'recognition' => $confidenceLevel, + 'license_plate' => $license_plate, + 'capture_images' => '' + ]); } // 手动添加车辆进出记录 diff --git a/app/Services/ParkingSpaceService.php b/app/Services/ParkingSpaceService.php index 39359b7..77ed210 100644 --- a/app/Services/ParkingSpaceService.php +++ b/app/Services/ParkingSpaceService.php @@ -447,7 +447,8 @@ class ParkingSpaceService extends BaseService $datetime, $license_plate_id = 0, $pic_url = '', - $is_change = true + $is_change = true, + $confidenceLevel = 90 ) { $model = ParkingSpace::query()->findOrFail($id); $oldValues = $model->toArray(); @@ -462,7 +463,7 @@ class ParkingSpaceService extends BaseService if ($status == 1) { $update['license_plate_id'] = $license_plate_id; $update['berthing_time'] = $datetime; - $update['recognition'] = '90'; + $update['recognition'] = $confidenceLevel; $update['pic_url'] = $pic_url; } $model->update($update);