Merge branch 'system-zjy' of uskycloud/usky-cloud into system-165

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/web/MceReceiveController.java

@@ -3,6 +3,8 @@ package com.usky.system.controller.web;
 
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.system.domain.MceReceive;
 import com.usky.system.service.MceReceiveService;
 import io.swagger.models.auth.In;
@@ -110,6 +112,7 @@ public class MceReceiveController {
      * 消息接收接口
      * @return
      */
+    @Log(title = "新增发布消息", businessType = BusinessType.INSERT)
     @PostMapping("/mceAdd")
     ApiResult<Void> add(@RequestBody String mceReceive){
         mceReceiveService.add(mceReceive);
@@ -119,6 +122,7 @@ public class MceReceiveController {
     /**
      * 删除
      */
+    @Log(title = "删除已发布消息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{id}")
     public ApiResult<Void> removeById(@PathVariable("id") Integer id)
     {

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

@@ -3,6 +3,8 @@ package com.usky.system.controller.web;
 
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.exception.BusinessErrorCode;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.controller.web.page.TableDataInfo;
 import com.usky.system.domain.SysConfig;
@@ -58,6 +60,7 @@ public class SysConfigController extends BaseController
     /**
      * 新增参数配置
      */
+    @Log(title = "新增-参数配置", businessType = BusinessType.INSERT)
     @PostMapping
     public ApiResult add(@Validated @RequestBody SysConfig config)
     {
@@ -72,6 +75,7 @@ public class SysConfigController extends BaseController
     /**
      * 修改参数配置
      */
+    @Log(title = "修改-参数配置", businessType = BusinessType.UPDATE)
     @PutMapping
     public ApiResult edit(@Validated @RequestBody SysConfig config)
     {
@@ -86,6 +90,7 @@ public class SysConfigController extends BaseController
     /**
      * 删除参数配置
      */
+    @Log(title = "删除-参数配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{configIds}")
     public ApiResult remove(@PathVariable Long[] configIds)
     {

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

@@ -4,6 +4,8 @@ package com.usky.system.controller.web;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.exception.BusinessErrorCode;
 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.system.domain.SysDept;
 import com.usky.system.domain.SysUser;
@@ -103,6 +105,7 @@ public class SysDeptController extends BaseController {
     /**
      * 新增部门
      */
+    @Log(title = "新增-部门", businessType = BusinessType.INSERT)
     @PostMapping
     public ApiResult add(@Validated @RequestBody SysDept dept) {
         if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
@@ -116,6 +119,7 @@ public class SysDeptController extends BaseController {
     /**
      * 修改部门
      */
+    @Log(title = "修改-部门", businessType = BusinessType.UPDATE)
     @PutMapping
     public ApiResult edit(@Validated @RequestBody SysDept dept) {
         if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
@@ -133,6 +137,7 @@ public class SysDeptController extends BaseController {
     /**
      * 删除部门
      */
+    @Log(title = "删除-部门", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")
     public ApiResult remove(@PathVariable Long deptId) {
         if (deptService.hasChildByDeptId(deptId)) {

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

@@ -1,6 +1,8 @@
 package com.usky.system.controller.web;
 
 
+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.system.controller.web.page.TableDataInfo;
@@ -65,6 +67,7 @@ public class SysDictDataController extends BaseController
     /**
      * 新增字典类型
      */
+    @Log(title = "新增-字典数据", businessType = BusinessType.INSERT)
     @PostMapping
     public ApiResult add(@Validated @RequestBody SysDictData dict)
     {
@@ -75,6 +78,7 @@ public class SysDictDataController extends BaseController
     /**
      * 修改保存字典类型
      */
+    @Log(title = "修改-字典数据", businessType = BusinessType.UPDATE)
     @PutMapping
     public ApiResult edit(@Validated @RequestBody SysDictData dict)
     {
@@ -85,6 +89,7 @@ public class SysDictDataController extends BaseController
     /**
      * 删除字典类型
      */
+    @Log(title = "删除-字典数据", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictCodes}")
     public ApiResult remove(@PathVariable Long[] dictCodes)
     {

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

@@ -1,6 +1,8 @@
 package com.usky.system.controller.web;
 
 
+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.exception.BusinessErrorCode;
@@ -47,6 +49,7 @@ public class SysDictTypeController extends BaseController
     /**
      * 新增字典类型
      */
+    @Log(title = "新增-字典类型", businessType = BusinessType.INSERT)
     @PostMapping
     public ApiResult add(@Validated @RequestBody SysDictType dict)
     {
@@ -62,6 +65,7 @@ public class SysDictTypeController extends BaseController
     /**
      * 修改字典类型
      */
+    @Log(title = "修改-字典类型", businessType = BusinessType.UPDATE)
     @PutMapping
     public ApiResult edit(@Validated @RequestBody SysDictType dict)
     {
@@ -76,6 +80,7 @@ public class SysDictTypeController extends BaseController
     /**
      * 删除字典类型
      */
+    @Log(title = "删除-字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictIds}")
     public ApiResult remove(@PathVariable Long[] dictIds)
     {

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/SysMenuController.java

@@ -108,6 +108,7 @@ public class SysMenuController extends BaseController
     /**
      * 新增菜单
      */
+    @Log(title = "新增-菜单", businessType = BusinessType.INSERT)
     @PostMapping
     public ApiResult add(@Validated @RequestBody SysMenu menu)
     {
@@ -127,6 +128,7 @@ public class SysMenuController extends BaseController
     /**
      * 修改菜单
      */
+    @Log(title = "修改-菜单", businessType = BusinessType.UPDATE)
     @PutMapping
     public ApiResult edit(@Validated @RequestBody SysMenu menu)
     {
@@ -150,6 +152,7 @@ public class SysMenuController extends BaseController
     /**
      * 删除菜单
      */
+    @Log(title = "删除-菜单", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
     public ApiResult remove(@PathVariable("menuId") Long menuId)
     {
@@ -218,7 +221,7 @@ public class SysMenuController extends BaseController
      * @param tenantMenu
      * @return
      */
-    @Log(title = "修改菜单昵称", businessType = BusinessType.UPDATE)
+    @Log(title = "修改-菜单昵称", businessType = BusinessType.UPDATE)
     @PutMapping("/updateTenantMenu")
     public ApiResult<Void> updateTenantMenu(@RequestBody SysTenantMenu tenantMenu)
     {

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

@@ -1,5 +1,7 @@
 package com.usky.system.controller.web;
 
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.common.security.annotation.RequiresPermissions;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
@@ -47,6 +49,7 @@ public class SysNoticeController extends BaseController
     /**
      * 新增通知公告
      */
+    @Log(title = "新增-通知公告", businessType = BusinessType.INSERT)
     @PostMapping
     public ApiResult add(@Validated @RequestBody SysNotice notice)
     {
@@ -57,6 +60,7 @@ public class SysNoticeController extends BaseController
     /**
      * 修改通知公告
      */
+    @Log(title = "修改-通知公告", businessType = BusinessType.UPDATE)
     @PutMapping
     public ApiResult edit(@Validated @RequestBody SysNotice notice)
     {
@@ -67,6 +71,7 @@ public class SysNoticeController extends BaseController
     /**
      * 删除通知公告
      */
+    @Log(title = "删除-通知公告", businessType = BusinessType.DELETE)
     @DeleteMapping("/{noticeIds}")
     public ApiResult remove(@PathVariable Long[] noticeIds)
     {

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/SysPlatformController.java

@@ -105,7 +105,7 @@ public class SysPlatformController {
      * @param platformMenuVo
      * @return
      */
-//    @Log(title = "平台挂管理", businessType = BusinessType.INSERT)
+    @Log(title = "PC端应用菜单编辑", businessType = BusinessType.INSERT)
     @PostMapping("updatePlatformMenu")
     public ApiResult<Void> updatePlatformMenu(@RequestBody PlatformMenuVo platformMenuVo) {
         sysPlatformService.updatePlatformMenu(platformMenuVo);
@@ -119,7 +119,7 @@ public class SysPlatformController {
      * @param mobilePlatformMenuVO
      * @return
      */
-//    @Log(title = "平台挂管理", businessType = BusinessType.INSERT)
+    @Log(title = "移动端应用菜单编辑", businessType = BusinessType.INSERT)
     @PostMapping("updateMobilePlatformMenu")
     public ApiResult<Void> updateMobilePlatformMenu(@RequestBody MobilePlatformMenuVO mobilePlatformMenuVO) {
         sysPlatformService.updateMobilePlatformMenu(mobilePlatformMenuVO);

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

@@ -1,6 +1,8 @@
 package com.usky.system.controller.web;
 
 
+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.exception.BusinessErrorCode;
@@ -50,6 +52,7 @@ public class SysPostController extends BaseController
     /**
      * 新增岗位
      */
+    @Log(title = "新增-菜单", businessType = BusinessType.INSERT)
     @PostMapping
     public ApiResult add(@Validated @RequestBody SysPost post)
     {
@@ -70,6 +73,7 @@ public class SysPostController extends BaseController
      * 修改岗位
      */
 //    @PreAuthorize("@ss.hasPermi('system:post:edit')")
+    @Log(title = "修改-菜单", businessType = BusinessType.UPDATE)
     @PutMapping
     public ApiResult edit(@Validated @RequestBody SysPost post)
     {
@@ -88,6 +92,7 @@ public class SysPostController extends BaseController
     /**
      * 删除岗位
      */
+    @Log(title = "删除-菜单", businessType = BusinessType.DELETE)
     @DeleteMapping("/{postIds}")
     public ApiResult remove(@PathVariable Long[] postIds)
     {

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

@@ -1,6 +1,8 @@
 package com.usky.system.controller.web;
 
 
+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.exception.BusinessErrorCode;
@@ -57,6 +59,7 @@ public class SysRoleController extends BaseController
     /**
      * 新增角色
      */
+    @Log(title = "新增-角色", businessType = BusinessType.INSERT)
     @PostMapping
     public ApiResult add(@Validated @RequestBody SysRole role)
     {
@@ -77,6 +80,7 @@ public class SysRoleController extends BaseController
     /**
      * 修改保存角色
      */
+    @Log(title = "修改-角色", businessType = BusinessType.UPDATE)
     @PutMapping
     public ApiResult edit(@Validated @RequestBody SysRole role)
     {
@@ -96,6 +100,7 @@ public class SysRoleController extends BaseController
     /**
      * 修改保存数据权限
      */
+    @Log(title = "修改-角色", businessType = BusinessType.UPDATE)
     @PutMapping("/dataScope")
     public ApiResult dataScope(@RequestBody SysRole role)
     {
@@ -106,6 +111,7 @@ public class SysRoleController extends BaseController
     /**
      * 状态修改
      */
+    @Log(title = "修改-角色", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
     public ApiResult changeStatus(@RequestBody SysRole role)
     {
@@ -117,6 +123,7 @@ public class SysRoleController extends BaseController
     /**
      * 删除角色
      */
+    @Log(title = "删除-角色", businessType = BusinessType.DELETE)
     @DeleteMapping("/{roleIds}")
     public ApiResult remove(@PathVariable Long[] roleIds)
     {

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

@@ -3,6 +3,8 @@ package com.usky.system.controller.web;
 
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.system.domain.SysMenu;
 import com.usky.system.domain.SysTenantConfig;
 import com.usky.system.service.SysTenantConfigService;
@@ -82,7 +84,7 @@ public class SysTenantConfigController {
      * @param sysTenantConfig
      * @return
      */
-//    @Log(title = "租户管理-系统配置", businessType = BusinessType.INSERT)
+    @Log(title = "新增租户信息", businessType = BusinessType.INSERT)
     @PostMapping("addMiddleConfig")
     public ApiResult<Void> addMiddleConfig(@RequestBody SysTenantConfig sysTenantConfig) {
         sysTenantConfigService.addMiddleConfig(sysTenantConfig);
@@ -95,7 +97,7 @@ public class SysTenantConfigController {
      * @param sysTenantConfig
      * @return
      */
-//    @Log(title = "租户管理-系统配置", businessType = BusinessType.UPDATE)
+    @Log(title = "修改租户信息", businessType = BusinessType.UPDATE)
     @PostMapping("updaMiddleConfig")
     public ApiResult<Void> updaMiddleConfig(@RequestBody SysTenantConfig sysTenantConfig) {
         sysTenantConfigService.updaMiddleConfig(sysTenantConfig);

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,7 +92,10 @@ public class SysOperLog extends BaseEntity
     /** 执行结束时间 */
     private Date endTime;
 
-    /** 执行耗时时间（带单位） */
+    /** 执行耗时时间 */
+    private Long consumingTime;
+
+    /** 执行耗时时间（单位：毫秒） */
     private String consumingTimeWithUnit;
 
     public String getSearchValue() {
@@ -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/SysLoginService.java

@@ -180,6 +180,17 @@ public class SysLoginService {
                 throw new BusinessException("用户名或手机号不能为空");
             }
             loginUser = sysUserService.getAppUserInfo(null, tenantId, phone);
+            // 获取部门ID
+            LambdaQueryWrapper<SysUser> deptQueryWrapper = Wrappers.lambdaQuery();
+            deptQueryWrapper.select(SysUser::getDeptId)
+                    .eq(SysUser::getDelFlag, 0)
+                    .eq(SysUser::getTenantId, tenantId)
+                    .and(w -> w.eq(SysUser::getUserName, username).or().eq(SysUser::getPhonenumber, username));
+            SysUser sysUser = sysUserService.getOne(deptQueryWrapper);
+            Integer deptId = 0; // 默认值为0，假设0表示没有部门ID
+            if (sysUser != null) {
+                deptId = sysUser.getDeptId().intValue(); // 将Long转换为Integer
+            }
         } else if(!StringUtils.isBlank(username) && !StringUtils.isBlank(verify)) {
             LOGGER.info("二维码验证码登录");
             if (StringUtils.isBlank(username)) {
@@ -191,16 +202,6 @@ public class SysLoginService {
             }
             loginUser = sysUserService.getAppUserInfo(username, tenantId, null);
         }
-
-        if (UserStatus.DELETED.getCode().equals(loginUser.getDelFlag())) {
-            asyncManager.insertLog(tenantId,loginUser.getUserName(), Constants.LOGIN_FAIL, "对不起，您的账号已被删除", null);
-            throw new BusinessException("对不起，您的账号：" + username + " 已被删除");
-        }
-        if (UserStatus.DISABLE.getCode().equals(loginUser.getStatus())) {
-            asyncManager.insertLog(tenantId,loginUser.getUserName(), Constants.LOGIN_FAIL, "用户已停用，请联系管理员", null);
-            throw new BusinessException("对不起，您的账号：" + loginUser.getUserName() + " 已停用");
-        }
-
         // 获取部门ID
         LambdaQueryWrapper<SysUser> deptQueryWrapper = Wrappers.lambdaQuery();
         deptQueryWrapper.select(SysUser::getDeptId)
@@ -212,6 +213,20 @@ public class SysLoginService {
         if (sysUser != null) {
             deptId = sysUser.getDeptId().intValue(); // 将Long转换为Integer
         }
+        if (UserStatus.DELETED.getCode().equals(loginUser.getDelFlag())) {
+            asyncManager.insertLog(tenantId,loginUser.getUserName(), Constants.LOGIN_FAIL, "对不起，您的账号已被删除", null);
+            throw new BusinessException("对不起，您的账号：" + username + " 已被删除");
+        }
+        if (UserStatus.DISABLE.getCode().equals(loginUser.getStatus())) {
+            asyncManager.insertLog(tenantId,loginUser.getUserName(), Constants.LOGIN_FAIL, "用户已停用，请联系管理员", null);
+            throw new BusinessException("对不起，您的账号：" + loginUser.getUserName() + " 已停用");
+        }
+
+//        Integer deptId = 0; // 默认值为0，假设0表示没有部门ID
+        // 确保在所有登录成功的路径中都获取部门ID
+        if (loginUser != null && loginUser.getDeptId() != null) {
+            deptId = loginUser.getDeptId().intValue();
+        }
         asyncManager.insertLog(tenantId,loginUser.getUserName(), Constants.LOGIN_SUCCESS, "登录成功", deptId);
         return loginUser;
     }

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