直播业务优化

liwei2917
1 parent 45c19786
Showing 3 changed files with 25 additions and 12 deletions
src/main/java/com/cnlive/shenhe/controller/LiveController.java
src/main/java/com/cnlive/shenhe/serviceImpl/LiveServiceImpl.java
src/main/resources/templates/page/live.html
@@ -118,7 +118,7 @@ public class LiveController {
     @GetMapping("/page")
     public Object getListVideos(Model model,String activity_id,String start_date,String end_date,
     		String activity_name, Integer activity_status, Integer page,Integer pageSize, 
-    		Integer shenhe_state, String orderByClause, String sp_desc, HttpSession session) {
+    		Integer shenhe_state, String sp_desc, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         if(CommonUtils.isNull(sessionUser)){
         	return "redirect:/users/login";
@@ -126,7 +126,7 @@ public class LiveController {
         Integer spid = sessionUser.getSpid();
         String userId = sessionUser.getUserId();
         if (CommonUtils.isNull(page)) page = 1;
-        if (CommonUtils.isNull(pageSize)) pageSize = 30;
+        if (CommonUtils.isNull(pageSize)) pageSize = 20;
         if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
         	ShySites shySite=sitesService.findspidBySpdesc(sp_desc);
         	if(CommonUtils.isNotNull(shySite)){
@@ -137,6 +137,19 @@ public class LiveController {
         } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
             spid = null;
         }
+        String orderByClause="";
+        if(shenhe_state!=null&&shenhe_state==0){//审核状态：全部待领
+        	orderByClause="activity_start_time ";
+        }else if(shenhe_state!=null&&shenhe_state==1){//审核状态：待审核
+        	orderByClause="activity_start_time ";
+        }else if(shenhe_state!=null&&shenhe_state==2){//审核状态：已审核
+        	orderByClause="activity_start_time desc";
+        }else{//审核状态：全部
+        	orderByClause="is_hot , activity_start_time ";
+        	if(activity_status!=null &&(activity_status==0 ||activity_status==2 || activity_status==4)){//直播状态：结束、撤销、下线
+        		orderByClause="is_hot , activity_start_time desc";
+        	}
+        }
         PageInfo<ShyLive> livePage = liveService.getListContent(activity_name, start_date,end_date,
         	activity_id, activity_status, page, pageSize, shenhe_state, orderByClause, spid, userId);
         List<ShyLive> list = livePage.getList();
@@ -174,7 +174,7 @@ public class LiveServiceImpl {
         } 
         criteria.andEqualTo("is_show", 1);
         //排序
-        example.setOrderByClause("is_hot desc, activity_start_time asc");
+//        example.setOrderByClause("is_hot desc, activity_start_time desc");
         PageHelper.startPage(page, pageSize, true);
         List<ShyLive> shyLiveList = shyLiveMapper.selectByExample(example);
         PageInfo<ShyLive> pageInfo = new PageInfo<>(shyLiveList);
@@ -79,17 +79,17 @@
 										<div class="btn-group margin-bottom col-md-7"
 											style="padding: 0;">
 											<div class="col-md-3" style="padding: 0">
-												<label for="activity_id" class="control-label cb-toolbar">直播id:</label>
+												<label for="activity_name" class="control-label cb-toolbar">直播名称:</label>
 												<div class="col-sm-7" style="padding: 0;">
-													<input class="form-control" name="activity_id" type="text"
-														id="activity_id">
+													<input class="form-control col-sm-2" name="activity_name"
+														type="text" id="activity_name">
 												</div>
 											</div>
 											<div class="col-md-3" style="padding: 0">
-												<label for="activity_name" class="control-label cb-toolbar">直播名称:</label>
+												<label for="activity_id" class="control-label cb-toolbar">直播id:</label>
 												<div class="col-sm-7" style="padding: 0;">
-													<input class="form-control col-sm-2" name="activity_name"
-														type="text" id="activity_name">
+													<input class="form-control" name="activity_id" type="text"
+														id="activity_id">
 												</div>
 											</div>
@@ -196,14 +196,14 @@
 <!-- 											</a> -->
 											<div class="form-group"  th:if="${live.activity_status != 1 }">
-													<div  style="height: 22vmin;background: pink;">
+													<div  style="height: 22vmin">
 													<img th:src='@{${live.cover_img_url}}'
 														alt="封面图" width="100%" height="100%">
 												</div>
 											</div>
 											<div class="form-group"  th:if="${live.activity_status== 1 }">
-													<div  style="height: 22vmin;background: pink;">
+													<div  style="height: 22vmin">
 														<embed name="cnlive" width="100%" height="100%" id="cnlive"
 															src="http://data.cnlive.com/export/UuidPlayerMain.swf"
 															th:flashVars="@{'hasBorder=false&appid=82_irej0pbo53&type=live&model=2&videoURL='+${live.rtmp_url}}"
@@ -629,7 +629,7 @@
 		/*时间插件*/
 		$('.date').datetimepicker({
-			format : 'YYYY-MM-DD HH:mm',
+			format : 'YYYY-MM-DD',
 			locale : "zh-CN",
 			toolbarPlacement : 'bottom',
 			showClear : true,