导入验证优化

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'),

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'               => __(

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'       => __(
-                'file'                => 'required|mimes:xlsx,xls,csv|max:2048',
+                    '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);

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'),

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);