Skip to content

S
SooonerHotel
Commit 2e545bd2 authored by 吴贤德's avatar 吴贤德
Browse files
Options

云端片库分表改为增加sp_id字段相关改动，云端片库页面美化修改

parent 8bfeb4c6
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 64 deletions
SooonerHotel/App/Lib/Action/Api/CenterAction.class.php
View file @ 2e545bd2
......@@ -68,6 +68,7 @@ class CenterAction extends Action
$rawData = @file_get_contents("php://input");
//echo $rawData."\n";
$json = json_decode($rawData,true);
$spid=$json["spid"];
$url = $json["jsonUrl"];
$content = file_get_contents($url);
......@@ -90,6 +91,8 @@ class CenterAction extends Action
$data["_starttime"]=$this->null2str($json["startTime"]);
$data["_updatetime"]=$this->null2str($json["updateTime"]);
$data["programType"]=$json["programType"];
$data["nodeId"]=$json["nodeId"];
$data["sp_id"]=$spid;
$model = D("Media");
$tmp = $model->field("id")->where("code='".$data['code']."'")->find();
......
SooonerHotel/App/Lib/Action/Api/GslbAction.class.php
View file @ 2e545bd2
......@@ -40,7 +40,7 @@ class GslbAction extends Action
*/
$sql="SELECT mw.id,mw.code,mw.url_play,hm.status,hm.status_inject"
." FROM sh_hotel_media_map_$spid hm,sh_media_wasu mw"
." FROM sh_hotel_media_map hm,sh_media_wasu mw"
." WHERE mw.code='$mcode' AND hm.hotel_id=$hid AND hm.media_id=mw.id;";
$arr = M("")->query($sql);
if (empty($arr)){
......
SooonerHotel/App/Lib/Action/Hotel/HotelAction.class.php
View file @ 2e545bd2
......@@ -88,7 +88,7 @@ class HotelAction extends CommonAction{
$push_mode = D("Conf")->field("v")->where($where)->find();
if ($push_mode["v"]==1) {
$sql = "INSERT INTO sh_hotel_media_map_$spid (media_id,hotel_id,status,status_inject)"
. " SELECT id,$id,status,0 FROM sh_media_wasu_$spid;";
. " SELECT id,$id,status,0 FROM sh_media_wasu WHERE sp_id=$spid;";
$model->execute($sql);
}
......
SooonerHotel/App/Lib/Action/Media/HotelAction.class.php
View file @ 2e545bd2
......@@ -32,7 +32,7 @@ class HotelAction extends CommonAction{
public function add(){
$userInfo = $_SESSION["_USER_INFO"];
$id = I('id','',int)?I('id','',int):0;
$model = D("HotelMediaMap");
$spModel = D("Sp");
$regionModel = D("Region");
......
SooonerHotel/App/Lib/Action/Sp/SpAction.class.php
View file @ 2e545bd2
......@@ -92,9 +92,6 @@ class SpAction extends CommonAction{
//创建合作方酒店片库表
$csql = "CREATE TABLE sh_hotel_media_map_$id LIKE sh_hotel_media_map;";
D("")->execute($csql);
//创建合作方云端片库表
$csql = "CREATE TABLE sh_media_wasu_$id LIKE sh_media_wasu;";
D("")->execute($csql);
echo 'true';
}else{
......
SooonerHotel/App/Lib/Model/MediaModel.class.php
View file @ 2e545bd2
......@@ -13,21 +13,28 @@ class MediaModel extends RelationModel{
$searchField = $inputs["searchField"]?$inputs["searchField"]:'title';
$searchValue = $inputs["searchValue"]?$inputs["searchValue"]:'';
$searchSp = $inputs["searchSp"]?$inputs["searchSp"]:0;
if ($searchSp)
$where = " and mw.sp_id=$searchSp ";
if($searchValue){
$where = " and (`title` like '%".$searchValue."%' or `code` like '%".$searchValue."%') ";
$where .= " and (mw.`title` like '".$searchValue."%' or mw.`code` = '".$searchValue."') ";
}
$model = new Model();
//======================
$fields = "count(id) count";
$fields = "count(1) count";
//返回列表（limit分页）
if($queryType=="list"){
$where .= $sort." ".$limit;
$fields = " *,case `status` when 1 then '<font color=green>上线</font>' when 2 then '<font color=red>下线</font>' when 0 then '<font>未知</font>' end as `status` ";
$fields = " mw.sp_id,sp.name sp_name,mw.id,mw.url_pic,mw.title,mw.code,mw.type,mw.programType"
.",mw.region,mw.year,mw.score,mw.addtime,mw.updatetime"
.",case mw.`status` when 1 then '<font color=green>上线</font>' when 2 then '<font color=red>下线</font>' when 0 then '<font>未知</font>' end as `status` ";
}
$sql = "select ".$fields." from sh_media_wasu_$searchSp where 1=1 ".$where.";";
$sql = "select ".$fields." from sh_media_wasu mw,sh_sp sp where sp.id=mw.sp_id ".$where.";";
// echo $sql;
return $model->query($sql);
}
......
SooonerHotel/App/Tpl/Media/zh-cn/Cloud/add.html
View file @ 2e545bd2
......@@ -21,77 +21,95 @@ body{padding:20px}
<div class="form-group">
<label for="name" class="col-sm-2 control-label">类型</label>
<div class="col-sm-6">
<select class="form-control" name="type">
<option value="0">请选择类型</option>
<option value="电影">电影</option>
<option value="电视剧">电视剧</option>
<option value="新闻">新闻</option>
<option value="综艺">综艺</option>
</select>
<!--<select class="form-control" name="type">-->
<!--<option value="0">请选择类型</option>-->
<!--<option value="电影">电影</option>-->
<!--<option value="电视剧">电视剧</option>-->
<!--<option value="新闻">新闻</option>-->
<!--<option value="综艺">综艺</option>-->
<!--</select>-->
{$info.type}
</div>
</div>
<div class="form-group">
<label for="name" class="col-sm-2 control-label">类型</label>
<div class="col-sm-6">
{$info.programType}
</div>
</div>
<div class="form-group">
<label for="inputEmail3" class="col-sm-2 control-label">媒资名称</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="inputEmail3" placeholder="请输入媒资名称" value="{$info.title}" name="title">
{$info.title}
<!--<input type="text" class="form-control" id="inputEmail3" placeholder="请输入媒资名称" value="{$info.title}" name="title">-->
</div>
</div>
<div class="form-group">
<label for="inputEmail3" class="col-sm-2 control-label">媒资唯一标识</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="inputEmail3" placeholder="请输入媒资唯一标识" name="code" value="{$info.code}">
{$info.code}
<!--<input type="text" class="form-control" id="inputEmail3" placeholder="请输入媒资唯一标识" name="code" value="{$info.code}">-->
</div>
</div>
<div class="form-group">
<label for="inputEmail3" class="col-sm-2 control-label">云存储地址</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="inputEmail3" placeholder="请输入云存储地址" name="url_play" value="{$info.url_play}">
{$info.url_play}
<!--<input type="text" class="form-control" id="inputEmail3" placeholder="请输入云存储地址" name="url_play" value="{$info.url_play}">-->
</div>
</div>
<div class="form-group">
<label for="inputEmail3" class="col-sm-2 control-label">海报图片地址</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="inputEmail3" placeholder="请输入海报图片地址" name="url_pic" value="{$info.url_pic}">
<a target='_blank' href='{$info.url_pic}' title='点击查看'>
<image src="{$info.url_pic}" height='100px' width='160px'/></a>
<!--<input type="text" class="form-control" id="inputEmail3" placeholder="请输入海报图片地址" name="url_pic" value="{$info.url_pic}">-->
</div>
</div>
<div class="form-group">
<label for="inputEmail3" class="col-sm-2 control-label">年份</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="inputEmail3" placeholder="请输入年份" name="year" value="{$info.year}">
{$info.year}
<!--<input type="text" class="form-control" id="inputEmail3" placeholder="请输入年份" name="year" value="{$info.year}">-->
</div>
</div>
<div class="form-group">
<label for="inputEmail3" class="col-sm-2 control-label">评分</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="inputEmail3" placeholder="请输入评分" name="score" value="{$info.score}">
{$info.score}
<!--<input type="text" class="form-control" id="inputEmail3" placeholder="请输入评分" name="score" value="{$info.score}">-->
</div>
</div>
<div class="form-group">
<label for="name" class="col-sm-2 control-label">国家/地区</label>
<div class="col-sm-6">
<select class="form-control" name="region">
<option value="0">请选择国家/地区</option>
<option value="内地">内地</option>
<option value="港台">港台</option>
</select>
{$info.region}
<!--<select class="form-control" name="region">-->
<!--<option value="0">请选择国家/地区</option>-->
<!--<option value="内地">内地</option>-->
<!--<option value="港台">港台</option>-->
<!--</select>-->
</div>
</div>
<div class="form-group">
<label for="inputEmail3" class="col-sm-2 control-label">导演</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="inputEmail3" placeholder="请输入导演" name="director" value="{$info.director}">
{$info.director}
<!--<input type="text" class="form-control" id="inputEmail3" placeholder="请输入导演" name="director" value="{$info.director}">-->
</div>
</div>
<div class="form-group">
<label for="inputEmail3" class="col-sm-2 control-label">演员</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="inputEmail3" placeholder="请输入演员" name="actor" value="{$info.actor}">
{$info.actor}
<!--<input type="text" class="form-control" id="inputEmail3" placeholder="请输入演员" name="actor" value="{$info.actor}">-->
</div>
</div>
<div class="form-group">
<label for="inputPassword3" class="col-sm-2 control-label">描述</label>
<div class="col-sm-9">
<textarea class="form-control" rows="3" name="description">{$info.description}</textarea>
{$info.description}
<!--<textarea class="form-control" rows="3" name="description">{$info.description}</textarea>-->
</div>
</div>
<!-- <div class="form-group">
......@@ -105,10 +123,10 @@ body{padding:20px}
</label>
</div>
</div>-->
<div class="btnMedia col-sm-5 control-label">
<input name="" type="button" class="btn btn-success" value="确定" onclick="submitForm()" {:buttonAuth('Media','Cloud','addhandle')}/>　　
<input name="" type="reset" class="btn btn-warning" value="取消" onclick="parentDialog.close();"/>　　
</div>
<!--<div class="btnMedia col-sm-5 control-label">-->
<!--<input name="" type="button" class="btn btn-success" value="确定" onclick="submitForm()" {:buttonAuth('Media','Cloud','addhandle')}/>　　-->
<!--<input name="" type="reset" class="btn btn-warning" value="取消" onclick="parentDialog.close();"/>　　-->
<!--</div> -->
</form>
<script type="text/javascript">
function submitForm(){
......@@ -143,10 +161,10 @@ function submitForm(){
});
}
$().ready(function(){
<if condition="$info">
$("select[name='region'] option[value='{$info.region}']").attr("selected",true);
$("select[name='type'] option[value='{$info.type}']").attr("selected",true);
</if>
// <if condition="$info">
// $("select[name='region'] option[value='{$info.region}']").attr("selected",true);
// $("select[name='type'] option[value='{$info.type}']").attr("selected",true);
// </if>
});
</script>
</body>
......
SooonerHotel/App/Tpl/Media/zh-cn/Cloud/index.html
View file @ 2e545bd2
......@@ -25,6 +25,7 @@
<input type="hidden" name="op" value="getjson">
<div class="inputBox">
<select class="select" name="searchSp">
<option value="0">请选择合作方</option>
<volist name="sp_lists" id="item">
<option value="{$item.id}" <if condition="$key eq 0">selected="selected"</if> >{$item.name}</option>
</volist>
......@@ -34,14 +35,6 @@
<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" {:buttonAuth('Media','Cloud','add')}>
<a href="javascript:;" onclick="add()" class="on"><span></span>新增</a>
</li>
</ul>
</div><!--mainBox end-->
</div>
</div>
</div>
......@@ -53,7 +46,7 @@ singleSelect: true,
url: '/Media/Cloud/index/',
method: 'post',
pagination: true,
pageList:[15,30,45,60],
pageList:[5,10,20,30,100],
rownumbers: true,
sortName:'id',
sortOrder:'asc',
......@@ -64,38 +57,46 @@ onRowContextMenu : onRowContextMenu
">
<thead>
<tr>
<th data-options="field:'title',width:60" sortable="true">媒资名称</th>
<th data-options="field:'code',width:15">媒资唯一标识</th>
<th data-options="field:'type',width:10">类型</th>
<th field="url_pic" align="center" formatter="imageFormat">媒资海报</th>
<th data-options="field:'title',width:60" sortable="true">媒资标题</th>
<th data-options="field:'sp_name',width:20" sortable="true">所属合作方</th>
<th data-options="field:'code',width:15">媒资标识</th>
<th data-options="field:'type',width:10">媒资分类</th>
<th data-options="field:'programType',width:20">媒资类型</th>
<th data-options="field:'region',width:15">国家/地区</th>
<th data-options="field:'year',width:10">年份</th>
<th data-options="field:'director',width:20">导演</th>
<th data-options="field:'actor',width:60">演员</th>
<th data-options="field:'score',width:10">评分</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:'status'" sortable="true" align="center">状态</th>
<th data-options="field:'addtime',width:25" sortable="true">创建时间</th>
<!--<th data-options="field:'updatetime',width:30" sortable="true">更新时间</th>-->
<!--<th data-options="field:'status'" sortable="true" align="center">状态</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('Media','Cloud','add')}>编辑</div>
<div iconCls="icon-cancel" id="menuDel" onclick="del()" {:buttonAuth('Media','Cloud','deletehandle')}>删除</div>
<div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('Media','Cloud','add')}>查看详情</div>
<!--<div iconCls="icon-cancel" id="menuDel" onclick="del()" {:buttonAuth('Media','Cloud','deletehandle')}>删除</div>-->
<!-- <div class="menu-sep"></div>
<div iconCls="icon-stop" id="menuStop" onclick="enable(1)" {:buttonAuth('Media','Cloud','updateStatusAjaxHandle')}>禁用</div>
<div iconCls="icon-start" id="menuStart" onclick="enable(0)" {:buttonAuth('Media','Cloud','updateStatusAjaxHandle')}>启用</div>-->
</div>
<div id="mm2" class="easyui-menu" style="width:120px;display: none">
<div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('Media','Cloud','add')}>编辑</div>
<div iconCls="icon-cancel" id="menuDel" onclick="del()" {:buttonAuth('Media','Cloud','deletehandle')}>删除</div>
<div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('Media','Cloud','add')}>查看详情</div>
<!--<div iconCls="icon-cancel" id="menuDel" onclick="del()" {:buttonAuth('Media','Cloud','deletehandle')}>删除</div>-->
<!-- <div class="menu-sep"></div>
<div iconCls="icon-stop" id="menuStop" onclick="enable(1)" {:buttonAuth('Media','Cloud','updateStatusAjaxHandle')}>禁用</div>
<div iconCls="icon-start" id="menuStart" onclick="enable(0)" {:buttonAuth('Media','Cloud','updateStatusAjaxHandle')}>启用</div>-->
</div>
<script type="text/javascript">
function imageFormat(value, row, index) {
return "<a target='_blank' href='"+row.url_pic+"' title='点击查看'> <image src="+row.url_pic+" height='70px' width='100px'/></a>";
}
function onRowContextMenu(e, rowIndex, rowData){
e.preventDefault();
$('#dg').datagrid('unselectAll');
......@@ -154,7 +155,7 @@ function add(){
function edit(){
var row = $('#dg').datagrid('getSelected');
if (row){
pop(800,700,true,'dg','datagrid','/Media/Cloud/add/id/'+row.id);
pop(800,700,true,'','datagrid','/Media/Cloud/add/id/'+row.id);
}else{
$.messager.alert('提示', '请选择要操作的记录！','info');
}
......@@ -214,11 +215,11 @@ $(function() {
var datagridId = 'dg';
// 第一次加载时自动变化大小
$('#' + datagridId).resizeDataGrid(0, 10, 0, 0);
$('#' + datagridId).resizeDataGrid(0, 5, 0, 0);
// 当窗口大小发生变化时，调整DataGrid的大小
$(window).resize(function() {
$('#' + datagridId).resizeDataGrid(0, 10, 0, 0);
$('#' + datagridId).resizeDataGrid(0, 5, 0, 0);
});
});
</script>
......
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