jinshihui 5 ore fa
parent
commit
1daf5e907c

+ 4 - 5
nightFragrance-common/src/main/java/com/ylx/common/annotation/Log.java

@@ -5,6 +5,7 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import com.ylx.common.enums.BusinessType;
 import com.ylx.common.enums.OperatorType;
 
@@ -12,20 +13,18 @@ import com.ylx.common.enums.OperatorType;
  * 自定义操作日志记录注解
  *
  * @author ylx
- *
  */
-@Target({ ElementType.PARAMETER, ElementType.METHOD })
+@Target({ElementType.PARAMETER, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-public @interface Log
-{
+public @interface Log {
     /**
      * 模块
      */
     public String title() default "";
 
     /**
-     * 功能
+     * 业务操作类型
      */
     public BusinessType businessType() default BusinessType.OTHER;
 

+ 1 - 3
nightFragrance-common/src/main/java/com/ylx/common/enums/BusinessStatus.java

@@ -4,10 +4,8 @@ package com.ylx.common.enums;
  * 操作状态
  *
  * @author ylx
- *
  */
-public enum BusinessStatus
-{
+public enum BusinessStatus {
     /**
      * 成功
      */

+ 1 - 2
nightFragrance-common/src/main/java/com/ylx/common/enums/BusinessType.java

@@ -5,8 +5,7 @@ package com.ylx.common.enums;
  *
  * @author ylx
  */
-public enum BusinessType
-{
+public enum BusinessType {
     /**
      * 其它
      */

+ 7 - 0
nightFragrance-framework/src/main/java/com/ylx/framework/aspectj/LogAspect.java

@@ -87,6 +87,13 @@ public class LogAspect {
         handleLog(joinPoint, controllerLog, e, null);
     }
 
+    /**
+     * 处理日志记录
+     * @param joinPoint
+     * @param controllerLog
+     * @param e
+     * @param jsonResult
+     */
     protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult) {
         try {
             // 获取当前的用户

+ 96 - 92
nightFragrance-system/src/main/java/com/ylx/system/domain/SysOperLog.java

@@ -1,6 +1,7 @@
 package com.ylx.system.domain;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ylx.common.annotation.Excel;
 import com.ylx.common.annotation.Excel.ColumnType;
@@ -13,261 +14,264 @@ import lombok.Data;
  * @author ylx
  */
 @Data
-public class SysOperLog extends BaseEntity
-{
+public class SysOperLog extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 日志主键 */
+    /**
+     * 日志主键
+     */
     @Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
     private Long operId;
 
-    /** 操作模块 */
+    /**
+     * 操作模块
+     */
     @Excel(name = "操作模块")
     private String title;
 
-    /** 业务类型(0其它 1新增 2修改 3删除) */
+    /**
+     * 业务类型(0其它 1新增 2修改 3删除)
+     */
     @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
     private Integer businessType;
 
-    /** 业务类型数组 */
+    /**
+     * 业务类型数组
+     */
     private Integer[] businessTypes;
 
-    /** 请求方法 */
+    /**
+     * 请求方法
+     */
     @Excel(name = "请求方法")
     private String method;
 
+    /**
+     * token
+     */
     @Excel(name = "heat")
     private String heat;
-    /** 请求方式 */
+
+    /**
+     * 请求方式
+     */
     @Excel(name = "请求方式")
     private String requestMethod;
 
-    /** 操作类别(0其它 1后台用户 2手机端用户) */
+    /**
+     * 操作类别(0其它 1后台用户 2手机端用户)
+     */
     @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
     private Integer operatorType;
 
-    /** 操作人员 */
+    /**
+     * 操作人员
+     */
     @Excel(name = "操作人员")
     private String operName;
 
-    /** 部门名称 */
+    /**
+     * 部门名称
+     */
     @Excel(name = "部门名称")
     private String deptName;
 
-    /** 请求url */
+    /**
+     * 请求url
+     */
     @Excel(name = "请求地址")
     private String operUrl;
 
-    /** 操作地址 */
+    /**
+     * 操作地址
+     */
     @Excel(name = "操作地址")
     private String operIp;
 
-    /** 操作地点 */
+    /**
+     * 操作地点
+     */
     @Excel(name = "操作地点")
     private String operLocation;
 
-    /** 请求参数 */
+    /**
+     * 请求参数
+     */
     @Excel(name = "请求参数")
     private String operParam;
 
-    /** 返回参数 */
+    /**
+     * 返回参数
+     */
     @Excel(name = "返回参数")
     private String jsonResult;
 
-    /** 操作状态(0正常 1异常) */
+    /**
+     * 操作状态(0正常 1异常)
+     */
     @Excel(name = "状态", readConverterExp = "0=正常,1=异常")
     private Integer status;
 
-    /** 错误消息 */
+    /**
+     * 错误消息
+     */
     @Excel(name = "错误消息")
     private String errorMsg;
 
-    /** 操作时间 */
+    /**
+     * 操作时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date operTime;
 
-    /** 消耗时间 */
+    /**
+     * 消耗时间
+     */
     @Excel(name = "消耗时间", suffix = "毫秒")
     private Long costTime;
 
-    public Long getOperId()
-    {
+    public Long getOperId() {
         return operId;
     }
 
-    public void setOperId(Long operId)
-    {
+    public void setOperId(Long operId) {
         this.operId = operId;
     }
 
-    public String getTitle()
-    {
+    public String getTitle() {
         return title;
     }
 
-    public void setTitle(String title)
-    {
+    public void setTitle(String title) {
         this.title = title;
     }
 
-    public Integer getBusinessType()
-    {
+    public Integer getBusinessType() {
         return businessType;
     }
 
-    public void setBusinessType(Integer businessType)
-    {
+    public void setBusinessType(Integer businessType) {
         this.businessType = businessType;
     }
 
-    public Integer[] getBusinessTypes()
-    {
+    public Integer[] getBusinessTypes() {
         return businessTypes;
     }
 
-    public void setBusinessTypes(Integer[] businessTypes)
-    {
+    public void setBusinessTypes(Integer[] businessTypes) {
         this.businessTypes = businessTypes;
     }
 
-    public String getMethod()
-    {
+    public String getMethod() {
         return method;
     }
 
-    public void setMethod(String method)
-    {
+    public void setMethod(String method) {
         this.method = method;
     }
 
-    public String getRequestMethod()
-    {
+    public String getRequestMethod() {
         return requestMethod;
     }
 
-    public void setRequestMethod(String requestMethod)
-    {
+    public void setRequestMethod(String requestMethod) {
         this.requestMethod = requestMethod;
     }
 
-    public Integer getOperatorType()
-    {
+    public Integer getOperatorType() {
         return operatorType;
     }
 
-    public void setOperatorType(Integer operatorType)
-    {
+    public void setOperatorType(Integer operatorType) {
         this.operatorType = operatorType;
     }
 
-    public String getOperName()
-    {
+    public String getOperName() {
         return operName;
     }
 
-    public void setOperName(String operName)
-    {
+    public void setOperName(String operName) {
         this.operName = operName;
     }
 
-    public String getDeptName()
-    {
+    public String getDeptName() {
         return deptName;
     }
 
-    public void setDeptName(String deptName)
-    {
+    public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
 
-    public String getOperUrl()
-    {
+    public String getOperUrl() {
         return operUrl;
     }
 
-    public void setOperUrl(String operUrl)
-    {
+    public void setOperUrl(String operUrl) {
         this.operUrl = operUrl;
     }
 
-    public String getOperIp()
-    {
+    public String getOperIp() {
         return operIp;
     }
 
-    public void setOperIp(String operIp)
-    {
+    public void setOperIp(String operIp) {
         this.operIp = operIp;
     }
 
-    public String getOperLocation()
-    {
+    public String getOperLocation() {
         return operLocation;
     }
 
-    public void setOperLocation(String operLocation)
-    {
+    public void setOperLocation(String operLocation) {
         this.operLocation = operLocation;
     }
 
-    public String getOperParam()
-    {
+    public String getOperParam() {
         return operParam;
     }
 
-    public void setOperParam(String operParam)
-    {
+    public void setOperParam(String operParam) {
         this.operParam = operParam;
     }
 
-    public String getJsonResult()
-    {
+    public String getJsonResult() {
         return jsonResult;
     }
 
-    public void setJsonResult(String jsonResult)
-    {
+    public void setJsonResult(String jsonResult) {
         this.jsonResult = jsonResult;
     }
 
-    public Integer getStatus()
-    {
+    public Integer getStatus() {
         return status;
     }
 
-    public void setStatus(Integer status)
-    {
+    public void setStatus(Integer status) {
         this.status = status;
     }
 
-    public String getErrorMsg()
-    {
+    public String getErrorMsg() {
         return errorMsg;
     }
 
-    public void setErrorMsg(String errorMsg)
-    {
+    public void setErrorMsg(String errorMsg) {
         this.errorMsg = errorMsg;
     }
 
-    public Date getOperTime()
-    {
+    public Date getOperTime() {
         return operTime;
     }
 
-    public void setOperTime(Date operTime)
-    {
+    public void setOperTime(Date operTime) {
         this.operTime = operTime;
     }
 
-    public Long getCostTime()
-    {
+    public Long getCostTime() {
         return costTime;
     }
 
-    public void setCostTime(Long costTime)
-    {
+    public void setCostTime(Long costTime) {
         this.costTime = costTime;
     }
 }