From 3f1e1cbe6435918a85f36c04f98c0fdf98926457 Mon Sep 17 00:00:00 2001 From: lyt Date: Thu, 18 Jan 2018 10:02:08 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=85=B3=E9=94=AE=E8=AF=8D=20=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E4=B8=8D=E6=98=BE=E7=A4=BA151?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/keyworlds.php | 2 ++ application/views/keyworlds/index.php | 1 + 2 files changed, 3 insertions(+) diff --git a/application/controllers/keyworlds.php b/application/controllers/keyworlds.php index c8cfbc11..45c3399f 100644 --- a/application/controllers/keyworlds.php +++ b/application/controllers/keyworlds.php @@ -103,6 +103,7 @@ class Keyworlds extends CI_Controller { // 每个点 foreach ($ra as $v) { $kwr_rank = $v->kwr_rank ? $v->kwr_rank : 'null'; + $kwr_rank = ($v->kwr_rank==151) ? 'null' : $v->kwr_rank; if ($v->kwr_rank == '>150') { $kwr_rank = 100; } @@ -115,6 +116,7 @@ class Keyworlds extends CI_Controller { $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 = ($v->kwr_mobile_rank==151) ? 'null' : $v->kwr_mobile_rank; if ($v->kwr_mobile_rank == '>150') { $kwr_mobile_rank = 100; } diff --git a/application/views/keyworlds/index.php b/application/views/keyworlds/index.php index b473dfb0..984e53fd 100644 --- a/application/views/keyworlds/index.php +++ b/application/views/keyworlds/index.php @@ -43,6 +43,7 @@
排名情况 + From ebd4c7e22d8db976adaf3f0cf73d951ae261bda4 Mon Sep 17 00:00:00 2001 From: cyc Date: Fri, 19 Jan 2018 14:03:57 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E7=89=B9?= =?UTF-8?q?=E6=AE=8A=E8=BD=A6=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/train/controllers/search.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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(); From 3912017b971ae1fe276b7f8c6cb2a114312daedb Mon Sep 17 00:00:00 2001 From: lyt Date: Mon, 22 Jan 2018 10:45:56 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=85=B3=E9=94=AE=E8=AF=8D=20=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E4=B8=8D=E6=98=BE=E7=A4=BA151,=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/keyworlds.php | 4 ++-- application/views/keyworlds/index.php | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/application/controllers/keyworlds.php b/application/controllers/keyworlds.php index 45c3399f..9b49868a 100644 --- a/application/controllers/keyworlds.php +++ b/application/controllers/keyworlds.php @@ -102,7 +102,7 @@ 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; if ($v->kwr_rank == '>150') { $kwr_rank = 100; @@ -115,7 +115,7 @@ 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; if ($v->kwr_mobile_rank == '>150') { $kwr_mobile_rank = 100; diff --git a/application/views/keyworlds/index.php b/application/views/keyworlds/index.php index 984e53fd..00d58858 100644 --- a/application/views/keyworlds/index.php +++ b/application/views/keyworlds/index.php @@ -54,7 +54,6 @@ - $rank) { ?> From 979b7d707b70157f1db5ae65b08b19e1bef415b2 Mon Sep 17 00:00:00 2001 From: lyt Date: Mon, 22 Jan 2018 10:59:16 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=85=B3=E9=94=AE=E8=AF=8D=20=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E4=B8=8D=E6=98=BE=E7=A4=BA151,=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/keyworlds.php | 8 ++++---- application/views/keyworlds/index.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/application/controllers/keyworlds.php b/application/controllers/keyworlds.php index 9b49868a..cbee8b1d 100644 --- a/application/controllers/keyworlds.php +++ b/application/controllers/keyworlds.php @@ -102,8 +102,8 @@ class Keyworlds extends CI_Controller { $data['rank_json'] .='{"name":"' . $ra[$data_time[0]]->kw_keyworlds . '","data":['; // 每个点 foreach ($ra as $v) { - $kwr_rank = (intval($v->kwr_rank) > 0) ? $v->kwr_rank : 'null'; - $kwr_rank = ($v->kwr_rank==151) ? 'null' : $v->kwr_rank; + $kwr_rank = (intval($v->kwr_rank) > 0) ? $v->kwr_rank : "null"; + $kwr_rank = ($v->kwr_rank==151) ? "null" : $v->kwr_rank; if ($v->kwr_rank == '>150') { $kwr_rank = 100; } @@ -115,8 +115,8 @@ 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 = (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 = (intval($v->kwr_mobile_rank) > 0) ? $v->kwr_mobile_rank : "null" ; + $kwr_mobile_rank = ($v->kwr_mobile_rank==151) ? "null" : $v->kwr_mobile_rank; if ($v->kwr_mobile_rank == '>150') { $kwr_mobile_rank = 100; } diff --git a/application/views/keyworlds/index.php b/application/views/keyworlds/index.php index 00d58858..37c7cb48 100644 --- a/application/views/keyworlds/index.php +++ b/application/views/keyworlds/index.php @@ -43,7 +43,7 @@
排名情况 - +
From 37541755db8ada90b918a0563ae4924da018212e Mon Sep 17 00:00:00 2001 From: lyt Date: Mon, 22 Jan 2018 11:14:14 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=85=B3=E9=94=AE=E8=AF=8D=20=E7=A9=BA?= =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/keyworlds.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/application/controllers/keyworlds.php b/application/controllers/keyworlds.php index cbee8b1d..4168c4fa 100644 --- a/application/controllers/keyworlds.php +++ b/application/controllers/keyworlds.php @@ -104,6 +104,7 @@ class Keyworlds extends CI_Controller { foreach ($ra as $v) { $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; } @@ -117,6 +118,7 @@ class Keyworlds extends CI_Controller { foreach ($ra as $v) { $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; } From 856c34b3d05eb12c0ad13e020ad593c76910e90a Mon Sep 17 00:00:00 2001 From: lyt Date: Mon, 22 Jan 2018 11:35:02 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=85=B3=E9=94=AE=E8=AF=8D=20=E6=8E=92?= =?UTF-8?q?=E5=90=8D=E5=92=8C=E4=B8=8A=E6=AC=A1=E6=AF=94=E8=BE=83=E7=9A=84?= =?UTF-8?q?=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/keyworlds.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/keyworlds.php b/application/controllers/keyworlds.php index 4168c4fa..f44e562c 100644 --- a/application/controllers/keyworlds.php +++ b/application/controllers/keyworlds.php @@ -338,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'); @@ -425,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');