From d2f4366f09bb89f8641b640835138f7bafcd5c32 Mon Sep 17 00:00:00 2001 From: wanghongjun <1445693971@qq.com> Date: Wed, 20 May 2026 10:47:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=AA=8C=E8=AF=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/EventCalendarController.php | 5 +--- .../Admin/ParkingLicensePlateController.php | 5 +--- .../Admin/ParkingPatternController.php | 25 +++++++++---------- .../Controllers/Admin/VipListController.php | 5 +--- app/Imports/EventCalendarImport.php | 14 +++++------ 5 files changed, 22 insertions(+), 32 deletions(-) diff --git a/app/Http/Controllers/Admin/EventCalendarController.php b/app/Http/Controllers/Admin/EventCalendarController.php index 8712a5e..615932e 100644 --- a/app/Http/Controllers/Admin/EventCalendarController.php +++ b/app/Http/Controllers/Admin/EventCalendarController.php @@ -349,11 +349,8 @@ class EventCalendarController extends BaseController try { // 1. 验证上传的文件 $data = $request->all(); - $request->validate([ - 'file' => 'required|mimes:xlsx,xls,csv|max:2048' - ]); $validator = Validator::make($data, [ - 'file' => 'required|mimes:xlsx,xls,csv|max:2048' + 'file' => 'required|mimes:xlsx,xls,csv,txt|max:2048' ], [ 'file.required' => __('validation.admin_list_vip.file_empty'), 'file.mimes' => __('validation.admin_list_vip.file_mimes'), diff --git a/app/Http/Controllers/Admin/ParkingLicensePlateController.php b/app/Http/Controllers/Admin/ParkingLicensePlateController.php index 2494cc8..fae84ea 100644 --- a/app/Http/Controllers/Admin/ParkingLicensePlateController.php +++ b/app/Http/Controllers/Admin/ParkingLicensePlateController.php @@ -232,11 +232,8 @@ class ParkingLicensePlateController extends BaseController try { // 1. 验证上传的文件 $params = $request->all(); - $request->validate([ - 'file' => 'required|mimes:xlsx,xls,csv|max:2048' // 限制文件类型和大小 - ]); $validator = Validator::make($params, [ - 'file' => 'required|mimes:xlsx,xls,csv|max:2048', + 'file' => 'required|mimes:xlsx,xls,csv,txt|max:2048', 'parking_space_type' => 'required|numeric' ], [ 'file.required' => __( diff --git a/app/Http/Controllers/Admin/ParkingPatternController.php b/app/Http/Controllers/Admin/ParkingPatternController.php index 59d0633..bd0ee7c 100644 --- a/app/Http/Controllers/Admin/ParkingPatternController.php +++ b/app/Http/Controllers/Admin/ParkingPatternController.php @@ -246,11 +246,8 @@ class ParkingPatternController extends BaseController try { // 1. 验证上传的文件 $data = $request->all(); - $request->validate([ - 'file' => 'required|mimes:xlsx,xls,csv|max:2048' // 限制文件类型和大小 - ]); $validator = Validator::make($data, [ - 'file' => 'required|mimes:xlsx,xls,csv|max:2048' + 'file' => 'required|mimes:xlsx,xls,csv,txt|max:2048' ], [ 'file.required' => __('validation.admin_list_vip.file_empty'), 'file.mimes' => __('validation.admin_list_vip.file_mimes'), @@ -300,20 +297,22 @@ class ParkingPatternController extends BaseController try { // 1. 验证上传的文件 $data = $request->all(); - $request->validate([ + $validator = Validator::make($data, [ 'file' => 'required|mimes:xlsx,xls,csv|max:2048', - // 限制文件类型和大小 'model_name' => 'required' - ]); - $validator = Validator::make($data, [ - 'file' => 'required|mimes:xlsx,xls,csv|max:2048', + ], [ + 'file.required' => __( + 'validation.admin_list_vip.file_empty' + ), + 'file.mimes' => __( + 'validation.admin_list_vip.file_mimes' + ), + 'file.max' => __( + 'validation.admin_list_vip.file_max' + ), 'model_name.required' => __( 'validation.parking_pattern.m_empty' ), - ], [ - 'file.required' => __('validation.admin_list_vip.file_empty'), - 'file.mimes' => __('validation.admin_list_vip.file_mimes'), - 'file.max' => __('validation.admin_list_vip.file_max'), ]); if ($validator->fails()) { throw new ValidationException($validator); diff --git a/app/Http/Controllers/Admin/VipListController.php b/app/Http/Controllers/Admin/VipListController.php index d0868c1..e94aab1 100644 --- a/app/Http/Controllers/Admin/VipListController.php +++ b/app/Http/Controllers/Admin/VipListController.php @@ -174,11 +174,8 @@ class VipListController extends BaseController { try { // 1. 验证上传的文件 - $request->validate([ - 'file' => 'required|mimes:xlsx,xls,csv|max:2048' // 限制文件类型和大小 - ]); $validator = Validator::make($request->all(), [ - 'file' => 'required|mimes:xlsx,xls,csv|max:2048' + 'file' => 'required|mimes:xlsx,xls,csv,txt|max:2048' ], [ 'file.required' => __('validation.admin_list_vip.file_empty'), 'file.mimes' => __('validation.admin_list_vip.file_mimes'), diff --git a/app/Imports/EventCalendarImport.php b/app/Imports/EventCalendarImport.php index 20c99bb..f2b6617 100644 --- a/app/Imports/EventCalendarImport.php +++ b/app/Imports/EventCalendarImport.php @@ -32,11 +32,11 @@ class EventCalendarImport implements ToModel, WithHeadingRow $end_date = $row['end_date']; $end_time = $row['end_time']; if (empty($pattern_name)) { - return false; + return ; } $pattern_id = ParkingPattern::getId($pattern_name); if (!$pattern_id) { - return false; + return ; } if (EventCalendar::query()->whereIn('status', [0, 1])->where( 'pattern_id', @@ -44,23 +44,23 @@ class EventCalendarImport implements ToModel, WithHeadingRow ) ->exists() ) { - return false; + return ; } $start_date_times = strtotime($start_date); $start_times = strtotime($start_time); $end_date_times = strtotime($end_date); $end_times = strtotime($end_time); if (!$start_date_times) { - return false; + return ; } if (!$start_times) { - return false; + return ; } if (!$end_date_times) { - return false; + return ; } if (!$end_times) { - return false; + return ; } $start_date = date("Y-m-d", $start_date_times); $start_time = date("H:i:s", $start_times);