diff --git a/application/controllers/keyworlds.php b/application/controllers/keyworlds.php index c8cfbc11..f44e562c 100644 --- a/application/controllers/keyworlds.php +++ b/application/controllers/keyworlds.php @@ -102,7 +102,9 @@ class Keyworlds extends CI_Controller { $data['rank_json'] .='{"name":"' . $ra[$data_time[0]]->kw_keyworlds . '","data":['; // 每个点 foreach ($ra as $v) { - $kwr_rank = $v->kwr_rank ? $v->kwr_rank : 'null'; + $kwr_rank = (intval($v->kwr_rank) > 0) ? $v->kwr_rank : "null"; + $kwr_rank = ($v->kwr_rank==151) ? "null" : $v->kwr_rank; + $kwr_rank = trim($kwr_rank)=="" ? "null" : $kwr_rank; if ($v->kwr_rank == '>150') { $kwr_rank = 100; } @@ -114,7 +116,9 @@ class Keyworlds extends CI_Controller { if ($data['wordcount'] == 1) { $data['rank_json'] .='{"name":"' . $ra[$data_time[0]]->kw_keyworlds . '(mobile)","data":['; foreach ($ra as $v) { - $kwr_mobile_rank = $v->kwr_mobile_rank ? $v->kwr_mobile_rank : 'null' ; + $kwr_mobile_rank = (intval($v->kwr_mobile_rank) > 0) ? $v->kwr_mobile_rank : "null" ; + $kwr_mobile_rank = ($v->kwr_mobile_rank==151) ? "null" : $v->kwr_mobile_rank; + $kwr_mobile_rank = trim($kwr_mobile_rank)=="" ? "null" : $kwr_mobile_rank; if ($v->kwr_mobile_rank == '>150') { $kwr_mobile_rank = 100; } @@ -334,7 +338,7 @@ class Keyworlds extends CI_Controller { $add = $this->Keywordsrank_model->add_rank($kw_id, $rank['rank'], $rank['rank_m'], $rank['source'], $rank['source_m'], $rank['engines']); } // rank 变化 - if ($client_flag === 'PC') { + if ($client_flag === 'PC' && trim($last_rank[0]->kwr_rank) != "") { $this->load->model('InfoSMS_model'); $last_rank_pc = isset($last_rank[0]) ? $last_rank[0]->kwr_rank : $rank['rank']; $this->InfoSMS_model->readed_for_info($kw_id, 'keywords_rank'); @@ -421,7 +425,7 @@ class Keyworlds extends CI_Controller { $add = $this->Keywordsrank_model->add_rank($v->kw_id, $rank['rank'], $rank['rank_m'], $rank['source'], $rank['source_m'], $rank['engines']); } // rank 变化 - if ($client_flag === 'PC') { + if ($client_flag === 'PC' && trim($last_rank_pc[0]->kwr_rank) != "") { $this->load->model('InfoSMS_model'); $last_rank_pc = isset($last_rank_pc[0]) ? $last_rank_pc[0]->kwr_rank : $rank['rank']; $this->InfoSMS_model->readed_for_info($v->kw_id, 'keywords_rank'); diff --git a/application/third_party/train/controllers/search.php b/application/third_party/train/controllers/search.php index 525c09a0..ed61c05e 100644 --- a/application/third_party/train/controllers/search.php +++ b/application/third_party/train/controllers/search.php @@ -27,9 +27,9 @@ class search extends CI_Controller{ $back_data = $this->get_http($url); //特殊车次处理(贵阳 -- 重庆) - if(($fromStation == 'GIW') && ($toStation == 'CQW') && (strtotime($train_date) - strtotime('2018-01-16') >= 0)){ + /*if(($fromStation == 'GIW') && ($toStation == 'CQW') && (strtotime($train_date) - strtotime('2018-01-16') >= 0)){ exit('{"httpstatus":200,"reason":"特殊车次不开车","data":{"result":""}}'); - } + }*/ $firstdata = $back_data; $return_data = new stdClass(); diff --git a/application/views/keyworlds/index.php b/application/views/keyworlds/index.php index b473dfb0..37c7cb48 100644 --- a/application/views/keyworlds/index.php +++ b/application/views/keyworlds/index.php @@ -43,6 +43,7 @@
+