开发日志模块的多条件搜索功能

王言钊
1 parent d8692b36
Showing 3 changed files with 27 additions and 7 deletions
src/main/java/com/cnlive/shenhe/dto/ShyLogDTO.java
src/main/java/com/cnlive/shenhe/service/serviceImpl/ShyLogServiceImpl.java
src/main/resources/templates/page/log.html
@@ -15,6 +15,8 @@ public class ShyLogDTO extends ShyLog implements Serializable {
     private Integer pageSize;
+    private String keyword;
+
     public ShyLogDTO() {
     }
@@ -39,11 +41,26 @@ public class ShyLogDTO extends ShyLog implements Serializable {
         this.pageSize = pageSize;
     }
+    public ShyLogDTO(Integer pageNum, Integer pageSize, String keyword) {
+        this.pageNum = pageNum;
+        this.pageSize = pageSize;
+        this.keyword = keyword;
+    }
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+
     @Override
     public String toString() {
         return "ShyLogDTO{" +
                 "pageNum=" + pageNum +
                 ", pageSize=" + pageSize +
+                ", keyword='" + keyword + '\'' +
                 "} " + super.toString();
     }
 }
@@ -2,10 +2,10 @@ package com.cnlive.shenhe.service.serviceImpl;
 import com.alibaba.fastjson.JSON;
 import com.cnlive.shenhe.dto.ShyLogDTO;
-import com.cnlive.shenhe.entity.ShyActivity;
 import com.cnlive.shenhe.entity.ShyLog;
 import com.cnlive.shenhe.mapper.ShyLogMapper;
 import com.cnlive.shenhe.service.ShyLogService;
+import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.slf4j.Logger;
@@ -37,14 +37,17 @@ public class ShyLogServiceImpl implements ShyLogService {
     @Override
     public PageInfo<ShyLog> selectByExample(ShyLogDTO shyLogDTO) {
         logger.info("进入日志查询方法，参数接受对象为，ShyLogDTO:{}", JSON.toJSONString(shyLogDTO));
-        Example example = new Example(ShyActivity.class);
+        Example example = new Example(ShyLog.class);
         //如果为空 按照倒序排序  分页查询所有
         //以创建时间为条件进行倒序
-        example.setOrderByClause("`operation_time` desc");
         Example.Criteria criteria = example.createCriteria();
+        Example.Criteria criteria2 = example.createCriteria();
+        example.setOrderByClause("`operation_time` desc");
         // 如果查询条件不为空  按照条件走模糊查询
-        if (shyLogDTO.getVideoId() != null) {
-            criteria.andLike("videoId", "%" + shyLogDTO.getVideoId() + "%");
+        if (CommonUtils.isNotEmpty(shyLogDTO.getKeyword())) {
+            criteria.andLike("videoId", "%" + shyLogDTO.getKeyword() + "%");
+            criteria2.andLike("operator", "%" + shyLogDTO.getKeyword() + "%");
+            example.or(criteria2);
         }
         PageHelper.startPage(shyLogDTO.getPageNum(), shyLogDTO.getPageSize());
         List<ShyLog> shyLogs = shyLogMapper.selectByExample(example);
@@ -36,7 +36,7 @@
                                         </div>
                                     </div>
                                     <div class="columns columns-right btn-group pull-right">
-                                        <button class="btn btn-default" type="button" name="refresh" title="搜索" id="log_query">刷新</button>
+                                        <button class="btn btn-default" type="button" name="refresh" title="搜索" id="log_query">搜索</button>
                                             <ul class="dropdown-menu" role="menu">
                                                 <li><label><input type="checkbox" data-field="sp_id" value="0"
                                                                   checked="checked"> 视频ID</label></li>
@@ -55,7 +55,7 @@
                                     </div>
                                     <div class="pull-right search">
 <!--                                        <form id="searchForm">-->
-                                            <input class="form-control" type="text"  placeholder="刷新" id="keyword" name="keyword" th:value="${param.keyword}">
+                                            <input class="form-control" type="text"  placeholder="搜索" id="keyword" name="keyword" th:value="${param.keyword}">
 <!--                                        </form>-->
                                     </div>
                                 </div>