日志添加修复

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/AccountGroupController.java

@@ -30,6 +30,7 @@ import com.gic.auth.service.CollaboratorApiService;
 import com.gic.auth.service.UserApiService;
 import com.gic.auth.web.vo.AccountGroupListVO;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.download.utils.OperationResultUtils;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
@@ -57,14 +58,14 @@ public class AccountGroupController {
     @RequestMapping("/save")
     public RestResponse saveAccountGroup(AccountGroupDTO dto) {
         dto.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
-        return ResultControllerUtils.operationResult(accountGroupApiService.save(dto),
-                ResultControllerUtils.LOG_NEW + "账号分组", dto.getAccountGroupName());
+        return OperationResultUtils.operationResult(accountGroupApiService.save(dto),
+                OperationResultUtils.LOG_NEW + "账号分组", dto.getAccountGroupName());
     }
 
     @RequestMapping("/edit")
     public RestResponse editAccountGroup(AccountGroupDTO dto) {
-        return ResultControllerUtils.operationResult(accountGroupApiService.update(dto),
-                ResultControllerUtils.LOG_EDIT + "账号分组", dto.getAccountGroupName());
+        return OperationResultUtils.operationResult(accountGroupApiService.update(dto),
+                OperationResultUtils.LOG_EDIT + "账号分组", dto.getAccountGroupName());
     }
 
     @RequestMapping("/list")
@@ -85,7 +86,7 @@ public class AccountGroupController {
     public RestResponse deleteAccountGroup(Integer accountGroupId) {
         ServiceResponse<AccountGroupDTO> result = accountGroupApiService.deleteByAccountGroupId(accountGroupId);
         String operationObject = result.isSuccess() ? result.getResult().getAccountGroupName() : null;
-        return ResultControllerUtils.operationResult(result, ResultControllerUtils.LOG_DELETE + "账号分组",
+        return OperationResultUtils.operationResult(result, OperationResultUtils.LOG_DELETE + "账号分组",
                 operationObject);
     }
 
@@ -93,7 +94,7 @@ public class AccountGroupController {
     public RestResponse sortAccountGroup(Integer accountGroupId, Integer sort) {
         ServiceResponse<AccountGroupDTO> result = accountGroupApiService.sort(accountGroupId, sort);
         String operationObject = result.isSuccess() ? result.getResult().getAccountGroupName() : null;
-        return ResultControllerUtils.operationResult(result, ResultControllerUtils.LOG_SORT + "账号分组", operationObject);
+        return OperationResultUtils.operationResult(result, OperationResultUtils.LOG_SORT + "账号分组", operationObject);
     }
 
     /**
@@ -160,12 +161,12 @@ public class AccountGroupController {
             ServiceResponse<String> result = accountGroupApiService.groupingOfUser(userIdList, accountGroupIdList,
                     enterpriseId);
             String operationObject = result.isSuccess() ? result.getResult() : null;
-            return ResultControllerUtils.operationResult(result, "账号分组批量分组组员", operationObject);
+            return OperationResultUtils.operationResult(result, "账号分组批量分组组员", operationObject);
         } else if (type.intValue() == AccountGroupMemberTypeEnum.COLLABORATOR.getCode()) {
             ServiceResponse<String> result = accountGroupApiService.groupingOfCollaborator(userIdList,
                     accountGroupIdList, enterpriseId);
             String operationObject = result.isSuccess() ? result.getResult() : null;
-            return ResultControllerUtils.operationResult(result, "账号分组批量分组组员", operationObject);
+            return OperationResultUtils.operationResult(result, "账号分组批量分组组员", operationObject);
         }
         return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "组员类型错误");
     }
@@ -189,6 +190,6 @@ public class AccountGroupController {
         }
         ServiceResponse<String> result = accountGroupApiService.saveAccountGroupRelFetch(list);
         String operationObject = result.isSuccess() ? result.getResult() : null;
-        return ResultControllerUtils.operationResult(result, "添加组员", operationObject);
+        return OperationResultUtils.operationResult(result, "添加组员", operationObject);
     }
 }

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/CollaboratorController.java

@@ -23,10 +23,7 @@ import com.gic.auth.service.MenuApiService;
 import com.gic.auth.web.vo.CollaboratorDetailVO;
 import com.gic.commons.util.DateUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
-import com.gic.download.utils.DataDownloadUtils;
-import com.gic.download.utils.DownloadReport;
-import com.gic.download.utils.DownloadUtils;
-import com.gic.download.utils.ExecutorPoolSingleton;
+import com.gic.download.utils.*;
 import com.gic.download.utils.log.LogUtils;
 import com.gic.enterprise.response.EnterpriseRestResponse;
 import com.gic.enterprise.utils.ResultControllerUtils;
@@ -125,7 +122,7 @@ public class CollaboratorController extends DownloadUtils{
     public RestResponse auth(String subAppIds, String menuIds, String resourceIds, Integer collaboratorId) {
         ServiceResponse<String> result = collaboratorApiService.auth(subAppIds, menuIds, resourceIds, collaboratorId);
         String operationObject = result.isSuccess() ? result.getResult() : null;
-        return ResultControllerUtils.operationResult(result, "协作人授权", operationObject);
+        return OperationResultUtils.operationResult(result, "协作人授权", operationObject);
     }
 
     @RequestMapping("/app-menu-tree")

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/RoleController.java

@@ -5,10 +5,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.gic.auth.constant.MenuTypeEnum;
-import com.gic.auth.constant.SignConstants;
-import com.gic.auth.web.vo.AppMenuVO;
-import com.gic.commons.util.EntityUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -16,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.constant.MenuLevelConstants;
 import com.gic.auth.constant.MenuProjectConstants;
+import com.gic.auth.constant.SignConstants;
 import com.gic.auth.dto.MenuDTO;
 import com.gic.auth.dto.RoleDTO;
 import com.gic.auth.dto.UserDTO;
@@ -25,7 +22,9 @@ import com.gic.auth.service.RoleApiService;
 import com.gic.auth.service.UserApiService;
 import com.gic.auth.web.vo.RoleDetailVO;
 import com.gic.auth.web.vo.RoleSelectVO;
+import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.download.utils.OperationResultUtils;
 import com.gic.enterprise.response.EnterpriseRestResponse;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
@@ -82,14 +81,14 @@ public class RoleController {
     @RequestMapping("/save")
     public RestResponse save(RoleDTO dto) {
         dto.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
-        return ResultControllerUtils.operationResult(roleApiService.save(dto), ResultControllerUtils.LOG_NEW + "角色",
+        return OperationResultUtils.operationResult(roleApiService.save(dto), OperationResultUtils.LOG_NEW + "角色",
                 dto.getRoleName());
     }
 
     @RequestMapping("/update")
     public RestResponse update(RoleDTO dto) {
         dto.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
-        return ResultControllerUtils.operationResult(roleApiService.update(dto), ResultControllerUtils.LOG_EDIT + "角色",
+        return OperationResultUtils.operationResult(roleApiService.update(dto), OperationResultUtils.LOG_EDIT + "角色",
                 dto.getRoleName());
     }
 
@@ -97,7 +96,7 @@ public class RoleController {
     public RestResponse delete(Integer id) {
         ServiceResponse<String> result = roleApiService.delete(id);
         String operationObject = result.isSuccess() ? result.getResult() : null;
-        return ResultControllerUtils.operationResult(result, ResultControllerUtils.LOG_DELETE + "角色", operationObject);
+        return OperationResultUtils.operationResult(result, OperationResultUtils.LOG_DELETE + "角色", operationObject);
     }
 
     @RequestMapping("/list-role")

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/UserController.java

 package com.gic.auth.web.controller;
 
-import com.gic.download.utils.log.LogUtils;
-import com.gic.enterprise.error.ErrorCode;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +14,9 @@ import com.gic.auth.service.UserApiService;
 import com.gic.auth.web.utils.UserPasswordUtils;
 import com.gic.auth.web.vo.UserDetailVO;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.download.utils.OperationResultUtils;
+import com.gic.download.utils.log.LogUtils;
+import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.response.EnterpriseRestResponse;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
@@ -53,9 +54,9 @@ public class UserController {
         }
         if (userResult.isSuccess()) {
             if (userDTO.getUserId() == null) {
-                LogUtils.createLog(ResultControllerUtils.LOG_NEW + "管理员", userDTO.getUserName());
+                LogUtils.createLog(OperationResultUtils.LOG_NEW + "管理员", userDTO.getUserName());
             } else {
-                LogUtils.createLog(ResultControllerUtils.LOG_EDIT + "管理员", userDTO.getUserName());
+                LogUtils.createLog(OperationResultUtils.LOG_EDIT + "管理员", userDTO.getUserName());
             }
             return RestResponse.success();
         } else {
@@ -79,8 +80,8 @@ public class UserController {
     @RequestMapping("/delete-user-by-id")
     public RestResponse delete(Integer userId) {
         ServiceResponse<String> result = userApiService.delete(userId);
-        return ResultControllerUtils.operationResult(result, ResultControllerUtils.LOG_DELETE + "管理员",
-                ResultControllerUtils.getOperationObject(result));
+        return OperationResultUtils.operationResult(result, OperationResultUtils.LOG_DELETE + "管理员",
+                OperationResultUtils.getOperationObject(result));
     }
 
     @RequestMapping("/list-user")
@@ -108,8 +109,8 @@ public class UserController {
     @RequestMapping("/remove-user-account-group")
     public RestResponse removeUserAccountGroup(Integer type, Integer accountGroupId, Integer userId) {
         ServiceResponse<String> result = userApiService.removeAccountGroup(accountGroupId, userId, type);
-        return ResultControllerUtils.operationResult(result, "移除账号分组",
-                ResultControllerUtils.getOperationObject(result));
+        return OperationResultUtils.operationResult(result, "移除账号分组",
+                OperationResultUtils.getOperationObject(result));
     }
 
 }