作者 lyh

gx

@@ -119,9 +119,11 @@ class VideoTask extends Command @@ -119,9 +119,11 @@ class VideoTask extends Command
119 'updated_at' => date('Y-m-d H:i:s'), 119 'updated_at' => date('Y-m-d H:i:s'),
120 'created_at' => date('Y-m-d H:i:s'), 120 'created_at' => date('Y-m-d H:i:s'),
121 ]; 121 ];
122 - KeywordVideoTaskLog::insert($array);  
123 - $num--;  
124 - $sub_task_num--; 122 + $rs = KeywordVideoTaskLog::insert($array);
  123 + if($rs){
  124 + $num--;
  125 + $sub_task_num--;
  126 + }
125 } 127 }
126 } 128 }
127 if($sub_task_num != 0){ 129 if($sub_task_num != 0){
@@ -184,10 +186,11 @@ class VideoTask extends Command @@ -184,10 +186,11 @@ class VideoTask extends Command
184 if(count($keyword_arr_id) == 0){ 186 if(count($keyword_arr_id) == 0){
185 return []; 187 return [];
186 } 188 }
187 - if(count($keyword_arr_id) < $number){  
188 - $number = count($keyword_arr_id); 189 + if(count($keyword_arr_id) <= $number){
  190 + $keyword_id = array_rand($keyword_arr_id, count($keyword_arr_id));
  191 + }else{
  192 + $keyword_id = array_rand($keyword_arr_id, $number);
189 } 193 }
190 - $keyword_id = array_rand($keyword_arr_id, $number);  
191 $keyword = Keyword::whereIn("id", $keyword_id)->get(); 194 $keyword = Keyword::whereIn("id", $keyword_id)->get();
192 return $keyword; 195 return $keyword;
193 } 196 }