正在显示
1 个修改的文件
包含
6 行增加
和
4 行删除
| @@ -44,7 +44,7 @@ class SyncSubmitTask extends Command | @@ -44,7 +44,7 @@ class SyncSubmitTask extends Command | ||
| 44 | } | 44 | } |
| 45 | $this->output('任务' . $task_id . '开始'); | 45 | $this->output('任务' . $task_id . '开始'); |
| 46 | $task_info = SyncSubmitTaskModel::find($task_id); | 46 | $task_info = SyncSubmitTaskModel::find($task_id); |
| 47 | - if (empty($task_info) || $task_info->status) { | 47 | + if (empty($task_info) || $task_info->status !=2) { |
| 48 | $this->output('任务不存在或者已执行'); | 48 | $this->output('任务不存在或者已执行'); |
| 49 | continue; | 49 | continue; |
| 50 | } | 50 | } |
| @@ -88,9 +88,11 @@ class SyncSubmitTask extends Command | @@ -88,9 +88,11 @@ class SyncSubmitTask extends Command | ||
| 88 | if (Redis::setnx($lockKey, 1)) { | 88 | if (Redis::setnx($lockKey, 1)) { |
| 89 | // 设置锁的过期时间,防止死锁 | 89 | // 设置锁的过期时间,防止死锁 |
| 90 | Redis::expire($lockKey, 10); | 90 | Redis::expire($lockKey, 10); |
| 91 | - $ids = SyncSubmitTaskModel::where('status', 0)->limit(100)->pluck('id'); | ||
| 92 | - foreach ($ids as $id) { | ||
| 93 | - Redis::lpush('sync_submit_task', $id); | 91 | + $tasks = SyncSubmitTaskModel::where('status', 0)->limit(100)->get(); |
| 92 | + foreach ($tasks as $task) { | ||
| 93 | + $task->status = 2; | ||
| 94 | + $task->save(); | ||
| 95 | + Redis::lpush('sync_submit_task', $task->id); | ||
| 94 | } | 96 | } |
| 95 | $task_id = Redis::rpop('sync_submit_task'); | 97 | $task_id = Redis::rpop('sync_submit_task'); |
| 96 | Redis::del($lockKey); | 98 | Redis::del($lockKey); |
-
请 注册 或 登录 后发表评论