Skip to content

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

更新媒资注入、播控

parent c0a944ee
Hide whitespace changes
Inline Side-by-side
Showing with 411 additions and 6 deletions
SooonerHotel/App/Lib/Action/Inject/InjectAction.class.php
View file @ 516f49f4
...@@ -61,7 +61,7 @@ class InjectAction extends CommonAction{ ...@@ -61,7 +61,7 @@ class InjectAction extends CommonAction{
$info =$model->where("id = $id")->find(); $info =$model->where("id = $id")->find();
$this->info = $info; $this->info = $info;
} }
$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("A.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")->where("`status`=0 and sp_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();
......
SooonerHotel/App/Lib/Action/Log/PullLogAction.class.php 0 → 100644
View file @ 516f49f4
<?php
class PullLogAction extends CommonAction{
//管理
public function index(){
$op = I('op');
$userInfo = $_SESSION["_USER_INFO"];
if($op=="getjson"){
$model = D("PullLog");
$inputs = I();
$list = $model->getList("list",$userInfo,$inputs);
$count = $model->getList("count",$userInfo,$inputs);
$total = $count[0]["count"];
echo "{\"total\":\"".$total."\",\"rows\":".json_encode($list)."}";
}else{
$spModel = D("Sp");
$siteModel = D("Site");
$hotelModel = D("Hotel");
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")->where("`status`=0 and sp_id in(".$userInfo['sp_ids'].")")->select();
}else{
$sp_lists = $spModel->field("id,`name`")->where("`status`=0")->select();
// $hotel_lists = $hotelModel->field("id,`name`,sp_id")->where("`status`=0")->select();
}
$site_lists = $siteModel->field("id,`name`")->where("`status`=0")->select();
$this->sp_lists = $sp_lists;
$this->site_lists = $site_lists;
$this->display();
}
}
//添加
public function add(){
$userInfo = $_SESSION["_USER_INFO"];
$id = I('id','',int)?I('id','',int):0;
$model = D("PullLog");
if($id){
$info =$model->where("id = $id")->find();
$this->info = $info;
}
$this->display();
}
//添加处理
public function addHandle(){
$model = D("PullLog");
$id = I('id','',int);
$data['name'] = I("name");
$data['code'] = I("code");
$data['remark'] = I("remark");
$data['status'] = I("status");
$data['v'] = I("v");
if($id){
$data['id'] = $id;
$data["updatetime"]=date('Y-m-d H:i:s');
$r = $model->save($data);
if($r){
echo 'true';
}else{
echo 'false';
}
}else{
$data["addtime"]=date('Y-m-d H:i:s');
$id = $model->add($data);
if($id){
echo 'true';
}else{
echo 'false';
}
}
}
//删除处理
public function deleteHandle(){
if(D("ConfType")->where("id=".I("id","",int))->delete()){
echo 'true';
}else{
echo 'false';
}
}
//ajax修改状态
public function updateStatusAjaxHandle(){
$model = D("PullLog");
$data = $_POST;
$data['updatetime'] = date('Y-m-d H:i:s');
if($model->save($data)){
echo 'true';
}else{
echo 'false';
}
}
}
SooonerHotel/App/Lib/Action/Playctrl/PlayCtrlAction.class.php
View file @ 516f49f4
...@@ -65,7 +65,7 @@ class PlayCtrlAction extends CommonAction{ ...@@ -65,7 +65,7 @@ class PlayCtrlAction extends CommonAction{
$this->log_info = $log_info; $this->log_info = $log_info;
$this->info = $info; $this->info = $info;
} }
$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("A.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")->where("`status`=0 and sp_id in(".$userInfo['sp_ids'].")")->select();
......
SooonerHotel/App/Lib/Model/HotelMediaMapModel.class.php
View file @ 516f49f4
...@@ -14,9 +14,11 @@ class HotelMediaMapModel extends RelationModel{ ...@@ -14,9 +14,11 @@ class HotelMediaMapModel extends RelationModel{
$searchValue = $inputs["searchValue"]?$inputs["searchValue"]:''; $searchValue = $inputs["searchValue"]?$inputs["searchValue"]:'';
$searchSp = $inputs["searchSp"]?$inputs["searchSp"]:0; $searchSp = $inputs["searchSp"]?$inputs["searchSp"]:0;
$searchHotel = $inputs["searchHotel"]?$inputs["searchHotel"]:0; $searchHotel = $inputs["searchHotel"]?$inputs["searchHotel"]:0;
$searchStatus = $inputs["searchStatus"]?$inputs["searchStatus"]:0;
$searchStatusInject = $inputs["searchStatusInject"]!=-1?$inputs["searchStatusInject"]:-1;
if($searchValue){ if($searchValue){
$where = " and (B.`title` like '%".$searchValue."%') "; $where = " and (B.`title` like '%".$searchValue."%' or B.`code` like '%".$searchValue."%') ";
} }
if($searchSp){ if($searchSp){
$this->tableName = 'sh_hotel_media_map_'.$searchSp; $this->tableName = 'sh_hotel_media_map_'.$searchSp;
...@@ -24,6 +26,12 @@ class HotelMediaMapModel extends RelationModel{ ...@@ -24,6 +26,12 @@ class HotelMediaMapModel extends RelationModel{
if($searchHotel){ if($searchHotel){
$where .= " and A.hotel_id = $searchHotel "; $where .= " and A.hotel_id = $searchHotel ";
} }
if($searchStatus){
$where .= " and A.status = $searchStatus ";
}
if($searchStatusInject!=-1){
$where .= " and A.status_inject = $searchStatusInject ";
}
if($userInfo['sp_ids']&&$userInfo['grade']>=3){ if($userInfo['sp_ids']&&$userInfo['grade']>=3){
$where .= " and C.sp_id in(".$userInfo['sp_ids'].") "; $where .= " and C.sp_id in(".$userInfo['sp_ids'].") ";
} }
......
SooonerHotel/App/Lib/Model/MediaModel.class.php
View file @ 516f49f4
...@@ -15,6 +15,7 @@ class MediaModel extends RelationModel{ ...@@ -15,6 +15,7 @@ class MediaModel extends RelationModel{
$searchSite = $inputs["searchSite"]?$inputs["searchSite"]:0; $searchSite = $inputs["searchSite"]?$inputs["searchSite"]:0;
$searchClass = $inputs["searchClass"]?$inputs["searchClass"]:0; $searchClass = $inputs["searchClass"]?$inputs["searchClass"]:0;
$searchType = $inputs["searchType"]?$inputs["searchType"]:0; $searchType = $inputs["searchType"]?$inputs["searchType"]:0;
$searchStatus = $inputs["searchStatus"]?$inputs["searchStatus"]:0;
if ($searchSite){ if ($searchSite){
$where = " and mw.site_id=$searchSite "; $where = " and mw.site_id=$searchSite ";
...@@ -28,6 +29,10 @@ class MediaModel extends RelationModel{ ...@@ -28,6 +29,10 @@ class MediaModel extends RelationModel{
if($searchType){ if($searchType){
$where .= " and mw.programType='$searchType' "; $where .= " and mw.programType='$searchType' ";
} }
if($searchStatus){
$where .= " and mw.`status`='$searchStatus' ";
}
if($searchValue){ if($searchValue){
$where .= " and (mw.`title` like '".$searchValue."%' or mw.`code` = '".$searchValue."') "; $where .= " and (mw.`title` like '".$searchValue."%' or mw.`code` = '".$searchValue."') ";
......
SooonerHotel/App/Lib/Model/PullLogModel.class.php
View file @ 516f49f4
<?php <?php
class PullLogModel extends RelationModel{ class PullLogModel extends RelationModel{
protected $tableName = 'sh_log_pull'; //重新定义表名 protected $tableName = 'sh_log_pull'; //重新定义表名
public function getList($queryType,$userInfo,$inputs){
$p=$inputs["page"]?$inputs["page"]:1;
$n=$inputs["rows"]?$inputs["rows"]:10;
$limit = "limit ".($p-1)*$n.",".$n;
$sort="";
if($inputs["sort"])
$sort = "order by ".$inputs["sort"]." ".$inputs["order"];
//=============
$searchField = $inputs["searchField"]?$inputs["searchField"]:'name';
$searchValue = $inputs["searchValue"]?$inputs["searchValue"]:'';
$searchSite = $inputs["searchSite"]?$inputs["searchSite"]:0;
if($searchValue){
$where = " and (A.`page` like '%".$searchValue."%') ";
}
if($searchSite){
$where .= " and A.site_id = $searchSite ";
}
if($userInfo['sp_ids']&&$userInfo['grade']>=3){
$where .= " and A.sp_id in(".$userInfo['sp_ids'].") ";
}
$model = new Model();
//======================
$fields = "count(A.id) count";
//返回列表（limit分页）
if($queryType=="list"){
$where .= $sort." ".$limit;
$fields = " A.*,B.`name` site_name ";
}
$sql = "select ".$fields." from sh_log_pull A join sh_site B on A.site_id=B.id where 1=1 ".$where.";";
// echo $sql;
return $model->query($sql);
}
} }
\ No newline at end of file
SooonerHotel/App/Tpl/Inject/zh-cn/Inject/add.html
View file @ 516f49f4
...@@ -220,7 +220,7 @@ $().ready(function(){ ...@@ -220,7 +220,7 @@ $().ready(function(){
$("#playlist").addClass("hidden"); $("#playlist").addClass("hidden");
$("#multiselectMedia").empty(); $("#multiselectMedia").empty();
$.each(eval(media_json),function(i,item){ $.each(eval(media_json),function(i,item){
if(sp_val==item.sp_id){ if(item.sp_ids.indexOf(sp_val)>-1){
if($("select[name='media_lists[]'] option[value='"+item.id+"']").length==0){ if($("select[name='media_lists[]'] option[value='"+item.id+"']").length==0){
$("#multiselectMedia").append("<option value='"+item.id+"'>"+item.title+"</option>"); $("#multiselectMedia").append("<option value='"+item.id+"'>"+item.title+"</option>");
} }
......
SooonerHotel/App/Tpl/Log/zh-cn/PullLog/index.html 0 → 100644
View file @ 516f49f4
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>拉取日志管理</title>
<link rel="stylesheet" type="text/css" href="__PUBLIC__/js/jquery-easyui-1.3.4/themes/default/easyui.css">
<link rel="stylesheet" type="text/css" href="__PUBLIC__/js/jquery-easyui-1.3.4/themes/icon.css">
<script type="text/javascript" src="__PUBLIC__/js/jquery.min.js"></script>
<script type="text/javascript" src="__PUBLIC__/js/jquery-easyui-1.3.4/jquery.easyui.min.js"></script>
<script type="text/javascript" src="__PUBLIC__/js/jquery-easyui-1.3.4/locale/easyui-lang-{$language}.js"></script>
<script type="text/javascript" src="__PUBLIC__/newVsdn/js/zDialog/zDrag.js"></script>
<script type="text/javascript" src="__PUBLIC__/newVsdn/js/zDialog/zDialog.js"></script>
<script type="text/javascript" src="__PUBLIC__/js/common/functions.js"></script>
<script type="text/javascript" src="__PUBLIC__/js/common/md5.js"></script>
<link href="__PUBLIC__/newVsdn/css/style_frame.css?v=20190829" rel="stylesheet" type="text/css" />
</head>
<body>
<!--搜索和按钮 开始 -->
<div class="searchLog clearfix">
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="hyperchanne clearfix">
<form name="searchform" method="post" action="" id ="searchform">
<input type="hidden" name="op" value="getjson">
<div class="inputBox">
<select class="select" name="searchSite">
<option value="0">站点</option>
<volist name="site_lists" id="item">
<option value="{$item.id}">{$item.name}</option>
</volist>
</select>
<!-- <input class="input" type="text" placeholder="" name="searchValue">-->
</div>
<input id="submit_search" name="" type="button" value="查询" class="btn_go_s btn_orange" />
</form>
</div><!--hyperchanne end-->
<div class="">
<!-- <ul class="operationBox">
<li class="add">
<a href="javascript:;" onclick="add()" class="on"><span></span>新增</a>
</li>
</ul>-->
</div><!--mainBox end-->
</div>
</div>
</div>
<!--搜索和按钮 结束-->
<table id="dg" title=""
data-options="
iconCls: 'icon-edit',
singleSelect: true,
url: '/Log/PullLog/index/',
method: 'post',
pagination: true,
pageList:[15,30,45,60],
rownumbers: true,
sortName:'id',
sortOrder:'asc',
queryParams: form2Json('searchform'),
fitColumns: true,
height:'auto',
onRowContextMenu : onRowContextMenu
">
<thead>
<tr>
<th data-options="field:'site_name',width:20" sortable="true">站点名称</th>
<th data-options="field:'newsId',width:10">媒资标识</th>
<th data-options="field:'newsName',width:20">媒资名称</th>
<th data-options="field:'jsonUrl',width:30">媒资详情地址</th>
<th data-options="field:'nodeId',width:20">栏目id</th>
<th data-options="field:'nodeName',width:20">栏目名称</th>
<th data-options="field:'code',width:10">同步状态</th>
<th data-options="field:'addtime',width:30">添加时间</th>
<th data-options="field:'updatetime',width:30">修改时间</th>
<th data-options="field:'status'" sortable="true" align="center" formatter="StatusAction">状态</th>
<!--<th field="action" align="center" formatter="InputAction">操作</th>-->
</tr>
</thead>
</table>
<div id="mm1" class="easyui-menu" style="width:120px;display: none">
<div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('Log','PullLog','add')}>编辑</div>
<div iconCls="icon-cancel" id="menuDel" onclick="del()" {:buttonAuth('Log','PullLog','deletehandle')}>删除</div>
<div class="menu-sep"></div>
<div iconCls="icon-stop" id="menuStop" onclick="enable(1)" {:buttonAuth('Log','PullLog','updateStatusAjaxHandle')}>禁用</div>
<div iconCls="icon-start" id="menuStart" onclick="enable(0)" {:buttonAuth('Log','PullLog','updateStatusAjaxHandle')}>启用</div>
</div>
<div id="mm2" class="easyui-menu" style="width:120px;display: none">
<div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('Log','PullLog','add')}>编辑</div>
<div iconCls="icon-cancel" id="menuDel" onclick="del()" {:buttonAuth('Log','PullLog','deletehandle')}>删除</div>
<div class="menu-sep"></div>
<div iconCls="icon-stop" id="menuStop" onclick="enable(1)" {:buttonAuth('Log','PullLog','updateStatusAjaxHandle')}>禁用</div>
<div iconCls="icon-start" id="menuStart" onclick="enable(0)" {:buttonAuth('Log','PullLog','updateStatusAjaxHandle')}>启用</div>
</div>
<script type="text/javascript">
function onRowContextMenu(e, rowIndex, rowData){
e.preventDefault();
$('#dg').datagrid('unselectAll');
$('#dg').datagrid('selectRow', rowIndex);
$('#mm2').menu('show', {
left:e.pageX,
top:e.pageY
});
}
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>';
}
function StatusAction(value, row, index) {
if(value==0){
return '未处理';
}else if(value==1){
return '<font color=green>已处理</font>';
}
}
function CodeAction(value, row, index) {
if(value==0){
return '<font color=green>成功</font>';
}else if(value==1){
return '<font color=red>未知</font>';
}else if(value==1001){
return '<font color=red>服务端错误</font>';
}else if(value==2001){
return '<font color=red>合作方接口错误</font>';
}
}
function setSelectRow(index) {
$('#dg').datagrid('unselectAll');
$('#dg').datagrid('selectRow', index);
}
//初始化菜单按钮
$(function(){
$('#dg').datagrid({
onLoadSuccess: function (data) {
for (i = 0; i < $('#dg').datagrid('getRows').length; i++) {
$('#mb' + i).menubutton();
}
}
})
});
//禁用启用
function enable(status){
var row = $('#dg').datagrid('getSelected');
if (row){
var msg='启用';
if(status==1)
msg='禁用'
$.messager.confirm('操作确认', '确认['+msg+']该记录?', function(r){
if (r){
$.post("/Log/PullLog/updateStatusAjaxHandle/", {id:row.id,status:status},
function(data){
$('#dg').datagrid('reload');
});
}
});
}else{
$.messager.alert('提示', '请选择要操作的记录！','info');
}
}
function add(){
pop(800,450,true,'dg','datagrid','/Log/PullLog/add/')
}
function edit(){
var row = $('#dg').datagrid('getSelected');
if (row){
pop(800,450,true,'dg','datagrid','/Log/PullLog/add/id/'+row.id);
}else{
$.messager.alert('提示', '请选择要操作的记录！','info');
}
}
function del(){
var row = $('#dg').datagrid('getSelected');
if (row){
$.messager.confirm('操作确认', '确认[删除]该记录?', function(r){
if (r){
$.post("/Log/PullLog/deleteHandle/", {id:row.id},
function(data){
$('#dg').datagrid('reload');
});
}
});
}else{
$.messager.alert('提示', '请选择要操作的记录！','info');
}
}
$("#submit_search").click(function () {
$('#dg').datagrid({ queryParams: form2Json("searchform") }); //点击搜索
});
/**
* JQuery扩展方法，用户对JQuery EasyUI的DataGrid控件进行操作。
*/
$.fn.extend({
/**
* 修改DataGrid对象的默认大小，以适应页面宽度。
*
* @param heightMargin
* 高度对页内边距的距离。
* @param widthMargin
* 宽度对页内边距的距离。
* @param minHeight
* 最小高度。
* @param minWidth
* 最小宽度。
*
*/
resizeDataGrid : function(heightMargin, widthMargin, minHeight, minWidth) {
var height = $(document.body).height() - heightMargin;
var width = $(document.body).width() - widthMargin;
height = height < minHeight ? minHeight : height;
width = width < minWidth ? minWidth : width;
$(this).datagrid('resize', {
//height : height,
width : width
});
}
});
$(function() {
// datagrid数据表格ID
var datagridId = 'dg';
// 第一次加载时自动变化大小
$('#' + datagridId).resizeDataGrid(0, 10, 0, 0);
// 当窗口大小发生变化时，调整DataGrid的大小
$(window).resize(function() {
$('#' + datagridId).resizeDataGrid(0, 10, 0, 0);
});
});
</script>
</body>
</html>
\ No newline at end of file
SooonerHotel/App/Tpl/Media/zh-cn/Cloud/index.html
View file @ 516f49f4
...@@ -29,6 +29,11 @@ ...@@ -29,6 +29,11 @@
<option value="{$item.id}" <if condition="$key eq 0">selected="selected"</if> >{$item.name}</option> <option value="{$item.id}" <if condition="$key eq 0">selected="selected"</if> >{$item.name}</option>
</volist> </volist>
</select> </select>
<select class="select" name="searchStatus">
<option value="0">请选择状态</option>
<option value="1">上线</option>
<option value="2">下线</option>
</select>
<select class="select" name="searchClass"> <select class="select" name="searchClass">
<option value="0">请选择分类</option> <option value="0">请选择分类</option>
<option value="1">电竞</option> <option value="1">电竞</option>
......
SooonerHotel/App/Tpl/Media/zh-cn/Hotel/index.html
View file @ 516f49f4
...@@ -35,7 +35,18 @@ ...@@ -35,7 +35,18 @@
<option value="{$item.id}" sp_id="{$item.sp_id}" style="display:none" >{$item.name}</option> <option value="{$item.id}" sp_id="{$item.sp_id}" style="display:none" >{$item.name}</option>
</volist> </volist>
</select> </select>
<input class="input" type="text" placeholder="媒资名称" name="searchValue"> <select class="select" name="searchStatus">
<option value="0">请选择播控状态</option>
<option value="1">上线</option>
<option value="2">下线</option>
</select>
<select class="select" name="searchStatusInject">
<option value="-1">请选择注入状态</option>
<option value="0">未注入</option>
<option value="1">已注入</option>
<option value="2">注入失败</option>
</select>
<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" />
</form> </form>
......
SooonerHotel/App/Tpl/Playctrl/zh-cn/PlayCtrl/add.html
View file @ 516f49f4
...@@ -264,7 +264,7 @@ $().ready(function(){ ...@@ -264,7 +264,7 @@ $().ready(function(){
$("#playlist").addClass("hidden"); $("#playlist").addClass("hidden");
$("#multiselectMedia").empty(); $("#multiselectMedia").empty();
$.each(eval(media_json),function(i,item){ $.each(eval(media_json),function(i,item){
if(sp_id==item.sp_id){ if(item.sp_ids.indexOf(sp_id)>-1){
if($("select[name='media_lists[]'] option[value='"+item.id+"']").length==0){ if($("select[name='media_lists[]'] option[value='"+item.id+"']").length==0){
$("#multiselectMedia").append("<option value='"+item.id+"'>"+item.title+"</option>"); $("#multiselectMedia").append("<option value='"+item.id+"'>"+item.title+"</option>");
} }
......
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