完成日志搜索

xiaoan-common/src/main/java/com/xiaoan/common/model/PageDto.java

@@ -15,6 +15,11 @@ public class PageDto {
 
     private int pageSize;
 
+    /**
+     * 搜索条件
+     */
+    private String itemName;
+
 //    private Date startDate;
 //
 //    private Date endDate;

xiaoan-dao/src/main/java/com/xiaoan/dao/backend/LogRepository.java

@@ -16,9 +16,17 @@ import java.util.List;
 @Component
 public interface LogRepository extends IBaseRepository<LogEntity, Long> {
 
-//    @Select(value = "select * from tb_log l left join tb_user u on l.user_id = u.id")
-//    List<LogResponse> findAllToUserName();
-
+    /**
+     * 关联查询
+     */
     @Select(value = "select l.type, l.description, l.create_time, u.user_name, u.real_name from tb_log l left join tb_user u on l.user_id = u.id order by create_time desc")
     List<LogResponse> findAllToUserName();
+
+    @Select(value = "select l.type, l.description, l.create_time, u.user_name, u.real_name from tb_log l left join tb_user u on l.user_id = u.id " +
+            "where (u.user_name like #{itemName} or #{itemName} is null) " +
+            "or (u.real_name like #{itemName} or #{itemName} is null) " +
+            "or (l.description like #{itemName} or #{itemName} is null) " +
+            "or (l.type like #{itemName} or #{itemName} is null) " +
+            "order by create_time desc")
+    List<LogResponse> search(String itemName);
 }

xiaoan-service/src/main/java/com/xiaoan/service/backend/LogService.java

@@ -12,4 +12,6 @@ import java.util.List;
 public interface LogService extends IBaseService<LogEntity, Long> {
 
     List<LogResponse> findAllToUserName();
+
+    List<LogResponse> search(String itemName);
 }

xiaoan-service/src/main/java/com/xiaoan/service/backend/impl/LogServiceImpl.java

@@ -33,4 +33,10 @@ public class LogServiceImpl extends BaseServiceImpl<LogEntity, Long> implements
     public List<LogResponse> findAllToUserName() {
         return entityMapper.findAllToUserName();
     }
+
+    @Override
+    public List<LogResponse> search(String itemName) {
+        itemName = "%" + itemName + "%";
+        return entityMapper.search(itemName);
+    }
 }

xiaoan-web/src/main/java/com/xiaoan/web/backend/LogController.java

@@ -38,7 +38,7 @@ public class LogController extends BaseController {
     private LogService logService;
 
     @WebControllerLog(description = "操作日志-查看日志列表")
-    @ApiOperation("分页获取用户列表")
+    @ApiOperation("分页获取日志列表")
     @PostMapping("list")
     public ResultJson list(@RequestBody PageDto param){
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
@@ -48,6 +48,17 @@ public class LogController extends BaseController {
         return new ResultJson(MsgCode.SUCCESS_CODE, pageInfo);
     }
 
+    @WebControllerLog(description = "操作日志-日志搜索")
+    @ApiOperation("搜索")
+    @PostMapping("search")
+    public ResultJson search(@RequestBody PageDto param){
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+        List<LogResponse> list = logService.search(param.getItemName());
+        PageInfo<LogResponse> pageInfo = new PageInfo<>(list);
+        return new ResultJson(MsgCode.SUCCESS_CODE, pageInfo);
+    }
+
+