合并分支 'master-server' 到 'master'

修改关键词生成视频



查看合并请求 !910

@@ -297,13 +297,15 @@ class VideoTask extends Command
                     break;
                     break;
                 }
                 }
                 $keyword_ids = implode(',',$item->keyword_id);
                 $keyword_ids = implode(',',$item->keyword_id);
+                $keyword_video_ids = implode(',',$item->keyword_video_id);
                 if (strpos(','.$keyword_ids.',', ','.$keyword_id.',') === false) {
                 if (strpos(','.$keyword_ids.',', ','.$keyword_id.',') === false) {
+                    if(strpos(','.$keyword_video_ids.',', ','.$keyword_id.',') === false){
                         //不包含
                         //不包含
                         $productModel = new Product();
                         $productModel = new Product();
-                    $keyword_ids = !empty($keyword_ids) ? ','.$keyword_ids.',' : ',' ;
-                    $keyword_id_str = $keyword_ids . $keyword_id.',';
-                    KeywordRelated::saveRelated($item->id,explode(',',trim($keyword_id_str,',')));
-                    $productModel->edit(['keyword_id'=>$keyword_id_str],['id'=>$item->id]);
+                        $keyword_video_ids = !empty($keyword_video_ids) ? ','.$keyword_video_ids.',' : ',' ;
+                        $keyword_video_id_str = $keyword_video_ids . $keyword_id.',';
+                        $productModel->edit(['keyword_video_id'=>$keyword_video_id_str],['id'=>$item->id]);
+                    }
                 }
                 }
                 $data[] = ['url'=>getImageUrl($item->thumb['url']),'title'=>$item->title];
                 $data[] = ['url'=>getImageUrl($item->thumb['url']),'title'=>$item->title];
             }
             }

@@ -391,17 +391,6 @@ class TranslateController extends BaseController
     }
     }
 
 
     /**
     /**
-     * @remark :获取默认数据
-     * @name   :getDefaultData
-     * @author :lyh
-     * @method :post
-     * @time   :2024/7/16 15:28
-     */
-    public function getDefaultData(){
-
-    }
-
-    /**
      * @remark :
      * @remark :
      * @name   :pageList
      * @name   :pageList
      * @author :lyh
      * @author :lyh

@@ -196,7 +196,9 @@ class Product extends Base
     public function getKeywordIdAttribute($value){
     public function getKeywordIdAttribute($value){
         return Arr::setToArr(trim($value,','));
         return Arr::setToArr(trim($value,','));
     }
     }
-
+    public function getKeywordVideoIdAttribute($value){
+        return Arr::setToArr(trim($value,','));
+    }
     public function getRelatedProductIdAttribute($value){
     public function getRelatedProductIdAttribute($value){
         return Arr::setToArr($value);
         return Arr::setToArr($value);
     }
     }