|
...
|
...
|
@@ -88,6 +88,9 @@ class VideoTask extends Command |
|
|
|
continue;
|
|
|
|
}
|
|
|
|
ProjectServer::useProject($task_project->project_id);
|
|
|
|
if(!empty($task_project->keywords)){
|
|
|
|
$task_project->keywords = explode(',',trim(',',$task_project->keywords));
|
|
|
|
}
|
|
|
|
$keyword = $this->getProjectKeyword($task_project->number,$task_project->keywords);
|
|
|
|
// 已经没有需要生成视频的关键词
|
|
|
|
if (!$keyword) {
|
|
...
|
...
|
@@ -174,17 +177,19 @@ class VideoTask extends Command |
|
|
|
public function getProjectKeyword($number,$keywords = [])
|
|
|
|
{
|
|
|
|
if(!empty($keywords)){
|
|
|
|
$keyword_id = Keyword::where('video', null)->whereIn("title", $keywords)->where('route', 'not like', '%-tag')->whereNotNull('keyword_content')->pluck('id')->toArray();
|
|
|
|
$keyword_id = Keyword::where('video', null)->whereIn("title", $keywords)
|
|
|
|
->where('route', 'not like', '%-tag')->whereNotNull('keyword_content')->pluck('id')->toArray();
|
|
|
|
if(count($keyword_id) == 0){
|
|
|
|
$keyword_arr_id = Keyword::where('video', null)->where('route', 'not like', '%-tag')
|
|
|
|
->whereNotNull('keyword_content')->orderBy('id','asc')->limit($number)->pluck('id')->toArray();
|
|
|
|
}else{
|
|
|
|
$keyword_arr_id = Keyword::where('video', null)->whereNotIn("title", $keywords)->where('route', 'not like', '%-tag')->whereNotNull('keyword_content')
|
|
|
|
->orderBy('id','asc')->limit($number - count($keyword_id))->pluck('id')->toArray();
|
|
|
|
$keyword_arr_id = Keyword::where('video', null)->whereNotIn("title", $keywords)->where('route', 'not like', '%-tag')
|
|
|
|
->whereNotNull('keyword_content')->orderBy('id','asc')->limit($number - count($keyword_id))->pluck('id')->toArray();
|
|
|
|
$keyword_arr_id = array_merge($keyword_id,$keyword_arr_id);
|
|
|
|
}
|
|
|
|
}else{
|
|
|
|
$keyword_arr_id = Keyword::where('video', null)->where('route', 'not like', '%-tag')->whereNotNull('keyword_content')->orderBy('id','asc')->limit($number)->pluck('id')->toArray();
|
|
|
|
$keyword_arr_id = Keyword::where('video', null)->where('route', 'not like', '%-tag')
|
|
|
|
->whereNotNull('keyword_content')->orderBy('id','asc')->limit($number)->pluck('id')->toArray();
|
|
|
|
}
|
|
|
|
if(count($keyword_arr_id) == 0){
|
|
|
|
return [];
|
...
|
...
|
|