播放日志，增加月份分表查询，默认当月

ceeca4be · wangjiangze · ec123e03 · ceeca4be · ceeca4be · ceeca4be
Commit ceeca4be authored Jul 29, 2019 by wangjiangze
4 changed files
--- a/SooonerHotel/App/Lib/Model/PlayLogModel.class.php
+++ b/SooonerHotel/App/Lib/Model/PlayLogModel.class.php
@@ -14,6 +14,7 @@ class PlayLogModel extends RelationModel{
 		$searchValue = $inputs["searchValue"]?$inputs["searchValue"]:'';
        $searchSp = $inputs["searchSp"]?$inputs["searchSp"]:0;
        $searchHotel = $inputs["searchHotel"]?$inputs["searchHotel"]:0;
+        $searchMonth = $inputs["searchMonth"]?$inputs["searchMonth"]:date("Ym");
        
        if($searchValue){
            $where = " and (A.`stb_id` like '%".$searchValue."%' or A.`order_id` like '%".$searchValue."%') ";
@@ -34,7 +35,7 @@ class PlayLogModel extends RelationModel{
 			$where .= $sort." ".$limit;
 			$fields = " A.*,B.`name` sp_name,C.`name` hotel_name,D.`title` media_name ";
 		}
-		$sql = "select ".$fields." from sh_log_play A join sh_sp B on A.sp_id=B.id join sh_hotel C on A.hotel_id=C.id join sh_media_wasu D on A.media_id=D.id where 1=1 ".$where.";";
+		$sql = "select ".$fields." from sh_log_play_$searchMonth A join sh_sp B on A.sp_id=B.id join sh_hotel C on A.hotel_id=C.id join sh_media_wasu D on A.media_id=D.id where 1=1 ".$where.";";
 //        echo $sql;
 		return $model->query($sql);
 	}

--- a/SooonerHotel/App/Tpl/Hotel/zh-cn/Region/add.html
+++ b/SooonerHotel/App/Tpl/Hotel/zh-cn/Region/add.html
@@ -22,7 +22,7 @@ body{padding:20px}
        <label for="name" class="col-sm-2 control-label">选择上级</label>
        <div class="col-sm-6" name="type">
        <select class="form-control" name="pid">
-            <option value="0">请选择地区</option>
+            <option value="1">请选择地区</option>
            <volist name='region_lists' id='item'>
                <if condition='$item.level eq 2'>
                    <option value="{$item.id}" pid="{$item.pid}">{$item.name}</option>

--- a/SooonerHotel/App/Tpl/Log/zh-cn/PlayLog/index.html
+++ b/SooonerHotel/App/Tpl/Log/zh-cn/PlayLog/index.html
@@ -13,6 +13,7 @@
 <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>
+<script type="text/javascript" src="__PUBLIC__/js/DatePicker.js"></script>
 <link href="__PUBLIC__/newVsdn/css/style_frame.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
@@ -36,9 +37,8 @@
                            <option value="{$item.id}">{$item.name}</option>   
                            </volist>
 						</select>
-                        
 						<input class="input" type="text" placeholder="机顶盒ID/订单ID" name="searchValue">
-                        <input class="easyui-datebox input" style="width:100%;height:30px;">
+                        <input class="input" type="text" name="searchMonth" onclick="setmonth(this,'yyyyMM','2019-07','2099-12',1)" style="width:80px" value="{$Think.now|strtotime|date='Ym',###}" readonly="readonly" />
 					</div>
 					<input id="submit_search" name="" type="button" value="查询" class="btn_go_s btn_orange" />
 				</form>
@@ -78,8 +78,11 @@ onRowContextMenu : onRowContextMenu
            <th data-options="field:'media_name',width:60">媒资名称</th>
            <th data-options="field:'stb_id',width:20">机顶盒ID</th>
            <th data-options="field:'order_id',width:20">订单ID</th>
-			<th data-options="field:'starttime',width:20" sortable="true">开始播放时间</th>
-            <th data-options="field:'endtime',width:20" sortable="true">结束播放时间</th>
+            <th data-options="field:'http_code',width:20">http响应码</th>
+            <th data-options="field:'err_code',width:20">错误码</th>
+            <th data-options="field:'duration',width:20">时长</th>
+			<th data-options="field:'starttime',width:30" sortable="true">开始播放时间</th>
+            <th data-options="field:'cache_status',width:20" sortable="true" formatter="CacheStatusAction">命中状态</th>
 			<!--<th field="action" align="center" formatter="InputAction">操作</th>-->
 		</tr>
 	</thead>
@@ -113,7 +116,15 @@ function onRowContextMenu(e, rowIndex, rowData){
 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 CacheStatusAction(value, row, index) {
+    if(value==1){
+        return "HIT";
+    }else if(value==0){
+        return "MISS";
+    }else{
+        return value;
+    }
+}
 function setSelectRow(index) {
 	$('#dg').datagrid('unselectAll');
 	$('#dg').datagrid('selectRow', index);

--- a/SooonerHotel/Public/js/DatePicker.js
+++ b/SooonerHotel/Public/js/DatePicker.js