日志模块分页修改

purchase-admin/src/main/java/com/ozs/web/controller/monitor/SysOperlogController.java

@@ -1,13 +1,26 @@
 package com.ozs.web.controller.monitor;
 
+import java.net.UnknownHostException;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ozs.base.domain.BasePolicy;
+import com.ozs.common.utils.file.FileUtils;
+import com.ozs.common.vo.EsMessage;
+import com.ozs.system.domain.vo.requestVo.SysOperLogRequestVo;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ozs.common.annotation.Log;
@@ -31,13 +44,34 @@ public class SysOperlogController extends BaseController
     @Autowired
     private ISysOperLogService operLogService;
 
+//    @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(SysOperLog operLog)
+//    {
+//        startPage();
+//        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+//        return getDataTable(list);
+//    }
+
     @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(SysOperLog operLog)
+    @PostMapping("/list")
+    public AjaxResult list(@RequestBody SysOperLogRequestVo vo)
     {
-        startPage();
-        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
-        return getDataTable(list);
+        LambdaQueryWrapper<SysOperLog> lw = new LambdaQueryWrapper<>();
+        if(!ObjectUtils.isEmpty(vo.getStartTime())){
+            lw.ge(SysOperLog::getOperTime,vo.getStartTime());
+        }
+        if(!ObjectUtils.isEmpty(vo.getStartTime())){
+            lw.le(SysOperLog::getOperTime,vo.getEntTime());
+        }
+        if(!ObjectUtils.isEmpty(vo.getBusinessType())){
+            lw.ge(SysOperLog::getBusinessType,vo.getBusinessType());
+        }
+        if(!ObjectUtils.isEmpty(vo.getStatus())){
+            lw.ge(SysOperLog::getStatus,vo.getStatus());
+        }
+        IPage<SysOperLog> page = operLogService.page(new Page<>(vo.getPageNum(), vo.getPageSize()), lw);
+        return success(page);
     }
 
     @Log(title = "操作日志", businessType = BusinessType.EXPORT)

purchase-common/src/main/java/com/ozs/common/core/domain/entity/SysMenu.java

@@ -5,6 +5,8 @@ import java.util.List;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ozs.common.core.domain.BaseEntity;
@@ -64,6 +66,7 @@ public class SysMenu extends BaseEntity
     private String icon;
 
     /** 子菜单 */
+    @TableField(exist = false)
     private List<SysMenu> children = new ArrayList<SysMenu>();
 
     public Long getMenuId()

purchase-common/src/main/java/com/ozs/common/core/domain/model/LoginUser.java

@@ -133,6 +133,11 @@ public class LoginUser implements UserDetails
         return user.getUserName();
     }
 
+    public String getNickName()
+    {
+        return user.getNickName();
+    }
+
     /**
      * 账户是否未过期,过期无法验证
      */

purchase-framework/src/main/java/com/ozs/framework/aspectj/LogAspect.java

@@ -80,7 +80,7 @@ public class LogAspect
             operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
             if (loginUser != null)
             {
-                operLog.setOperName(loginUser.getUsername());
+                operLog.setOperName(loginUser.getNickName());
             }
 
             if (e != null)

purchase-system/src/main/java/com/ozs/system/domain/SysOperLog.java

@@ -1,6 +1,8 @@
 package com.ozs.system.domain;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.annotation.Excel.ColumnType;
@@ -28,6 +30,7 @@ public class SysOperLog extends BaseEntity
     private Integer businessType;
 
     /** 业务类型数组 */
+    @TableField(exist = false)
     private Integer[] businessTypes;
 
     /** 请求方法 */

purchase-system/src/main/java/com/ozs/system/domain/vo/requestVo/SysOperLogRequestVo.java

@@ -0,0 +1,28 @@
+package com.ozs.system.domain.vo.requestVo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ozs.common.vo.PageVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class SysOperLogRequestVo extends PageVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private Integer businessType;
+    // 开始时间
+    @ApiModelProperty("开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    // 结束时间
+    @ApiModelProperty("结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date entTime;
+    private Integer status;
+}

purchase-system/src/main/java/com/ozs/system/mapper/SysOperLogMapper.java

@@ -2,6 +2,8 @@ package com.ozs.system.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ozs.base.domain.BasePolicy;
 import com.ozs.system.domain.SysOperLog;
 
 /**
@@ -9,7 +11,7 @@ import com.ozs.system.domain.SysOperLog;
  *
  * @author ruoyi
  */
-public interface SysOperLogMapper
+public interface SysOperLogMapper extends BaseMapper<SysOperLog>
 {
     /**
      * 新增操作日志

purchase-system/src/main/java/com/ozs/system/service/ISysOperLogService.java

@@ -2,6 +2,8 @@ package com.ozs.system.service;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ozs.base.domain.BasePolicy;
 import com.ozs.system.domain.SysOperLog;
 
 /**
@@ -9,7 +11,7 @@ import com.ozs.system.domain.SysOperLog;
  *
  * @author ruoyi
  */
-public interface ISysOperLogService
+public interface ISysOperLogService extends IService<SysOperLog>
 {
     /**
      * 新增操作日志

purchase-system/src/main/java/com/ozs/system/service/impl/SysOperLogServiceImpl.java

@@ -2,6 +2,9 @@ package com.ozs.system.service.impl;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ozs.base.domain.BasePolicy;
+import com.ozs.base.mapper.BasePolicyMapper;
 import com.ozs.system.domain.SysOperLog;
 import com.ozs.system.mapper.SysOperLogMapper;
 import com.ozs.system.service.ISysOperLogService;
@@ -14,7 +17,7 @@ import org.springframework.stereotype.Service;
  * @author ruoyi
  */
 @Service
-public class SysOperLogServiceImpl implements ISysOperLogService
+public class SysOperLogServiceImpl extends ServiceImpl<SysOperLogMapper, SysOperLog> implements ISysOperLogService
 {
     @Autowired
     private SysOperLogMapper operLogMapper;