gx脚本更新路由

@@ -9,6 +9,7 @@
 
 
 namespace App\Console\Commands\Test;
 namespace App\Console\Commands\Test;
 
 
+use App\Models\Product\Column;
 use App\Models\Product\Detail;
 use App\Models\Product\Detail;
 use App\Models\Product\Product;
 use App\Models\Product\Product;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployBuild;
@@ -61,7 +62,7 @@ class UpdateBuildConfiguration extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['delete_status'=>0,'id'=>['in',[1671,1718]]],'id',['id'],'asc');
+        $list = $projectModel->list(['delete_status'=>0,'id'=>['not in',[1671,1718]]],'id',['id'],'asc');
         foreach ($list as $k => $v){
         foreach ($list as $k => $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
             ProjectServer::useProject($v['id']);
@@ -83,14 +84,25 @@ class UpdateBuildConfiguration extends Command
         $productModel = new Product();
         $productModel = new Product();
         $page = 1;
         $page = 1;
         while (true){
         while (true){
-            $lists = $productModel->lists([],$page,10,['id','describe']);
+            $lists = $productModel->lists([],$page,100,['id','content','describe']);
             $detailModel = new Detail();
             $detailModel = new Detail();
             if(!empty($lists['list'])){
             if(!empty($lists['list'])){
                 foreach ($lists['list'] as $k => $v){
                 foreach ($lists['list'] as $k => $v){
                     echo date('Y-m-d H:i:s') . '产品id:'.$v['id'] . PHP_EOL;
                     echo date('Y-m-d H:i:s') . '产品id:'.$v['id'] . PHP_EOL;
-                    if(empty($v['describe'])){
-                        continue;
+                    if(!empty($v['content'])){
+                        $data = [
+                            'product_id'=>$v['id'],
+                            'column_id'=>1,
+                            'text_type'=>1,
+                            'title'=>$value['title'] ?? '',
+                            'sort'=>1,
+                            'content'=>json_encode(['content'=>$value['text'] ?? ''],JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
+                            'created_at'=>date('Y-m-d H:i:s'),
+                            'updated_at'=>date('Y-m-d H:i:s')
+                        ];
+                        $detailModel->insert($data);
                     }
                     }
+                    if(!empty($v['describe'])){
                         foreach ($v['describe'] as $key => $value){
                         foreach ($v['describe'] as $key => $value){
                             if(isset($value['title']) && ($value['title'] == null)){
                             if(isset($value['title']) && ($value['title'] == null)){
                                 $value['title'] = '';
                                 $value['title'] = '';
@@ -98,20 +110,24 @@ class UpdateBuildConfiguration extends Command
                             if(isset($value['text']) && ($value['text'] == null)){
                             if(isset($value['text']) && ($value['text'] == null)){
                                 $value['text'] = '';
                                 $value['text'] = '';
                             }
                             }
-                        if(empty($value['text'])){
+                            if(empty($value['title'])){
                                 continue;
                                 continue;
                             }
                             }
-                        $data = [
+                            //添加切换栏
+                            $c = new Column();
+                            $id = $c->addReturnId(['column_name'=>$value['title'],'product_id'=>$v['id']]);
+                            $dataS = [
                                 'product_id'=>$v['id'],
                                 'product_id'=>$v['id'],
-                            'column_id'=>1,
+                                'column_id'=>$id,
                                 'text_type'=>1,
                                 'text_type'=>1,
                                 'title'=>$value['title'] ?? '',
                                 'title'=>$value['title'] ?? '',
-                            'sort'=>1,
+                                'sort'=>$key + 1,
                                 'content'=>json_encode(['content'=>$value['text'] ?? ''],JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
                                 'content'=>json_encode(['content'=>$value['text'] ?? ''],JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
                                 'created_at'=>date('Y-m-d H:i:s'),
                                 'created_at'=>date('Y-m-d H:i:s'),
                                 'updated_at'=>date('Y-m-d H:i:s')
                                 'updated_at'=>date('Y-m-d H:i:s')
                             ];
                             ];
-                        $detailModel->insert($data);
+                            $detailModel->insert($dataS);
+                        }
                     }
                     }
                 }
                 }
             }else{
             }else{

@@ -31,7 +31,7 @@ class DetailController extends BaseController
         ],[
         ],[
             'product_id.required' => '产品id不能为空',
             'product_id.required' => '产品id不能为空',
         ]);
         ]);
-        $data_column = $column->list([],'id',['*'],'asc');
+        $data_column = $column->list(['product_id'=>['in',$this->map['product_id']]],'id',['*'],'asc');
         $data = $detail->list($this->map,'sort',['*'],'asc');
         $data = $detail->list($this->map,'sort',['*'],'asc');
         if(!empty($data_column) && !empty($data)){
         if(!empty($data_column) && !empty($data)){
             foreach ($data_column as $k => $v){
             foreach ($data_column as $k => $v){
@@ -74,6 +74,12 @@ class DetailController extends BaseController
      * @time   :2024/11/12 15:07
      * @time   :2024/11/12 15:07
      */
      */
     public function getColumn(Column $column){
     public function getColumn(Column $column){
+        $this->request->validate([
+            'product_id'=>'required'
+        ],[
+            'product_id.required' => '产品id不能为空'
+        ]);
+        $this->map['product_id'] = ['in',[0,$this->map['product_id']]];
         $data = $column->list($this->map,'id',['*'],'asc');
         $data = $column->list($this->map,'id',['*'],'asc');
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
@@ -87,9 +93,11 @@ class DetailController extends BaseController
      */
      */
     public function saveColumn(DetailLogic $logic){
     public function saveColumn(DetailLogic $logic){
         $this->request->validate([
         $this->request->validate([
-            'column_name'=>'required'
+            'column_name'=>'required',
+            'product_id'=>'required'
         ],[
         ],[
-            'column_name.required' => '栏目名称不能为空'
+            'column_name.required' => '栏目名称不能为空',
+            'product_id.required' => '产品id不能为空'
         ]);
         ]);
         $data = $logic->saveColumn();
         $data = $logic->saveColumn();
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);