Merge branch 'dev'

郑超
2 parents 26cffc9b 5616e587
Showing 2 changed files with 66 additions and 49 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/resources/templates/page/video.html
 package com.cnlive.shenhe.controller;
-import com.cnlive.shenhe.utils.*;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
@@ -16,8 +11,12 @@ import com.cnlive.shenhe.entity.ShyVideos;
 import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
 import com.cnlive.shenhe.serviceImpl.UsersServiceImpl;
 import com.cnlive.shenhe.serviceImpl.VideosServiceImpl;
+import com.cnlive.shenhe.utils.*;
 import com.github.pagehelper.PageInfo;
-import org.jsoup.helper.DataUtil;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +29,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import javax.persistence.criteria.CriteriaBuilder;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -163,8 +161,8 @@ public class VideosController extends BaseController {
             if (data != null) {
                 String pid = data.getString("pid");
                 video_id = pid;
-            }else {
-                video_id=contentId.toString();
+            } else {
+                video_id = contentId.toString();
             }
         }
@@ -281,6 +279,10 @@ public class VideosController extends BaseController {
                             videos.setSpid_desc("少儿吟诵" + "(目击者)");
                         } else if ("49".equals(source1)) {
                             videos.setSpid_desc("少年先锋" + "(目击者)");
+                        } else if ("50".equals(source1)) {
+                            videos.setSpid_desc("巾帼故事汇" + "(目击者)");
+                        } else if ("51".equals(source1)) {
+                            videos.setSpid_desc("浣花吟唱节" + "(目击者)");
                         } else {
                             videos.setSpid_desc(shySites.getName() + "(目击者)");
                         }
@@ -326,7 +328,7 @@ public class VideosController extends BaseController {
         } else if (plat == CommonConst.KS_PLAT) {
             yuming = ks_domain + "/";
         }
-        detailsContent.setAttr_tags(CommonUtils.isEmpty(detailsContent.getAttr_tags())?"":detailsContent.getAttr_tags());
+        detailsContent.setAttr_tags(CommonUtils.isEmpty(detailsContent.getAttr_tags()) ? "" : detailsContent.getAttr_tags());
         ShySites shySites = sitesService.findspidDescByspid(detailsContent.getSpid());
         if (CommonUtils.isNotNull(shySites)) {
@@ -421,7 +423,7 @@ public class VideosController extends BaseController {
             for (String cid : cids) {
                 ShyVideos shyVideos = videosService.selectByPrimaryKey(Integer.parseInt(cid));
                 if (CommonUtils.isNotNull(shyVideos)) {
-                    if (shyVideos.getState() != CommonConst.AUDIT_INTT || shyVideos.getReceive()==CommonConst.RECEIVE_AFTER) {
+                    if (shyVideos.getState() != CommonConst.AUDIT_INTT || shyVideos.getReceive() == CommonConst.RECEIVE_AFTER) {
                         return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "您领取的内容中有已被领取或者已经被审核，请检查并重试");
                     }
                 } else {
@@ -437,6 +439,7 @@ public class VideosController extends BaseController {
     /**
      * 退领
+     *
      * @param ids
      * @param session
      * @return
@@ -450,7 +453,7 @@ public class VideosController extends BaseController {
         String[] cids = ids.split(",");
         for (String cid : cids) {
             ShyVideos shyVideos = videosService.selectByPrimaryKey(Integer.parseInt(cid));
-            if (shyVideos.getState() != CommonConst.AUDIT_INTT || shyVideos.getReceive()==CommonConst.RECEIVE_BEFORE || !shyVideos.getReceive_user_id().equals(userId)) {
+            if (shyVideos.getState() != CommonConst.AUDIT_INTT || shyVideos.getReceive() == CommonConst.RECEIVE_BEFORE || !shyVideos.getReceive_user_id().equals(userId)) {
                 return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "退领失败，您选中的内容包含已退领的或已经审核的");
             }
         }
@@ -650,14 +653,14 @@ public class VideosController extends BaseController {
     @PostMapping("/repulse")
     @ResponseBody
     public ResponseBean repulse(String ids, String msg, HttpSession session) {
-        logger.info("ids:{},msg:{}",ids,msg);
+        logger.info("ids:{},msg:{}", ids, msg);
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         String userId = sessionUser.getUserId();
         ResponseBean responseBean = new ResponseBean();
         String[] shyVideoIds = ids.split(",");
         String showMsg = "";
         for (String shyVideoId : shyVideoIds) {
-             showMsg = videosService.repulse(shyVideoId, msg, userId);
+            showMsg = videosService.repulse(shyVideoId, msg, userId);
         }
         if (CommonUtils.isNotEmpty(showMsg)) {
             responseBean.setErrorCode(ErrorEnum.ERROR.getErrorCode());
@@ -665,14 +668,14 @@ public class VideosController extends BaseController {
         }
         return responseBean;
     }
-    
+
     @GetMapping("/ceshi")
     @ResponseBody
     public void ceshi() {
-    	System.out.println("进入测试");
+        System.out.println("进入测试");
 //    	InfoUtil test = new InfoUtil();
 //    	infoUtil.show("测试通知", "这是一个弹窗测试！",localhost_url+"/channel/page?shenhe_status=0&receive=0");
-    	
+
     }
 }
@@ -76,7 +76,8 @@
                                 </button>
                             </div>
                             <div class="form-horizontal form-group-sm" id="forms" style="display: none;float: left;">
-                                <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 15%;float: left;">
+                                <div class="btn-group margin-bottom col-md-6"
+                                     style="padding: 0;width: 15%;float: left;">
                                     <div class="col-md-5" style="padding: 0;width: 100%;">
                                         <label for="video_titleID" class="control-label cb-toolbar">标题:</label>
                                         <div class="col-sm-9" style="padding: 0;">
@@ -85,7 +86,8 @@
                                     </div>
                                 </div>
-                                <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 10%;float: left;">
+                                <div class="btn-group margin-bottom col-md-6"
+                                     style="padding: 0;width: 10%;float: left;">
                                     <div class="col-md-5" style="padding: 0;width: 100%;">
                                         <label for="state" class="control-label cb-toolbar">状态:</label>
                                         <div class="col-sm-8" style="padding: 0;">
@@ -125,7 +127,8 @@
                                             </div>
                                         </div>
-                                        <div class="col-md-6" style="padding: 0;width: 25%;" th:if="${session.sessionUser.spid==0}">
+                                        <div class="col-md-6" style="padding: 0;width: 25%;"
+                                             th:if="${session.sessionUser.spid==0}">
                                             <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label>
                                             <div class="col-sm-9" style="padding: 0;">
                                                 <input class="form-control" type="text" value="" id="sp_desc">
@@ -183,6 +186,8 @@
                                                     <option value="47">老体协-综合类</option>
                                                     <option value="48">少儿吟诵</option>
                                                     <option value="49">少年先锋</option>
+                                                    <option value="50">巾帼故事汇</option>
+                                                    <option value="51">浣花吟唱节</option>
                                                 </select>
                                                 <!--<input class="form-control" name="video_priority" type="text" id="video_priority">-->
                                             </div>
@@ -190,21 +195,24 @@
                                     </div>
                                 </div>
-                                <div class="col-md-6" style="padding: 0;width: 18%;" th:if="${session.sessionUser.spid==0}">
+                                <div class="col-md-6" style="padding: 0;width: 18%;"
+                                     th:if="${session.sessionUser.spid==0}">
                                     <label for="video_id" class="control-label cb-toolbar">video_id</label>
                                     <div class="col-sm-9" style="padding: 0;">
                                         <input class="form-control" type="text" value="" id="video_id">
                                     </div>
                                 </div>
-                                <div class="col-md-6" style="padding: 0;width: 18%;" th:if="${session.sessionUser.spid==0}">
+                                <div class="col-md-6" style="padding: 0;width: 18%;"
+                                     th:if="${session.sessionUser.spid==0}">
                                     <label for="video_user_id" class="control-label cb-toolbar">sid</label>
                                     <div class="col-sm-9" style="padding: 0;">
                                         <input class="form-control" type="text" value="" id="video_user_id">
                                     </div>
                                 </div>
-                                <div class="col-md-6" style="padding: 0;width: 18%;" th:if="${session.sessionUser.spid==0}">
+                                <div class="col-md-6" style="padding: 0;width: 18%;"
+                                     th:if="${session.sessionUser.spid==0}">
                                     <label for="contentId" class="control-label cb-toolbar">内容id:</label>
                                     <div class="col-sm-9" style="padding: 0;">
                                         <input class="form-control" type="text" value="" id="contentId">
@@ -212,14 +220,16 @@
                                 </div>
-                                <div class="col-md-6" style="padding: 0;width: 18%;" th:if="${session.sessionUser.spid==0}">
+                                <div class="col-md-6" style="padding: 0;width: 18%;"
+                                     th:if="${session.sessionUser.spid==0}">
                                     <label for="sp_Id" class="control-label cb-toolbar">sp_Id</label>
                                     <div class="col-sm-9" style="padding: 0;">
                                         <input class="form-control" type="text" value="" id="sp_Id">
                                     </div>
                                 </div>
-                                <div class="col-md-6" style="padding: 0;width: 18%;" th:if="${session.sessionUser.spid==0}">
+                                <div class="col-md-6" style="padding: 0;width: 18%;"
+                                     th:if="${session.sessionUser.spid==0}">
                                     <label for="shen_auditor_id" class="control-label cb-toolbar">审核员</label>
                                     <div class="col-sm-9" style="padding: 0;">
                                         <input class="form-control" type="text" value="" id="shen_auditor_id">
@@ -299,7 +309,7 @@
                                                                             type="checkbox" th:value="${video.id}"></td>
                                             <td style="text-align: center; width: 6%;"
                                                 th:text="${video.spid_desc}"></td>
-                                            <td style="text-align: center; width: 20%;" >
+                                            <td style="text-align: center; width: 20%;">
                                                 <a class="detail" th:href="@{'/videos/details/?id='+${video.id}}">
                                                     <span th:text="${video.video_title}">邓建国正面PK冯小刚</span>
                                                 </a>
@@ -319,15 +329,16 @@
                                                 <!--                                                 <span class="btn btn-sm btn-danger" th:if="${video.state==3}">自动审核失败</span> -->
                                             </td>
                                             <td style="text-align: center; width: 3%;">
-                                                <span  th:if="${video.shenhe_type==1}">免审</span>
-                                                <span  th:if="${video.shenhe_type==2}">机审</span>
-                                                <span  th:if="${video.shenhe_type==3}">人工审</span>
+                                                <span th:if="${video.shenhe_type==1}">免审</span>
+                                                <span th:if="${video.shenhe_type==2}">机审</span>
+                                                <span th:if="${video.shenhe_type==3}">人工审</span>
                                             </td>
                                             <td style="text-align: center; width: 10%;"
                                                 th:text="${#dates.format(video.video_upload_time, 'yyyy-MM-dd HH:mm:ss')}">
                                                 2018-03-07 16:56:20
                                             </td>
-                                            <td style="text-align: center; width: 6%;" th:text="${video.video_user_id}">视频上传人的id
+                                            <td style="text-align: center; width: 6%;" th:text="${video.video_user_id}">
+                                                视频上传人的id
                                             </td>
                                             <td style="text-align: center; width: 10%;"
                                                 th:text="${#dates.format(video.created_at, 'yyyy-MM-dd HH:mm:ss')}">
@@ -336,7 +347,10 @@
                                             <td style="text-align: center; width: 17%;">
                                                 <a class="detail" th:href="@{'/videos/details/?id='+${video.id}}">
                                                     <!--th:if="${ (video.receive==true and session.sessionUser.userId==video.receive_user_id) or (video.state==1 or video.state==2) }"-->
-                                                    <button  class="btn btn-info btn-sm" th:style="${state1 eq '0' && receive1 eq  'false'} ? 'display: none ' : ' '">查看</button>
+                                                    <button class="btn btn-info btn-sm"
+                                                            th:style="${state1 eq '0' && receive1 eq  'false'} ? 'display: none ' : ' '">
+                                                        查看
+                                                    </button>
                                                 </a>
                                                 <span th:if="${video.state==0 and video.receive==0}"> &nbsp;</span>
                                                 <a th:href="@{'javascript:applyReceive('+${video.id}+')'}"
@@ -365,7 +379,7 @@
                                             <option value="50" th:selected="${pageSize==50}">50</option>
                                             <option value="100" th:selected="${pageSize==100}">100</option>
                                         </select>
-                                        <span class="pagination-info" >条记录</span>
+                                        <span class="pagination-info">条记录</span>
                                     </div>
                                     <div class="pull-right pagination">
                                         <ul class="pagination" th:if="${videoPage.pages>1}">
@@ -450,8 +464,8 @@
         }
         //选择每页数量触发函数
-        function selectPageSize(){
-            var pageSize=$("#pageSize").val();
+        function selectPageSize() {
+            var pageSize = $("#pageSize").val();
             var param = location.search;
             if (param.indexOf("pageSize=") != -1) {
                 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
@@ -459,7 +473,7 @@
                 var h = "";
                 for (var i = 0; i < split.length; i++) {
                     var s = split[i];
-                    if (s.indexOf("pageSize=") < 0 &&s.indexOf("page=") < 0) h = h + "&" + split[i];
+                    if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
                 }
                 h = h.substring(1, h.length);
                 window.location.href = "/videos/page?" + h + "&pageSize=" + pageSize;
@@ -482,11 +496,11 @@
             window.location.href = "/videos/excel" + param;
         }
-        var video_priority ="";
+        var video_priority = "";
         var video_title = "";
-        var start_date ="";
+        var start_date = "";
         var end_date = "";
-        var sp_desc ="";
+        var sp_desc = "";
         var count = "";
         var state = "";
         var sp_Id = "";
@@ -497,15 +511,15 @@
         var video_id = "";
-        function updateValue(){
+        function updateValue() {
             video_title = $("#video_titleID").val();
             start_date = $("#start_date").val();
             end_date = $("#end_date").val();
             state = $("#state").val();
             sp_Id = $("#sp_Id").val();
             source = $("#source").val();
-            var spId=[[${session.sessionUser.spid}]];
-            if(spId==0){
+            var spId = [[${session.sessionUser.spid}]];
+            if (spId == 0) {
                 sp_desc = $("#sp_desc").val();
                 count = $("#pageSize").val();
                 video_user_id = $("#video_user_id").val();
@@ -519,35 +533,35 @@
         //全部
         function quanbu() {
             updateValue();
-            window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date +  "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count+"&sp_Id="+sp_Id+"&source="+source+"&video_user_id="+video_user_id+"&shen_auditor_id="+shen_auditor_id+"&contentId="+contentId+"&video_id="+video_id;
+            window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id;
         }
         //全部待领
         $('#daishen').click(function () {
             updateValue();
-            if($.trim(state) == '') state=0;
+            if ($.trim(state) == '') state = 0;
             var receive = 0;
-            window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count+"&sp_Id="+sp_Id+"&source="+source+"&video_user_id="+video_user_id+"&shen_auditor_id="+shen_auditor_id+"&contentId="+contentId+"&video_id="+video_id;
+            window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id;
         });
         //我的待审核
         $('#Mydaishen').click(function () {
             updateValue();
             var receive = 1;
-            if($.trim(state) == '') state=0;
-            window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count+"&sp_Id="+sp_Id+"&source="+source+"&video_user_id="+video_user_id+"&shen_auditor_id="+shen_auditor_id+"&contentId="+contentId+"&video_id="+video_id;
+            if ($.trim(state) == '') state = 0;
+            window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id;
         });
         //我的已审核
         $('#yishen').click(function () {
             updateValue();
             var receive = 1;
-            if($.trim(state) == '') state=3;//审核状态，3代表通过和拒绝都查询
-            window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count+"&sp_Id="+sp_Id+"&source="+source+"&video_user_id="+video_user_id+"&shen_auditor_id="+shen_auditor_id+"&contentId="+contentId+"&video_id="+video_id;
+            if ($.trim(state) == '') state = 3;//审核状态，3代表通过和拒绝都查询
+            window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id;
         });
         //查询
         $('#videos_query').click(function () {
-            window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count+"&sp_Id="+sp_Id+"&source="+source+"&video_user_id="+video_user_id+"&shen_auditor_id="+shen_auditor_id+"&contentId="+contentId+"&video_id="+video_id;
+            window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id;
         });
         /*全选的操作*/
         $('#select_all').click(function () {