优化配置，新增操作日志等

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.constants.UserConstants;
@@ -97,6 +99,7 @@ public class SysDeptController extends BaseController
      * 新增部门
      */
     @PostMapping
+    @Log(title = "新增部门", businessType = BusinessType.INSERT)
     public ApiResult add(@Validated @RequestBody SysDept dept)
     {
         if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
@@ -112,6 +115,7 @@ public class SysDeptController extends BaseController
      * 修改部门
      */
     @PutMapping
+    @Log(title = "修改部门", businessType = BusinessType.UPDATE)
     public ApiResult edit(@Validated @RequestBody SysDept dept)
     {
         if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
@@ -135,6 +139,7 @@ public class SysDeptController extends BaseController
      * 删除部门
      */
     @DeleteMapping("/{deptId}")
+    @Log(title = "删除部门", businessType = BusinessType.DELETE)
     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/SysMenuController.java

@@ -2,6 +2,8 @@ package com.usky.system.controller.web;
 
 
 import com.usky.common.core.util.ServletUtils;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.common.security.service.TokenService;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
@@ -94,6 +96,7 @@ public class SysMenuController extends BaseController
      * 新增菜单
      */
     @PostMapping
+    @Log(title = "新增菜单", businessType = BusinessType.INSERT)
     public ApiResult add(@Validated @RequestBody SysMenu menu)
     {
         if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))

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

@@ -2,6 +2,8 @@ package com.usky.system.controller.web;
 
 
 import com.usky.common.core.bean.ApiResult;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.system.domain.SysMobileBanner;
 import com.usky.system.service.SysMobileBannerService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +33,7 @@ public class SysMobileBannerController extends BaseController{
      * @return
      */
     @PostMapping("addMobileBanner")
+    @Log(title = "租户管理-系统配置-移动端banner图配置新增", businessType = BusinessType.INSERT)
     public ApiResult<Void> addMobileBanner(@RequestBody SysMobileBanner sysMobileBanner){
         sysMobileBannerService.addMobileBanner(sysMobileBanner);
         return ApiResult.success();
@@ -43,6 +46,7 @@ public class SysMobileBannerController extends BaseController{
      * @return
      */
     @PutMapping("updateMobileBanner")
+    @Log(title = "租户管理-系统配置-移动端banner图配置修改", businessType = BusinessType.UPDATE)
     public ApiResult<Void> updateMobileBanner(@RequestBody SysMobileBanner sysMobileBanner) {
         sysMobileBannerService.updateMobileBanner(sysMobileBanner);
         return ApiResult.success();

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

@@ -6,6 +6,7 @@ import com.usky.common.core.constants.CommonConst;
 import com.usky.common.core.exception.BusinessErrorCode;
 import com.usky.common.core.util.ServletUtils;
 import com.usky.common.core.util.StringUtils;
+import com.usky.common.log.annotation.Log;
 import com.usky.common.security.service.TokenService;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.domain.*;

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

@@ -84,7 +84,7 @@ public class SysOperlogController extends BaseController {
 
 
     @DeleteMapping("/{operIds}")
-    @Log(title = "操作日志", businessType = BusinessType.DELETE)
+    @Log(title = "删除操作日志", businessType = BusinessType.DELETE)
     public ApiResult<Void> remove(@PathVariable Long[] operIds) {
         return toAjax(operLogService.deleteOperLogByIds(operIds));
     }

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;
@@ -51,6 +53,7 @@ public class SysPostController extends BaseController
      * 新增岗位
      */
     @PostMapping
+    @Log(title = "新增岗位", businessType = BusinessType.INSERT)
     public ApiResult add(@Validated @RequestBody SysPost post)
     {
         if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
@@ -71,6 +74,7 @@ public class SysPostController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('system:post:edit')")
     @PutMapping
+    @Log(title = "修改岗位", businessType = BusinessType.UPDATE)
     public ApiResult edit(@Validated @RequestBody SysPost post)
     {
         if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
@@ -88,7 +92,8 @@ public class SysPostController extends BaseController
     /**
      * 删除岗位
      */
-    @DeleteMapping("/{postIds}")
+    @DeleteMapping(value = "/{postIds}")
+    @Log(title = "删除岗位", businessType = BusinessType.DELETE)
     public ApiResult remove(@PathVariable Long[] postIds)
     {
         return toAjax(postService.deletePostByIds(postIds));

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

@@ -4,6 +4,8 @@ package com.usky.system.controller.web;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.exception.BusinessException;
 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.service.TokenService;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.domain.SysUser;
@@ -53,6 +55,7 @@ public class SysProfileController extends BaseController
      * 修改用户
      */
     @PutMapping
+    @Log(title = "修改用户个人信息", businessType = BusinessType.UPDATE)
     public ApiResult updateProfile(@RequestBody SysUser user)
     {
         if (StringUtils.isNotEmpty(user.getPhonenumber())
@@ -86,6 +89,7 @@ public class SysProfileController extends BaseController
      * 重置密码
      */
     @PutMapping("/updatePwd")
+    @Log(title = "重置用户密码", businessType = BusinessType.UPDATE)
     public ApiResult updatePwd(String oldPassword, String newPassword)
     {
         LoginUser loginUser = SecurityUtils.getLoginUser();

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;
@@ -58,6 +60,7 @@ public class SysRoleController extends BaseController
      * 新增角色
      */
     @PostMapping
+    @Log(title = "新增角色", businessType = BusinessType.INSERT)
     public ApiResult add(@Validated @RequestBody SysRole role)
     {
         if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
@@ -78,6 +81,7 @@ public class SysRoleController extends BaseController
      * 修改保存角色
      */
     @PutMapping
+    @Log(title = "修改角色", businessType = BusinessType.UPDATE)
     public ApiResult edit(@Validated @RequestBody SysRole role)
     {
         roleService.checkRoleAllowed(role);
@@ -96,7 +100,7 @@ public class SysRoleController extends BaseController
     /**
      * 修改保存数据权限
      */
-    @PutMapping("/dataScope")
+    @Log(title = "修改角色数据权限", businessType = BusinessType.UPDATE)
     public ApiResult dataScope(@RequestBody SysRole role)
     {
         roleService.checkRoleAllowed(role);
@@ -106,7 +110,7 @@ public class SysRoleController extends BaseController
     /**
      * 状态修改
      */
-    @PutMapping("/changeStatus")
+    @Log(title = "修改角色状态", businessType = BusinessType.UPDATE)
     public ApiResult changeStatus(@RequestBody SysRole role)
     {
         roleService.checkRoleAllowed(role);
@@ -117,7 +121,7 @@ public class SysRoleController extends BaseController
     /**
      * 删除角色
      */
-    @DeleteMapping("/{roleIds}")
+    @Log(title = "删除角色", businessType = BusinessType.DELETE)
     public ApiResult remove(@PathVariable Long[] roleIds)
     {
         return toAjax(roleService.deleteRoleByIds(roleIds));
@@ -158,6 +162,7 @@ public class SysRoleController extends BaseController
      * 取消授权用户
      */
     @PutMapping("/authUser/cancel")
+    @Log(title = "取消授权用户", businessType = BusinessType.GRANT)
     public ApiResult cancelAuthUser(@RequestBody SysUserRole userRole)
     {
         return toAjax(roleService.deleteAuthUser(userRole));
@@ -166,7 +171,7 @@ public class SysRoleController extends BaseController
     /**
      * 批量取消授权用户
      */
-    @PutMapping("/authUser/cancelAll")
+    @Log(title = "批量取消授权用户", businessType = BusinessType.GRANT)
     public ApiResult cancelAuthUserAll(Long roleId, Long[] userIds)
     {
         return toAjax(roleService.deleteAuthUsers(roleId, userIds));

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);
@@ -97,6 +99,7 @@ public class SysTenantConfigController {
      */
 //    @Log(title = "租户管理-系统配置", businessType = BusinessType.UPDATE)
     @PostMapping("updaMiddleConfig")
+    @Log(title = "租户管理-系统配置-租户配置修改", businessType = BusinessType.UPDATE)
     public ApiResult<Void> updaMiddleConfig(@RequestBody SysTenantConfig sysTenantConfig) {
         sysTenantConfigService.updaMiddleConfig(sysTenantConfig);
         return ApiResult.success();

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

@@ -2,6 +2,8 @@ package com.usky.system.controller.web;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.usky.common.core.exception.BusinessException;
+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;
@@ -78,6 +80,7 @@ public class SysUserController extends BaseController {
 //    @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @Transactional
     @PostMapping
+    @Log(title = "新增用户", businessType = BusinessType.INSERT)
     public ApiResult<Void> add(@Validated @RequestBody SysUser user) {
        // SysCheckCode sysCheckCode = new SysCheckCode();
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName(), SecurityUtils.getTenantId()))) {
@@ -126,6 +129,7 @@ public class SysUserController extends BaseController {
 //    @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @Transactional
     @PostMapping("/appAdd")
+    @Log(title = "新增APP用户", businessType = BusinessType.INSERT)
     public ApiResult<Void> appAdd(@Validated @RequestBody SysUser user) {
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName(), user.getTenantId()))) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增用户'" + user.getUserName() + "'失败，登录账号已存在");
@@ -142,7 +146,7 @@ public class SysUserController extends BaseController {
      * 修改用户
      */
 //    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @Transactional
+    @Log(title = "修改用户", businessType = BusinessType.UPDATE)
     @PutMapping
     public ApiResult<Void> edit(@Validated @RequestBody SysUser user) {
         userService.checkUserAllowed(user);
@@ -187,7 +191,7 @@ public class SysUserController extends BaseController {
      * 删除用户
      */
 //    @Log(title = "用户管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{userIds}")
+    @Log(title = "批量删除用户", businessType = BusinessType.DELETE)
     public ApiResult<Void> remove(@PathVariable String userIds) {
         String[] userIdsArray = userIds.split(",");
         Long[] userIdsList = Arrays.stream(userIdsArray)
@@ -200,7 +204,7 @@ public class SysUserController extends BaseController {
      * 删除用户
      */
 //    @Log(title = "用户管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{userId}/{password}")
+    @Log(title = "删除用户", businessType = BusinessType.DELETE)
     public ApiResult<Void> remove(@PathVariable Long userId, @PathVariable String password) {
         String password1 = SecurityUtils.encryptPassword(password);
         return toAjax(userService.deleteUserByPwd(userId, password1));
@@ -209,7 +213,7 @@ public class SysUserController extends BaseController {
     /**
      * 重置密码
      */
-    @PutMapping("/resetPwd")
+    @Log(title = "重置用户密码", businessType = BusinessType.INSERT)
     public ApiResult<Void> resetPwd(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         // userService.updateCheckPassword(user);
@@ -235,7 +239,7 @@ public class SysUserController extends BaseController {
     /**
      * 状态修改
      */
-    @PutMapping("/changeStatus")
+    @Log(title = "修改用户状态", businessType = BusinessType.INSERT)
     public ApiResult<Void> changeStatus(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         user.setUpdateBy(SecurityUtils.getUsername());
@@ -246,6 +250,7 @@ public class SysUserController extends BaseController {
      * 根据用户编号获取授权角色
      */
     @GetMapping("/authRole/{userId}")
+    @Log(title = "根据用户编号获取授权角色", businessType = BusinessType.INSERT)
     public ApiResult<Map<String, Object>> authRole(@PathVariable("userId") Long userId) {
         Map<String, Object> ajax = new HashMap<>();
         SysUser user = userService.selectUserById(userId);
@@ -259,6 +264,7 @@ public class SysUserController extends BaseController {
      * 用户授权角色
      */
     @PutMapping("/authRole")
+    @Log(title = "用户授权角色", businessType = BusinessType.INSERT)
     public ApiResult<Void> insertAuthRole(Long userId, Long[] roleIds) {
         userService.insertUserAuth(userId, roleIds);
         return ApiResult.success();

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/TenantConfigController.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.SysPlatform;
 import com.usky.system.domain.SysTenant;
 import com.usky.system.service.SysPlatformService;
@@ -48,7 +50,7 @@ public class TenantConfigController {
      * @param sysTenant
      * @return
      */
-//    @Log(title = "租户管理-单位管理", businessType = BusinessType.INSERT)
+    @Log(title = "租户管理-租户单位配置-新增", businessType = BusinessType.INSERT)
     @PostMapping("addTenantData")
     public ApiResult<Void> addTenantData(@RequestBody SysTenant sysTenant) {
         sysTenantService.addTenantData(sysTenant);
@@ -63,6 +65,7 @@ public class TenantConfigController {
      */
 //    @Log(title = "租户管理-单位管理", businessType = BusinessType.UPDATE)
     @PostMapping("updateTenantData")
+    @Log(title = "租户管理-租户单位配置-修改", businessType = BusinessType.UPDATE)
     public ApiResult<Void> updateTenantData(@RequestBody SysTenant sysTenant) {
         sysTenantService.updateTenantData(sysTenant);
         return ApiResult.success();

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;
@@ -41,6 +43,7 @@ public class UserConfigController extends BaseController {
 //    @Log(title = "租户管理-管理员配置", businessType = BusinessType.INSERT)
     @Transactional
     @PostMapping("/addUserData")
+    @Log(title = "租户管理-管理员配置-新增", businessType = BusinessType.INSERT)
     public ApiResult<Void> addUserData(@Validated @RequestBody SysUser user) {
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName(),user.getTenantId()))) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增用户'" + user.getUserName() + "'失败，登录账号已存在");
@@ -69,6 +72,7 @@ public class UserConfigController extends BaseController {
 //    @Log(title = "租户管理-管理员配置", businessType = BusinessType.UPDATE)
     @Transactional
     @PostMapping("/updateserData")
+    @Log(title = "租户管理-管理员配置-修改", businessType = BusinessType.UPDATE)
     public ApiResult<Void> updateserData(@Validated @RequestBody SysUser user) {
         if(StringUtils.isNotBlank(user.getPassword())){
             user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
@@ -86,7 +90,7 @@ public class UserConfigController extends BaseController {
      * @return
      */
 //    @Log(title = "租户管理-管理员配置", businessType = BusinessType.DELETE)
-    @GetMapping("/delUsers")
+    @Log(title = "租户管理-管理员配置-删除", businessType = BusinessType.DELETE)
     public ApiResult<Void> delUsers(@RequestParam Long userId) {
         SysUser user = new SysUser();
         if (userId == 0 && userId == null) {
@@ -110,7 +114,7 @@ public class UserConfigController extends BaseController {
      * @return
      */
 //    @Log(title = "租户管理-管理员配置", businessType = BusinessType.UPDATE)
-    @PutMapping("/updatePwd")
+    @Log(title = "租户管理-管理员配置-重置密码", businessType = BusinessType.UPDATE)
     public ApiResult updatePwd(String newPassword, Long UserId) {
         SysUser sysUser = userService.selectUserById(UserId);
         if (sysUser.getUserId() == 0 && sysUser.getUserId() == null) {