Skip to content

S
SooonerHotel
Commit b1008c5f authored by wangjiangze's avatar wangjiangze
Browse files
Options

Merge branch 'develop' of http://code.dev.soooner.com:18000/wuxiande/SooonerHotel into develop

parents d28b30a1 b3700496
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 38 deletions
Services/CenterService/Common/Request/Request.go
View file @ b1008c5f
......@@ -39,7 +39,7 @@ func Post(url string, jsonBody string) (string, error) {
func Get(url string) (string, error) {
//log.Infoln("request : ",url)
//req.Debug = false
//req.Debug = true
req.SetFlags(req.LstdFlags | req.Lcost)
req.SetTimeout(time.Duration(60) * time.Second)
......
Services/CenterService/Controller/ConfigChecker.go
View file @ b1008c5f
......@@ -12,6 +12,7 @@ type ConfigChecker struct {
func (this *ConfigChecker) Start() {
this.startSysConfigChecker()
this.startSpsConfigChecker()
this.startSitesConfigChecker()
}
func (this *ConfigChecker) startSysConfigChecker() {
......@@ -41,3 +42,17 @@ func (this *ConfigChecker) startSpsConfigChecker() {
goto START
}()
}
func (this *ConfigChecker) startSitesConfigChecker() {
config := Config.GetInstance()
go func() {
START:
s, ok := config.Sys.Get("config_sp_check_seconds")
if ok {
n := Unit.Time2Seconds(s.(string))
time.Sleep(time.Duration(n) * time.Second)
config.InitSitesConfig()
}
goto START
}()
}
\ No newline at end of file
Services/CenterService/config.ini
View file @ b1008c5f
[local]
api_conf_sys = http://192.168.199.104:801/api/center/conf_sys
api_conf_sps = http://192.168.199.104:801/api/center/conf_sps
api_conf_sites = http://192.168.199.104:801/api/center/conf_sites
api_tb_playlog_create = http://192.168.199.104:801/api/center/tb_playlog_create
log_path = ./
log_filename = center_service.log
[debug]
api_conf_sys = http://192.168.200.134:801/api/center/conf_sys
api_conf_sps = http://192.168.200.134:801/api/center/conf_sps
......
SooonerHotel/App/Lib/Action/Api/CenterAction.class.php
View file @ b1008c5f
......@@ -285,6 +285,7 @@ class CenterAction extends Action
if ($push_mode==1) {
$sp_id = $sp["sp_id"];
$media_id = $data["id"];
$media_code = $data["code"];
$status = $data["status"];
$updateSQL = "UPDATE sh_hotel_media_map_$sp_id SET status=$status WHERE media_id=$media_id;";
......@@ -296,7 +297,7 @@ class CenterAction extends Action
$arr = M("")->query($sql);
foreach ($arr as $item) {
$dataList[] = array("media_id" => $media_id, "hotel_id" => $item["id"], "status" => $status, "status_inject" => 0);
$dataList[] = array("media_code"=>$media_code,"media_id" => $media_id, "hotel_id" => $item["id"], "status" => $status, "status_inject" => 0);
}
if (!empty($dataList)) {
......@@ -400,7 +401,9 @@ class CenterAction extends Action
$end = date('Y-m-d H:i:s', strtotime($_GET["end"]));
}
$sqlTotal = "SELECT count(1) total FROM sh_hotel_media_map_$spid WHERE status_inject=1 AND updatetime BETWEEN '$start' AND '$end';";
$sqlTotal = "SELECT count(1) total FROM sh_hotel_media_map_$spid WHERE updatetime BETWEEN '$start' AND '$end';";
// echo $sqlTotal;
$totalArr = M("")->query($sqlTotal);
$total = 0;
if (count($totalArr)>0){
......@@ -459,7 +462,7 @@ class CenterAction extends Action
$sql = "SELECT $fields"
. " FROM (SELECT hm.media_id,h.code,hm.status,hm.status_inject FROM sh_hotel_media_map_$spid hm,sh_hotel h"
. " WHERE hm.status_inject=1 AND hm.updatetime BETWEEN '$start' AND '$end' AND h.id=hm.hotel_id ORDER BY hm.updatetime,hm.media_id ASC LIMIT $limit_from,$page_size) hm"
. " WHERE hm.updatetime BETWEEN '$start' AND '$end' AND h.id=hm.hotel_id ORDER BY hm.updatetime,hm.media_id ASC LIMIT $limit_from,$page_size) hm"
. " JOIN sh_media_wasu mw ON mw.id=hm.media_id";
// echo $sql;exit;
......@@ -507,7 +510,7 @@ class CenterAction extends Action
$log["req_json"]=$rawData;
$log["resp_json"]=$data;
$log["code"]=$result["code"];
D("PushLog")->add($log);
D("LogPush")->add($log);
}
echo json_encode($result);
exit;
......
SooonerHotel/App/Lib/Action/Inject/InjectAction.class.php
View file @ b1008c5f
......@@ -61,9 +61,9 @@ class InjectAction extends CommonAction{
$info =$model->where("id = $id")->find();
$this->info = $info;
}
$media_lists = $mediaModel->join(" A join sh_sp B on A.site_id = B.site_id ")->field("A.id,A.title,group_concat(B.id) sp_ids")->group(" A.id ")->select();
$media_lists = $mediaModel->join(" A join sh_sp B on A.site_id = B.site_id ")->field("concat(A.id,'_',A.code) id,A.title,group_concat(B.id) sp_ids")->group(" A.id ")->select();
if($userInfo['sp_ids']&&$userInfo['grade']>=3){
$sp_lists = $spModel->field("id,`name`")->where("`status`=0 and id in(".$userInfo['sp_ids'].")")->select();
$sp_lists = $spModel->field("A.id,`name`")->where("`status`=0 and id in(".$userInfo['sp_ids'].")")->select();
$hotel_lists = $hotelModel->field("id,`name`,sp_id")->where("`status`=0 and sp_id in(".$userInfo['sp_ids'].")")->select();
$play_lists = $spPlaylistModel->join(" A join sh_sp_playlist_media_map B on A.id = B.playlist_id ")->field("A.id,A.`name`,A.sp_id,group_concat(B.media_id) media_ids")->where("A.sp_id in(".$userInfo['sp_ids'].") and A.`status` = 0")->group("A.id")->select();
}else{
......@@ -114,30 +114,29 @@ class InjectAction extends CommonAction{
foreach($media_lists as $k => $v){
$logData = array();
$mapData = array();
// $isExists = M("Map_$sp_id","sh_hotel_media_")->field("id")->where("media_id = $v and hotel_id= $hotel_id")->find();
// if($isExists){
// continue;
// }
//支持重新注入(注入失败需要重新注入)
$sqlUpdate = "update sh_hotel_media_map_$sp_id set status_inject=0 where media_id=$v and hotel_id=$hotel_id";
$uok = M("")->execute($sqlUpdate);
if ($uok){
continue;
$tmp = explode("_",$v);
$media_id=$tmp[0];
$media_code=$tmp[1];
$isExists = M("Map_$sp_id","sh_hotel_media_")->field("id")->where("media_id = $media_id and hotel_id= $hotel_id")->find();
$mapData['media_id'] = $v;
$mapData['media_code'] = "$media_code";
$mapData['hotel_id'] = $hotel_id;
$mapData['addtime'] = date('Y-m-d H:i:s');
if($isExists){
$mapData['id'] = $isExists['id'];
M("Map_$sp_id","sh_hotel_media_")->save($mapData);
}else{
M("Map_$sp_id","sh_hotel_media_")->add($mapData);
}
$logData['task_id'] = $task_id;
$logData['media_id'] = $v;
$logData['media_id'] = $media_id;
$logData['hotel_id'] = $hotel_id;
$logData['sp_id'] = $sp_id;
$logData['status'] = 1;
$mapData['media_id'] = $v;
$mapData['hotel_id'] = $hotel_id;
$mapData['addtime'] = date('Y-m-d H:i:s');
M("Map_$sp_id","sh_hotel_media_")->add($mapData);
if($logData){
$logDataLists[] = $logData;
}
......
SooonerHotel/App/Lib/Action/Playctrl/PlayCtrlAction.class.php
View file @ b1008c5f
......@@ -65,7 +65,7 @@ class PlayCtrlAction extends CommonAction{
$this->log_info = $log_info;
$this->info = $info;
}
$media_lists = $mediaModel->join(" A join sh_sp B on A.site_id = B.site_id ")->field("A.id,A.title,group_concat(B.id) sp_ids")->group(" A.id ")->select();
$media_lists = $mediaModel->join(" A join sh_sp B on A.site_id = B.site_id ")->field("concat(A.id,'_',A.code) id,A.title,group_concat(B.id) sp_ids")->group(" A.id ")->select();
if($userInfo['sp_ids']&&$userInfo['grade']>=3){
$sp_lists = $spModel->field("id,`name`")->where("`status`=0 and id in(".$userInfo['sp_ids'].")")->select();
$hotel_lists = $hotelModel->field("id,`name`,sp_id,region_id")->where("`status`=0 and sp_id in(".$userInfo['sp_ids'].")")->select();
......@@ -121,26 +121,24 @@ class PlayCtrlAction extends CommonAction{
foreach($media_lists as $k => $v){
$logData = array();
$mapData = array();
$isExists = M("Map_$sp_id","sh_hotel_media_")->field("id")->where("media_id = $v and hotel_id= $hotel_id")->find();
$tmp = explode("_",$v);
$media_id=$tmp[0];
$media_code=$tmp[1];
$mapData['media_id'] = $media_id;
$mapData['media_code'] = "$media_code";;
$mapData['hotel_id'] = $hotel_id;
$mapData['status'] = I("status",1,int);
$isExists = M("Map_$sp_id","sh_hotel_media_")->field("id")->where("media_id = $media_id and hotel_id= $hotel_id")->find();
if($isExists){
$mapData['id'] = $isExists['id'];
$mapData['media_id'] = $v;
$mapData['hotel_id'] = $hotel_id;
$mapData['status'] = I("status",1,int);
$mapData['updatetime'] = date('Y-m-d H:i:s');
M("Map_$sp_id","sh_hotel_media_")->save($mapData);
}else{
$mapData['media_id'] = $v;
$mapData['hotel_id'] = $hotel_id;
$mapData['status'] = I("status",1,int);
$mapData['addtime'] = date('Y-m-d H:i:s');
M("Map_$sp_id","sh_hotel_media_")->add($mapData);
}
$logData['task_id'] = $task_id;
$logData['media_id'] = $v;
$logData['media_id'] = $media_id;
$logData['hotel_id'] = $hotel_id;
$logData['sp_id'] = $sp_id;
$logData['status'] = I("status",1,int);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment