update 失败任务：1. logs 10s 一直无新增数据；2. 查询最新更新时间大于 20 秒未新增数据--失败

Author: lisgroup

laravel/app/Http/Repository/ApiRepository.php

@@ -79,22 +79,28 @@ public function autoFailed()
         // 3. 完成率 10% -- 5 分钟不再增加
         // 4. 完成率 1%  -- 10 分钟不再增加
         // 5. 完成率 0%  -- 30 分钟不再增加
-        $excels = DB::connection()->select('SELECT ae.id,ae.api_param_id,ae.state,ae.total_excel,ael.api_excel_id,ael.sort_index,ael.created_at FROM `boss_api_excel` ae LEFT JOIN boss_api_excel_logs ael ON ae.id=ael.api_excel_id AND ael.id=(SELECT id FROM boss_api_excel_logs WHERE boss_api_excel_logs.api_excel_id=ae.id ORDER BY sort_index DESC LIMIT 1) WHERE ae.state=1 AND ae.`deleted_at` IS NULL ');
+        // $excels = DB::connection()->select('SELECT ae.id,ae.api_param_id,ae.state,ae.total_excel,ael.api_excel_id,ael.sort_index,ael.created_at FROM `boss_api_excel` ae LEFT JOIN boss_api_excel_logs ael ON ae.id=ael.api_excel_id AND ael.id=(SELECT id FROM boss_api_excel_logs WHERE boss_api_excel_logs.api_excel_id=ae.id ORDER BY sort_index DESC LIMIT 1) WHERE ae.state=1 AND ae.`deleted_at` IS NULL ');
+        $excels = DB::connection()->select('SELECT ae.id,ae.api_param_id,ae.state,ae.total_excel,ael.api_excel_id,ael.sort_index,ae.updated_at,ael.created_at FROM `boss_api_excel` ae LEFT JOIN boss_api_excel_logs ael ON ae.id=ael.api_excel_id AND ael.id=(SELECT id FROM boss_api_excel_logs WHERE boss_api_excel_logs.api_excel_id=ae.id ORDER BY id DESC LIMIT 1) WHERE ae.state=1 AND ae.`deleted_at` IS NULL ');
 
         foreach ($excels as $excel) {
             // 开启任务后 10 分钟未查询出结果=》失败
             // if ($excel['auto_delete'] > 0 && strtotime($excel['updated_at']) + 600 < time()) {
             //     ApiExcel::where('id', $excel['id'])->update(['state' => 5]);
             // }
-            if (!$excel->sort_index || !$excel->created_at) {
-                continue;
-            }
-            // 记录完成率
-            $finish = (($excel->sort_index + 1) / $excel->total_excel) * 100;
-            $finish = sprintf("%.2f", $finish);
-            if (($finish > '96' && strtotime($excel->created_at) + 5 < time()) || ($finish > '50' && strtotime($excel->created_at) + 60 < time()) || ($finish > '10' && strtotime($excel->created_at) + 300 < time()) || ($finish > '1' && strtotime($excel->created_at) + 600 < time()) || ($finish >= 0 && strtotime($excel->created_at) + 1800 < time())) {
+            // if (!$excel->sort_index || !$excel->created_at) {
+            //     continue;
+            // }
+
+            // 1. logs 10s 一直无新增数据；2. 查询最新更新时间大于 20 秒未新增数据--失败
+            if ((!$excel->sort_index && $excel['updated_at'] + 10 < time()) || strtotime($excel->created_at) + 20 < time()) {
                 ApiExcel::where('id', $excel->id)->update(['state' => 5]);
             }
+            // 记录完成率
+            // $finish = (($excel->sort_index + 1) / $excel->total_excel) * 100;
+            // $finish = sprintf("%.2f", $finish);
+            // if (($finish > '96' && strtotime($excel->created_at) + 5 < time()) || ($finish > '50' && strtotime($excel->created_at) + 60 < time()) || ($finish > '10' && strtotime($excel->created_at) + 300 < time()) || ($finish > '1' && strtotime($excel->created_at) + 600 < time()) || ($finish >= 0 && strtotime($excel->created_at) + 1800 < time())) {
+            //    ApiExcel::where('id', $excel->id)->update(['state' => 5]);
+            // }
         }
     }