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

gxai



查看合并请求 !1819

@@ -74,26 +74,25 @@ class UpdateRoute extends Command
         $a = new AggregateKeyword();
         $a = new AggregateKeyword();
         $list = $a->formatQuery(['status'=>1])->pluck('project_id')->unique()->values()->toArray();
         $list = $a->formatQuery(['status'=>1])->pluck('project_id')->unique()->values()->toArray();
         foreach ($list as $v){
         foreach ($list as $v){
+            if($v == 1){
+                continue;
+            }
             echo date('Y-m-d H:i:s').' 执行的项目id:'.$v.PHP_EOL;
             echo date('Y-m-d H:i:s').' 执行的项目id:'.$v.PHP_EOL;
             ProjectServer::useProject($v);
             ProjectServer::useProject($v);
             $keywordModel = new Keyword();
             $keywordModel = new Keyword();
-            $keyList = $keywordModel->list(['status'=>1],'id',['id','title'],'asc');
-            foreach ($keyList as $keyV){
-                echo date('Y-m-d H:i:s').'对应数据id:'.$keyV['id'].PHP_EOL;
-                $keywordInfo = $keywordModel->read(['id'=>$keyV['id']],['id']);
-                if($keywordInfo !== false){
-                    $keywordIds = $keywordModel->formatQuery(['id'=>['!=',$keyV['id']],'title'=>$keyV['title']])->pluck('id')->toArray();
-                    if(!empty($keywordIds)){
-                        echo date('Y-m-d H:i:s').'清空对应重复的关键词....'.PHP_EOL;
-                        $keywordModel->del(['id'=>['in',$keywordIds]]);
-                        $routeMapModel = new RouteMap();
-                        $routeMapModel->del(['source'=>'product_keyword','source_id'=>['in',$keywordIds]]);
-                    }else{
-                        echo date('Y-m-d H:i:s').'无重复关键词..'.PHP_EOL;
-                    }
-                }else{
-                    echo '当前关键词已被清除'.PHP_EOL;
+            $bak_lists = DB::table('gl_product_keyword_bak')->where('status',1)->get()->toArray();
+            foreach ($bak_lists as $bakV){
+                $info = $keywordModel->read(['title'=>$bakV['title']],['id']);
+                if($info !== false){
+                    echo '当前关键词已存在，跳过的关键词'.$bakV['title'].PHP_EOL;
+                    continue;
                 }
                 }
+                //执行新增数据
+                unset($bakV['id']);
+                $id = $keywordModel->addReturnId($bakV);
+                $route = RouteMap::setRoute($bakV['route'],'product_keyword',$id,$v);
+                $keywordModel->edit(['route'=>$route],['id'=>$id]);
+                echo '执行新增----'.$bakV['title'].PHP_EOL;
             }
             }
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
         }
         }