Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -28,23 +28,15 @@ class SyncSubmitTask extends Command
 
 
     public function handle()
     public function handle()
     {
     {
-        $backup = false;
         while (true) {
         while (true) {
-            $task_id = $this->getTaskId();
-            if ($task_id > 2000000) {
-                $backup = true;
-            }
-            if (empty($task_id)) {
-                if ($backup) {
-                    $this->backup();
-                    $backup = false;
-                }
-                sleep(5);
+            $task_id = Redis::rpop('sync_submit_task');
+            if(!$task_id){
+                sleep(3);
                 continue;
                 continue;
             }
             }
             $this->output('任务' . $task_id . '开始');
             $this->output('任务' . $task_id . '开始');
             $task_info = SyncSubmitTaskModel::find($task_id);
             $task_info = SyncSubmitTaskModel::find($task_id);
-            if (empty($task_info) || $task_info->status !=2) {
+            if (empty($task_info) || $task_info->status !=3) {
                 $this->output('任务不存在或者已执行');
                 $this->output('任务不存在或者已执行');
                 continue;
                 continue;
             }
             }
@@ -79,31 +71,6 @@ class SyncSubmitTask extends Command
         }
         }
     }
     }
 
 
-    public function getTaskId()
-    {
-        $task_id = Redis::rpop('sync_submit_task');
-        $lockKey = 'lock_sync_submit_task';
-        if (empty($task_id)) {
-            // 获取锁
-            if (Redis::setnx($lockKey, 1)) {
-                // 设置锁的过期时间，防止死锁
-                Redis::expire($lockKey, 10);
-                $tasks = SyncSubmitTaskModel::where('status', 0)->limit(100)->get();
-                foreach ($tasks as $task) {
-                    $task->status = 2;
-                    $task->save();
-                    Redis::lpush('sync_submit_task', $task->id);
-                }
-                $task_id = Redis::rpop('sync_submit_task');
-                Redis::del($lockKey);
-            } else {
-                // 未获取到锁
-                return '';
-            }
-        }
-        return $task_id;
-    }
-
     /**
     /**
      * 输出处理日志
      * 输出处理日志
      */
      */
@@ -112,31 +79,4 @@ class SyncSubmitTask extends Command
         echo date('Y-m-d H:i:s') . ' | ' . $message . PHP_EOL;
         echo date('Y-m-d H:i:s') . ' | ' . $message . PHP_EOL;
         return true;
         return true;
     }
     }
-
-    /**
-     * 备份数据
-     * @author zbj
-     * @date 2024/1/23
-     */
-    public function backup()
-    {
-        DB::beginTransaction();
-        try {
-            $table = (new SyncSubmitTaskModel())->getTable();
-            $new_table = $table . '_backup_' . date('Ymd');
-
-            //重命名当前表
-            Schema::rename($table, $new_table);
-            //克隆表数据
-            DB::statement('CREATE TABLE ' . $table . ' LIKE ' . $new_table);
-
-            DB::commit();
-
-            $this->output('数据备份成功');
-        } catch (\Exception $e) {
-            $this->output('数据备份失败' . $e->getMessage());
-            DB::rollBack();
-        }
-        return true;
-    }
 }
 }

+<?php
+
+namespace App\Console\Commands\Sync;
+
+
+use App\Exceptions\InquiryFilterException;
+use App\Models\Project\Project;
+use App\Models\SyncSubmitTask\SyncSubmitTask as SyncSubmitTaskModel;
+use App\Services\SyncSubmitTaskService;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Redis;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Str;
+
+/**
+ *
+ * Class SyncSubmitTask
+ * @package App\Console\Commands
+ * @author zbj
+ * @date 2023/11/28
+ */
+class SyncSubmitTaskDistribution extends Command
+{
+
+    protected $signature = 'sync_submit_task_distribution';
+    protected $description = '询盘、访问异步任务分发';
+
+    public function handle()
+    {
+        while (true) {
+            $len = Redis::llen('sync_submit_task');
+            if (!$len) {
+                $max_id = SyncSubmitTaskModel::orderBy('id', 'desc')->value('id');
+                if ($max_id > 2000000) {
+                    $this->backup();
+                } else {
+                    $tasks = SyncSubmitTaskModel::where('status', 0)->limit(100)->get();
+                    foreach ($tasks as $task) {
+                        $task->status = 3;
+                        $task->save();
+                        Redis::lpush('sync_submit_task', $task->id);
+                    }
+                }
+            }
+            sleep(3);
+        }
+    }
+
+    /**
+     * 输出处理日志
+     */
+    public function output($message): bool
+    {
+        echo date('Y-m-d H:i:s') . ' | ' . $message . PHP_EOL;
+        return true;
+    }
+
+    /**
+     * 备份数据
+     * @author zbj
+     * @date 2024/1/23
+     */
+    public function backup()
+    {
+        DB::beginTransaction();
+        try {
+            $table = (new SyncSubmitTaskModel())->getTable();
+            $new_table = $table . '_backup_' . date('Ymd');
+
+            //重命名当前表
+            Schema::rename($table, $new_table);
+            //克隆表数据
+            DB::statement('CREATE TABLE ' . $table . ' LIKE ' . $new_table);
+
+            //未入队的写到新表
+            $list = DB::table($new_table)->where('status', 0)->get();
+            $data = [];
+            foreach ($list as $task) {
+                $data[] = [
+                    'type' => $task->type,
+                    'data' => json_encode($task->data),
+                    'created_at' => $task['created_at'],
+                    'updated_at' => $task['updated_at'],
+                ];
+            }
+            $data && SyncSubmitTaskModel::insert($data);
+
+            DB::commit();
+
+            $this->output('数据备份成功');
+        } catch (\Exception $e) {
+            $this->output('数据备份失败' . $e->getMessage());
+            DB::rollBack();
+        }
+        return $new_table ?? '';
+    }
+}