周伟鹏 / cnlive_shenhe · Commits

Commit a5e061f57005583bb59d8b5ba961017be10ecea5

Authored by 王言钊
1 parent cb44c8f5

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

Inline Side-by-side
Showing 5 changed files with 15 additions and 15 deletions
src/main/java/com/cnlive/shenhe/dto/ChannelDTO.java
  View file @a5e061f
... ... @@ -35,7 +35,7 @@ public class ChannelDTO extends ShyChannel implements Serializable {
35 35 }
36 36  
37 37 public Integer getPage() {
38   - return page == null ? 1 : page;
  38 + return page;
39 39 }
40 40  
41 41 public void setPage(Integer page) {
... ... @@ -43,7 +43,7 @@ public class ChannelDTO extends ShyChannel implements Serializable {
43 43 }
44 44  
45 45 public Integer getPageSize() {
46   - return pageSize == null ? 10 : pageSize;
  46 + return pageSize;
47 47 }
48 48  
49 49 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/ShyLogDTO.java
  View file @a5e061f
... ... @@ -13,13 +13,13 @@ public class ShyLogDTO extends ShyLog implements Serializable {
13 13  
14 14 private Integer pageNum;
15 15  
16   - private Integer pageSize ;
  16 + private Integer pageSize;
17 17  
18 18 public ShyLogDTO() {
19 19 }
20 20  
21 21 public Integer getPageNum() {
22   - return pageNum == null ? 1 : pageNum;
  22 + return pageNum;
23 23 }
24 24  
25 25 public void setPageNum(Integer pageNum) {
... ... @@ -27,14 +27,14 @@ public class ShyLogDTO extends ShyLog implements Serializable {
27 27 }
28 28  
29 29 public Integer getPageSize() {
30   - return pageSize == null ? 10 : pageSize;
  30 + return pageSize;
31 31 }
32 32  
33 33 public void setPageSize(Integer pageSize) {
34 34 this.pageSize = pageSize;
35 35 }
36 36  
37   - public ShyLogDTO(Integer page, Integer pageSize) {
  37 + public ShyLogDTO(Integer pageNum, Integer pageSize) {
38 38 this.pageNum = pageNum;
39 39 this.pageSize = pageSize;
40 40 }
... ... @@ -42,7 +42,7 @@ public class ShyLogDTO extends ShyLog implements Serializable {
42 42 @Override
43 43 public String toString() {
44 44 return "ShyLogDTO{" +
45   - "page=" + pageNum +
  45 + "pageNum=" + pageNum +
46 46 ", pageSize=" + pageSize +
47 47 "} " + super.toString();
48 48 }
... ...
src/main/resources/templates/common/frame.html
  View file @a5e061f
... ... @@ -84,7 +84,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em"
84 84 <li><a href="/comments/page?state=0&receive=0" id="/comments/page"> 评论审核</a></li>
85 85 <li><a href="/content/page?receive_status=0" id="/content/page"> 图文审核</a></li>
86 86 <li><a href="/topic/page?shenhe_status=0&receive=0" id="/topic/page"> 话题审核</a></li>
87   - <li><a href="/channel/page?shenhe_status=0&receive=0" id="/channel/page"> 频道审核</a></li>
  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" id="/liveApply/page">直播申请审核</a></li>
89 89 </ul>
90 90 </li>
... ... @@ -99,7 +99,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
99 99 <li><a href="/usersFree/page" id="/usersFree/page"> 网++白名单管理</a></li>
100 100 <li><a href="/notSpeak/page" id="/notSpeak/page"> 网++禁言管理</a></li>
101 101 <li><a href="/activity/page?pageNum=1&pageSize=10" id="/activity/page"> 活动管理</a></li>
102   - <li><a href="/log/page" id="/log/page"> 日志管理</a></li>
  102 + <li><a href="/log/page?pageNum=1&pageSize=10" id="/log/page"> 日志管理</a></li>
103 103 </ul>
104 104 </li>
105 105 </ul>
... ...
src/main/resources/templates/page/channel.html
  View file @a5e061f
... ... @@ -439,7 +439,7 @@
439 439 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
440 440 }
441 441 h = h.substring(1, h.length);
442   - window.location.href = "/channel/page?" + h + "&pageSize=" + pageSize;
  442 + window.location.href = "/channel/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
443 443 } else {
444 444 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
445 445 var split = se.split("&");
... ... @@ -449,7 +449,7 @@
449 449 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
450 450 }
451 451 h = h.substring(1, h.length);
452   - window.location.href = "/channel/page?" + h + "&pageSize=" + pageSize;
  452 + window.location.href = "/channel/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
453 453 }
454 454 }
455 455  
... ... @@ -487,7 +487,7 @@
487 487 end_date = $("#end_date").val();
488 488 count = $("#pageSize").val();
489 489 var expand_list_state = $("#forms").attr("expand_list_state");
490   - 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;
  490 + 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;
491 491 }
492 492  
493 493 //全部
... ...
src/main/resources/templates/page/log.html
  View file @a5e061f
... ... @@ -210,7 +210,7 @@
210 210 if (s.indexOf("pageSize=") < 0 &&s.indexOf("pageNum=") < 0) h = h + "&" + split[i];
211 211 }
212 212 h = h.substring(1, h.length);
213   - window.location.href = "/log/page?" + h + "&pageSize=" + pageSize;
  213 + window.location.href = "/log/page?" + h + "&pageNum=" + 1 + "&pageSize=" + pageSize;
214 214 } else {
215 215 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
216 216 var split = se.split("&");
... ... @@ -220,7 +220,7 @@
220 220 if (s.indexOf("pageNum=") < 0) h = h + "&" + split[i];
221 221 }
222 222 h = h.substring(1, h.length);
223   - window.location.href = "/log/page?" + h + "&pageSize=" + pageSize;
  223 + window.location.href = "/log/page?" + h + "&pageNum=" + 1 + "&pageSize=" + pageSize;
224 224 }
225 225 }
226 226  
... ... @@ -228,7 +228,7 @@
228 228 $('#site_query').click(function () {
229 229 var keyword = $("#keyword").val();
230 230 var pageSize = $("#pageSize").val();
231   - window.location.href = "/log/page?keyword=" + keyword + "&pageSize=" + pageSize;
  231 + window.location.href = "/log/page?keyword=" + keyword + "&pageNum=" + 1 + "&pageSize=" + pageSize;
232 232 });
233 233  
234 234 </script>
... ...