From edb400576c0d12b15257b3a7084f32e932069305 Mon Sep 17 00:00:00 2001
From: zzx <2651787250@qq.com>
Date: Thu, 1 Feb 2024 19:45:02 +0800
Subject: [PATCH] fourth improve

---
 eventmesh-dashboard-console/pom.xml                        | 6 ++++++
 .../testLinkedServiceOfTheThreeTable.java                  | 7 ++++---
 .../dashboard/console/unit/group/TestGroupDao.java         | 6 +++---
 .../dashboard/console/unit/topic/testTopicDao.java         | 4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/eventmesh-dashboard-console/pom.xml b/eventmesh-dashboard-console/pom.xml
index 242c2550..ddf65952 100644
--- a/eventmesh-dashboard-console/pom.xml
+++ b/eventmesh-dashboard-console/pom.xml
@@ -75,6 +75,12 @@
             <artifactId>spring-aspects</artifactId>
             <version>5.1.2.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+        </dependency>
 
 
     </dependencies>
diff --git a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/linkage/GroupAndMemberAndTopicService/testLinkedServiceOfTheThreeTable.java b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/linkage/GroupAndMemberAndTopicService/testLinkedServiceOfTheThreeTable.java
index 8e5a6df9..c0b7dfb8 100644
--- a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/linkage/GroupAndMemberAndTopicService/testLinkedServiceOfTheThreeTable.java
+++ b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/linkage/GroupAndMemberAndTopicService/testLinkedServiceOfTheThreeTable.java
@@ -3,9 +3,10 @@
 import org.apache.eventmesh.dashboard.console.EventmeshConsoleApplication;
 import org.apache.eventmesh.dashboard.console.entity.GroupMemberEntity;
 import org.apache.eventmesh.dashboard.console.entity.TopicEntity;
-import org.apache.eventmesh.dashboard.console.service.GroupMemberService;
-import org.apache.eventmesh.dashboard.console.service.GroupService;
-import org.apache.eventmesh.dashboard.console.service.TopicService;
+import org.apache.eventmesh.dashboard.console.service.group.GroupService;
+import org.apache.eventmesh.dashboard.console.service.groupmember.GroupMemberService;
+import org.apache.eventmesh.dashboard.console.service.topic.TopicService;
+
 
 import java.sql.Timestamp;
 
diff --git a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/group/TestGroupDao.java b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/group/TestGroupDao.java
index 1c14ab13..e541e9e2 100644
--- a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/group/TestGroupDao.java
+++ b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/group/TestGroupDao.java
@@ -20,7 +20,7 @@ public class TestGroupDao {
 
     @Autowired
     private OprGroupMapper groupDao;
-
+    
     public List<GroupEntity> insertGroupData(String name) {
         List<GroupEntity> groupEntities = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
@@ -95,7 +95,7 @@ public void test_selectGroupByClusterId() {
 
     @Test
     public void test_selectGroupByDynamic() {
-        List<GroupEntity> groupEntities = this.insertGroupData("selectByDynamic");
-        Assert.assertEquals(groupEntities, this.getRemovedTimeList("Dynamic"));
+        List<GroupEntity> groupEntities = this.insertGroupData("selectByDynamic1");
+        Assert.assertEquals(groupEntities, this.getRemovedTimeList("Dynamic1"));
     }
 }
diff --git a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/topic/testTopicDao.java b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/topic/testTopicDao.java
index 38e14594..d4c2b5a5 100644
--- a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/topic/testTopicDao.java
+++ b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/topic/testTopicDao.java
@@ -2,7 +2,7 @@
 
 import org.apache.eventmesh.dashboard.console.EventmeshConsoleApplication;
 import org.apache.eventmesh.dashboard.console.entity.TopicEntity;
-import org.apache.eventmesh.dashboard.console.mapper.TopicDao;
+import org.apache.eventmesh.dashboard.console.mapper.topic.TopicMapper;
 
 import java.sql.Timestamp;
 
@@ -17,7 +17,7 @@
 public class testTopicDao {
 
     @Autowired
-    private TopicDao topicDao;
+    private TopicMapper topicDao;
     @Test
     public void testSelectTopicByClusterId(){
         TopicEntity topicEntity = new TopicEntity();