周伟鹏 / cnlive_shenhe · Commits

Commit d94a2113e676c59436c9d0e4478bebfc0dfbc598

Authored by 郑超
2 parents 26cffc9b 5616e587

Merge branch 'dev'

Inline Side-by-side
Showing 2 changed files with 66 additions and 49 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
  View file @d94a211
1 1 package com.cnlive.shenhe.controller;
2 2  
3   -import com.cnlive.shenhe.utils.*;
4   -import org.apache.poi.xssf.usermodel.XSSFCell;
5   -import org.apache.poi.xssf.usermodel.XSSFRow;
6   -import org.apache.poi.xssf.usermodel.XSSFSheet;
7   -import org.apache.poi.xssf.usermodel.XSSFWorkbook;
8 3 import com.alibaba.fastjson.JSON;
9 4 import com.alibaba.fastjson.JSONObject;
10 5 import com.cnlive.shenhe.bean.ErrorEnum;
... ... @@ -16,8 +11,12 @@ import com.cnlive.shenhe.entity.ShyVideos;
16 11 import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
17 12 import com.cnlive.shenhe.serviceImpl.UsersServiceImpl;
18 13 import com.cnlive.shenhe.serviceImpl.VideosServiceImpl;
  14 +import com.cnlive.shenhe.utils.*;
19 15 import com.github.pagehelper.PageInfo;
20   -import org.jsoup.helper.DataUtil;
  16 +import org.apache.poi.xssf.usermodel.XSSFCell;
  17 +import org.apache.poi.xssf.usermodel.XSSFRow;
  18 +import org.apache.poi.xssf.usermodel.XSSFSheet;
  19 +import org.apache.poi.xssf.usermodel.XSSFWorkbook;
21 20 import org.slf4j.Logger;
22 21 import org.slf4j.LoggerFactory;
23 22 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -30,7 +29,6 @@ import org.springframework.web.bind.annotation.PostMapping;
30 29 import org.springframework.web.bind.annotation.RequestMapping;
31 30 import org.springframework.web.bind.annotation.ResponseBody;
32 31  
33   -import javax.persistence.criteria.CriteriaBuilder;
34 32 import javax.servlet.ServletOutputStream;
35 33 import javax.servlet.http.HttpServletResponse;
36 34 import javax.servlet.http.HttpSession;
... ... @@ -163,8 +161,8 @@ public class VideosController extends BaseController {
163 161 if (data != null) {
164 162 String pid = data.getString("pid");
165 163 video_id = pid;
166   - }else {
167   - video_id=contentId.toString();
  164 + } else {
  165 + video_id = contentId.toString();
168 166 }
169 167 }
170 168  
... ... @@ -281,6 +279,10 @@ public class VideosController extends BaseController {
281 279 videos.setSpid_desc("少儿吟诵" + "(目击者)");
282 280 } else if ("49".equals(source1)) {
283 281 videos.setSpid_desc("少年先锋" + "(目击者)");
  282 + } else if ("50".equals(source1)) {
  283 + videos.setSpid_desc("巾帼故事汇" + "(目击者)");
  284 + } else if ("51".equals(source1)) {
  285 + videos.setSpid_desc("浣花吟唱节" + "(目击者)");
284 286 } else {
285 287 videos.setSpid_desc(shySites.getName() + "(目击者)");
286 288 }
... ... @@ -326,7 +328,7 @@ public class VideosController extends BaseController {
326 328 } else if (plat == CommonConst.KS_PLAT) {
327 329 yuming = ks_domain + "/";
328 330 }
329   - detailsContent.setAttr_tags(CommonUtils.isEmpty(detailsContent.getAttr_tags())?"":detailsContent.getAttr_tags());
  331 + detailsContent.setAttr_tags(CommonUtils.isEmpty(detailsContent.getAttr_tags()) ? "" : detailsContent.getAttr_tags());
330 332  
331 333 ShySites shySites = sitesService.findspidDescByspid(detailsContent.getSpid());
332 334 if (CommonUtils.isNotNull(shySites)) {
... ... @@ -421,7 +423,7 @@ public class VideosController extends BaseController {
421 423 for (String cid : cids) {
422 424 ShyVideos shyVideos = videosService.selectByPrimaryKey(Integer.parseInt(cid));
423 425 if (CommonUtils.isNotNull(shyVideos)) {
424   - if (shyVideos.getState() != CommonConst.AUDIT_INTT || shyVideos.getReceive()==CommonConst.RECEIVE_AFTER) {
  426 + if (shyVideos.getState() != CommonConst.AUDIT_INTT || shyVideos.getReceive() == CommonConst.RECEIVE_AFTER) {
425 427 return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "您领取的内容中有已被领取或者已经被审核，请检查并重试");
426 428 }
427 429 } else {
... ... @@ -437,6 +439,7 @@ public class VideosController extends BaseController {
437 439  
438 440 /**
439 441 * 退领
  442 + *
440 443 * @param ids
441 444 * @param session
442 445 * @return
... ... @@ -450,7 +453,7 @@ public class VideosController extends BaseController {
450 453 String[] cids = ids.split(",");
451 454 for (String cid : cids) {
452 455 ShyVideos shyVideos = videosService.selectByPrimaryKey(Integer.parseInt(cid));
453   - if (shyVideos.getState() != CommonConst.AUDIT_INTT || shyVideos.getReceive()==CommonConst.RECEIVE_BEFORE || !shyVideos.getReceive_user_id().equals(userId)) {
  456 + if (shyVideos.getState() != CommonConst.AUDIT_INTT || shyVideos.getReceive() == CommonConst.RECEIVE_BEFORE || !shyVideos.getReceive_user_id().equals(userId)) {
454 457 return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "退领失败，您选中的内容包含已退领的或已经审核的");
455 458 }
456 459 }
... ... @@ -650,14 +653,14 @@ public class VideosController extends BaseController {
650 653 @PostMapping("/repulse")
651 654 @ResponseBody
652 655 public ResponseBean repulse(String ids, String msg, HttpSession session) {
653   - logger.info("ids:{},msg:{}",ids,msg);
  656 + logger.info("ids:{},msg:{}", ids, msg);
654 657 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
655 658 String userId = sessionUser.getUserId();
656 659 ResponseBean responseBean = new ResponseBean();
657 660 String[] shyVideoIds = ids.split(",");
658 661 String showMsg = "";
659 662 for (String shyVideoId : shyVideoIds) {
660   - showMsg = videosService.repulse(shyVideoId, msg, userId);
  663 + showMsg = videosService.repulse(shyVideoId, msg, userId);
661 664 }
662 665 if (CommonUtils.isNotEmpty(showMsg)) {
663 666 responseBean.setErrorCode(ErrorEnum.ERROR.getErrorCode());
... ... @@ -665,14 +668,14 @@ public class VideosController extends BaseController {
665 668 }
666 669 return responseBean;
667 670 }
668   -
  671 +
669 672 @GetMapping("/ceshi")
670 673 @ResponseBody
671 674 public void ceshi() {
672   - System.out.println("进入测试");
  675 + System.out.println("进入测试");
673 676 // InfoUtil test = new InfoUtil();
674 677 // infoUtil.show("测试通知", "这是一个弹窗测试！",localhost_url+"/channel/page?shenhe_status=0&receive=0");
675   -
  678 +
676 679 }
677 680  
678 681 }
... ...
src/main/resources/templates/page/video.html
  View file @d94a211
... ... @@ -76,7 +76,8 @@
76 76 </button>
77 77 </div>
78 78 <div class="form-horizontal form-group-sm" id="forms" style="display: none;float: left;">
79   - <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 15%;float: left;">
  79 + <div class="btn-group margin-bottom col-md-6"
  80 + style="padding: 0;width: 15%;float: left;">
80 81 <div class="col-md-5" style="padding: 0;width: 100%;">
81 82 <label for="video_titleID" class="control-label cb-toolbar">标题:</label>
82 83 <div class="col-sm-9" style="padding: 0;">
... ... @@ -85,7 +86,8 @@
85 86 </div>
86 87 </div>
87 88  
88   - <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 10%;float: left;">
  89 + <div class="btn-group margin-bottom col-md-6"
  90 + style="padding: 0;width: 10%;float: left;">
89 91 <div class="col-md-5" style="padding: 0;width: 100%;">
90 92 <label for="state" class="control-label cb-toolbar">状态:</label>
91 93 <div class="col-sm-8" style="padding: 0;">
... ... @@ -125,7 +127,8 @@
125 127 </div>
126 128 </div>
127 129  
128   - <div class="col-md-6" style="padding: 0;width: 25%;" th:if="${session.sessionUser.spid==0}">
  130 + <div class="col-md-6" style="padding: 0;width: 25%;"
  131 + th:if="${session.sessionUser.spid==0}">
129 132 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label>
130 133 <div class="col-sm-9" style="padding: 0;">
131 134 <input class="form-control" type="text" value="" id="sp_desc">
... ... @@ -183,6 +186,8 @@
183 186 <option value="47">老体协-综合类</option>
184 187 <option value="48">少儿吟诵</option>
185 188 <option value="49">少年先锋</option>
  189 + <option value="50">巾帼故事汇</option>
  190 + <option value="51">浣花吟唱节</option>
186 191 </select>
187 192 <!--<input class="form-control" name="video_priority" type="text" id="video_priority">-->
188 193 </div>
... ... @@ -190,21 +195,24 @@
190 195 </div>
191 196 </div>
192 197  
193   - <div class="col-md-6" style="padding: 0;width: 18%;" th:if="${session.sessionUser.spid==0}">
  198 + <div class="col-md-6" style="padding: 0;width: 18%;"
  199 + th:if="${session.sessionUser.spid==0}">
194 200 <label for="video_id" class="control-label cb-toolbar">video_id</label>
195 201 <div class="col-sm-9" style="padding: 0;">
196 202 <input class="form-control" type="text" value="" id="video_id">
197 203 </div>
198 204 </div>
199 205  
200   - <div class="col-md-6" style="padding: 0;width: 18%;" th:if="${session.sessionUser.spid==0}">
  206 + <div class="col-md-6" style="padding: 0;width: 18%;"
  207 + th:if="${session.sessionUser.spid==0}">
201 208 <label for="video_user_id" class="control-label cb-toolbar">sid</label>
202 209 <div class="col-sm-9" style="padding: 0;">
203 210 <input class="form-control" type="text" value="" id="video_user_id">
204 211 </div>
205 212 </div>
206 213  
207   - <div class="col-md-6" style="padding: 0;width: 18%;" th:if="${session.sessionUser.spid==0}">
  214 + <div class="col-md-6" style="padding: 0;width: 18%;"
  215 + th:if="${session.sessionUser.spid==0}">
208 216 <label for="contentId" class="control-label cb-toolbar">内容id:</label>
209 217 <div class="col-sm-9" style="padding: 0;">
210 218 <input class="form-control" type="text" value="" id="contentId">
... ... @@ -212,14 +220,16 @@
212 220 </div>
213 221  
214 222  
215   - <div class="col-md-6" style="padding: 0;width: 18%;" th:if="${session.sessionUser.spid==0}">
  223 + <div class="col-md-6" style="padding: 0;width: 18%;"
  224 + th:if="${session.sessionUser.spid==0}">
216 225 <label for="sp_Id" class="control-label cb-toolbar">sp_Id</label>
217 226 <div class="col-sm-9" style="padding: 0;">
218 227 <input class="form-control" type="text" value="" id="sp_Id">
219 228 </div>
220 229 </div>
221 230  
222   - <div class="col-md-6" style="padding: 0;width: 18%;" th:if="${session.sessionUser.spid==0}">
  231 + <div class="col-md-6" style="padding: 0;width: 18%;"
  232 + th:if="${session.sessionUser.spid==0}">
223 233 <label for="shen_auditor_id" class="control-label cb-toolbar">审核员</label>
224 234 <div class="col-sm-9" style="padding: 0;">
225 235 <input class="form-control" type="text" value="" id="shen_auditor_id">
... ... @@ -299,7 +309,7 @@
299 309 type="checkbox" th:value="${video.id}"></td>
300 310 <td style="text-align: center; width: 6%;"
301 311 th:text="${video.spid_desc}"></td>
302   - <td style="text-align: center; width: 20%;" >
  312 + <td style="text-align: center; width: 20%;">
303 313 <a class="detail" th:href="@{'/videos/details/?id='+${video.id}}">
304 314 <span th:text="${video.video_title}">邓建国正面PK冯小刚</span>
305 315 </a>
... ... @@ -319,15 +329,16 @@
319 329 <!-- <span class="btn btn-sm btn-danger" th:if="${video.state==3}">自动审核失败</span> -->
320 330 </td>
321 331 <td style="text-align: center; width: 3%;">
322   - <span th:if="${video.shenhe_type==1}">免审</span>
323   - <span th:if="${video.shenhe_type==2}">机审</span>
324   - <span th:if="${video.shenhe_type==3}">人工审</span>
  332 + <span th:if="${video.shenhe_type==1}">免审</span>
  333 + <span th:if="${video.shenhe_type==2}">机审</span>
  334 + <span th:if="${video.shenhe_type==3}">人工审</span>
325 335 </td>
326 336 <td style="text-align: center; width: 10%;"
327 337 th:text="${#dates.format(video.video_upload_time, 'yyyy-MM-dd HH:mm:ss')}">
328 338 2018-03-07 16:56:20
329 339 </td>
330   - <td style="text-align: center; width: 6%;" th:text="${video.video_user_id}">视频上传人的id
  340 + <td style="text-align: center; width: 6%;" th:text="${video.video_user_id}">
  341 + 视频上传人的id
331 342 </td>
332 343 <td style="text-align: center; width: 10%;"
333 344 th:text="${#dates.format(video.created_at, 'yyyy-MM-dd HH:mm:ss')}">
... ... @@ -336,7 +347,10 @@
336 347 <td style="text-align: center; width: 17%;">
337 348 <a class="detail" th:href="@{'/videos/details/?id='+${video.id}}">
338 349 <!--th:if="${ (video.receive==true and session.sessionUser.userId==video.receive_user_id) or (video.state==1 or video.state==2) }"-->
339   - <button class="btn btn-info btn-sm" th:style="${state1 eq '0' && receive1 eq 'false'} ? 'display: none ' : ' '">查看</button>
  350 + <button class="btn btn-info btn-sm"
  351 + th:style="${state1 eq '0' && receive1 eq 'false'} ? 'display: none ' : ' '">
  352 + 查看
  353 + </button>
340 354 </a>
341 355 <span th:if="${video.state==0 and video.receive==0}"> &nbsp;</span>
342 356 <a th:href="@{'javascript:applyReceive('+${video.id}+')'}"
... ... @@ -365,7 +379,7 @@
365 379 <option value="50" th:selected="${pageSize==50}">50</option>
366 380 <option value="100" th:selected="${pageSize==100}">100</option>
367 381 </select>
368   - <span class="pagination-info" >条记录</span>
  382 + <span class="pagination-info">条记录</span>
369 383 </div>
370 384 <div class="pull-right pagination">
371 385 <ul class="pagination" th:if="${videoPage.pages>1}">
... ... @@ -450,8 +464,8 @@
450 464 }
451 465  
452 466 //选择每页数量触发函数
453   - function selectPageSize(){
454   - var pageSize=$("#pageSize").val();
  467 + function selectPageSize() {
  468 + var pageSize = $("#pageSize").val();
455 469 var param = location.search;
456 470 if (param.indexOf("pageSize=") != -1) {
457 471 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
... ... @@ -459,7 +473,7 @@
459 473 var h = "";
460 474 for (var i = 0; i < split.length; i++) {
461 475 var s = split[i];
462   - if (s.indexOf("pageSize=") < 0 &&s.indexOf("page=") < 0) h = h + "&" + split[i];
  476 + if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
463 477 }
464 478 h = h.substring(1, h.length);
465 479 window.location.href = "/videos/page?" + h + "&pageSize=" + pageSize;
... ... @@ -482,11 +496,11 @@
482 496 window.location.href = "/videos/excel" + param;
483 497 }
484 498  
485   - var video_priority ="";
  499 + var video_priority = "";
486 500 var video_title = "";
487   - var start_date ="";
  501 + var start_date = "";
488 502 var end_date = "";
489   - var sp_desc ="";
  503 + var sp_desc = "";
490 504 var count = "";
491 505 var state = "";
492 506 var sp_Id = "";
... ... @@ -497,15 +511,15 @@
497 511 var video_id = "";
498 512  
499 513  
500   - function updateValue(){
  514 + function updateValue() {
501 515 video_title = $("#video_titleID").val();
502 516 start_date = $("#start_date").val();
503 517 end_date = $("#end_date").val();
504 518 state = $("#state").val();
505 519 sp_Id = $("#sp_Id").val();
506 520 source = $("#source").val();
507   - var spId=[[${session.sessionUser.spid}]];
508   - if(spId==0){
  521 + var spId = [[${session.sessionUser.spid}]];
  522 + if (spId == 0) {
509 523 sp_desc = $("#sp_desc").val();
510 524 count = $("#pageSize").val();
511 525 video_user_id = $("#video_user_id").val();
... ... @@ -519,35 +533,35 @@
519 533 //全部
520 534 function quanbu() {
521 535 updateValue();
522   - 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;
  536 + 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;
523 537 }
524 538  
525 539 //全部待领
526 540 $('#daishen').click(function () {
527 541 updateValue();
528   - if($.trim(state) == '') state=0;
  542 + if ($.trim(state) == '') state = 0;
529 543 var receive = 0;
530   - 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;
  544 + 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;
531 545 });
532 546 //我的待审核
533 547 $('#Mydaishen').click(function () {
534 548 updateValue();
535 549 var receive = 1;
536   - if($.trim(state) == '') state=0;
537   - 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;
  550 + if ($.trim(state) == '') state = 0;
  551 + 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;
538 552 });
539 553 //我的已审核
540 554 $('#yishen').click(function () {
541 555 updateValue();
542 556 var receive = 1;
543   - if($.trim(state) == '') state=3;//审核状态，3代表通过和拒绝都查询
544   - 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;
  557 + if ($.trim(state) == '') state = 3;//审核状态，3代表通过和拒绝都查询
  558 + 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;
545 559 });
546 560  
547 561  
548 562 //查询
549 563 $('#videos_query').click(function () {
550   - 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;
  564 + 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;
551 565 });
552 566 /*全选的操作*/
553 567 $('#select_all').click(function () {
... ...