Commit 92d3d4df927c30a03c1d3349e588d4b5dccd1d3c

Authored by 王言钊
2 parents 83b61730 2f7f3c86

Merge branch 'dev'

src/main/java/com/cnlive/shenhe/controller/UsersController.java
... ... @@ -111,7 +111,7 @@ public class UsersController extends BaseController {
111 111 shyLog.setOperationType("登录");
112 112 shyLog.setRemark(user.getUsername() + "--" + "登录");
113 113 shyLogService.addShyLog(shyLog);
114   - return "redirect:" + redirect_url + "/videos/page?video_title=&start_date=&end_date=&state=0&receive=0&video_priority=";
  114 + return "redirect:" + redirect_url + "/videos/page?state=0&receive=0&page=1&pageSize=10";
115 115 }
116 116 }
117 117  
... ...
src/main/java/com/cnlive/shenhe/dto/ContentDTO.java
... ... @@ -33,7 +33,7 @@ public class ContentDTO extends ShyContent implements Serializable {
33 33 }
34 34  
35 35 public Integer getPage() {
36   - return page == null ? 1 : page;
  36 + return page;
37 37 }
38 38  
39 39 public void setPage(Integer page) {
... ... @@ -41,7 +41,7 @@ public class ContentDTO extends ShyContent implements Serializable {
41 41 }
42 42  
43 43 public Integer getPageSize() {
44   - return pageSize == null ? 10 : pageSize;
  44 + return pageSize;
45 45 }
46 46  
47 47 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/EmailDTO.java
... ... @@ -25,7 +25,7 @@ public class EmailDTO extends ShyEmail implements Serializable {
25 25 }
26 26  
27 27 public Integer getPage() {
28   - return page == null ? 1 : page;
  28 + return page;
29 29 }
30 30  
31 31 public void setPage(Integer page) {
... ... @@ -33,7 +33,7 @@ public class EmailDTO extends ShyEmail implements Serializable {
33 33 }
34 34  
35 35 public Integer getPageSize() {
36   - return pageSize == null ? 10 : pageSize;
  36 + return pageSize;
37 37 }
38 38  
39 39 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/LiveDTO.java
... ... @@ -37,7 +37,7 @@ public class LiveDTO extends ShyLive implements Serializable {
37 37 }
38 38  
39 39 public Integer getPage() {
40   - return page == null ? 1 : page;
  40 + return page;
41 41 }
42 42  
43 43 public void setPage(Integer page) {
... ... @@ -45,7 +45,7 @@ public class LiveDTO extends ShyLive implements Serializable {
45 45 }
46 46  
47 47 public Integer getPageSize() {
48   - return pageSize == null ? 20 : pageSize;
  48 + return pageSize;
49 49 }
50 50  
51 51 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/UsersDTO.java
... ... @@ -25,7 +25,7 @@ public class UsersDTO extends ShyUsers implements Serializable {
25 25 }
26 26  
27 27 public Integer getPage() {
28   - return page == null ? 1 : page;
  28 + return page;
29 29 }
30 30  
31 31 public void setPage(Integer page) {
... ... @@ -33,7 +33,7 @@ public class UsersDTO extends ShyUsers implements Serializable {
33 33 }
34 34  
35 35 public Integer getPageSize() {
36   - return pageSize == null ? 10 : pageSize;
  36 + return pageSize;
37 37 }
38 38  
39 39 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/VideosDTO.java
... ... @@ -56,7 +56,7 @@ public class VideosDTO extends ShyVideos implements Serializable {
56 56  
57 57  
58 58 public Integer getPage() {
59   - return page == null ? 1 : page;
  59 + return page;
60 60 }
61 61  
62 62 public void setPage(Integer page) {
... ... @@ -64,7 +64,7 @@ public class VideosDTO extends ShyVideos implements Serializable {
64 64 }
65 65  
66 66 public Integer getPageSize() {
67   - return pageSize == null ? 10 : pageSize;
  67 + return pageSize;
68 68 }
69 69  
70 70 public void setPageSize(Integer pageSize) {
... ...
src/main/resources/templates/common/frame.html
... ... @@ -78,11 +78,11 @@ line-height: 2em; margin: 0 auto;font-size: 2em"
78 78 <span class="menu-item-top">审核云</span>
79 79 </a>
80 80 <ul class="treeview-menu">
81   - <li class="active"><a href="/videos/page?state=0&receive=0" id="/videos/page">点播审核</a></li>
  81 + <li class="active"><a href="/videos/page?state=0&receive=0&page=1&pageSize=10" id="/videos/page">点播审核</a></li>
82 82 <li><a href="/audio/page?state=0&receive=0&page=1&pageSize=10" id="/audio/page"> 音频审核</a></li>
83   - <li><a href="/live/page?shenhe_state=0" id="/live/page"> 直播审核</a></li>
  83 + <li><a href="/live/page?shenhe_state=0&page=1&pageSize=20" id="/live/page"> 直播审核</a></li>
84 84 <li><a href="/comments/page?state=0&receive=0&page=1&pageSize=10" id="/comments/page"> 评论审核</a></li>
85   - <li><a href="/content/page?receive_status=0" id="/content/page"> 图文审核</a></li>
  85 + <li><a href="/content/page?receive_status=0&page=1&pageSize=10" id="/content/page"> 图文审核</a></li>
86 86 <li><a href="/topic/page?shenhe_status=0&receive=0&page=1&pageSize=10" id="/topic/page"> 话题审核</a></li>
87 87 <li><a href="/channel/page?shenhe_status=0&receive=0&page=1&pageSize=10" id="/channel/page"> 频道审核</a></li>
88 88 <li><a href="/liveApply/page?shenhe_state=0&receive=0&page=1&pageSize=10" id="/liveApply/page">直播申请审核</a></li>
... ... @@ -93,9 +93,9 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
93 93 <span class="menu-item-top">系统管理</span>
94 94 </a>
95 95 <ul class="treeview-menu">
96   - <li><a href="/users/page" id="/users/page"> 审核云用户管理</a></li>
  96 + <li><a href="/users/page?page=1&pageSize=10" id="/users/page"> 审核云用户管理</a></li>
97 97 <li><a href="/sites/page?page=1&pageSize=10" id="/sites/page"> SP白名单管理</a></li>
98   - <li><a href="/email/page" id="/email/page"> 邮件消息管理</a></li>
  98 + <li><a href="/email/page?page=1&pageSize=10" id="/email/page"> 邮件消息管理</a></li>
99 99 <li><a href="/usersFree/page?page=1&pageSize=10" id="/usersFree/page"> 网++白名单管理</a></li>
100 100 <li><a href="/notSpeak/page?page=1&pageSize=10" id="/notSpeak/page"> 网++禁言管理</a></li>
101 101 <li><a href="/activity/page?pageNum=1&pageSize=10" id="/activity/page"> 活动管理</a></li>
... ...
src/main/resources/templates/page/content.html
... ... @@ -451,7 +451,7 @@
451 451 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
452 452 }
453 453 h = h.substring(1, h.length);
454   - window.location.href = "/content/page?" + h + "&pageSize=" + pageSize;
  454 + window.location.href = "/content/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
455 455 } else {
456 456 var se = param.replace("?", "");//去掉问号,防止问号和要去掉的参数相连
457 457 var split = se.split("&");
... ... @@ -461,7 +461,7 @@
461 461 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
462 462 }
463 463 h = h.substring(1, h.length);
464   - window.location.href = "/content/page?" + h + "&pageSize=" + pageSize;
  464 + window.location.href = "/content/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
465 465 }
466 466 }
467 467  
... ... @@ -501,32 +501,32 @@
501 501 function quanbu() {
502 502 updateValue();
503 503 var expand_list_state = $("#forms").attr("expand_list_state");
504   - window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag + "&expand_list_state=" + expand_list_state;
  504 + window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag + "&expand_list_state=" + expand_list_state;
505 505 }
506 506  
507 507 //全部待领
508 508 $('#daishen').click(function () {
509 509 updateValue();
510 510 var receive_status = 0;
511   - window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
  511 + window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
512 512 });
513 513 //我的待审核
514 514 $('#Mydaishen').click(function () {
515 515 updateValue();
516 516 var receive_status = 1;
517   - window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
  517 + window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
518 518 });
519 519 //我的已审核
520 520 $('#yishen').click(function () {
521 521 updateValue();
522 522 var receive_status = 2;
523   - window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
  523 + window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
524 524 });
525 525  
526 526  
527 527 //查询
528 528 $('#videos_query').click(function () {
529   - window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
  529 + window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
530 530 });
531 531 /*全选的操作*/
532 532 $('#select_all').click(function () {
... ...
src/main/resources/templates/page/email.html
... ... @@ -396,7 +396,7 @@ input:checked + .slider:before {
396 396 if (s.indexOf("pageSize=") < 0 &&s.indexOf("page=") < 0) h = h + "&" + split[i];
397 397 }
398 398 h = h.substring(1, h.length);
399   - window.location.href = "/email/page?" + h + "&pageSize=" + pageSize;
  399 + window.location.href = "/email/page?" + h + "&page="+ 1 + "&pageSize=" + pageSize;
400 400 } else {
401 401 var se = param.replace("?", "");//去掉问号,防止问号和要去掉的参数相连
402 402 var split = se.split("&");
... ... @@ -406,7 +406,7 @@ input:checked + .slider:before {
406 406 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
407 407 }
408 408 h = h.substring(1, h.length);
409   - window.location.href = "/email/page?" + h + "&pageSize=" + pageSize;
  409 + window.location.href = "/email/page?" + h + "&page="+ 1 + "&pageSize=" + pageSize;
410 410 }
411 411 }
412 412  
... ... @@ -415,7 +415,7 @@ input:checked + .slider:before {
415 415 var email = $("#email_query").val();
416 416 var remark = $("#remark_query").val();
417 417 var pageSize = $("#pageSize").val();
418   - window.location.href = "/email/page?email=" + email + "&remark=" + remark+ "&pageSize=" + pageSize;
  418 + window.location.href = "/email/page?email=" + email + "&remark=" + remark + "&page="+ 1 + "&pageSize=" + pageSize;
419 419 });
420 420  
421 421 //鼠标回车事件
... ...
src/main/resources/templates/page/live.html
... ... @@ -490,7 +490,7 @@
490 490 contentId = $("#contentId").val();
491 491 }
492 492 var expand_list_state = $("#forms").attr("expand_list_state");
493   - 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 + "&expand_list_state=" + expand_list_state;
  493 + 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 + "&page=" + 1 + "&pageSize=" + count + "&shenhe_state=" + shenhe_state + "&contentId=" + contentId + "&expand_list_state=" + expand_list_state;
494 494 }
495 495  
496 496 //全部
... ... @@ -770,7 +770,7 @@
770 770 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
771 771 }
772 772 h = h.substring(1, h.length);
773   - window.location.href = "/live/page?" + h + "&pageSize=" + pageSize;
  773 + window.location.href = "/live/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
774 774 } else {
775 775 var se = param.replace("?", "");//去掉问号,防止问号和要去掉的参数相连
776 776 var split = se.split("&");
... ... @@ -780,7 +780,7 @@
780 780 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
781 781 }
782 782 h = h.substring(1, h.length);
783   - window.location.href = "/live/page?" + h + "&pageSize=" + pageSize;
  783 + window.location.href = "/live/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
784 784 }
785 785 }
786 786  
... ...
src/main/resources/templates/page/users.html
... ... @@ -297,7 +297,7 @@
297 297 if (s.indexOf("pageSize=") < 0 &&s.indexOf("page=") < 0) h = h + "&" + split[i];
298 298 }
299 299 h = h.substring(1, h.length);
300   - window.location.href = "/users/page?" + h + "&pageSize=" + pageSize;
  300 + window.location.href = "/users/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
301 301 } else {
302 302 var se = param.replace("?", "");//去掉问号,防止问号和要去掉的参数相连
303 303 var split = se.split("&");
... ... @@ -307,7 +307,7 @@
307 307 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
308 308 }
309 309 h = h.substring(1, h.length);
310   - window.location.href = "/users/page?" + h + "&pageSize=" + pageSize;
  310 + window.location.href = "/users/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
311 311 }
312 312 }
313 313  
... ... @@ -318,7 +318,7 @@
318 318 var sp_id = $("#sp_id").val();
319 319 var mobile = $("#mobile").val();
320 320 var pageSize = $("#pageSize").val();
321   - window.location.href = "/users/page?company_brief=" + company_brief + "&username=" + username+ "&sp_id=" + sp_id+ "&mobile=" + mobile+ "&pageSize=" + pageSize;
  321 + window.location.href = "/users/page?company_brief=" + company_brief + "&username=" + username+ "&sp_id=" + sp_id+ "&mobile=" + mobile + "&page=" + 1 + "&pageSize=" + pageSize;
322 322 });
323 323 //鼠标回车事件
324 324 $(document).keyup(function(event){
... ...
src/main/resources/templates/page/video.html
... ... @@ -445,7 +445,7 @@
445 445 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
446 446 }
447 447 h = h.substring(1, h.length);
448   - window.location.href = "/videos/page?" + h + "&pageSize=" + pageSize;
  448 + window.location.href = "/videos/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
449 449 } else {
450 450 var se = param.replace("?", "");//去掉问号,防止问号和要去掉的参数相连
451 451 var split = se.split("&");
... ... @@ -455,7 +455,7 @@
455 455 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
456 456 }
457 457 h = h.substring(1, h.length);
458   - window.location.href = "/videos/page?" + h + "&pageSize=" + pageSize;
  458 + window.location.href = "/videos/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
459 459 }
460 460 }
461 461  
... ... @@ -503,7 +503,7 @@
503 503 function quanbu() {
504 504 updateValue();
505 505 var expand_list_state = $("#forms").attr("expand_list_state");
506   - 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 + "&expand_list_state=" + expand_list_state;
  506 + 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 + "&page=" + 1 + "&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 + "&expand_list_state=" + expand_list_state;
507 507  
508 508 }
509 509  
... ... @@ -512,27 +512,27 @@
512 512 updateValue();
513 513 if ($.trim(state) == '') state = 0;
514 514 var receive = 0;
515   - 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;
  515 + 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 + "&page=" + 1 + "&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;
516 516 });
517 517 //我的待审核
518 518 $('#Mydaishen').click(function () {
519 519 updateValue();
520 520 var receive = 1;
521 521 if ($.trim(state) == '') state = 0;
522   - 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;
  522 + 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 + "&page=" + 1 + "&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 523 });
524 524 //我的已审核
525 525 $('#yishen').click(function () {
526 526 updateValue();
527 527 var receive = 1;
528 528 if ($.trim(state) == '') state = 3;//审核状态,3代表通过和拒绝都查询
529   - 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;
  529 + 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 + "&page=" + 1 + "&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;
530 530 });
531 531  
532 532  
533 533 //查询
534 534 $('#videos_query').click(function () {
535   - 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;
  535 + 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 + "&page=" + 1 + "&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 536 });
537 537 /*全选的操作*/
538 538 $('#select_all').click(function () {
... ...