Improve code's cohesion && save jmx properties

kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/OperateRecordService.java

 package com.xiaojukeji.kafka.manager.service.service;
 
+import com.xiaojukeji.kafka.manager.common.bizenum.ModuleEnum;
+import com.xiaojukeji.kafka.manager.common.bizenum.OperateEnum;
 import com.xiaojukeji.kafka.manager.common.entity.dto.rd.OperateRecordDTO;
 import com.xiaojukeji.kafka.manager.common.entity.pojo.OperateRecordDO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author zhongyuankai
@@ -12,5 +15,7 @@ import java.util.List;
 public interface OperateRecordService {
     int insert(OperateRecordDO operateRecordDO);
 
+    int insert(String operator, ModuleEnum module, String resourceName, OperateEnum operate, Map<String, String> content);
+
     List<OperateRecordDO> queryByCondt(OperateRecordDTO dto);
 }

kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/ClusterServiceImpl.java

@@ -17,11 +17,7 @@ import com.xiaojukeji.kafka.manager.dao.ClusterMetricsDao;
 import com.xiaojukeji.kafka.manager.dao.ControllerDao;
 import com.xiaojukeji.kafka.manager.service.cache.LogicalClusterMetadataManager;
 import com.xiaojukeji.kafka.manager.service.cache.PhysicalClusterMetadataManager;
-import com.xiaojukeji.kafka.manager.service.service.ClusterService;
-import com.xiaojukeji.kafka.manager.service.service.ConsumerService;
-import com.xiaojukeji.kafka.manager.service.service.RegionService;
-import com.xiaojukeji.kafka.manager.service.service.ZookeeperService;
-import com.xiaojukeji.kafka.manager.service.utils.ChangeTrackingUtils;
+import com.xiaojukeji.kafka.manager.service.service.*;
 import com.xiaojukeji.kafka.manager.service.utils.ConfigUtils;
 import org.apache.zookeeper.ZooKeeper;
 import org.slf4j.Logger;
@@ -69,7 +65,7 @@ public class ClusterServiceImpl implements ClusterService {
     private ZookeeperService zookeeperService;
 
     @Autowired
-    private ChangeTrackingUtils changeTrackingUtils;
+    private OperateRecordService operateRecordService;
 
     @Override
     public ResultStatus addNew(ClusterDO clusterDO, String operator) {
@@ -84,7 +80,8 @@ public class ClusterServiceImpl implements ClusterService {
             content.put("zk address", clusterDO.getZookeeper());
             content.put("bootstrap servers", clusterDO.getBootstrapServers());
             content.put("security properties", clusterDO.getSecurityProperties());
-            changeTrackingUtils.saveOperateRecord(operator, ModuleEnum.CLUSTER, clusterDO.getClusterName(), OperateEnum.ADD, content);
+            content.put("jmx properties", clusterDO.getJmxProperties());
+            operateRecordService.insert(operator, ModuleEnum.CLUSTER, clusterDO.getClusterName(), OperateEnum.ADD, content);
             if (clusterDao.insert(clusterDO) <= 0) {
                 LOGGER.error("add new cluster failed, clusterDO:{}.", clusterDO);
                 return ResultStatus.MYSQL_ERROR;
@@ -118,7 +115,8 @@ public class ClusterServiceImpl implements ClusterService {
         Map<String, String> content = new HashMap<>();
         content.put("cluster id", clusterDO.getId().toString());
         content.put("security properties", clusterDO.getSecurityProperties());
-        changeTrackingUtils.saveOperateRecord(operator, ModuleEnum.CLUSTER, clusterDO.getClusterName(), OperateEnum.EDIT, content);
+        content.put("jmx properties", clusterDO.getJmxProperties());
+        operateRecordService.insert(operator, ModuleEnum.CLUSTER, clusterDO.getClusterName(), OperateEnum.EDIT, content);
         return updateById(clusterDO);
     }
 
@@ -277,7 +275,7 @@ public class ClusterServiceImpl implements ClusterService {
         try {
             Map<String, String> content = new HashMap<>();
             content.put("cluster id", clusterId.toString());
-            changeTrackingUtils.saveOperateRecord(operator, ModuleEnum.CLUSTER, getClusterName(clusterId).getPhysicalClusterName(), OperateEnum.DELETE, content);
+            operateRecordService.insert(operator, ModuleEnum.CLUSTER, getClusterName(clusterId).getPhysicalClusterName(), OperateEnum.DELETE, content);
             if (clusterDao.deleteById(clusterId) <= 0) {
                 LOGGER.error("delete cluster failed, clusterId:{}.", clusterId);
                 return ResultStatus.MYSQL_ERROR;

kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/OperateRecordServiceImpl.java

 package com.xiaojukeji.kafka.manager.service.service.impl;
 
+import com.xiaojukeji.kafka.manager.common.bizenum.ModuleEnum;
+import com.xiaojukeji.kafka.manager.common.bizenum.OperateEnum;
 import com.xiaojukeji.kafka.manager.common.entity.dto.rd.OperateRecordDTO;
 import com.xiaojukeji.kafka.manager.common.entity.pojo.OperateRecordDO;
+import com.xiaojukeji.kafka.manager.common.utils.JsonUtils;
 import com.xiaojukeji.kafka.manager.common.utils.ValidateUtils;
 import com.xiaojukeji.kafka.manager.dao.OperateRecordDao;
 import com.xiaojukeji.kafka.manager.service.service.OperateRecordService;
@@ -10,6 +13,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author zhongyuankai
@@ -25,6 +29,17 @@ public class OperateRecordServiceImpl implements OperateRecordService {
         return operateRecordDao.insert(operateRecordDO);
     }
 
+    @Override
+    public int insert(String operator, ModuleEnum module, String resourceName, OperateEnum operate, Map<String, String> content) {
+        OperateRecordDO operateRecordDO = new OperateRecordDO();
+        operateRecordDO.setOperator(operator);
+        operateRecordDO.setModuleId(module.getCode());
+        operateRecordDO.setResource(resourceName);
+        operateRecordDO.setOperateId(operate.getCode());
+        operateRecordDO.setContent(JsonUtils.toJSONString(content));
+        return insert(operateRecordDO);
+    }
+
     @Override
     public List<OperateRecordDO> queryByCondt(OperateRecordDTO dto) {
         return operateRecordDao.queryByCondt(

kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/utils/ChangeTrackingUtils.java

-package com.xiaojukeji.kafka.manager.service.utils;
-
-import com.xiaojukeji.kafka.manager.common.bizenum.ModuleEnum;
-import com.xiaojukeji.kafka.manager.common.bizenum.OperateEnum;
-import com.xiaojukeji.kafka.manager.common.entity.pojo.OperateRecordDO;
-import com.xiaojukeji.kafka.manager.common.utils.JsonUtils;
-import com.xiaojukeji.kafka.manager.service.service.OperateRecordService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.Map;
-
-/**
- * Track changes applied to Kafka.
- */
-public class ChangeTrackingUtils {
-    private final OperateRecordService operateRecordService;
-
-    @Autowired
-    public ChangeTrackingUtils(OperateRecordService operateRecordService) {
-        this.operateRecordService = operateRecordService;
-    }
-
-    /**
-     * Saving operate record to database.
-     */
-    public void saveOperateRecord(String operator, ModuleEnum module, String resourceName, OperateEnum operate, Map<String, String> content) {
-        OperateRecordDO operateRecordDO = new OperateRecordDO();
-        operateRecordDO.setOperator(operator);
-        operateRecordDO.setModuleId(module.getCode());
-        operateRecordDO.setResource(resourceName);
-        operateRecordDO.setOperateId(operate.getCode());
-        operateRecordDO.setContent(JsonUtils.toJSONString(content));
-        operateRecordService.insert(operateRecordDO);
-    }
-}