举报投诉直播内容查询

徐近程
1 parent 78a59fa7
Showing 3 changed files with 69 additions and 32 deletions
src/main/java/com/cnlive/shenhe/controller/LiveController.java
src/main/resources/application.properties
src/main/resources/templates/page/live.html
 package com.cnlive.shenhe.controller;
  
+import com.cnlive.shenhe.utils.HttpClientUtils;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -36,7 +37,9 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.*;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
  
 @Controller
 @RequestMapping("/live")
@@ -59,6 +62,9 @@ public class LiveController extends BaseController {
     @Value("${ks_domain}")
     String ks_domain;
  
+    @Value("${cms_getVideoAndLiveId}")
+    String cms_getVideoAndLiveId;
+
     /**
      * 审核信息返回接口
      *
@@ -106,20 +112,25 @@ public class LiveController extends BaseController {
     /**
      * 内容分页列表接口
      *
-     * @param video_title
+     * @param model
+     * @param activity_id
      * @param start_date
      * @param end_date
-     * @param state
+     * @param activity_name
+     * @param activity_status
      * @param page
      * @param pageSize
-     * @param orderByClause
+     * @param shenhe_state
+     * @param sp_desc
+     * @param contentId
+     * @param session
      * @return
      */
     @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 sp_desc, HttpSession session) {
-    	System.out.println("进入直播内容页"); 
+    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 sp_desc, Integer contentId, HttpSession session) {
+        System.out.println("进入直播内容页");
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
 //        if(CommonUtils.isNull(sessionUser)){
 //        	return "redirect:/users/login";
@@ -129,38 +140,53 @@ public class LiveController extends BaseController {
         if (CommonUtils.isNull(page)) page = 1;
         if (CommonUtils.isNull(pageSize)) pageSize = 20;
         if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
-        	ShySites shySite=sitesService.findspidBySpdesc(sp_desc);
-        	if(CommonUtils.isNotNull(shySite)){
-        		spid = shySite.getSpid();
-        	}else{
-        		setmodel_site(model);
-        		return "error.html";
-        	}
+            ShySites shySite = sitesService.findspidBySpdesc(sp_desc);
+            if (CommonUtils.isNotNull(shySite)) {
+                spid = shySite.getSpid();
+            } else {
+                setmodel_site(model);
+                return "error.html";
+            }
         } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
             spid = null;
         }
-        String orderByClause="";
-        if(shenhe_state!=null&&shenhe_state==0){//审核状态：全部待领
-        	orderByClause="pre_start_time ";
-        }else if(shenhe_state!=null&&shenhe_state==1){//审核状态：待审核
-        	orderByClause="pre_start_time ";
-        }else if(shenhe_state!=null&&shenhe_state==2){//审核状态：已审核
-        	orderByClause="pre_start_time desc";
-        }else{//审核状态：全部
-        	orderByClause="is_hot desc, pre_start_time ";
-        	if(activity_status!=null &&(activity_status==0 ||activity_status==2 || activity_status==4)){//直播状态：结束、撤销、下线
-        		orderByClause="is_hot desc, pre_start_time desc";
-        	}
+        String orderByClause = "";
+        if (shenhe_state != null && shenhe_state == 0) {//审核状态：全部待领
+            orderByClause = "pre_start_time ";
+        } else if (shenhe_state != null && shenhe_state == 1) {//审核状态：待审核
+            orderByClause = "pre_start_time ";
+        } else if (shenhe_state != null && shenhe_state == 2) {//审核状态：已审核
+            orderByClause = "pre_start_time desc";
+        } else {//审核状态：全部
+            orderByClause = "is_hot desc, pre_start_time ";
+            if (activity_status != null && (activity_status == 0 || activity_status == 2 || activity_status == 4)) {//直播状态：结束、撤销、下线
+                orderByClause = "is_hot desc, pre_start_time desc";
+            }
+        }
+
+        if (CommonUtils.isNotNull(contentId)) {
+            Map<String, String> map = new HashMap<>(1);
+            map.put("id", contentId.toString());
+            String post = HttpClientUtils.get(cms_getVideoAndLiveId, map);
+            JSONObject jsonObject = JSONObject.parseObject(post);
+            JSONObject data = jsonObject.getJSONObject("data");
+            if (data != null) {
+                String pid = data.getString("pid");
+                activity_id = pid;
+            } else {
+                activity_id = contentId.toString();
+            }
         }
-        PageInfo<ShyLive> livePage = liveService.getListContent(activity_name, start_date,end_date,
-        	activity_id, activity_status, page, pageSize, shenhe_state, orderByClause, spid, userId);
+
+        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();
         if (!list.isEmpty()) {
             for (ShyLive live : list) {
                 //显示spid简称
                 ShySites shySites = sitesService.findspidDescByspid(live.getSp_id());
                 if (CommonUtils.isNotNull(shySites)) {
-                	live.setSpid_desc(shySites.getName());
+                    live.setSpid_desc(shySites.getName());
                 }
             }
         }
@@ -104,4 +104,5 @@ ks_domain=http://test.wideo.cnlive.com
  
 #\u56fe\u7247\u5b58\u653e\u6839\u8def\u5f84
 desdir=shen
-yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/callbackAudio
 \ No newline at end of file
+yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/callbackAudio
+cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanById
@@ -93,6 +93,14 @@
 												</div>
 											</div>
  
+											<div class="col-md-3" style="padding: 0" th:if="${session.sessionUser.spid==0}">
+												<label for="contentId" class="control-label cb-toolbar">内容id:</label>
+												<div class="col-sm-7" style="padding: 0;">
+													<input class="form-control" name="contentId" type="text"
+														   id="contentId">
+												</div>
+											</div>
+
 <!-- 											<div class="col-md-3" style="padding: 0"> -->
 <!-- 												<label for="is_hot" class="control-label cb-toolbar">是否热点:</label> -->
 <!-- 												<div class="col-sm-6" style="padding: 0;"> -->
@@ -442,7 +450,8 @@
 		var sp_desc = "";
 		var count = "";
 		var shenhe_state ="";//审核状态 
-					            	
+		var contentId ="";//审核状态
+
 		function query(){
 			activity_id = $("#activity_id").val();
 			activity_name = $("#activity_name").val();
@@ -453,8 +462,9 @@
 			var spId=[[${session.sessionUser.spid}]];
 			if(spId==0){
 				sp_desc = $("#sp_desc").val();
+                contentId = $("#contentId").val();
 			}
-			window.location.href = "/live/page?activity_status="+activity_status+"&activity_id=" + activity_id + "&start_date=" + start_date + "&end_date=" + end_date +  "&activity_name=" + activity_name + "&sp_desc=" + sp_desc+"&pageSize="+count+"&shenhe_state="+shenhe_state;
+			window.location.href = "/live/page?activity_status="+activity_status+"&activity_id=" + activity_id + "&start_date=" + start_date + "&end_date=" + end_date +  "&activity_name=" + activity_name + "&sp_desc=" + sp_desc+"&pageSize="+count+"&shenhe_state="+shenhe_state+"&contentId="+contentId;
 		}
  
 	    //全部