修复日志、频道模块并测试

王言钊
1 parent cb44c8f5
Showing 5 changed files with 15 additions and 15 deletions
src/main/java/com/cnlive/shenhe/dto/ChannelDTO.java
src/main/java/com/cnlive/shenhe/dto/ShyLogDTO.java
src/main/resources/templates/common/frame.html
src/main/resources/templates/page/channel.html
src/main/resources/templates/page/log.html
@@ -35,7 +35,7 @@ public class ChannelDTO extends ShyChannel implements Serializable {
     }
     public Integer getPage() {
-        return page == null ? 1 : page;
+        return page;
     }
     public void setPage(Integer page) {
@@ -43,7 +43,7 @@ public class ChannelDTO extends ShyChannel implements Serializable {
     }
     public Integer getPageSize() {
-        return pageSize == null ? 10 : pageSize;
+        return pageSize;
     }
     public void setPageSize(Integer pageSize) {
@@ -13,13 +13,13 @@ public class ShyLogDTO extends ShyLog implements Serializable {
     private Integer pageNum;
-    private Integer pageSize ;
+    private Integer pageSize;
     public ShyLogDTO() {
     }
     public Integer getPageNum() {
-        return pageNum == null ? 1 : pageNum;
+        return pageNum;
     }
     public void setPageNum(Integer pageNum) {
@@ -27,14 +27,14 @@ public class ShyLogDTO extends ShyLog implements Serializable {
     }
     public Integer getPageSize() {
-        return pageSize == null ? 10 : pageSize;
+        return pageSize;
     }
     public void setPageSize(Integer pageSize) {
         this.pageSize = pageSize;
     }
-    public ShyLogDTO(Integer page, Integer pageSize) {
+    public ShyLogDTO(Integer pageNum, Integer pageSize) {
         this.pageNum = pageNum;
         this.pageSize = pageSize;
     }
@@ -42,7 +42,7 @@ public class ShyLogDTO extends ShyLog implements Serializable {
     @Override
     public String toString() {
         return "ShyLogDTO{" +
-                "page=" + pageNum +
+                "pageNum=" + pageNum +
                 ", pageSize=" + pageSize +
                 "} " + super.toString();
     }
@@ -84,7 +84,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
                     <li><a href="/comments/page?state=0&receive=0" id="/comments/page"> 评论审核</a></li>
                     <li><a href="/content/page?receive_status=0" id="/content/page"> 图文审核</a></li>
                     <li><a href="/topic/page?shenhe_status=0&receive=0" id="/topic/page"> 话题审核</a></li>
-                    <li><a href="/channel/page?shenhe_status=0&receive=0" id="/channel/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" id="/liveApply/page">直播申请审核</a></li>
                 </ul>
             </li>
@@ -99,7 +99,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
                     <li><a href="/usersFree/page" id="/usersFree/page"> 网++白名单管理</a></li>
                     <li><a href="/notSpeak/page" id="/notSpeak/page"> 网++禁言管理</a></li>
                     <li><a href="/activity/page?pageNum=1&pageSize=10" id="/activity/page"> 活动管理</a></li>
-                    <li><a href="/log/page" id="/log/page"> 日志管理</a></li>
+                    <li><a href="/log/page?pageNum=1&pageSize=10" id="/log/page"> 日志管理</a></li>
                 </ul>
             </li>
         </ul>
@@ -439,7 +439,7 @@
                     if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
                 }
                 h = h.substring(1, h.length);
-                window.location.href = "/channel/page?" + h + "&pageSize=" + pageSize;
+                window.location.href = "/channel/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
             } else {
                 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
                 var split = se.split("&");
@@ -449,7 +449,7 @@
                     if (s.indexOf("page=") < 0) h = h + "&" + split[i];
                 }
                 h = h.substring(1, h.length);
-                window.location.href = "/channel/page?" + h + "&pageSize=" + pageSize;
+                window.location.href = "/channel/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
             }
         }
@@ -487,7 +487,7 @@
             end_date = $("#end_date").val();
             count = $("#pageSize").val();
             var expand_list_state = $("#forms").attr("expand_list_state");
-            window.location.href = "/channel/page?channel_id=" + channel_id + "&start_date=" + start_date + "&end_date=" + end_date + "&channel_name=" + channel_name + "&pageSize=" + count + "&shenhe_status=" + shenhe_status + "&receive=" + receive + "&expand_list_state=" + expand_list_state;
+            window.location.href = "/channel/page?channel_id=" + channel_id + "&start_date=" + start_date + "&end_date=" + end_date + "&channel_name=" + channel_name + "&page=" + 1 + "&pageSize=" + count + "&shenhe_status=" + shenhe_status + "&receive=" + receive + "&expand_list_state=" + expand_list_state;
         }
         //全部
@@ -210,7 +210,7 @@
                      if (s.indexOf("pageSize=") < 0 &&s.indexOf("pageNum=") < 0) h = h + "&" + split[i];
                  }
                  h = h.substring(1, h.length);
-                 window.location.href = "/log/page?" + h + "&pageSize=" + pageSize;
+                 window.location.href = "/log/page?" + h + "&pageNum=" + 1 + "&pageSize=" + pageSize;
              } else {
             	 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
                  var split = se.split("&");
@@ -220,7 +220,7 @@
                      if (s.indexOf("pageNum=") < 0) h = h + "&" + split[i];
                  }
                  h = h.substring(1, h.length);
-                 window.location.href = "/log/page?" + h + "&pageSize=" + pageSize;
+                 window.location.href = "/log/page?" + h + "&pageNum=" + 1 + "&pageSize=" + pageSize;
              }
         }
@@ -228,7 +228,7 @@
         $('#site_query').click(function () {
         	var keyword = $("#keyword").val();
         	var pageSize = $("#pageSize").val();
-        	window.location.href = "/log/page?keyword=" + keyword + "&pageSize=" + pageSize;
+        	window.location.href = "/log/page?keyword=" + keyword + "&pageNum=" + 1 + "&pageSize=" + pageSize;
 		});
     </script>