Merge pull request #174 from 17hao/issue-153-authority

Tracking delete account

kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/AccountService.java

@@ -33,7 +33,7 @@ public interface AccountService {
      * @param username 用户名
      * @return
      */
-    ResultStatus deleteByName(String username);
+    ResultStatus deleteByName(String username, String operator);
 
     /**
      * 更新账号

kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/impl/AccountServiceImpl.java

@@ -6,6 +6,8 @@ import com.xiaojukeji.kafka.manager.account.AccountService;
 import com.xiaojukeji.kafka.manager.account.common.EnterpriseStaff;
 import com.xiaojukeji.kafka.manager.account.component.AbstractEnterpriseStaffService;
 import com.xiaojukeji.kafka.manager.common.bizenum.AccountRoleEnum;
+import com.xiaojukeji.kafka.manager.common.bizenum.ModuleEnum;
+import com.xiaojukeji.kafka.manager.common.bizenum.OperateEnum;
 import com.xiaojukeji.kafka.manager.common.constant.Constant;
 import com.xiaojukeji.kafka.manager.common.entity.Result;
 import com.xiaojukeji.kafka.manager.common.entity.ResultStatus;
@@ -15,6 +17,7 @@ import com.xiaojukeji.kafka.manager.common.utils.EncryptUtil;
 import com.xiaojukeji.kafka.manager.common.utils.ValidateUtils;
 import com.xiaojukeji.kafka.manager.dao.AccountDao;
 import com.xiaojukeji.kafka.manager.service.service.ConfigService;
+import com.xiaojukeji.kafka.manager.service.service.OperateRecordService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +51,9 @@ public class AccountServiceImpl implements AccountService {
     @Autowired
     private AbstractEnterpriseStaffService enterpriseStaffService;
 
+    @Autowired
+    private OperateRecordService operateRecordService;
+
     /**
      * 用户组织信息
      * <username, Staff>
@@ -82,9 +88,12 @@ public class AccountServiceImpl implements AccountService {
     }
 
     @Override
-    public ResultStatus deleteByName(String username) {
+    public ResultStatus deleteByName(String username, String operator) {
         try {
             if (accountDao.deleteByName(username) > 0) {
+                Map<String, String> content = new HashMap<>();
+                content.put("username", username);
+                operateRecordService.insert(operator, ModuleEnum.AUTHORITY, username, OperateEnum.DELETE, content);
                 return ResultStatus.SUCCESS;
             }
         } catch (Exception e) {

kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/rd/RdAccountController.java

@@ -2,6 +2,7 @@ package com.xiaojukeji.kafka.manager.web.api.versionone.rd;
 
 import com.xiaojukeji.kafka.manager.common.entity.ResultStatus;
 import com.xiaojukeji.kafka.manager.common.entity.vo.common.AccountVO;
+import com.xiaojukeji.kafka.manager.common.utils.SpringTool;
 import com.xiaojukeji.kafka.manager.common.utils.ValidateUtils;
 import com.xiaojukeji.kafka.manager.common.constant.ApiPrefix;
 import com.xiaojukeji.kafka.manager.web.converters.AccountConverter;
@@ -46,7 +47,7 @@ public class RdAccountController {
     @RequestMapping(value = "accounts", method = RequestMethod.DELETE)
     @ResponseBody
     public Result deleteAccount(@RequestParam("username") String username) {
-        ResultStatus rs = accountService.deleteByName(username);
+        ResultStatus rs = accountService.deleteByName(username, SpringTool.getUserName());
         return Result.buildFrom(rs);
     }