合并分支 'akun' 到 'master'

Akun



查看合并请求 !20

@@ -10,9 +10,11 @@ use App\Models\Mail\Mail;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Redis;
 
 
 /**
 /**
- * Class GoogleRank
+ * 导入任务异步执行
+ * Class ProjectImport
  * @package App\Console\Commands
  * @package App\Console\Commands
  * @author Akun
  * @author Akun
  * @date 2023/9/20 15:18
  * @date 2023/9/20 15:18
@@ -43,7 +45,13 @@ class ProjectImport extends Command
 
 
     protected function start_import()
     protected function start_import()
     {
     {
-        $task = ImportTask::where('status', ImportTask::STATUS_UN)->first();
+        $task_id = $this->get_task();
+        if (!$task_id) {
+            sleep(2);
+            return true;
+        }
+
+        $task = ImportTask::where('id', $task_id)->where('status', ImportTask::STATUS_UN)->first();
         if (!$task) {
         if (!$task) {
             sleep(2);
             sleep(2);
             return true;
             return true;
@@ -51,6 +59,9 @@ class ProjectImport extends Command
 
 
         echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', import start' . PHP_EOL;
         echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', import start' . PHP_EOL;
 
 
+        $task->status = ImportTask::STATUS_ING;//导入中
+        $task->save();
+
         $is_gbk = 0;
         $is_gbk = 0;
         $file_code_type = $this->get_code_type($task->file_url);
         $file_code_type = $this->get_code_type($task->file_url);
         if ($file_code_type === false) {
         if ($file_code_type === false) {
@@ -86,8 +97,6 @@ class ProjectImport extends Command
         $success_count = 0; //成功导入条数
         $success_count = 0; //成功导入条数
         $repeat_count = 0; //过滤已存在条数
         $repeat_count = 0; //过滤已存在条数
         if (count($line_of_text) > 1) {
         if (count($line_of_text) > 1) {
-            $task->status = ImportTask::STATUS_ING;//导入中
-            $task->save();
 
 
             //设置数据库
             //设置数据库
             $project = ProjectServer::useProject($task->project_id);
             $project = ProjectServer::useProject($task->project_id);
@@ -144,6 +153,28 @@ class ProjectImport extends Command
         sleep(2);
         sleep(2);
     }
     }
 
 
+    //获取任务
+    protected function get_task()
+    {
+        $key = 'console_import_task';
+        $task_id = Redis::rpop($key);
+        if ($task_id) {
+            return $task_id;
+        }
+
+        $task_list = ImportTask::where('status', ImportTask::STATUS_UN)->limit(20)->get();
+        if ($task_list->count() == 0) {
+            return false;
+        }
+
+        foreach ($task_list as $value) {
+            Redis::lpush($key, $value->id);
+        }
+
+        $task_id = Redis::rpop($key);
+        return $task_id;
+    }
+
     //判断编码格式
     //判断编码格式
     protected function get_code_type($file)
     protected function get_code_type($file)
     {
     {
@@ -158,7 +189,7 @@ class ProjectImport extends Command
         return false;
         return false;
     }
     }
 
 
-    //发生站内通知
+    //发送站内通知
     protected function send_mail($user_list, $time, $type, $success_count, $repeat_count, $reason)
     protected function send_mail($user_list, $time, $type, $success_count, $repeat_count, $reason)
     {
     {
         if ($type == ImportTask::TYPE_NEWS) {
         if ($type == ImportTask::TYPE_NEWS) {