Commit acd513f8 authored by wangjiangze's avatar wangjiangze

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

parents d45ff13c 9db495a8
package Config package Config
import ( import (
rotatelogs "github.com/lestrrat/go-file-rotatelogs"
"github.com/pkg/errors"
"github.com/rifflock/lfshook"
log "github.com/sirupsen/logrus"
"path"
"time" "time"
) )
// config logrus log to local filesystem, with file rotation // config logrus log to local filesystem, with file rotation
func initLogConfig(logPath string, logFileName string, maxAge time.Duration, rotationTime time.Duration) { func initLogConfig(logPath string, logFileName string, maxAge time.Duration, rotationTime time.Duration) {
baseLogPaht := path.Join(logPath, logFileName) //baseLogPaht := path.Join(logPath, logFileName)
writer, err := rotatelogs.New( //writer, err := rotatelogs.New(
baseLogPaht+".%Y%m%d%H%M", // baseLogPaht+".%Y%m%d%H%M",
rotatelogs.WithLinkName(baseLogPaht), // 生成软链,指向最新日志文件 // rotatelogs.WithLinkName(baseLogPaht), // 生成软链,指向最新日志文件
rotatelogs.WithMaxAge(maxAge), // 文件最大保存时间 // rotatelogs.WithMaxAge(maxAge), // 文件最大保存时间
rotatelogs.WithRotationTime(rotationTime), // 日志切割时间间隔 // rotatelogs.WithRotationTime(rotationTime), // 日志切割时间间隔
) //)
if err != nil { //if err != nil {
log.Errorf("config local file system logger error. %+v", errors.WithStack(err)) // log.Errorf("config local file system logger error. %+v", errors.WithStack(err))
} //}
lfHook := lfshook.NewHook(lfshook.WriterMap{ //lfHook := lfshook.NewHook(lfshook.WriterMap{
log.DebugLevel: writer, // 为不同级别设置不同的输出目的 // log.DebugLevel: writer, // 为不同级别设置不同的输出目的
log.InfoLevel: writer, // log.InfoLevel: writer,
log.WarnLevel: writer, // log.WarnLevel: writer,
log.ErrorLevel: writer, // log.ErrorLevel: writer,
log.FatalLevel: writer, // log.FatalLevel: writer,
log.PanicLevel: writer, // log.PanicLevel: writer,
}, &log.JSONFormatter{}) //}, &log.JSONFormatter{})
log.AddHook(lfHook) //log.AddHook(lfHook)
} }
...@@ -5,6 +5,7 @@ import ( ...@@ -5,6 +5,7 @@ import (
"src/Common/DateTime" "src/Common/DateTime"
"src/Common/Unit" "src/Common/Unit"
"src/Config" "src/Config"
"strconv"
"time" "time"
) )
...@@ -27,7 +28,12 @@ func (this *SpModel) Start() { ...@@ -27,7 +28,12 @@ func (this *SpModel) Start() {
n = Unit.Time2Seconds(push_check_seconds) n = Unit.Time2Seconds(push_check_seconds)
} }
this.push(); push_type,_:=strconv.Atoi(conf["push_type"].(string)) //0不推送,1推送
if push_type == 1 {
this.push();
}
} }
......
...@@ -7,10 +7,10 @@ log_path = ./ ...@@ -7,10 +7,10 @@ log_path = ./
log_filename = center_service.log log_filename = center_service.log
[debug] [debug]
api_conf_sys = http://192.168.200.134:801/api/center/conf_sys api_conf_sys = http://192.168.200.134:80/api/center/conf_sys
api_conf_sps = http://192.168.200.134:801/api/center/conf_sps api_conf_sps = http://192.168.200.134:80/api/center/conf_sps
api_conf_sites = http://192.168.200.134:801/api/center/conf_sites api_conf_sites = http://192.168.200.134:80/api/center/conf_sites
api_tb_playlog_create = http://192.168.200.134:801/api/center/tb_playlog_create api_tb_playlog_create = http://192.168.200.134:80/api/center/tb_playlog_create
log_path = ./ log_path = ./
log_filename = center_service.log log_filename = center_service.log
......
...@@ -196,7 +196,7 @@ class CenterAction extends Action ...@@ -196,7 +196,7 @@ class CenterAction extends Action
$data['code'] = $json["id"]; $data['code'] = $json["id"];
$data['description'] = $json["description"]; $data['description'] = $json["description"];
$data['url_play'] = $json["playUrl"]; $data['url_play'] = $json["playUrl"];
$data['url_pic'] = $json["picUrl"]; $data['url_pic'] = $this->remakeImageUrlForCache($json["picUrl"]);
$data['year'] = substr($json["year"],0,4); $data['year'] = substr($json["year"],0,4);
$data['score'] = floatval($json["score"]); $data['score'] = floatval($json["score"]);
$data['region'] = $json["region"]; $data['region'] = $json["region"];
...@@ -212,9 +212,9 @@ class CenterAction extends Action ...@@ -212,9 +212,9 @@ class CenterAction extends Action
$data["nodeName"]=$this->null2str($json["nodeName"]); $data["nodeName"]=$this->null2str($json["nodeName"]);
//圆动和互动新增字段() //圆动和互动新增字段()
$data['newsImage_1'] = $this->null2str($json["newsImage_1"]); $data['newsImage_1'] = $this->remakeImageUrlForCache($json["newsImage_1"]);
$data['newsImage_2'] = $this->null2str($json["newsImage_2"]); $data['newsImage_2'] = $this->remakeImageUrlForCache($json["newsImage_2"]);
$data['newsImage_3'] = $this->null2str($json["newsImage_3"]); $data['newsImage_3'] = $this->remakeImageUrlForCache($json["newsImage_3"]);
$data['englishTitle'] = $this->null2str($json["englishTitle"]); $data['englishTitle'] = $this->null2str($json["englishTitle"]);
//end //end
...@@ -273,6 +273,15 @@ class CenterAction extends Action ...@@ -273,6 +273,15 @@ class CenterAction extends Action
} }
return $str; return $str;
} }
function remakeImageUrlForCache($url){
$imageDomain="image.hotel.wasu.tv";
if ($url!="" && !is_null($url)){
$url="http://$imageDomain/".substr($url,7);
}else{
$url = "";
}
return $url;
}
/* /*
* 媒资自动转推函数 * 媒资自动转推函数
* 批量修改媒资状态 * 批量修改媒资状态
...@@ -344,7 +353,7 @@ class CenterAction extends Action ...@@ -344,7 +353,7 @@ class CenterAction extends Action
$end = date('Y-m-d H:i:s',strtotime($_GET["end"])); $end = date('Y-m-d H:i:s',strtotime($_GET["end"]));
$page=$_GET["page"]; $page=$_GET["page"];
$sqlTotal = "SELECT count(1) total FROM sh_hotel_media_map_$spid WHERE $whereHotelid AND hm.status_inject=1 AND updatetime BETWEEN '$start' AND '$end';"; $sqlTotal = "SELECT count(1) total FROM sh_hotel_media_map_$spid WHERE $whereHotelid AND status_inject=1 AND updatetime BETWEEN '$start' AND '$end';";
$totalArr = M("")->query($sqlTotal); $totalArr = M("")->query($sqlTotal);
$total = 0; $total = 0;
if (count($totalArr)>0){ if (count($totalArr)>0){
......
...@@ -63,6 +63,7 @@ class FrontAction extends Action ...@@ -63,6 +63,7 @@ class FrontAction extends Action
} }
} }
header('Content-type: application/json'); //json
echo json_encode($config); echo json_encode($config);
exit; exit;
...@@ -87,7 +88,8 @@ class FrontAction extends Action ...@@ -87,7 +88,8 @@ class FrontAction extends Action
$end = date('Y-m-d H:i:s',strtotime($_GET["end"])); $end = date('Y-m-d H:i:s',strtotime($_GET["end"]));
$page=$_GET["page"]; $page=$_GET["page"];
$sqlTotal = "SELECT count(1) total FROM sh_hotel_media_map_$spid WHERE hotel_id=$hid AND updatetime BETWEEN '$start' AND '$end';"; $sqlTotal = "SELECT count(1) total FROM sh_hotel_media_map_$spid
WHERE hotel_id=$hid AND updatetime BETWEEN '$start' AND '$end';";
// echo $sqlTotal;exit; // echo $sqlTotal;exit;
$totalArr = M("")->query($sqlTotal); $totalArr = M("")->query($sqlTotal);
$total = 0; $total = 0;
...@@ -97,9 +99,10 @@ class FrontAction extends Action ...@@ -97,9 +99,10 @@ class FrontAction extends Action
$page_num = ceil($total/$page_size); $page_num = ceil($total/$page_size);
$limit_from = ($page-1)*$page_size; $limit_from = ($page-1)*$page_size;
$sql="SELECT mw.id,mw.code,mw.url_play,hm.status,hm.status_inject" $sql="SELECT mw.id,mw.code,mw.url_play,hm.status,hm.status_inject,hm.updatetime"
." FROM (SELECT media_id,hotel_id,status,status_inject FROM sh_hotel_media_map_$spid" ." FROM (SELECT media_id,hotel_id,status,status_inject,updatetime FROM sh_hotel_media_map_$spid"
." WHERE hotel_id=$hid AND updatetime BETWEEN '$start' AND '$end' ORDER BY updatetime,media_id ASC LIMIT $limit_from,$page_size) hm" ." WHERE hotel_id=$hid AND updatetime BETWEEN '$start' AND '$end'
ORDER BY updatetime,media_id ASC LIMIT $limit_from,$page_size) hm"
." JOIN sh_media_wasu mw ON mw.id=hm.media_id"; ." JOIN sh_media_wasu mw ON mw.id=hm.media_id";
...@@ -110,6 +113,7 @@ class FrontAction extends Action ...@@ -110,6 +113,7 @@ class FrontAction extends Action
$result["page_num"]=(int)$page_num; $result["page_num"]=(int)$page_num;
$result["list"] = $list; $result["list"] = $list;
header('Content-type: application/json'); //json
echo json_encode($result); echo json_encode($result);
exit; exit;
} }
......
...@@ -19,7 +19,7 @@ class MonitorAction extends Action ...@@ -19,7 +19,7 @@ class MonitorAction extends Action
$userInfo = $_SESSION["_USER_INFO"]; $userInfo = $_SESSION["_USER_INFO"];
$limitRtimeout=60; $limitRtimeout=180;
$limitCpu=0.9; $limitCpu=0.9;
$limitMem=0.9; $limitMem=0.9;
...@@ -113,7 +113,7 @@ class MonitorAction extends Action ...@@ -113,7 +113,7 @@ class MonitorAction extends Action
$id = $_GET["id"]; $id = $_GET["id"];
$this->assign('SYSTEM_INFO',C('SYSTEM_INFO')); $this->assign('SYSTEM_INFO',C('SYSTEM_INFO'));
$limitRtimeout=60; $limitRtimeout=180;
$limitCpu=0.9; $limitCpu=0.9;
$limitMem=0.9; $limitMem=0.9;
......
<?php
/**
* Created by PhpStorm.
* User: wuxiande
* Date: 2019/11/6
* Time: 15:46
* 华数演示接口
* 这边希望两块数据
1.获得二级栏目,类似于电竞分dota2,lol等等
2.根据获得的栏目查询此栏目下的内容
*/
class WasuAction extends Action
{
/*
* 获取栏目列表
* 输入:
* sid : 站点id
* 输出:
* {"movie":["栏目1","栏目2"],"news":["",""]}
*
* 示例:
* 小帅站点:
* http://api.hotel.wasu.tv/api/wasu/programs?sid=1
* 圆动站点:
* http://api.hotel.wasu.tv/api/wasu/programs?sid=2
*/
public function programs(){
$sid = $_GET["sid"];
$sql = "select type,programType from sh_media_wasu
where site_id=$sid group by type,programType";
$arr = M()->query($sql);
foreach ($arr as $item){
$result[$item["type"]][]=$item["programType"];
}
header('Content-type: application/json'); //json
echo json_encode($result);
exit;
}
/**
* 获取指定酒店指定栏目下媒资列表(分页获取)
* /api/wasu/medias?spid=1&hid=1&program=恐怖悬疑&page=1&size=10
* 输入:
* spid : 合作方id
* hid : 酒店id
* program : 栏目名称(不传或all获取所有栏目媒资)
* status_inject : 注入状态:1已注入 ,all为所有
* page : 请求页
* page_size : 每页记录数
* 输出:
*
* 示例:
* 圆动 -> 华数圆动测试酒店:
* http://api.hotel.wasu.tv/api/wasu/medias?status_inject=1&spid=33&hid=97&program=恐怖悬疑&page=1&size=20
* 华数测试 -> 华数测试酒店1:
* http://api.hotel.wasu.tv/api/wasu/medias?status_inject=1&spid=5&hid=3&program=恐怖悬疑&page=1&size=20
*/
public function medias(){
$spid = $_GET["spid"];
$hid = $_GET["hid"];
$page=$_GET["page"];
$size = $_GET["size"];
$where=" 1=1 ";
$status_inject = $_GET["status_inject"];
if (!empty($status_inject)&& $status_inject!="all"){
$where.=" AND hm.status_inject=$status_inject ";
}
$program = urldecode($_GET["program"]);
if (!empty($program)&& $program!="all" && $program!=""){
$where.=" AND mw.programType='$program' ";
}
if (empty($size)){
$size = 10;
}
$sqlTotal = "SELECT count(1) total FROM sh_hotel_media_map_$spid hm,sh_media_wasu mw"
." WHERE $where AND hm.status=1 AND hm.hotel_id=$hid
AND mw.id=media_id ";
// echo $sqlTotal;
$totalArr = M("")->query($sqlTotal);
$total = 0;
if (count($totalArr)>0){
$total = $totalArr[0]["total"];
}
$page_num = ceil($total/$size);
$limit_from = ($page-1)*$size;
$fields = "mw.code id,mw.title,mw.description,mw.programType,mw.url_pic picUrl"
. ",mw.year,mw.type,mw.score,mw.region,mw.actor,mw.director"
. ",hm.status,hm.status_inject statusInject"
. ",mw.type,mw.nodeId,mw.nodeName"
. ",mw.newsImage_1,mw.newsImage_2,mw.newsImage_3,mw.englishTitle";
$sql = "SELECT $fields"
." FROM sh_hotel_media_map_$spid hm,sh_media_wasu mw"
." WHERE $where AND hm.status=1 AND hm.hotel_id=$hid"
." AND mw.id=media_id ORDER BY mw.id ASC limit $limit_from,$size;";
// echo $sql;exit;
$list = M("")->query($sql);
$result["total"]=(int)$total;
$result["page_cur"]=(int)$page;
$result["page_num"]=(int)$page_num;
$result["list"] = $list;
header('Content-type: application/json'); //json
echo json_encode($result);
exit;
}
}
\ No newline at end of file
...@@ -91,8 +91,8 @@ class HotelAction extends CommonAction{ ...@@ -91,8 +91,8 @@ class HotelAction extends CommonAction{
$spinfo = D("Sp")->field("site_id")->where(array("id"=>$spid))->find(); $spinfo = D("Sp")->field("site_id")->where(array("id"=>$spid))->find();
$siteid = $spinfo["site_id"]; $siteid = $spinfo["site_id"];
if ($siteid){ if ($siteid){
$sql = "INSERT INTO sh_hotel_media_map_$spid (media_id,hotel_id,status,status_inject)" $sql = "INSERT INTO sh_hotel_media_map_$spid (media_id,hotel_id,status,status_inject,media_code)"
. " SELECT id,$id,status,0 FROM sh_media_wasu WHERE site_id=$siteid;"; . " SELECT id,$id,status,0,code FROM sh_media_wasu WHERE site_id=$siteid;";
$model->execute($sql); $model->execute($sql);
} }
} }
......
...@@ -4,6 +4,7 @@ class InjectAction extends CommonAction{ ...@@ -4,6 +4,7 @@ class InjectAction extends CommonAction{
//管理 //管理
public function index(){ public function index(){
$op = I('op'); $op = I('op');
$userInfo = $_SESSION["_USER_INFO"];
if($op=="getjson"){ if($op=="getjson"){
$model = D("Inject"); $model = D("Inject");
$userInfo = $_SESSION["_USER_INFO"]; $userInfo = $_SESSION["_USER_INFO"];
...@@ -13,6 +14,13 @@ class InjectAction extends CommonAction{ ...@@ -13,6 +14,13 @@ class InjectAction extends CommonAction{
$total = $count[0]["count"]; $total = $count[0]["count"];
echo "{\"total\":\"".$total."\",\"rows\":".json_encode($list)."}"; echo "{\"total\":\"".$total."\",\"rows\":".json_encode($list)."}";
}else{ }else{
$spModel = D("Sp");
if($userInfo['sp_ids']&&$userInfo['grade']>=3){
$sp_lists = $spModel->where("`status`=0 and id in(".$userInfo['sp_ids'].")")->select();
}else{
$sp_lists = $spModel->where("`status`=0")->select();
}
$this->sp_lists = $sp_lists;
$this->display(); $this->display();
} }
} }
...@@ -64,12 +72,20 @@ class InjectAction extends CommonAction{ ...@@ -64,12 +72,20 @@ class InjectAction extends CommonAction{
$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,A.`type`,A.`status`,A.programType")->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,A.`type`,A.`status`,A.programType")->group(" A.id ")->select();
if($userInfo['sp_ids']&&$userInfo['grade']>=3){ 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("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(); $hotel_lists = $hotelModel->field("id,`name`,sp_id")
$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(); ->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 ")
->join(" join sh_media_wasu C on B.media_id=C.id ")
->field("A.id,A.`name`,A.sp_id,group_concat(concat(B.media_id,'_',C.code)) media_ids")
->where("A.sp_id in(".$userInfo['sp_ids'].") and A.`status` = 0")
->group("A.id")->select();
}else{ }else{
$sp_lists = $spModel->field("id,`name`")->where("`status`=0")->select(); $sp_lists = $spModel->field("id,`name`")->where("`status`=0")->select();
$hotel_lists = $hotelModel->field("id,`name`,sp_id")->where("`status`=0")->select(); $hotel_lists = $hotelModel->field("id,`name`,sp_id")->where("`status`=0")->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.`status` = 0")->group("A.id")->select(); $play_lists = $spPlaylistModel->join(" A join sh_sp_playlist_media_map B on A.id = B.playlist_id ")
->join(" join sh_media_wasu C on B.media_id=C.id ")
->field("A.id,A.`name`,A.sp_id,group_concat(concat(B.media_id,'_',C.code)) media_ids")
->where("A.`status` = 0")->group("A.id")->select();
} }
$type_lists = $mediaModel->field("type,programType")->where("programType!=''")->group("programType")->select(); $type_lists = $mediaModel->field("type,programType")->where("programType!=''")->group("programType")->select();
$this->type_lists = json_encode($type_lists); $this->type_lists = json_encode($type_lists);
...@@ -101,6 +117,7 @@ class InjectAction extends CommonAction{ ...@@ -101,6 +117,7 @@ class InjectAction extends CommonAction{
echo 'false'; echo 'false';
} }
}else{ }else{
$taskData['sp_id'] = I("sp");
$taskData['name'] = I("name"); $taskData['name'] = I("name");
$taskData['addtime'] = date('Y-m-d H:i:s'); $taskData['addtime'] = date('Y-m-d H:i:s');
$taskData['remark'] = I("remark"); $taskData['remark'] = I("remark");
......
...@@ -47,7 +47,9 @@ class PlaylistAction extends CommonAction{ ...@@ -47,7 +47,9 @@ class PlaylistAction extends CommonAction{
$sp_lists = $spModel->field("id,`name`")->where("`status`=0")->select(); $sp_lists = $spModel->field("id,`name`")->where("`status`=0")->select();
$play_lists = $model->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")->group("A.id")->select(); $play_lists = $model->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")->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(); // $media_lists = $mediaModel->field("id,title,sp_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();
$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();
$this->sp_lists = $sp_lists; $this->sp_lists = $sp_lists;
$this->media_lists = json_encode($media_lists); $this->media_lists = json_encode($media_lists);
......
...@@ -4,6 +4,7 @@ class PlayCtrlAction extends CommonAction{ ...@@ -4,6 +4,7 @@ class PlayCtrlAction extends CommonAction{
//管理 //管理
public function index(){ public function index(){
$op = I('op'); $op = I('op');
$userInfo = $_SESSION["_USER_INFO"];
if($op=="getjson"){ if($op=="getjson"){
$model = D("PlayCtrl"); $model = D("PlayCtrl");
$userInfo = $_SESSION["_USER_INFO"]; $userInfo = $_SESSION["_USER_INFO"];
...@@ -13,6 +14,13 @@ class PlayCtrlAction extends CommonAction{ ...@@ -13,6 +14,13 @@ class PlayCtrlAction extends CommonAction{
$total = $count[0]["count"]; $total = $count[0]["count"];
echo "{\"total\":\"".$total."\",\"rows\":".json_encode($list)."}"; echo "{\"total\":\"".$total."\",\"rows\":".json_encode($list)."}";
}else{ }else{
$spModel = D("Sp");
if($userInfo['sp_ids']&&$userInfo['grade']>=3){
$sp_lists = $spModel->where("`status`=0 and id in(".$userInfo['sp_ids'].")")->select();
}else{
$sp_lists = $spModel->where("`status`=0")->select();
}
$this->sp_lists = $sp_lists;
$this->display(); $this->display();
} }
} }
...@@ -68,12 +76,19 @@ class PlayCtrlAction extends CommonAction{ ...@@ -68,12 +76,19 @@ class PlayCtrlAction extends CommonAction{
$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(); $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){ 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("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(); $hotel_lists = $hotelModel->field("id,`name`,sp_id,region_id")
$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'].")")->group("A.id")->select(); ->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 ")
->join(" join sh_media_wasu C on B.media_id=C.id ")
->field("A.id,A.`name`,A.sp_id,group_concat(concat(B.media_id,'_',C.code)) media_ids")
->where("A.sp_id in(".$userInfo['sp_ids'].")")
->group("A.id")->select();
}else{ }else{
$sp_lists = $spModel->field("id,`name`")->where("`status`=0")->select(); $sp_lists = $spModel->field("id,`name`")->where("`status`=0")->select();
$hotel_lists = $hotelModel->field("id,`name`,sp_id,region_id")->where("`status`=0")->select(); $hotel_lists = $hotelModel->field("id,`name`,sp_id,region_id")->where("`status`=0")->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")->group("A.id")->select(); $play_lists = $spPlaylistModel->join(" A join sh_sp_playlist_media_map B on A.id = B.playlist_id ")
->join(" join sh_media_wasu C on B.media_id=C.id ")
->field("A.id,A.`name`,A.sp_id,group_concat(concat(B.media_id,'_',C.code)) media_ids")->group("A.id")->select();
} }
$region_lists = $regionModel->where("`level` < 4 and pid < 999999")->select(); $region_lists = $regionModel->where("`level` < 4 and pid < 999999")->select();
...@@ -106,6 +121,7 @@ class PlayCtrlAction extends CommonAction{ ...@@ -106,6 +121,7 @@ class PlayCtrlAction extends CommonAction{
echo 'false'; echo 'false';
} }
}else{ }else{
$taskData['sp_id'] = I("sp");
$taskData['name'] = I("name"); $taskData['name'] = I("name");
$taskData['addtime'] = date('Y-m-d H:i:s'); $taskData['addtime'] = date('Y-m-d H:i:s');
$taskData['remark'] = I("remark"); $taskData['remark'] = I("remark");
......
...@@ -54,7 +54,7 @@ class HotelMediaMapModel extends RelationModel{ ...@@ -54,7 +54,7 @@ class HotelMediaMapModel extends RelationModel{
//返回列表(limit分页) //返回列表(limit分页)
if($queryType=="list"){ if($queryType=="list"){
$where .= $sort." ".$limit; $where .= $sort." ".$limit;
$fields = " A.*,B.id mid,B.code mcode,B.programType,B.url_pic,B.title,C.`name` hotel_name,case A.`status` when 1 then '<font color=green>上线</font>' when 2 then '<font color=red>下线</font>' when 0 then '<font color=red>删除</font>' end as `status` "; $fields = " A.*,B.id mid,B.code mcode,B.programType,B.url_pic,B.title,C.`name` hotel_name,A.`status` status1,case A.`status` when 1 then '<font color=green>上线</font>' when 2 then '<font color=red>下线</font>' when 0 then '<font color=red>删除</font>' end as `status` ";
} }
$sql = "select ".$fields." from ".$this->tableName." A join sh_media_wasu B on A.media_id = B.id join sh_hotel C on A.hotel_id = C.id and C.sp_id = $searchSp where 1=1 ".$where.";"; $sql = "select ".$fields." from ".$this->tableName." A join sh_media_wasu B on A.media_id = B.id join sh_hotel C on A.hotel_id = C.id and C.sp_id = $searchSp where 1=1 ".$where.";";
// echo $sql; // echo $sql;
......
...@@ -13,9 +13,12 @@ class InjectModel extends RelationModel{ ...@@ -13,9 +13,12 @@ class InjectModel extends RelationModel{
$searchField = $inputs["searchField"]?$inputs["searchField"]:'name'; $searchField = $inputs["searchField"]?$inputs["searchField"]:'name';
$searchValue = $inputs["searchValue"]?$inputs["searchValue"]:''; $searchValue = $inputs["searchValue"]?$inputs["searchValue"]:'';
$searchSp = $inputs["searchSp"]?$inputs["searchSp"]:0; $searchSp = $inputs["searchSp"]?$inputs["searchSp"]:0;
if ($searchSp){
$where = " and t.sp_id=$searchSp ";
}
if($searchValue){ if($searchValue){
$where = " and (`name` like '%".$searchValue."%') "; $where .= " and (t.`name` like '%".$searchValue."%') ";
} }
$model = new Model(); $model = new Model();
...@@ -25,9 +28,11 @@ class InjectModel extends RelationModel{ ...@@ -25,9 +28,11 @@ class InjectModel extends RelationModel{
//返回列表(limit分页) //返回列表(limit分页)
if($queryType=="list"){ if($queryType=="list"){
$where .= $sort." ".$limit; $where .= $sort." ".$limit;
$fields = " *,case `status` when 0 then '未注入' when 1 then '<font color=green>注入成功</font>' when 2 then '<font color=red>注入失败</font>' end as `status` "; $fields = " t.*,s.name sp_name,case t.`status` when 0 then '未注入'
when 1 then '<font color=green>注入成功</font>'
when 2 then '<font color=red>注入失败</font>' end as `status` ";
} }
$sql = "select ".$fields." from sh_task_inject where 1=1 ".$where.";"; $sql = "select ".$fields." from sh_task_inject t,sh_sp s where 1=1 and t.sp_id=s.id ".$where.";";
// echo $sql; // echo $sql;
return $model->query($sql); return $model->query($sql);
} }
......
...@@ -13,9 +13,12 @@ class PlayCtrlModel extends RelationModel{ ...@@ -13,9 +13,12 @@ class PlayCtrlModel extends RelationModel{
$searchField = $inputs["searchField"]?$inputs["searchField"]:'name'; $searchField = $inputs["searchField"]?$inputs["searchField"]:'name';
$searchValue = $inputs["searchValue"]?$inputs["searchValue"]:''; $searchValue = $inputs["searchValue"]?$inputs["searchValue"]:'';
$searchSp = $inputs["searchSp"]?$inputs["searchSp"]:0; $searchSp = $inputs["searchSp"]?$inputs["searchSp"]:0;
if ($searchSp){
$where = " and t.sp_id=$searchSp ";
}
if($searchValue){ if($searchValue){
$where = " and (`name` like '%".$searchValue."%') "; $where .= " and (t.`name` like '%".$searchValue."%') ";
} }
$model = new Model(); $model = new Model();
...@@ -25,9 +28,11 @@ class PlayCtrlModel extends RelationModel{ ...@@ -25,9 +28,11 @@ class PlayCtrlModel extends RelationModel{
//返回列表(limit分页) //返回列表(limit分页)
if($queryType=="list"){ if($queryType=="list"){
$where .= $sort." ".$limit; $where .= $sort." ".$limit;
$fields = " *,case `status` when 0 then '<font color=red>删除</font>' when 1 then '<font color=green>上线</font>' when 2 then '<font color=red>下线</font>' end as `status` "; $fields = " t.*,s.name sp_name,case t.`status` when 0 then '<font color=red>删除</font>'
when 1 then '<font color=green>上线</font>'
when 2 then '<font color=red>下线</font>' end as `status` ";
} }
$sql = "select ".$fields." from sh_task_ctrl where 1=1 ".$where.";"; $sql = "select ".$fields." from sh_task_ctrl t,sh_sp s where 1=1 and t.sp_id=s.id ".$where.";";
// echo $sql; // echo $sql;
return $model->query($sql); return $model->query($sql);
} }
......
...@@ -23,6 +23,12 @@ ...@@ -23,6 +23,12 @@
<form name="searchform" method="post" action="" id ="searchform"> <form name="searchform" method="post" action="" id ="searchform">
<input type="hidden" name="op" value="getjson"> <input type="hidden" name="op" value="getjson">
<div class="inputBox"> <div class="inputBox">
<select class="select" name="searchSp">
<option value="0">合作方</option>
<volist name="sp_lists" id="item">
<option value="{$item.id}">{$item.name}</option>
</volist>
</select>
<input class="input" type="text" placeholder="任务名称" name="searchValue"> <input class="input" type="text" placeholder="任务名称" name="searchValue">
</div> </div>
<input id="submit_search" name="" type="button" value="查询" class="btn_go_s btn_orange" /> <input id="submit_search" name="" type="button" value="查询" class="btn_go_s btn_orange" />
...@@ -52,6 +58,7 @@ onRowContextMenu : onRowContextMenu ...@@ -52,6 +58,7 @@ onRowContextMenu : onRowContextMenu
<thead> <thead>
<tr> <tr>
<th data-options="field:'name',width:100" sortable="true">任务名称</th> <th data-options="field:'name',width:100" sortable="true">任务名称</th>
<th data-options="field:'sp_name',width:40" align="center" sortable="true">合作方</th>
<th data-options="field:'addtime',width:30" sortable="true">创建时间</th> <th data-options="field:'addtime',width:30" sortable="true">创建时间</th>
<th data-options="field:'updatetime',width:30" sortable="true">更新时间</th> <th data-options="field:'updatetime',width:30" sortable="true">更新时间</th>
<th data-options="field:'remark',width:30" sortable="true">备注</th> <th data-options="field:'remark',width:30" sortable="true">备注</th>
...@@ -63,7 +70,7 @@ onRowContextMenu : onRowContextMenu ...@@ -63,7 +70,7 @@ onRowContextMenu : onRowContextMenu
<div id="mm1" class="easyui-menu" style="width:120px;display: none"> <div id="mm1" class="easyui-menu" style="width:120px;display: none">
<div iconCls="icon-list" id="menuEdit" onclick="lists()" {:buttonAuth('Inject','Inject','lists')}>媒资注入列表</div> <div iconCls="icon-list" id="menuEdit" onclick="lists()" {:buttonAuth('Inject','Inject','lists')}>媒资注入列表</div>
<div iconCls="icon-cancel" id="menuDel" onclick="del()" {:buttonAuth('Inject','Inject','deletehandle')}>删除</div> <!--<div iconCls="icon-cancel" id="menuDel" onclick="del()" {:buttonAuth('Inject','Inject','deletehandle')}>删除</div>-->
<!-- <div class="menu-sep"></div> <!-- <div class="menu-sep"></div>
<div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('Inject','Inject','add')}>列表</div>--> <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('Inject','Inject','add')}>列表</div>-->
<!-- <div class="menu-sep"></div> <!-- <div class="menu-sep"></div>
...@@ -72,7 +79,7 @@ onRowContextMenu : onRowContextMenu ...@@ -72,7 +79,7 @@ onRowContextMenu : onRowContextMenu
</div> </div>
<div id="mm2" class="easyui-menu" style="width:120px;display: none"> <div id="mm2" class="easyui-menu" style="width:120px;display: none">
<div iconCls="icon-list" id="menuEdit" onclick="lists()" {:buttonAuth('Inject','Inject','lists')}>媒资注入列表</div> <div iconCls="icon-list" id="menuEdit" onclick="lists()" {:buttonAuth('Inject','Inject','lists')}>媒资注入列表</div>
<div iconCls="icon-cancel" id="menuDel" onclick="del()" {:buttonAuth('Inject','Inject','deletehandle')}>删除</div> <!--<div iconCls="icon-cancel" id="menuDel" onclick="del()" {:buttonAuth('Inject','Inject','deletehandle')}>删除</div>-->
<!-- <div class="menu-sep"></div> <!-- <div class="menu-sep"></div>
<div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('Inject','Inject','add')}>列表</div>--> <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('Inject','Inject','add')}>列表</div>-->
<!-- <div class="menu-sep"></div> <!-- <div class="menu-sep"></div>
......
...@@ -106,8 +106,8 @@ onRowContextMenu : onRowContextMenu ...@@ -106,8 +106,8 @@ onRowContextMenu : onRowContextMenu
<div id="mm1" class="easyui-menu" style="width:120px;display: none"> <div id="mm1" class="easyui-menu" style="width:120px;display: none">
<!-- <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('Media','Hotel','add')}>编辑</div>--> <!-- <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('Media','Hotel','add')}>编辑</div>-->
<div iconCls="icon-cancel" id="menuDel" onclick="enable(0)" {:buttonAuth('Media','Hotel','deletehandle')}>删除</div> <!--<div iconCls="icon-cancel" id="menuDel" onclick="enable(0)" {:buttonAuth('Media','Hotel','deletehandle')}>删除</div>-->
<div class="menu-sep"></div> <!--<div class="menu-sep"></div>-->
<div iconCls="icon-edit" id="menuEdit" onclick="details()" {:buttonAuth('Media','Cloud','add')}>查看详情</div> <div iconCls="icon-edit" id="menuEdit" onclick="details()" {:buttonAuth('Media','Cloud','add')}>查看详情</div>
<div iconCls="icon-reload" id="menuStop" onclick="restartInject(0)" {:buttonAuth('Media','Hotel','updateStatusInjectAjaxHandle')}>重新注入</div> <div iconCls="icon-reload" id="menuStop" onclick="restartInject(0)" {:buttonAuth('Media','Hotel','updateStatusInjectAjaxHandle')}>重新注入</div>
<div class="menu-sep"></div> <div class="menu-sep"></div>
...@@ -168,13 +168,17 @@ function InputAction(value, row, index) { ...@@ -168,13 +168,17 @@ function InputAction(value, row, index) {
return'<a href="javascript:void(0)" id="mb' + index + '" class="easyui-menubutton" menu="#mm1" iconCls="icon-list" onmouseover="setSelectRow(' + index + ')">'+this.title+'</a>'; return'<a href="javascript:void(0)" id="mb' + index + '" class="easyui-menubutton" menu="#mm1" iconCls="icon-list" onmouseover="setSelectRow(' + index + ')">'+this.title+'</a>';
} }
function StatusInjectAction(value, row, index){ function StatusInjectAction(value, row, index){
if(value==0){ var str="--";
return "注入中"; if (row.status1==1){
}else if(value==1){ if (value==1){
return "<font color=green>已注入</font>"; str="<font color=green>已注入</font>";
}else if(value==2){ }else{
return "<font color=red>注入失败</font>"; str="<font color=#ff8c00>注入中</font>:"+value;
}
}else{
str="<font color=red>已删除</font>:"+value;
} }
return str;
} }
function setSelectRow(index) { function setSelectRow(index) {
$('#dg').datagrid('unselectAll'); $('#dg').datagrid('unselectAll');
......
...@@ -23,6 +23,12 @@ ...@@ -23,6 +23,12 @@
<form name="searchform" method="post" action="" id ="searchform"> <form name="searchform" method="post" action="" id ="searchform">
<input type="hidden" name="op" value="getjson"> <input type="hidden" name="op" value="getjson">
<div class="inputBox"> <div class="inputBox">
<select class="select" name="searchSp">
<option value="0">合作方</option>
<volist name="sp_lists" id="item">
<option value="{$item.id}">{$item.name}</option>
</volist>
</select>
<input class="input" type="text" placeholder="播控名称" name="searchValue"> <input class="input" type="text" placeholder="播控名称" name="searchValue">
</div> </div>
<input id="submit_search" name="" type="button" value="查询" class="btn_go_s btn_orange" /> <input id="submit_search" name="" type="button" value="查询" class="btn_go_s btn_orange" />
...@@ -52,6 +58,7 @@ onRowContextMenu : onRowContextMenu ...@@ -52,6 +58,7 @@ onRowContextMenu : onRowContextMenu
<thead> <thead>
<tr> <tr>
<th data-options="field:'name',width:100" sortable="true">播控名称</th> <th data-options="field:'name',width:100" sortable="true">播控名称</th>
<th data-options="field:'sp_name',width:40" align="center" sortable="true">合作方</th>
<th data-options="field:'addtime',width:30" sortable="true">创建时间</th> <th data-options="field:'addtime',width:30" sortable="true">创建时间</th>
<th data-options="field:'updatetime',width:30" sortable="true">更新时间</th> <th data-options="field:'updatetime',width:30" sortable="true">更新时间</th>
<th data-options="field:'status'" sortable="true" align="center">状态</th> <th data-options="field:'status'" sortable="true" align="center">状态</th>
...@@ -62,7 +69,7 @@ onRowContextMenu : onRowContextMenu ...@@ -62,7 +69,7 @@ onRowContextMenu : onRowContextMenu
<div id="mm1" class="easyui-menu" style="width:120px;display: none"> <div id="mm1" class="easyui-menu" style="width:120px;display: none">
<div iconCls="icon-list" id="menuEdit" onclick="lists()" {:buttonAuth('PlayCtrl','PlayCtrl','lists')}>播控列表</div> <div iconCls="icon-list" id="menuEdit" onclick="lists()" {:buttonAuth('PlayCtrl','PlayCtrl','lists')}>播控列表</div>
<div iconCls="icon-cancel" id="menuDel" onclick="del()" {:buttonAuth('PlayCtrl','PlayCtrl','deletehandle')}>删除</div> <!--<div iconCls="icon-cancel" id="menuDel" onclick="del()" {:buttonAuth('PlayCtrl','PlayCtrl','deletehandle')}>删除</div>-->
<!-- <div class="menu-sep"></div> <!-- <div class="menu-sep"></div>
<div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('PlayCtrl','PlayCtrl','add')}>列表</div>--> <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('PlayCtrl','PlayCtrl','add')}>列表</div>-->
<!-- <div class="menu-sep"></div> <!-- <div class="menu-sep"></div>
...@@ -71,7 +78,7 @@ onRowContextMenu : onRowContextMenu ...@@ -71,7 +78,7 @@ onRowContextMenu : onRowContextMenu
</div> </div>
<div id="mm2" class="easyui-menu" style="width:120px;display: none"> <div id="mm2" class="easyui-menu" style="width:120px;display: none">
<div iconCls="icon-list" id="menuEdit" onclick="lists()" {:buttonAuth('PlayCtrl','PlayCtrl','lists')}>播控列表</div> <div iconCls="icon-list" id="menuEdit" onclick="lists()" {:buttonAuth('PlayCtrl','PlayCtrl','lists')}>播控列表</div>
<div iconCls="icon-cancel" id="menuDel" onclick="del()" {:buttonAuth('PlayCtrl','PlayCtrl','deletehandle')}>删除</div> <!--<div iconCls="icon-cancel" id="menuDel" onclick="del()" {:buttonAuth('PlayCtrl','PlayCtrl','deletehandle')}>删除</div>-->
<!-- <div class="menu-sep"></div> <!-- <div class="menu-sep"></div>
<div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('PlayCtrl','PlayCtrl','add')}>列表</div>--> <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('PlayCtrl','PlayCtrl','add')}>列表</div>-->
<!-- <div class="menu-sep"></div> <!-- <div class="menu-sep"></div>
......
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