diff --git a/application/third_party/updatetrain/controllers/updatestation.php b/application/third_party/updatetrain/controllers/updatestation.php index 952c6634..4e1b934b 100644 --- a/application/third_party/updatetrain/controllers/updatestation.php +++ b/application/third_party/updatetrain/controllers/updatestation.php @@ -11,6 +11,7 @@ defined('BASEPATH') or exit('No direct script access allowed'); ini_set('memory_limit', '256M'); +set_time_limit(0); class updatestation extends CI_Controller { @@ -70,7 +71,7 @@ class updatestation extends CI_Controller $strStation = "@-1|" . $TRS_Code . "|" . $TRS_Station . "|" . $TRS_StationCN . "|2|"; $UpdateStaion .= $strStation; //表操作 - // $this->station_model->UpdateStation($TRS_Code, $TRS_StationCN); + $this->station_model->UpdateStation($TRS_Code, $TRS_StationCN); } else if ($isNew == 2) { //新增 $strStation = "@9999|" . $TRS_Code . "|" . $TRS_Station . "|" . $TRS_StationCN . "|2|"; @@ -79,7 +80,7 @@ class updatestation extends CI_Controller $data["StationCN"] = $TRS_StationCN; $data["Station"] = $TRS_Station; $data["Code"] = $TRS_Code; - //$this->station_model->AddStation($data); + $this->station_model->AddStation($data); } } } @@ -88,7 +89,7 @@ class updatestation extends CI_Controller $len = strlen($NewStationList); //count( explode("@",$NewStationList))-1; header("Content-Length: " . $len); header("Content-Encoding:UTF-8"); - echo $NewStationList; + if ($len > 0) { //发送邮件 @@ -100,6 +101,10 @@ class updatestation extends CI_Controller 'New Station(by12306):' . date("Y-m-d"), $NewStationList ); + + echo $NewStationList; + }else{ + echo "无站点更新"; } } @@ -165,16 +170,22 @@ class updatestation extends CI_Controller //$this->station_model->AddStation($data); } } - echo $NewStation; - //发送邮件 - $this->station_model->SendMail( - "UpdateStationSystem", - "noreplay@email.com", - 'zhaopeng', - 'zhaopeng@hainatravel.com', - '站点文件导入HT:' . date("Y-m-d"), - $NewStation - ); + + if (strlen($NewStation) > 0) { + //发送邮件 + $this->station_model->SendMail( + "UpdateStationSystem", + "noreplay@email.com", + 'zhaopeng', + 'zhaopeng@hainatravel.com', + '站点文件导入HT:' . date("Y-m-d"), + $NewStation + ); + + echo $NewStation; + } else { + echo ("无新站点"); + } } diff --git a/application/third_party/updatetrain/models/station_model.php b/application/third_party/updatetrain/models/station_model.php index 57ad1ec8..ffcae384 100644 --- a/application/third_party/updatetrain/models/station_model.php +++ b/application/third_party/updatetrain/models/station_model.php @@ -112,8 +112,8 @@ class station_model extends CI_Model */ function UpdateStation($code, $name) { - $name = iconv("utf-8", "gb2312//IGNORE", $name); - $sql = "update TrainStation set TRS_Code=? where TRS_StationCN='".$name."'"; + //$name = iconv("utf-8", "gb2312//IGNORE", $name); + $sql = "update TrainStation set TRS_Code=?,TRS_Use=1 where TRS_StationCN='".$name."'"; $param = array($code); $query = $this->HT->query($sql, $param); }