From da4e0806569af3e676c88cbbe637debf4d1a57c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Tue, 3 Aug 2021 19:29:59 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=20=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=97=A5=E5=BF=97=E5=AF=BC=E5=87=BA=20=E9=80=82?= =?UTF-8?q?=E9=85=8Deasyexcel=E5=B7=A5=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitor/SysOperlogController.java | 12 +++-- .../com/ruoyi/system/domain/SysOperLog.java | 47 +++++++++++-------- ruoyi-ui/src/views/monitor/operlog/index.vue | 14 +----- ruoyi-ui/src/views/system/oss/index.vue | 4 +- 4 files changed, 37 insertions(+), 40 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java index 97f99206c..c7d1fcdbf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java @@ -5,18 +5,19 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.utils.poi.ExcelUtils; import com.ruoyi.system.domain.SysOperLog; import com.ruoyi.system.service.ISysOperLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** * 操作日志记录 - * + * * @author ruoyi */ @RestController @@ -36,11 +37,12 @@ public class SysOperlogController extends BaseController @Log(title = "操作日志", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('monitor:operlog:export')") @GetMapping("/export") - public AjaxResult export(SysOperLog operLog) + public void export(SysOperLog operLog, HttpServletResponse response) { List list = operLogService.selectOperLogList(operLog); - ExcelUtil util = new ExcelUtil(SysOperLog.class); - return util.exportExcel(list, "操作日志"); + ExcelUtils.exportExcel(list, "操作日志", SysOperLog.class, response); +// ExcelUtil util = new ExcelUtil(SysOperLog.class); +// return util.exportEasyExcel(list, "操作日志"); } @Log(title = "操作日志", businessType = BusinessType.DELETE) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java index 03e5d26fa..8b14c360e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java @@ -1,12 +1,13 @@ package com.ruoyi.system.domain; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; +import com.ruoyi.common.annotation.ExcelDictFormat; +import com.ruoyi.common.convert.ExcelDictConvert; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; @@ -26,26 +27,31 @@ import java.util.Map; @NoArgsConstructor @Accessors(chain = true) @TableName("sys_oper_log") +@ExcelIgnoreUnannotated +//@ColumnWidth(16) +//@HeadRowHeight(14) +//@HeadFontStyle(fontHeightInPoints = 11) public class SysOperLog implements Serializable { private static final long serialVersionUID = 1L; /** * 日志主键 */ - @Excel(name = "操作序号", cellType = ColumnType.NUMERIC) + @ExcelProperty(value = "操作序号") @TableId(value = "oper_id", type = IdType.AUTO) private Long operId; /** * 操作模块 */ - @Excel(name = "操作模块") + @ExcelProperty(value = "操作模块") private String title; /** * 业务类型（0其它 1新增 2修改 3删除） */ - @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据") + @ExcelProperty(value = "业务类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_oper_type") private Integer businessType; /** @@ -57,80 +63,81 @@ public class SysOperLog implements Serializable { /** * 请求方法 */ - @Excel(name = "请求方法") + @ExcelProperty(value = "请求方法") private String method; /** * 请求方式 */ - @Excel(name = "请求方式") + @ExcelProperty(value = "请求方式") private String requestMethod; /** * 操作类别（0其它 1后台用户 2手机端用户） */ - @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户") + @ExcelProperty(value = "操作类别", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=其它,1=后台用户,2=手机端用户") private Integer operatorType; /** * 操作人员 */ - @Excel(name = "操作人员") + @ExcelProperty(value = "操作人员") private String operName; /** * 部门名称 */ - @Excel(name = "部门名称") + @ExcelProperty(value = "部门名称") private String deptName; /** * 请求url */ - @Excel(name = "请求地址") + @ExcelProperty(value = "请求地址") private String operUrl; /** * 操作地址 */ - @Excel(name = "操作地址") + @ExcelProperty(value = "操作地址") private String operIp; /** * 操作地点 */ - @Excel(name = "操作地点") + @ExcelProperty(value = "操作地点") private String operLocation; /** * 请求参数 */ - @Excel(name = "请求参数") + @ExcelProperty(value = "请求参数") private String operParam; /** * 返回参数 */ - @Excel(name = "返回参数") + @ExcelProperty(value = "返回参数") private String jsonResult; /** * 操作状态（0正常 1异常） */ - @Excel(name = "状态", readConverterExp = "0=正常,1=异常") + @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_common_status") private Integer status; /** * 错误消息 */ - @Excel(name = "错误消息") + @ExcelProperty(value = "错误消息") private String errorMsg; /** * 操作时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @ExcelProperty(value = "操作时间") private Date operTime; /** diff --git a/ruoyi-ui/src/views/monitor/operlog/index.vue b/ruoyi-ui/src/views/monitor/operlog/index.vue index ff6c7989a..08f3d432d 100644 --- a/ruoyi-ui/src/views/monitor/operlog/index.vue +++ b/ruoyi-ui/src/views/monitor/operlog/index.vue @@ -189,6 +189,7 @@