From a6fb88d74c20cc28043d75e8a5097fce49cf9a78 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 15 十月 2021 15:19:42 +0800
Subject: [PATCH] update [重大更新]全业务 增加 接口文档注解 格式化代码
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java | 73 ++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 25 deletions(-)
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 03e5d26..84ab555 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,14 +1,15 @@
package com.ruoyi.system.domain;
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
@@ -19,123 +20,145 @@
/**
* 鎿嶄綔鏃ュ織璁板綍琛� oper_log
*
- * @author ruoyi
+ * @author Lion Li
*/
@Data
-@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_oper_log")
+@ExcelIgnoreUnannotated
+@ApiModel("鎿嶄綔鏃ュ織璁板綍涓氬姟瀵硅薄")
public class SysOperLog implements Serializable {
+
private static final long serialVersionUID = 1L;
/**
* 鏃ュ織涓婚敭
*/
- @Excel(name = "鎿嶄綔搴忓彿", cellType = ColumnType.NUMERIC)
- @TableId(value = "oper_id", type = IdType.AUTO)
+ @ApiModelProperty(value = "鏃ュ織涓婚敭")
+ @ExcelProperty(value = "鏃ュ織涓婚敭")
+ @TableId(value = "oper_id")
private Long operId;
/**
* 鎿嶄綔妯″潡
*/
- @Excel(name = "鎿嶄綔妯″潡")
+ @ApiModelProperty(value = "鎿嶄綔妯″潡")
+ @ExcelProperty(value = "鎿嶄綔妯″潡")
private String title;
/**
* 涓氬姟绫诲瀷锛�0鍏跺畠 1鏂板 2淇敼 3鍒犻櫎锛�
*/
- @Excel(name = "涓氬姟绫诲瀷", readConverterExp = "0=鍏跺畠,1=鏂板,2=淇敼,3=鍒犻櫎,4=鎺堟潈,5=瀵煎嚭,6=瀵煎叆,7=寮洪��,8=鐢熸垚浠ｇ爜,9=娓呯┖鏁版嵁")
+ @ApiModelProperty(value = "涓氬姟绫诲瀷锛�0鍏跺畠 1鏂板 2淇敼 3鍒犻櫎锛�")
+ @ExcelProperty(value = "涓氬姟绫诲瀷", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "sys_oper_type")
private Integer businessType;
/**
* 涓氬姟绫诲瀷鏁扮粍
*/
+ @ApiModelProperty(value = "涓氬姟绫诲瀷鏁扮粍")
@TableField(exist = false)
private Integer[] businessTypes;
/**
* 璇锋眰鏂规硶
*/
- @Excel(name = "璇锋眰鏂规硶")
+ @ApiModelProperty(value = "璇锋眰鏂规硶")
+ @ExcelProperty(value = "璇锋眰鏂规硶")
private String method;
/**
* 璇锋眰鏂瑰紡
*/
- @Excel(name = "璇锋眰鏂瑰紡")
+ @ApiModelProperty(value = "璇锋眰鏂瑰紡")
+ @ExcelProperty(value = "璇锋眰鏂瑰紡")
private String requestMethod;
/**
* 鎿嶄綔绫诲埆锛�0鍏跺畠 1鍚庡彴鐢ㄦ埛 2鎵嬫満绔敤鎴凤級
*/
- @Excel(name = "鎿嶄綔绫诲埆", readConverterExp = "0=鍏跺畠,1=鍚庡彴鐢ㄦ埛,2=鎵嬫満绔敤鎴�")
+ @ApiModelProperty(value = "鎿嶄綔绫诲埆锛�0鍏跺畠 1鍚庡彴鐢ㄦ埛 2鎵嬫満绔敤鎴凤級")
+ @ExcelProperty(value = "鎿嶄綔绫诲埆", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(readConverterExp = "0=鍏跺畠,1=鍚庡彴鐢ㄦ埛,2=鎵嬫満绔敤鎴�")
private Integer operatorType;
/**
* 鎿嶄綔浜哄憳
*/
- @Excel(name = "鎿嶄綔浜哄憳")
+ @ApiModelProperty(value = "鎿嶄綔浜哄憳")
+ @ExcelProperty(value = "鎿嶄綔浜哄憳")
private String operName;
/**
* 閮ㄩ棬鍚嶇О
*/
- @Excel(name = "閮ㄩ棬鍚嶇О")
+ @ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
+ @ExcelProperty(value = "閮ㄩ棬鍚嶇О")
private String deptName;
/**
* 璇锋眰url
*/
- @Excel(name = "璇锋眰鍦板潃")
+ @ApiModelProperty(value = "璇锋眰url")
+ @ExcelProperty(value = "璇锋眰鍦板潃")
private String operUrl;
/**
* 鎿嶄綔鍦板潃
*/
- @Excel(name = "鎿嶄綔鍦板潃")
+ @ApiModelProperty(value = "鎿嶄綔鍦板潃")
+ @ExcelProperty(value = "鎿嶄綔鍦板潃")
private String operIp;
/**
* 鎿嶄綔鍦扮偣
*/
- @Excel(name = "鎿嶄綔鍦扮偣")
+ @ApiModelProperty(value = "鎿嶄綔鍦扮偣")
+ @ExcelProperty(value = "鎿嶄綔鍦扮偣")
private String operLocation;
/**
* 璇锋眰鍙傛暟
*/
- @Excel(name = "璇锋眰鍙傛暟")
+ @ApiModelProperty(value = "璇锋眰鍙傛暟")
+ @ExcelProperty(value = "璇锋眰鍙傛暟")
private String operParam;
/**
* 杩斿洖鍙傛暟
*/
- @Excel(name = "杩斿洖鍙傛暟")
+ @ApiModelProperty(value = "杩斿洖鍙傛暟")
+ @ExcelProperty(value = "杩斿洖鍙傛暟")
private String jsonResult;
/**
* 鎿嶄綔鐘舵�侊紙0姝ｅ父 1寮傚父锛�
*/
- @Excel(name = "鐘舵��", readConverterExp = "0=姝ｅ父,1=寮傚父")
+ @ApiModelProperty(value = "鎿嶄綔鐘舵�侊紙0姝ｅ父 1寮傚父锛�")
+ @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "sys_common_status")
private Integer status;
/**
* 閿欒娑堟伅
*/
- @Excel(name = "閿欒娑堟伅")
+ @ApiModelProperty(value = "閿欒娑堟伅")
+ @ExcelProperty(value = "閿欒娑堟伅")
private String errorMsg;
/**
* 鎿嶄綔鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鎿嶄綔鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鎿嶄綔鏃堕棿")
+ @ExcelProperty(value = "鎿嶄綔鏃堕棿")
private Date operTime;
/**
* 璇锋眰鍙傛暟
*/
+ @ApiModelProperty(value = "璇锋眰鍙傛暟")
@TableField(exist = false)
private Map<String, Object> params = new HashMap<>();
--
Gitblit v1.9.3