作者 lyh

gx脚本更新路由

@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 9
10 namespace App\Console\Commands\Test; 10 namespace App\Console\Commands\Test;
11 11
  12 +use App\Models\Product\Column;
12 use App\Models\Product\Detail; 13 use App\Models\Product\Detail;
13 use App\Models\Product\Product; 14 use App\Models\Product\Product;
14 use App\Models\Project\DeployBuild; 15 use App\Models\Project\DeployBuild;
@@ -61,7 +62,7 @@ class UpdateBuildConfiguration extends Command @@ -61,7 +62,7 @@ class UpdateBuildConfiguration extends Command
61 */ 62 */
62 public function handle(){ 63 public function handle(){
63 $projectModel = new Project(); 64 $projectModel = new Project();
64 - $list = $projectModel->list(['delete_status'=>0,'id'=>['in',[1671,1718]]],'id',['id'],'asc'); 65 + $list = $projectModel->list(['delete_status'=>0,'id'=>['not in',[1671,1718]]],'id',['id'],'asc');
65 foreach ($list as $k => $v){ 66 foreach ($list as $k => $v){
66 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL; 67 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
67 ProjectServer::useProject($v['id']); 68 ProjectServer::useProject($v['id']);
@@ -83,24 +84,12 @@ class UpdateBuildConfiguration extends Command @@ -83,24 +84,12 @@ class UpdateBuildConfiguration extends Command
83 $productModel = new Product(); 84 $productModel = new Product();
84 $page = 1; 85 $page = 1;
85 while (true){ 86 while (true){
86 - $lists = $productModel->lists([],$page,10,['id','describe']); 87 + $lists = $productModel->lists([],$page,100,['id','content','describe']);
87 $detailModel = new Detail(); 88 $detailModel = new Detail();
88 if(!empty($lists['list'])){ 89 if(!empty($lists['list'])){
89 foreach ($lists['list'] as $k => $v){ 90 foreach ($lists['list'] as $k => $v){
90 echo date('Y-m-d H:i:s') . '产品id:'.$v['id'] . PHP_EOL; 91 echo date('Y-m-d H:i:s') . '产品id:'.$v['id'] . PHP_EOL;
91 - if(empty($v['describe'])){  
92 - continue;  
93 - }  
94 - foreach ($v['describe'] as $key => $value){  
95 - if(isset($value['title']) && ($value['title'] == null)){  
96 - $value['title'] = '';  
97 - }  
98 - if(isset($value['text']) && ($value['text'] == null)){  
99 - $value['text'] = '';  
100 - }  
101 - if(empty($value['text'])){  
102 - continue;  
103 - } 92 + if(!empty($v['content'])){
104 $data = [ 93 $data = [
105 'product_id'=>$v['id'], 94 'product_id'=>$v['id'],
106 'column_id'=>1, 95 'column_id'=>1,
@@ -113,6 +102,33 @@ class UpdateBuildConfiguration extends Command @@ -113,6 +102,33 @@ class UpdateBuildConfiguration extends Command
113 ]; 102 ];
114 $detailModel->insert($data); 103 $detailModel->insert($data);
115 } 104 }
  105 + if(!empty($v['describe'])){
  106 + foreach ($v['describe'] as $key => $value){
  107 + if(isset($value['title']) && ($value['title'] == null)){
  108 + $value['title'] = '';
  109 + }
  110 + if(isset($value['text']) && ($value['text'] == null)){
  111 + $value['text'] = '';
  112 + }
  113 + if(empty($value['title'])){
  114 + continue;
  115 + }
  116 + //添加切换栏
  117 + $c = new Column();
  118 + $id = $c->addReturnId(['column_name'=>$value['title'],'product_id'=>$v['id']]);
  119 + $dataS = [
  120 + 'product_id'=>$v['id'],
  121 + 'column_id'=>$id,
  122 + 'text_type'=>1,
  123 + 'title'=>$value['title'] ?? '',
  124 + 'sort'=>$key + 1,
  125 + 'content'=>json_encode(['content'=>$value['text'] ?? ''],JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
  126 + 'created_at'=>date('Y-m-d H:i:s'),
  127 + 'updated_at'=>date('Y-m-d H:i:s')
  128 + ];
  129 + $detailModel->insert($dataS);
  130 + }
  131 + }
116 } 132 }
117 }else{ 133 }else{
118 break; 134 break;
@@ -31,7 +31,7 @@ class DetailController extends BaseController @@ -31,7 +31,7 @@ class DetailController extends BaseController
31 ],[ 31 ],[
32 'product_id.required' => '产品id不能为空', 32 'product_id.required' => '产品id不能为空',
33 ]); 33 ]);
34 - $data_column = $column->list([],'id',['*'],'asc'); 34 + $data_column = $column->list(['product_id'=>['in',$this->map['product_id']]],'id',['*'],'asc');
35 $data = $detail->list($this->map,'sort',['*'],'asc'); 35 $data = $detail->list($this->map,'sort',['*'],'asc');
36 if(!empty($data_column) && !empty($data)){ 36 if(!empty($data_column) && !empty($data)){
37 foreach ($data_column as $k => $v){ 37 foreach ($data_column as $k => $v){
@@ -74,6 +74,12 @@ class DetailController extends BaseController @@ -74,6 +74,12 @@ class DetailController extends BaseController
74 * @time :2024/11/12 15:07 74 * @time :2024/11/12 15:07
75 */ 75 */
76 public function getColumn(Column $column){ 76 public function getColumn(Column $column){
  77 + $this->request->validate([
  78 + 'product_id'=>'required'
  79 + ],[
  80 + 'product_id.required' => '产品id不能为空'
  81 + ]);
  82 + $this->map['product_id'] = ['in',[0,$this->map['product_id']]];
77 $data = $column->list($this->map,'id',['*'],'asc'); 83 $data = $column->list($this->map,'id',['*'],'asc');
78 $this->response('success',Code::SUCCESS,$data); 84 $this->response('success',Code::SUCCESS,$data);
79 } 85 }
@@ -87,9 +93,11 @@ class DetailController extends BaseController @@ -87,9 +93,11 @@ class DetailController extends BaseController
87 */ 93 */
88 public function saveColumn(DetailLogic $logic){ 94 public function saveColumn(DetailLogic $logic){
89 $this->request->validate([ 95 $this->request->validate([
90 - 'column_name'=>'required' 96 + 'column_name'=>'required',
  97 + 'product_id'=>'required'
91 ],[ 98 ],[
92 - 'column_name.required' => '栏目名称不能为空' 99 + 'column_name.required' => '栏目名称不能为空',
  100 + 'product_id.required' => '产品id不能为空'
93 ]); 101 ]);
94 $data = $logic->saveColumn(); 102 $data = $logic->saveColumn();
95 $this->response('success',Code::SUCCESS,$data); 103 $this->response('success',Code::SUCCESS,$data);