fix(repo): 更新数据库字段

Author: lisgroup

laravel/app/Http/Controllers/Api/ApiExcelController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api;
 
 use App\Events\ApiExcelEvent;
+use App\Http\Repository\ApiRepository;
 use App\Http\Repository\ExcelRepository;
 use App\Http\Requests\ApiExcel\Store;
 use App\Http\Requests\ApiExcel\Update;
@@ -57,6 +58,8 @@ public function index()
             $where = ['uid' => $user_id];
         }
         $list = ApiExcel::with('apiParam')->where($where)->orderBy('id', 'desc')->paginate($this->perPage);
+        // 获取完成进度情况
+        $list = ApiRepository::getInstent()->workProgress($list);
 
         $appUrl = env('APP_URL') ?? '';
         $collect = collect(['appUrl' => $appUrl]);
@@ -264,6 +267,11 @@ public function forceDelete($id)
         return $this->out(200);
     }
 
+    /**
+     * 下载已完成数据
+     * 
+     * @return \Illuminate\Http\Response
+     */
     public function downloadLog()
     {
         $api_excel_id = $this->request->input('id');
@@ -280,4 +288,5 @@ public function downloadLog()
         }
         return $this->out(200, ['failed_done_file' => $failed_done_file]);
     }
+
 }

laravel/app/Http/Repository/MultithreadingRepository.php

@@ -150,7 +150,9 @@ public function loadExcel()
             }
 
             $this->dataSet = $dataSet;
-            return true;
+            // return true;
+            // 更新 api_excel 表 total_excel 条数
+            return $this->saveTotalExcel($this->api_excel_id, count($dataSet['data']));
         } catch (\Exception $e) {
             return false;
         }
@@ -324,7 +326,9 @@ public function newLoadExcel()
             // 3. 循环数组每个单元格的数据
             $this->dataSet['data'] = $data;
 
-            return true;
+            // return true;
+            // 更新 api_excel 表 total_excel 条数
+            return $this->saveTotalExcel($this->api_excel_id, count($data));
         } catch (Exception|\PhpOffice\PhpSpreadsheet\Exception $exception) {
             return false;
         }
@@ -647,6 +651,19 @@ public function completionRate($excel_id)
         return '100';
     }
 
+    /**
+     * 保存 total_excel 字段
+     *
+     * @param $api_id
+     * @param $total
+     *
+     * @return bool
+     */
+    private function saveTotalExcel($api_id, $total)
+    {
+        return ApiExcel::where('id', $api_id)->update(['total_excel' => $total]);
+    }
+
     /**
      * BusRepository constructor.
      */