作者 赵彬吉

update

@@ -71,15 +71,25 @@ class RankDataController extends BaseController @@ -71,15 +71,25 @@ class RankDataController extends BaseController
71 * @date 2023/5/15 71 * @date 2023/5/15
72 */ 72 */
73 public function export(RankDataLogic $logic){ 73 public function export(RankDataLogic $logic){
  74 + $lang = $this->request['lang'] ??'';
74 $data = $logic->keywords_rank_list(true); 75 $data = $logic->keywords_rank_list(true);
75 76
  77 + $img_position = $video_position= false;
76 foreach ($data as &$item){ 78 foreach ($data as &$item){
77 $item['domain'] = explode(':', $item['domain'])[1]; 79 $item['domain'] = explode(':', $item['domain'])[1];
78 $item['lang'] = $this->request['lang'] ?: 'en'; 80 $item['lang'] = $this->request['lang'] ?: 'en';
79 $item['g_text'] = RankData::gMap()[$item['g']]??''; 81 $item['g_text'] = RankData::gMap()[$item['g']]??'';
  82 + $item['img_position'] = $item['img_position'] ?? '';
  83 + $item['video_position'] = $item['video_position'] ?? '';
80 foreach ($item['position'] as $date => $position){ 84 foreach ($item['position'] as $date => $position){
81 $item[$date] = $position; 85 $item[$date] = $position;
82 } 86 }
  87 + if(isset($item['img_position'])){
  88 + $img_position = true;
  89 + }
  90 + if(isset($item['video_position'])){
  91 + $video_position = true;
  92 + }
83 } 93 }
84 94
85 $map = [ 95 $map = [
@@ -91,9 +101,11 @@ class RankDataController extends BaseController @@ -91,9 +101,11 @@ class RankDataController extends BaseController
91 foreach ($data[0]['position'] as $date => $position){ 101 foreach ($data[0]['position'] as $date => $position){
92 $map[$date] = $date; 102 $map[$date] = $date;
93 } 103 }
  104 + $img_position && $map['img_position'] = '图片';
  105 + $video_position && $map['video_position'] = '视频';
94 106
95 //生成文件,发送到客户端 107 //生成文件,发送到客户端
96 - $table = new BatchExportService("关键词数据导出"); 108 + $table = new BatchExportService($lang . "关键词数据导出");
97 $file = $table->head($map)->data($data)->save(); 109 $file = $table->head($map)->data($data)->save();
98 if (!$file) { 110 if (!$file) {
99 throw new \Exception('文件生成失败,请重试'); 111 throw new \Exception('文件生成失败,请重试');
@@ -104,7 +116,7 @@ class RankDataController extends BaseController @@ -104,7 +116,7 @@ class RankDataController extends BaseController
104 } 116 }
105 117
106 /** 118 /**
107 - * 数据导出 119 + * 历史数据导出
108 * @author zbj 120 * @author zbj
109 * @date 2023/5/15 121 * @date 2023/5/15
110 */ 122 */
@@ -184,8 +184,17 @@ class RankDataLogic extends BaseLogic @@ -184,8 +184,17 @@ class RankDataLogic extends BaseLogic
184 'keyword' => $key, 184 'keyword' => $key,
185 'domain' => $domain_text, 185 'domain' => $domain_text,
186 'g' => $last['g'], //1核心关键词 186 'g' => $last['g'], //1核心关键词
187 - 'position' => $data 187 + 'position' => $data,
188 ]; 188 ];
  189 + //图片排名
  190 + if(isset($last['p_img'])){
  191 + $v['img_position'] = $last['p_img'];
  192 + }
  193 + //视频排名
  194 + if(isset($last['p_vid'])){
  195 + $v['video_position'] = $last['p_vid'];
  196 + }
  197 +
189 if ($last['position'] == 0) { 198 if ($last['position'] == 0) {
190 $list0[] = $v; 199 $list0[] = $v;
191 } elseif ($last['position'] <= 30) { 200 } elseif ($last['position'] <= 30) {