完善日志模块的翻页功能

王言钊
1 parent 31821c5c
Showing 3 changed files with 26 additions and 21 deletions
src/main/java/com/cnlive/shenhe/dto/ShyLogDTO.java
src/main/java/com/cnlive/shenhe/serviceImpl/ShyLogServiceImpl.java
src/main/resources/templates/page/log.html
@@ -11,19 +11,19 @@ import java.io.Serializable;
  */
 public class ShyLogDTO extends ShyLog implements Serializable {
  
-    private Integer page;
+    private Integer pageNum;
  
     private Integer pageSize ;
  
     public ShyLogDTO() {
     }
  
-    public Integer getPage() {
-        return page == null ? 1 : page;
+    public Integer getPageNum() {
+        return pageNum == null ? 1 : pageNum;
     }
  
-    public void setPage(Integer pageNum) {
-        this.page = page;
+    public void setPageNum(Integer pageNum) {
+        this.pageNum = pageNum;
     }
  
     public Integer getPageSize() {
@@ -35,14 +35,14 @@ public class ShyLogDTO extends ShyLog implements Serializable {
     }
  
     public ShyLogDTO(Integer page, Integer pageSize) {
-        this.page = page;
+        this.pageNum = pageNum;
         this.pageSize = pageSize;
     }
  
     @Override
     public String toString() {
         return "ShyLogDTO{" +
-                "page=" + page +
+                "page=" + pageNum +
                 ", pageSize=" + pageSize +
                 "} " + super.toString();
     }
@@ -41,7 +41,12 @@ public class ShyLogServiceImpl {
         example.setOrderByClause("`operation_time` desc");
  
         Example.Criteria criteria = example.createCriteria();
-        PageHelper.startPage(shyLogDTO.getPage(), shyLogDTO.getPageSize());
+
+        // 如果查询条件不为空  按照条件走模糊查询
+        if (shyLogDTO.getVideoId() != null) {
+            criteria.andLike("videoId", "%" + shyLogDTO.getVideoId() + "%");
+        }
+        PageHelper.startPage(shyLogDTO.getPageNum(), shyLogDTO.getPageSize());
         List<ShyLog> shyLogs = shyLogMapper.selectByExample(example);
         PageInfo<ShyLog> shyLogPageInfo = new PageInfo<>(shyLogs);
         return shyLogPageInfo;
@@ -120,10 +120,10 @@
                                         <div class="pull-left pagination-detail">
                                        	 <span class="pagination-info" th:text="'共 '+${shyLogPageInfo.total}+' 条记录，每页显示'">共 0 条记录</span>
                                         <select class="" id="pageSize" name="pageSize" onchange="selectPageSize()">
-                                          <option value="10" th:selected="${pageSize==10}">10</option>
-                                          <option value="20" th:selected="${pageSize==20}">20</option>
-                                          <option value="50" th:selected="${pageSize==50}">50</option>
-                                          <option value="100" th:selected="${pageSize==100}">100</option>
+                                          <option value="10" th:selected="${shyLogPageInfo.pageSize==10}">10</option>
+                                          <option value="20" th:selected="${shyLogPageInfo.pageSize==20}">20</option>
+                                          <option value="50" th:selected="${shyLogPageInfo.pageSize==50}">50</option>
+                                          <option value="100" th:selected="${shyLogPageInfo.pageSize==100}">100</option>
                                         </select>
                                         <span class="pagination-info" >条记录</span>
                                         </div>
@@ -181,22 +181,22 @@
         //翻页函数
         function fanye(page) {
             var param = location.search;
-            if (param.indexOf("page=") != -1) {
+            if (param.indexOf("pageNum=") != -1) {
             	var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
                 var split = se.split("&");
                 var h = "";
                 for (var i = 0; i < split.length; i++) {
                     var s = split[i];
-                    if (s.indexOf("page=") < 0) h = h + "&" + split[i];
+                    if (s.indexOf("pageNum=") < 0) h = h + "&" + split[i];
                 }
                 h = h.substring(1, h.length);
-                window.location.href = "/log/page?" + h + "&page=" + page;
+                window.location.href = "/log/page?" + h + "&pageNum=" + page;
             } else {
                 param = param.substring(1, param.length);
-                window.location.href = "/log/page?" + param + "&page=" + page;
+                window.location.href = "/log/page?" + param + "&pageNum=" + page;
             }
         }
-        
+
         //选择每页数量触发函数
         function selectPageSize(){
         	var pageSize=$("#pageSize").val();
@@ -207,23 +207,23 @@
                  var h = "";
                  for (var i = 0; i < split.length; i++) {
                      var s = split[i];
-                     if (s.indexOf("pageSize=") < 0 &&s.indexOf("page=") < 0) h = h + "&" + split[i];
+                     if (s.indexOf("pageSize=") < 0 &&s.indexOf("pageNum=") < 0) h = h + "&" + split[i];
                  }
                  h = h.substring(1, h.length);
-                 window.location.href = "/sites/page?" + h + "&pageSize=" + pageSize;
+                 window.location.href = "/log/page?" + h + "&pageSize=" + pageSize;
              } else {
             	 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
                  var split = se.split("&");
                  var h = "";
                  for (var i = 0; i < split.length; i++) {
                      var s = split[i];
-                     if (s.indexOf("page=") < 0) h = h + "&" + split[i];
+                     if (s.indexOf("pageNum=") < 0) h = h + "&" + split[i];
                  }
                  h = h.substring(1, h.length);
                  window.location.href = "/log/page?" + h + "&pageSize=" + pageSize;
              }
         }
-        
+
         //搜索
         $('#site_query').click(function () {
         	var keyword = $("#keyword").val();