Merge branch 'test' into dev

王言钊
2 parents 27112ea6 6669776d
Showing 12 changed files with 39 additions and 39 deletions
src/main/java/com/cnlive/shenhe/controller/UsersController.java
src/main/java/com/cnlive/shenhe/dto/ContentDTO.java
src/main/java/com/cnlive/shenhe/dto/EmailDTO.java
src/main/java/com/cnlive/shenhe/dto/LiveDTO.java
src/main/java/com/cnlive/shenhe/dto/UsersDTO.java
src/main/java/com/cnlive/shenhe/dto/VideosDTO.java
src/main/resources/templates/common/frame.html
src/main/resources/templates/page/content.html
src/main/resources/templates/page/email.html
src/main/resources/templates/page/live.html
src/main/resources/templates/page/users.html
src/main/resources/templates/page/video.html
@@ -111,7 +111,7 @@ public class UsersController extends BaseController {
                 shyLog.setOperationType("登录");
                 shyLog.setRemark(user.getUsername() + "--" + "登录");
                 shyLogService.addShyLog(shyLog);
-                return "redirect:" + redirect_url + "/videos/page?video_title=&start_date=&end_date=&state=0&receive=0&video_priority=";
+                return "redirect:" + redirect_url + "/videos/page?state=0&receive=0&page=1&pageSize=10";
             }
         }
  
@@ -33,7 +33,7 @@ public class ContentDTO extends ShyContent implements Serializable {
     }
  
     public Integer getPage() {
-        return page == null ? 1 : page;
+        return page;
     }
  
     public void setPage(Integer page) {
@@ -41,7 +41,7 @@ public class ContentDTO extends ShyContent implements Serializable {
     }
  
     public Integer getPageSize() {
-        return pageSize == null ? 10 : pageSize;
+        return pageSize;
     }
  
     public void setPageSize(Integer pageSize) {
@@ -25,7 +25,7 @@ public class EmailDTO extends ShyEmail implements Serializable {
     }
  
     public Integer getPage() {
-        return page == null ? 1 : page;
+        return page;
     }
  
     public void setPage(Integer page) {
@@ -33,7 +33,7 @@ public class EmailDTO extends ShyEmail implements Serializable {
     }
  
     public Integer getPageSize() {
-        return pageSize == null ? 10 : pageSize;
+        return pageSize;
     }
  
     public void setPageSize(Integer pageSize) {
@@ -37,7 +37,7 @@ public class LiveDTO extends ShyLive implements Serializable {
     }
  
     public Integer getPage() {
-        return page == null ? 1 : page;
+        return page;
     }
  
     public void setPage(Integer page) {
@@ -45,7 +45,7 @@ public class LiveDTO extends ShyLive implements Serializable {
     }
  
     public Integer getPageSize() {
-        return pageSize == null ? 20 : pageSize;
+        return pageSize;
     }
  
     public void setPageSize(Integer pageSize) {
@@ -25,7 +25,7 @@ public class UsersDTO extends ShyUsers implements Serializable {
     }
  
     public Integer getPage() {
-        return page == null ? 1 : page;
+        return page;
     }
  
     public void setPage(Integer page) {
@@ -33,7 +33,7 @@ public class UsersDTO extends ShyUsers implements Serializable {
     }
  
     public Integer getPageSize() {
-        return pageSize == null ? 10 : pageSize;
+        return pageSize;
     }
  
     public void setPageSize(Integer pageSize) {
@@ -56,7 +56,7 @@ public class VideosDTO extends ShyVideos implements Serializable {
  
  
     public Integer getPage() {
-        return page == null ? 1 : page;
+        return page;
     }
  
     public void setPage(Integer page) {
@@ -64,7 +64,7 @@ public class VideosDTO extends ShyVideos implements Serializable {
     }
  
     public Integer getPageSize() {
-        return pageSize == null ? 10 : pageSize;
+        return pageSize;
     }
  
     public void setPageSize(Integer pageSize) {
@@ -78,11 +78,11 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
                     <span class="menu-item-top">审核云</span>
                 </a>
                 <ul class="treeview-menu">
-                    <li class="active"><a href="/videos/page?state=0&receive=0" id="/videos/page">点播审核</a></li>
+                    <li class="active"><a href="/videos/page?state=0&receive=0&page=1&pageSize=10" id="/videos/page">点播审核</a></li>
                     <li><a href="/audio/page?state=0&receive=0&page=1&pageSize=10" id="/audio/page"> 音频审核</a></li>
-                    <li><a href="/live/page?shenhe_state=0" id="/live/page"> 直播审核</a></li>
+                    <li><a href="/live/page?shenhe_state=0&page=1&pageSize=20" id="/live/page"> 直播审核</a></li>
                     <li><a href="/comments/page?state=0&receive=0&page=1&pageSize=10" id="/comments/page"> 评论审核</a></li>
-                    <li><a href="/content/page?receive_status=0" id="/content/page"> 图文审核</a></li>
+                    <li><a href="/content/page?receive_status=0&page=1&pageSize=10" id="/content/page"> 图文审核</a></li>
                     <li><a href="/topic/page?shenhe_status=0&receive=0&page=1&pageSize=10" id="/topic/page"> 话题审核</a></li>
                     <li><a href="/channel/page?shenhe_status=0&receive=0&page=1&pageSize=10" id="/channel/page"> 频道审核</a></li>
                     <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;
                     <span class="menu-item-top">系统管理</span>
                 </a>
                 <ul class="treeview-menu">
-                    <li><a href="/users/page" id="/users/page"> 审核云用户管理</a></li>
+                    <li><a href="/users/page?page=1&pageSize=10" id="/users/page"> 审核云用户管理</a></li>
                     <li><a href="/sites/page?page=1&pageSize=10" id="/sites/page"> SP白名单管理</a></li>
-                    <li><a href="/email/page" id="/email/page"> 邮件消息管理</a></li>
+                    <li><a href="/email/page?page=1&pageSize=10" id="/email/page"> 邮件消息管理</a></li>
                     <li><a href="/usersFree/page?page=1&pageSize=10" id="/usersFree/page"> 网++白名单管理</a></li>
                     <li><a href="/notSpeak/page?page=1&pageSize=10" id="/notSpeak/page"> 网++禁言管理</a></li>
                     <li><a href="/activity/page?pageNum=1&pageSize=10" id="/activity/page"> 活动管理</a></li>
@@ -451,7 +451,7 @@
                     if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
                 }
                 h = h.substring(1, h.length);
-                window.location.href = "/content/page?" + h + "&pageSize=" + pageSize;
+                window.location.href = "/content/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
             } else {
                 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
                 var split = se.split("&");
@@ -461,7 +461,7 @@
                     if (s.indexOf("page=") < 0) h = h + "&" + split[i];
                 }
                 h = h.substring(1, h.length);
-                window.location.href = "/content/page?" + h + "&pageSize=" + pageSize;
+                window.location.href = "/content/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
             }
         }
  
@@ -501,32 +501,32 @@
         function quanbu() {
             updateValue();
             var expand_list_state = $("#forms").attr("expand_list_state");
-            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;
+            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;
         }
  
         //全部待领
         $('#daishen').click(function () {
             updateValue();
             var receive_status = 0;
-            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;
+            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;
         });
         //我的待审核
         $('#Mydaishen').click(function () {
             updateValue();
             var receive_status = 1;
-            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;
+            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;
         });
         //我的已审核
         $('#yishen').click(function () {
             updateValue();
             var receive_status = 2;
-            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;
+            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;
         });
  
  
         //查询
         $('#videos_query').click(function () {
-            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;
+            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;
         });
         /*全选的操作*/
         $('#select_all').click(function () {
@@ -396,7 +396,7 @@ input:checked + .slider:before {
                      if (s.indexOf("pageSize=") < 0 &&s.indexOf("page=") < 0) h = h + "&" + split[i];
                  }
                  h = h.substring(1, h.length);
-                 window.location.href = "/email/page?" + h + "&pageSize=" + pageSize;
+                 window.location.href = "/email/page?" + h + "&page="+ 1 + "&pageSize=" + pageSize;
              } else {
             	 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
                  var split = se.split("&");
@@ -406,7 +406,7 @@ input:checked + .slider:before {
                      if (s.indexOf("page=") < 0) h = h + "&" + split[i];
                  }
                  h = h.substring(1, h.length);
-                 window.location.href = "/email/page?" + h + "&pageSize=" + pageSize;
+                 window.location.href = "/email/page?" + h + "&page="+ 1 + "&pageSize=" + pageSize;
              }
         }
  
@@ -415,7 +415,7 @@ input:checked + .slider:before {
         	var email = $("#email_query").val();
         	var remark = $("#remark_query").val();
         	var pageSize = $("#pageSize").val();
-        	window.location.href = "/email/page?email=" + email + "&remark=" + remark+ "&pageSize=" + pageSize;
+        	window.location.href = "/email/page?email=" + email + "&remark=" + remark + "&page="+ 1 + "&pageSize=" + pageSize;
 		});
  
       //鼠标回车事件
@@ -490,7 +490,7 @@
                 contentId = $("#contentId").val();
             }
             var expand_list_state = $("#forms").attr("expand_list_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 + "&expand_list_state=" + expand_list_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 + "&page=" + 1  + "&pageSize=" + count + "&shenhe_state=" + shenhe_state + "&contentId=" + contentId + "&expand_list_state=" + expand_list_state;
         }
  
         //全部
@@ -770,7 +770,7 @@
                     if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
                 }
                 h = h.substring(1, h.length);
-                window.location.href = "/live/page?" + h + "&pageSize=" + pageSize;
+                window.location.href = "/live/page?" + h + "&page=" + 1  + "&pageSize=" + pageSize;
             } else {
                 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
                 var split = se.split("&");
@@ -780,7 +780,7 @@
                     if (s.indexOf("page=") < 0) h = h + "&" + split[i];
                 }
                 h = h.substring(1, h.length);
-                window.location.href = "/live/page?" + h + "&pageSize=" + pageSize;
+                window.location.href = "/live/page?" + h + "&page=" + 1  + "&pageSize=" + pageSize;
             }
         }
  
@@ -297,7 +297,7 @@
                      if (s.indexOf("pageSize=") < 0 &&s.indexOf("page=") < 0) h = h + "&" + split[i];
                  }
                  h = h.substring(1, h.length);
-                 window.location.href = "/users/page?" + h + "&pageSize=" + pageSize;
+                 window.location.href = "/users/page?" + h + "&page=" + 1  + "&pageSize=" + pageSize;
              } else {
             	 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
                  var split = se.split("&");
@@ -307,7 +307,7 @@
                      if (s.indexOf("page=") < 0) h = h + "&" + split[i];
                  }
                  h = h.substring(1, h.length);
-                 window.location.href = "/users/page?" + h + "&pageSize=" + pageSize;
+                 window.location.href = "/users/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
              }
         }
  
@@ -318,7 +318,7 @@
         	var sp_id = $("#sp_id").val();
         	var mobile = $("#mobile").val();
         	var pageSize = $("#pageSize").val();
-        	window.location.href = "/users/page?company_brief=" + company_brief + "&username=" + username+ "&sp_id=" + sp_id+ "&mobile=" + mobile+ "&pageSize=" + pageSize;
+        	window.location.href = "/users/page?company_brief=" + company_brief + "&username=" + username+ "&sp_id=" + sp_id+ "&mobile=" + mobile + "&page=" + 1  + "&pageSize=" + pageSize;
 		});
         //鼠标回车事件
         $(document).keyup(function(event){
@@ -445,7 +445,7 @@
                     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;
+                window.location.href = "/videos/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
             } else {
                 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
                 var split = se.split("&");
@@ -455,7 +455,7 @@
                     if (s.indexOf("page=") < 0) h = h + "&" + split[i];
                 }
                 h = h.substring(1, h.length);
-                window.location.href = "/videos/page?" + h + "&pageSize=" + pageSize;
+                window.location.href = "/videos/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
             }
         }
  
@@ -503,7 +503,7 @@
         function quanbu() {
             updateValue();
             var expand_list_state = $("#forms").attr("expand_list_state");
-            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;
+            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;
  
         }
  
@@ -512,27 +512,27 @@
             updateValue();
             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 + "&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;
         });
         //我的待审核
         $('#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;
+            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;
         });
         //我的已审核
         $('#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;
+            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;
         });
  
  
         //查询
         $('#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 + "&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;
         });
         /*全选的操作*/
         $('#select_all').click(function () {