操作日志入库添加无单位值，优化操作日志注解及使用

base-modules/service-system/service-system-api/src/main/java/com/usky/system/domain/SysOperLogVO.java

@@ -69,6 +69,9 @@ public class SysOperLogVO extends BaseEntity
     /** 执行结束时间 */
     private Date endTime;
 
+    /** 执行耗时时间 */
+    private Long consumingTime;
+
     /** 执行耗时时间（带单位） */
     private String consumingTimeWithUnit;
 
@@ -240,6 +243,10 @@ public class SysOperLogVO extends BaseEntity
 
     public void setEndTime(Date endTime) {this.endTime = endTime;}
 
+    public Long getConsumingTime() {return consumingTime;}
+
+    public void setConsumingTime(Long consumingTime) {this.consumingTime = consumingTime;}
+
     public String getConsumingTimeWithUnit() {return consumingTimeWithUnit;}
 
     public void setConsumingTimeWithUnit(String consumingTimeWithUnit) {this.consumingTimeWithUnit = consumingTimeWithUnit;}

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/api/SysLogControllerApi.java

@@ -1,38 +1,38 @@
-package com.usky.system.controller.api;
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.util.BeanMapperUtils;
-import com.usky.system.RemoteLogService;
-import com.usky.system.domain.SysLogininfor;
-import com.usky.system.domain.SysLogininforVO;
-import com.usky.system.domain.SysOperLog;
-import com.usky.system.domain.SysOperLogVO;
-import com.usky.system.service.ISysLogininforService;
-import com.usky.system.service.ISysOperLogService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author yq
- * @date 2022/7/1 11:08
- */
-@RequestMapping("/logApi")
-@RestController
-public class SysLogControllerApi implements RemoteLogService {
-
-    @Autowired
-    private ISysOperLogService sysOperLogService;
-
-    @Autowired
-    private ISysLogininforService sysLogininforService;
-    @Override
-    public ApiResult<Boolean> saveLog(SysOperLogVO sysOperLog) {
-        return ApiResult.success(sysOperLogService.save(BeanMapperUtils.map(sysOperLog, SysOperLog.class)));
-    }
-
-    @Override
-    public ApiResult<Boolean> saveLogininfor(SysLogininforVO sysLogininfor) {
-        return ApiResult.success(sysLogininforService.save(BeanMapperUtils.map(sysLogininfor, SysLogininfor.class)));
-    }
-}
+//package com.usky.system.controller.api;
+//
+//import com.usky.common.core.bean.ApiResult;
+//import com.usky.common.core.util.BeanMapperUtils;
+//import com.usky.system.RemoteLogService;
+//import com.usky.system.domain.SysLogininfor;
+//import com.usky.system.domain.SysLogininforVO;
+//import com.usky.system.domain.SysOperLog;
+//import com.usky.system.domain.SysOperLogVO;
+//import com.usky.system.service.ISysLogininforService;
+//import com.usky.system.service.ISysOperLogService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+///**
+// * @author yq
+// * @date 2022/7/1 11:08
+// */
+//@RequestMapping("/logApi")
+//@RestController
+//public class SysLogControllerApi implements RemoteLogService {
+//
+//    @Autowired
+//    private ISysOperLogService sysOperLogService;
+//
+//    @Autowired
+//    private ISysLogininforService sysLogininforService;
+//    @Override
+//    public ApiResult<Boolean> saveLog(SysOperLogVO sysOperLog) {
+//        return ApiResult.success(sysOperLogService.save(BeanMapperUtils.map(sysOperLog, SysOperLog.class)));
+//    }
+//
+//    @Override
+//    public ApiResult<Boolean> saveLogininfor(SysLogininforVO sysLogininfor) {
+//        return ApiResult.success(sysLogininforService.save(BeanMapperUtils.map(sysLogininfor, SysLogininfor.class)));
+//    }
+//}

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysLogininforController.java

@@ -28,7 +28,7 @@ public class SysLogininforController extends BaseController
     @Autowired
     private ISysLogininforService logininforService;
 
-    @Log(title = "查询登录日志", businessType = BusinessType.SELECT)
+//    @Log(title = "查询登录日志", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     public ApiResult<TableDataInfo> list(SysLogininfor logininfor)
     {
@@ -53,7 +53,7 @@ public class SysLogininforController extends BaseController
         return toAjax(logininforService.deleteLogininforByIds(infoIds));
     }
 
-
+    @Log(title = "清空登录日志", businessType = BusinessType.CLEAN)
     @DeleteMapping("/clean")
     public ApiResult<Void> clean()
     {

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysOperlogController.java

@@ -43,6 +43,7 @@ public class SysOperlogController extends BaseController
      * @param operLog
      * @throws IOException
      */
+    @Log(title = "操作日志-导出", businessType = BusinessType.EXPORT)
     @PostMapping("listExport")
     public void export(HttpServletResponse response,
                        @RequestParam(value = "exportTitle") String exportTitle,

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysUserController.java

@@ -51,7 +51,7 @@ public class SysUserController extends BaseController
     /**
      * 获取用户列表
      */
-    @Log(title = "用户列表", businessType = BusinessType.SELECT)
+//    @Log(title = "用户列表", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     public ApiResult<TableDataInfo> list(SysUser user)
     {

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/UserConfigController.java

@@ -1,6 +1,8 @@
 package com.usky.system.controller.web;
 
 import com.usky.common.core.util.StringUtils;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
@@ -66,7 +68,7 @@ public class UserConfigController extends BaseController {
      * @param user
      * @return
      */
-//    @Log(title = "租户管理-管理员配置", businessType = BusinessType.UPDATE)
+    @Log(title = "修改租户信息", businessType = BusinessType.UPDATE)
     @Transactional
     @PostMapping("/updateserData")
     public ApiResult<Void> updateserData(@Validated @RequestBody SysUser user) {
@@ -85,7 +87,7 @@ public class UserConfigController extends BaseController {
      * @param userId 用户ID
      * @return
      */
-//    @Log(title = "租户管理-管理员配置", businessType = BusinessType.DELETE)
+    @Log(title = "删除租户", businessType = BusinessType.DELETE)
     @GetMapping("/delUsers")
     public ApiResult<Void> delUsers(@RequestParam Long userId) {
         SysUser user = new SysUser();
@@ -109,7 +111,7 @@ public class UserConfigController extends BaseController {
      * @param UserId      用户ID
      * @return
      */
-//    @Log(title = "租户管理-管理员配置", businessType = BusinessType.UPDATE)
+    @Log(title = "重置租户密码", businessType = BusinessType.UPDATE)
     @PutMapping("/updatePwd")
     public ApiResult updatePwd(String newPassword, Long UserId) {
         SysUser sysUser = userService.selectUserById(UserId);

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/SysOperLog.java

@@ -92,6 +92,9 @@ public class SysOperLog extends BaseEntity
     /** 执行结束时间 */
     private Date endTime;
 
+    /** 执行耗时时间 */
+    private Long consumingTime;
+
     /** 执行耗时时间（带单位） */
     private String consumingTimeWithUnit;
 
@@ -332,6 +335,10 @@ public class SysOperLog extends BaseEntity
 
     public void setEndTime(Date endTime) { this.endTime = endTime; }
 
+    public Long getConsumingTime() {return consumingTime;}
+
+    public void setConsumingTime(Long consumingTime) {this.consumingTime = consumingTime;}
+
     public String getConsumingTimeWithUnit() { return consumingTimeWithUnit; }
 
     public void setConsumingTimeWithUnit(String consumingTimeWithUnit) { this.consumingTimeWithUnit = consumingTimeWithUnit; }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/SysOperLogExportVO.java

@@ -68,6 +68,11 @@ public class SysOperLogExportVO {
     @Excel(name = "执行结束时间")
     private LocalDateTime endTime;
 
-    /** 执行耗时时间（带单位） */
+    /** 执行耗时时间 */
+    @Excel(name = "执行耗时时间")
+    private Long consumingTime;
+
+    /** 执行耗时时间（单位：毫秒） */
+    @Excel(name = "执行耗时时间（带单位）")
     private String consumingTimeWithUnit;
 }

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysOperLogMapper.xml

@@ -26,11 +26,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="createBy"       column="create_by"      />
 		<result property="startTime"     column="start_time"    />
 		<result property="endTime"       column="end_time"      />
+		<result property="consumingTime"   column="consuming_time" />
 		<result property="consumingTimeWithUnit"     column="consuming_time_with_unit"    />
 	</resultMap>
 
 	<sql id="selectOperLogVo">
-        select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time, start_time, end_time, consuming_time_with_unit
+		select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time, start_time, end_time, consuming_time, consuming_time_with_unit
 		from sys_oper_log d
     </sql>
     
@@ -57,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="createBy != null"> create_by, </if>
 			<if test="startTime != null"> start_time, </if>
 			<if test="endTime != null"> end_time, </if>
+			<if test="consumingTime != null"> consuming_time, </if>
 			<if test="consumingTimeWithUnit !=null"> consuming_time_with_unit, </if>
 		</trim>
 		values
@@ -81,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="createBy != null"> #{createBy},</if>
 			<if test="startTime != null"> #{startTime},</if>
 		    <if test="endTime != null"> #{endTime},</if>
+			<if test="consumingTime != null"> #{consumingTime},</if>
 		    <if test="consumingTimeWithUnit !=null"> #{consumingTimeWithUnit},</if>
 		</trim>
 	</insert>
@@ -122,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
 	<select id="selectOperLogListExport" parameterType="com.usky.system.domain.SysOperLog" resultType="com.usky.system.service.vo.SysOperLogExportVO">
-		SELECT oper_id, oper_ip, oper_name, title, (CASE business_type WHEN '0' THEN '其它' WHEN '1' THEN '新增' WHEN '2' THEN '修改' ELSE '删除' END) AS businessType, request_method, (CASE STATUS WHEN '0' THEN '成功' ELSE '失败' END) AS STATUS, oper_time, start_time, end_time, consuming_time_with_unit
+		SELECT oper_id, oper_ip, oper_name, title, (CASE business_type WHEN '0' THEN '其它' WHEN '1' THEN '新增' WHEN '2' THEN '修改' ELSE '删除' END) AS businessType, request_method, (CASE STATUS WHEN '0' THEN '成功' ELSE '失败' END) AS STATUS, oper_time, start_time, end_time, consuming_time, consuming_time_with_unit
 		FROM sys_oper_log d
 		<where>
 			<if test="title != null and title != ''">

usky-common/usky-common-log/src/main/java/com/usky/common/log/aspect/LogAspect.java

@@ -95,6 +95,7 @@ public class LogAspect {
 
             // 将耗时转换为带有单位"ms"的字符串
             String consumingTimeWithUnit = consumingTime + "ms";
+            operLog.setConsumingTime(consumingTime); // 存储耗时
             operLog.setConsumingTimeWithUnit(consumingTimeWithUnit); // 存储带有单位的字符串
 
             // 保存数据库

usky-common/usky-common-log/src/main/java/com/usky/common/log/service/AsyncLogService.java

@@ -15,7 +15,6 @@ import org.springframework.stereotype.Service;
 @Service
 public class AsyncLogService
 {
-    @Qualifier("com.usky.system.RemoteLogService")
     @Autowired
     private RemoteLogService remoteLogService;
 
@@ -25,6 +24,6 @@ public class AsyncLogService
     @Async
     public void saveSysLog(SysOperLogVO sysOperLog)
     {
-        remoteLogService.saveLog(sysOperLog);
+        this.remoteLogService.saveLog(sysOperLog);
     }
 }