From 4538593236ed2374627ff1b208886bec45559855 Mon Sep 17 00:00:00 2001
From: xuguang <xuguang_i@didiglobal.com>
Date: Wed, 8 Dec 2021 15:50:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0core=E5=8C=85=E4=B8=8BTopicRe?=
 =?UTF-8?q?portService=E6=8E=A5=E5=8F=A3=E5=8D=95=E5=85=83=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=20&=20TopicReportDao.xml=E4=B8=AD=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=92=8C=E5=85=B3=E9=94=AE=E5=AD=97=E9=94=99=E8=AF=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gateway/TopicReportServiceTest.java       | 47 +++++++++++++++++++
 .../main/resources/mapper/TopicReportDao.xml  |  4 +-
 2 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 kafka-manager-core/src/test/java/com/xiaojukeji/kafka/manager/service/service/gateway/TopicReportServiceTest.java

diff --git a/kafka-manager-core/src/test/java/com/xiaojukeji/kafka/manager/service/service/gateway/TopicReportServiceTest.java b/kafka-manager-core/src/test/java/com/xiaojukeji/kafka/manager/service/service/gateway/TopicReportServiceTest.java
new file mode 100644
index 00000000..82a4c8b3
--- /dev/null
+++ b/kafka-manager-core/src/test/java/com/xiaojukeji/kafka/manager/service/service/gateway/TopicReportServiceTest.java
@@ -0,0 +1,47 @@
+package com.xiaojukeji.kafka.manager.service.service.gateway;
+
+import com.xiaojukeji.kafka.manager.common.entity.pojo.gateway.TopicReportDO;
+import com.xiaojukeji.kafka.manager.dao.gateway.TopicReportDao;
+import com.xiaojukeji.kafka.manager.service.config.BaseTest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author xuguang
+ * @Date 2021/12/7
+ */
+public class TopicReportServiceTest extends BaseTest {
+
+    @Autowired
+    private TopicReportService topicReportService;
+
+    @Autowired
+    private TopicReportDao topicReportDao;
+
+    @DataProvider(name = "provideTopicReportDO")
+    public static Object[][] provideTopicReportDO() {
+        TopicReportDO topicReportDO = new TopicReportDO();
+        topicReportDO.setId(1L);
+        topicReportDO.setClusterId(1L);
+        topicReportDO.setTopicName("xgTest");
+        topicReportDO.setStartTime(new Date(1638786493173L));
+        topicReportDO.setEndTime(new Date(1638786493173L));
+        topicReportDO.setModifyTime(new Date(1638786493173L));
+        topicReportDO.setCreateTime(new Date(1638786493173L));
+        return new Object[][] {{topicReportDO}};
+    }
+
+    @Test(dataProvider = "provideTopicReportDO")
+    public void getNeedReportTopicTest(TopicReportDO topicReportDO) {
+        // 数据库中插入数据
+        int replace = topicReportDao.replace(topicReportDO);
+        List<TopicReportDO> result = topicReportService.getNeedReportTopic(1L);
+        Assert.assertEquals(result.size(), 1);
+        Assert.assertEquals(result.get(0).toString(), topicReportDO.toString());
+    }
+}
diff --git a/kafka-manager-dao/src/main/resources/mapper/TopicReportDao.xml b/kafka-manager-dao/src/main/resources/mapper/TopicReportDao.xml
index 80d459b0..bb75ca97 100644
--- a/kafka-manager-dao/src/main/resources/mapper/TopicReportDao.xml
+++ b/kafka-manager-dao/src/main/resources/mapper/TopicReportDao.xml
@@ -27,13 +27,13 @@
         ]]>
     </delete>
 
-    <select id="getNeedReportTopics" parameterType="java.util.Map" resultMap="TopicReportMap">
+    <select id="getNeedReportTopic" parameterType="java.util.Map" resultMap="TopicReportMap">
         <![CDATA[
         SELECT *
         FROM topic_report
         WHERE (cluster_id = #{clusterId}
             AND start_time <= #{now}
-            And end_time >= #{now})
+            AND end_time >= #{now})
         ]]>
     </select>