Merge pull request #1 from didi/dev

Dev
2026-01-03 02:52:08 +08:00 · 2021-05-11 10:28:02 +08:00
parent 9334e9552f e342e646ff
commit 12bea9b60a
82 changed files with 1005 additions and 387 deletions
--- a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/normal/NormalTopicController.java
+++ b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/normal/NormalTopicController.java
@@ -11,11 +11,13 @@ import com.xiaojukeji.kafka.manager.common.entity.metrics.BaseMetrics;
 import com.xiaojukeji.kafka.manager.common.entity.vo.common.RealTimeMetricsVO;
 import com.xiaojukeji.kafka.manager.common.entity.vo.normal.TopicBusinessInfoVO;
 import com.xiaojukeji.kafka.manager.common.entity.vo.normal.topic.*;
+import com.xiaojukeji.kafka.manager.common.utils.DateUtils;
 import com.xiaojukeji.kafka.manager.common.utils.SpringTool;
 import com.xiaojukeji.kafka.manager.common.utils.ValidateUtils;
 import com.xiaojukeji.kafka.manager.common.entity.pojo.ClusterDO;
 import com.xiaojukeji.kafka.manager.common.entity.pojo.KafkaBillDO;
 import com.xiaojukeji.kafka.manager.common.utils.jmx.JmxAttributeEnum;
+import com.xiaojukeji.kafka.manager.common.entity.vo.normal.topic.TopicStatisticMetricsVO;
 import com.xiaojukeji.kafka.manager.service.cache.LogicalClusterMetadataManager;
 import com.xiaojukeji.kafka.manager.service.cache.PhysicalClusterMetadataManager;
 import com.xiaojukeji.kafka.manager.service.service.*;
@@ -339,4 +341,23 @@ public class NormalTopicController {
        );
    }

+    @ApiOperation(value = "Topic流量统计信息", notes = "")
+    @RequestMapping(value = "{clusterId}/topics/{topicName}/statistic-metrics", method = RequestMethod.GET)
+    @ResponseBody
+    public Result<TopicStatisticMetricsVO> getTopicStatisticMetrics(@PathVariable Long clusterId,
+                                                                    @PathVariable String topicName,
+                                                                    @RequestParam(value = "isPhysicalClusterId", required = false) Boolean isPhysicalClusterId,
+                                                                    @RequestParam("latest-day") Integer latestDay) {
+        Long physicalClusterId = logicalClusterMetadataManager.getPhysicalClusterId(clusterId, isPhysicalClusterId);
+        if (ValidateUtils.isNull(physicalClusterId)) {
+            return Result.buildFrom(ResultStatus.CLUSTER_NOT_EXIST);
+        }
+
+        Double maxAvgBytesIn = topicManagerService.getTopicMaxAvgBytesIn(physicalClusterId, topicName, new Date(DateUtils.getDayStarTime(-1 * latestDay)), new Date(), 1);
+        if (ValidateUtils.isNull(maxAvgBytesIn)) {
+            return Result.buildFrom(ResultStatus.MYSQL_ERROR);
+        }
+        return new Result<>(new TopicStatisticMetricsVO(maxAvgBytesIn));
+    }
+
 }
--- a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/rd/RdOperateRecordController.java
+++ b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/rd/RdOperateRecordController.java
@@ -36,7 +36,7 @@ public class RdOperateRecordController {
        if (ValidateUtils.isNull(dto) || !dto.legal()) {
            return Result.buildFrom(ResultStatus.PARAM_ILLEGAL);
        }
-        List<OperateRecordVO> voList = OperateRecordModelConverter.convert2OperateRecordVOList(operateRecordService.queryByCondt(dto));
+        List<OperateRecordVO> voList = OperateRecordModelConverter.convert2OperateRecordVOList(operateRecordService.queryByCondition(dto));
        if (voList.size() > MAX_RECORD_COUNT) {
            voList = voList.subList(0, MAX_RECORD_COUNT);
        }
--- a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartBrokerController.java
+++ b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartBrokerController.java
@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
 */
@Api(tags = "开放接口-Broker相关接口(REST)")
@RestController
-@RequestMapping(ApiPrefix.API_V1_THIRD_PART_PREFIX)
+@RequestMapping(ApiPrefix.API_V1_THIRD_PART_OP_PREFIX)
 public class ThirdPartBrokerController {
    @Autowired
    private BrokerService brokerService;
--- a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartOpUtilController.java
+++ b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartOpUtilController.java
@@ -21,8 +21,8 @@ import org.springframework.web.bind.annotation.*;
 */
@Api(tags = "开放接口-OP相关接口(REST)")
@RestController
-@RequestMapping(ApiPrefix.API_V1_THIRD_PART_PREFIX)
-public class ThirdPartOpController {
+@RequestMapping(ApiPrefix.API_V1_THIRD_PART_OP_PREFIX)
+public class ThirdPartOpUtilController {

    @Autowired
    private AdminService adminService;
--- a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartTopicController.java
+++ b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartTopicController.java
@@ -13,8 +13,6 @@ import com.xiaojukeji.kafka.manager.common.entity.vo.normal.topic.TopicAuthorize
 import com.xiaojukeji.kafka.manager.common.entity.vo.normal.topic.TopicRequestTimeDetailVO;
 import com.xiaojukeji.kafka.manager.common.zookeeper.znode.brokers.TopicMetadata;
 import com.xiaojukeji.kafka.manager.openapi.common.vo.TopicOffsetChangedVO;
-import com.xiaojukeji.kafka.manager.openapi.common.vo.TopicStatisticMetricsVO;
-import com.xiaojukeji.kafka.manager.common.utils.DateUtils;
 import com.xiaojukeji.kafka.manager.common.utils.ValidateUtils;
 import com.xiaojukeji.kafka.manager.common.entity.pojo.ClusterDO;
 import com.xiaojukeji.kafka.manager.service.cache.PhysicalClusterMetadataManager;
@@ -30,7 +28,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

-import java.util.Date;
 import java.util.List;

 /**
@@ -69,27 +66,6 @@ public class ThirdPartTopicController {
        return new Result<>(vo);
    }

-    @ApiOperation(value = "Topic流量统计信息", notes = "")
-    @RequestMapping(value = "{physicalClusterId}/topics/{topicName}/statistic-metrics", method = RequestMethod.GET)
-    @ResponseBody
-    public Result<TopicStatisticMetricsVO> getTopicStatisticMetrics(@PathVariable Long physicalClusterId,
-                                                                    @PathVariable String topicName,
-                                                                    @RequestParam("latest-day") Integer latestDay) {
-        try {
-            return new Result<>(new TopicStatisticMetricsVO(topicManagerService.getTopicMaxAvgBytesIn(
-                    physicalClusterId,
-                    topicName,
-                    new Date(DateUtils.getDayStarTime(-1 * latestDay)),
-                    new Date(),
-                    1
-            )));
-        } catch (Exception e) {
-            LOGGER.error("get topic statistic metrics failed, clusterId:{} topicName:{} latestDay:{}."
-                    , physicalClusterId, topicName, latestDay, e);
-        }
-        return Result.buildFrom(ResultStatus.MYSQL_ERROR);
-    }
-
    @ApiOperation(value = "Topic是否有流量", notes = "")
    @RequestMapping(value = "{physicalClusterId}/topics/{topicName}/offset-changed", method = RequestMethod.GET)
    @ResponseBody
--- a/kafka-manager-web/src/main/resources/application.yml
+++ b/kafka-manager-web/src/main/resources/application.yml
@@ -11,9 +11,9 @@ spring:
    name: kafkamanager
  datasource:
    kafka-manager:
-      jdbc-url: jdbc:mysql://127.0.0.1:3306/logi_kafka_manager?characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-      username: admin
-      password: admin
+      jdbc-url: jdbc:mysql://localhost:3306/logi_kafka_manager?characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+      username: root
+      password: 123456
      driver-class-name: com.mysql.cj.jdbc.Driver
  main:
    allow-bean-definition-overriding: true
@@ -46,6 +46,9 @@ custom:
 task:
  op:
    sync-topic-enabled: false # 未落盘的Topic定期同步到DB中
+    order-auto-exec:          # 工单自动化审批线程的开关
+      topic-enabled: false      # Topic工单自动化审批开关, false:关闭自动化审批, true:开启
+      app-enabled: false        # App工单自动化审批开关, false:关闭自动化审批, true:开启

 account:
  ldap: