[ISSUE #26] CRUD the basic tables of Topic, Group, GroupMember, and Operation

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/log/OprLog.java

@@ -71,13 +71,13 @@ public Object logStart(ProceedingJoinPoint joinPoint) throws Throwable {
  try {
  proceed = joinPoint.proceed();
  logEntity.setStatus(2);
- logEntity.setResultContent(Objects.isNull(proceed) ? "" : proceed.toString());
+ logEntity.setResult(Objects.isNull(proceed) ? "" : proceed.toString());
  return proceed;
  } catch (Throwable e) {
  logEntity.setStatus(3);
  throw new RuntimeException(e);
  } finally {
- logEntity.setResultContent(proceed.toString());
+ logEntity.setResult(proceed.toString());
  logService.updateLog(logEntity);
  }
 
@@ -94,7 +94,7 @@ public LogEntity productLoEntity(EmLog declaredAnnotation, ProceedingJoinPoint j
  Long opClusterPhyId = (Long) clusterPhyId.get(model);
  //The clusterId is obtained from the parameter object, and the operation is described as the object itself
  logEntity.setClusterId(opClusterPhyId);
- logEntity.setDescription(model.toString());
+ logEntity.setContent(model.toString());
  logEntity.setOperationType(declaredAnnotation.OprType());
  logEntity.setTargetType(declaredAnnotation.OprTarget());
  logEntity.setStatus(1);

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/group/OprGroupMapper.java

@@ -67,7 +67,7 @@ public interface OprGroupMapper {
  + "and is_delete=0"
  + "</where>"
  + "</script>")
- List<GroupEntity> selectGroupByDynamic(GroupEntity groupEntity);
+ List<GroupEntity> selectGroup(GroupEntity groupEntity);
 
 
 }

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/groupmember/OprGroupMemberMapper.java

@@ -74,7 +74,7 @@ public interface OprGroupMemberMapper {
  + "</where>"
  + "and is_delete=0"
  + "</script>")
- List<GroupMemberEntity> selectAllMemberByDynamic(GroupMemberEntity groupMemberEntity);
+ List<GroupMemberEntity> selectMember(GroupMemberEntity groupMemberEntity);
 
  @Update("update group_member set state=#{state} where topic_name=#{topicName}")
  void updateMemberByTopic(GroupMemberEntity groupMemberEntity);

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/topic/TopicMapper.java

@@ -35,8 +35,8 @@
 @Mapper
 public interface TopicMapper {
 
-
- @Select("<script>"
+ @Select(
+  "<script>"
  + "select * from topic"
  + "<where>"
  + "<if test='topicName!=null'>"
@@ -48,7 +48,7 @@ public interface TopicMapper {
  + "and is_delete=0"
  + "</where>"
  + "</script>")
- List<TopicEntity> getTopicListByDynamic(TopicEntity topicEntity);
+ List<TopicEntity> getTopicList(TopicEntity topicEntity);
 
  @Insert("INSERT INTO topic (cluster_id, topic_name, runtime_id, storage_id, retention_ms, type, description) "
  + "VALUE (#{clusterId},#{topicName},#{runtimeId},#{storageId},#{retentionMs},#{type},#{description})"

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/group/GroupService.java

@@ -39,7 +39,7 @@ public interface GroupService {
 
  GroupEntity selectGroup(GroupEntity groupEntity);
 
- Integer insertMemberToGroup_plus(GroupMemberEntity groupMemberEntity);
+ Integer insertMemberToGroup(GroupMemberEntity groupMemberEntity);
 
- Integer deleteMemberFromGroup_plus(GroupMemberEntity groupMemberEntity);
+ Integer deleteMemberFromGroup(GroupMemberEntity groupMemberEntity);
 }

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/group/GroupServiceImpl.java

@@ -41,7 +41,7 @@ public class GroupServiceImpl implements GroupService {
  @EmLog(OprType = "search", OprTarget = "Group")
  @Override
  public List<GroupEntity> getGroupByClusterId(GroupEntity groupEntity) {
- return oprGroupMapper.selectGroupByDynamic(groupEntity);
+ return oprGroupMapper.selectGroup(groupEntity);
 
  }
 
@@ -68,7 +68,7 @@ public GroupEntity selectGroup(GroupEntity groupEntity) {
  }
 
  @Override
- public Integer insertMemberToGroup_plus(GroupMemberEntity groupMemberEntity) {
+ public Integer insertMemberToGroup(GroupMemberEntity groupMemberEntity) {
  groupMemberService.addGroupMember(groupMemberEntity);
  GroupEntity groupEntity = new GroupEntity();
  groupEntity.setName(groupMemberEntity.getGroupName());
@@ -85,7 +85,7 @@ public Integer insertMemberToGroup_plus(GroupMemberEntity groupMemberEntity) {
  }
 
  @Override
- public Integer deleteMemberFromGroup_plus(GroupMemberEntity groupMemberEntity) {
+ public Integer deleteMemberFromGroup(GroupMemberEntity groupMemberEntity) {
  groupMemberService.deleteGroupMember(groupMemberEntity);
  GroupEntity groupEntity = new GroupEntity();
  groupEntity.setName(groupMemberEntity.getGroupName());

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/groupmember/GroupMemberServiceImp.java

@@ -66,12 +66,12 @@ public List<GroupMemberEntity> selectGroupMemberByGroup(GroupEntity groupEntity)
  groupMemberEntity.setGroupName(groupEntity.getName());
  groupMemberEntity.setClusterId(groupEntity.getClusterId());
  //Obtain a member who meets the conditions of a group
- return oprGroupMemberMapper.selectAllMemberByDynamic(groupMemberEntity);
+ return oprGroupMemberMapper.selectMember(groupMemberEntity);
  }
 
  @Override
  public List<GroupMemberEntity> selectAllMemberByTopic(GroupMemberEntity groupMemberEntity) {
- List<GroupMemberEntity> groupMemberEntities = oprGroupMemberMapper.selectAllMemberByDynamic(groupMemberEntity);
+ List<GroupMemberEntity> groupMemberEntities = oprGroupMemberMapper.selectMember(groupMemberEntity);
  return groupMemberEntities;
  }
 

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/topic/TopicService.java

@@ -31,11 +31,11 @@ public interface TopicService {
 
  void updateTopic(TopicEntity topicEntity);
 
- void deleteTopic(TopicEntity topicEntity);
+ void deleteTopicById(TopicEntity topicEntity);
 
  TopicEntity selectTopicById(TopicEntity topicEntity);
 
  TopicEntity selectTopicByUnique(TopicEntity topicEntity);
 
- void deleteTopic_plus(TopicEntity topicEntity);
+ void deleteTopic(TopicEntity topicEntity);
 }

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/topic/TopicServiceImpl.java

@@ -39,7 +39,7 @@ public class TopicServiceImpl implements TopicService {
 
  @Override
  public List<TopicEntity> getTopicList(TopicEntity topicEntity) {
- return topicMapper.getTopicListByDynamic(topicEntity);
+ return topicMapper.getTopicList(topicEntity);
  }
 
  @Override
@@ -57,7 +57,7 @@ public void updateTopic(TopicEntity topicEntity) {
  }
 
  @Override
- public void deleteTopic(TopicEntity topicEntity) {
+ public void deleteTopicById(TopicEntity topicEntity) {
  topicMapper.deleteTopic(topicEntity);
  }
 
@@ -72,7 +72,7 @@ public TopicEntity selectTopicByUnique(TopicEntity topicEntity) {
  }
 
  @Override
- public void deleteTopic_plus(TopicEntity topicEntity) {
+ public void deleteTopic(TopicEntity topicEntity) {
  GroupMemberEntity groupMemberEntity = new GroupMemberEntity();
  groupMemberEntity.setTopicName(topicEntity.getTopicName());
  groupMemberEntity.setState("empty");

eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/linkage/log/TestOprLog.java

@@ -26,11 +26,11 @@ public class TestOprLog {
  private LogService logService;
 
  @Test
- public void test_groupService_OprLog() {
+ public void testGroupServiceOprLog() {
  GroupEntity groupEntity = new GroupEntity(null, 1L, "logTest", 0, null, 1, "OK", null, null);
  GroupEntity groupEntity1 = groupService.addGroup(groupEntity);
  LogEntity logEntity = new LogEntity(null, 1L, "add", "Group", 2, groupEntity1.toString(), null, null, null, null);
- logEntity.setResultContent(groupEntity.toString());
+ logEntity.setResult(groupEntity.toString());
  logEntity.setId(groupEntity1.getId());
  List<LogEntity> logListByCluster = logService.getLogListByCluster(logEntity);
  logListByCluster.get(0).setId(null);

eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/group/TestGroupMapper.java

@@ -35,7 +35,7 @@ public List<GroupEntity> insertGroupData(String name) {
  public List<GroupEntity> getRemovedTimeList(String name) {
  GroupEntity groupEntity = new GroupEntity();
  groupEntity.setName(name);
- List<GroupEntity> groupEntities = groupMapper.selectGroupByDynamic(groupEntity);
+ List<GroupEntity> groupEntities = groupMapper.selectGroup(groupEntity);
  for (GroupEntity groupEntity1 : groupEntities) {
  groupEntity1.setCreateTime(null);
  groupEntity1.setUpdateTime(null);
@@ -44,16 +44,16 @@ public List<GroupEntity> getRemovedTimeList(String name) {
  }
 
  @Test
- public void test_addGroup() {
+ public void testAddGroup() {
  List<GroupEntity> groupEntities = this.insertGroupData("addGroup");
  GroupEntity groupEntity = new GroupEntity();
  groupEntity.setName("addGroup");
- List<GroupEntity> groupEntities1 = groupMapper.selectGroupByDynamic(groupEntity);
+ List<GroupEntity> groupEntities1 = groupMapper.selectGroup(groupEntity);
  Assert.assertEquals(groupEntities, this.getRemovedTimeList("addGroup"));
  }
 
  @Test
- public void test_updateGroupById() {
+ public void testUpdateGroupById() {
  List<GroupEntity> groupEntities = this.insertGroupData("updateById2");
  GroupEntity groupEntity = groupEntities.get(9);
  groupEntity.setType(3);
@@ -65,7 +65,7 @@ public void test_updateGroupById() {
  }
 
  @Test
- public void test_deleteGroupById() {
+ public void testDeleteGroupById() {
  List<GroupEntity> groupEntities = this.insertGroupData("deleteById");
  GroupEntity groupEntity = groupEntities.get(9);
  groupMapper.deleteGroup(groupEntity);
@@ -74,7 +74,7 @@ public void test_deleteGroupById() {
  }
 
  @Test
- public void test_selectGroupById() {
+ public void testSelectGroupById() {
  List<GroupEntity> groupEntities = this.insertGroupData("selectById");
  GroupEntity groupEntity = groupMapper.selectGroupById(groupEntities.get(0));
  groupEntity.setCreateTime(null);
@@ -83,7 +83,7 @@ public void test_selectGroupById() {
  }
 
  @Test
- public void test_selectGroupByClusterId() {
+ public void testSelectGroupByClusterId() {
  List<GroupEntity> groupEntities = this.insertGroupData("selectByUnique");
  GroupEntity groupEntity1 = new GroupEntity();
  groupEntity1.setClusterId(groupEntities.get(0).getClusterId());
@@ -95,7 +95,7 @@ public void test_selectGroupByClusterId() {
  }
 
  @Test
- public void test_selectGroupByDynamic() {
+ public void testSelectGroupByDynamic() {
  List<GroupEntity> groupEntities = this.insertGroupData("selectByDynamic1");
  Assert.assertEquals(groupEntities, this.getRemovedTimeList("Dynamic1"));
  }

eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/groupmember/testGroupMemberMapper.java

@@ -35,7 +35,7 @@ public List<GroupMemberEntity> getRemovedTimeList(String topicName, String group
  GroupMemberEntity groupMemberEntity = new GroupMemberEntity();
  groupMemberEntity.setTopicName(topicName);
  groupMemberEntity.setGroupName(groupName);
- List<GroupMemberEntity> groupEntities = groupMemberMapper.selectAllMemberByDynamic(groupMemberEntity);
+ List<GroupMemberEntity> groupEntities = groupMemberMapper.selectMember(groupMemberEntity);
  for (GroupMemberEntity groupEntity1 : groupEntities) {
  groupEntity1.setCreateTime(null);
  groupEntity1.setUpdateTime(null);
@@ -44,13 +44,13 @@ public List<GroupMemberEntity> getRemovedTimeList(String topicName, String group
  }
 
  @Test
- public void test_addGroupMember() {
+ public void testAddGroupMember() {
  List<GroupMemberEntity> add1 = this.insertGroupData("add1", "groupMember");
  Assert.assertEquals(add1, this.getRemovedTimeList("add1", "groupMember"));
  }
 
  @Test
- public void test_getGroupMemberByClusterId() {
+ public void testGetGroupMemberByClusterId() {
  List<GroupMemberEntity> add1 = this.insertGroupData("getByCluster", "groupMember");
  GroupMemberEntity groupMemberEntity = new GroupMemberEntity();
  groupMemberEntity.setClusterId(add1.get(1).getClusterId());
@@ -63,7 +63,7 @@ public void test_getGroupMemberByClusterId() {
  }
 
  @Test
- public void test_deleteGroupMemberById() {
+ public void testDeleteGroupMemberById() {
  List<GroupMemberEntity> add1 = this.insertGroupData("getById", "groupMember");
  GroupMemberEntity groupMemberEntity = new GroupMemberEntity();
  groupMemberEntity.setId(add1.get(2).getId());
@@ -74,7 +74,7 @@ public void test_deleteGroupMemberById() {
  }
 
  @Test
- public void test_updateGroupMemberById() {
+ public void testUpdateGroupMemberById() {
  List<GroupMemberEntity> add1 = this.insertGroupData("updateById", "groupMember");
  GroupMemberEntity groupMemberEntity = new GroupMemberEntity();
  add1.get(1).setState("fail1");
@@ -88,7 +88,7 @@ public void test_updateGroupMemberById() {
  }
 
  @Test
- public void test_selectGroupMemberByUnique() {
+ public void testSelectGroupMemberByUnique() {
  List<GroupMemberEntity> groupMemberEntities = this.insertGroupData("selectByUnique", "groupMember");
  GroupMemberEntity groupMemberEntity = new GroupMemberEntity();
  groupMemberEntity.setClusterId(groupMemberEntities.get(1).getClusterId());
@@ -101,21 +101,21 @@ public void test_selectGroupMemberByUnique() {
  }
 
  @Test
- public void test_selectGroupMemberByGroup() {
+ public void testSelectGroupMemberByGroup() {
  List<GroupMemberEntity> groupMemberEntities = this.insertGroupData("selectByGroup1", "groupMember1");
  List<GroupMemberEntity> removedTimeList = this.getRemovedTimeList(null, "groupMember1");
  Assert.assertEquals(groupMemberEntities, removedTimeList);
  }
 
  @Test
- public void test_selectGroupMemberByTopic() {
+ public void testSelectGroupMemberByTopic() {
  List<GroupMemberEntity> groupMemberEntities = this.insertGroupData("selectByTopic1", "groupMember2");
  List<GroupMemberEntity> removedTimeList = this.getRemovedTimeList("selectByTopic1", null);
  Assert.assertEquals(groupMemberEntities, removedTimeList);
  }
 
  @Test
- public void test_updateGroupMemberByTopic() {
+ public void testUpdateGroupMemberByTopic() {
  List<GroupMemberEntity> groupMemberEntities = this.insertGroupData("updateByTopic1", "groupMember2");
  for (GroupMemberEntity groupMemberEntity : groupMemberEntities) {
  groupMemberEntity.setState("fail2");
@@ -128,7 +128,7 @@ public void test_updateGroupMemberByTopic() {
  }
 
  @Test
- public void test_selectGroupMemberById() {
+ public void testSelectGroupMemberById() {
  List<GroupMemberEntity> groupMemberEntities = this.insertGroupData("updateById1", "groupMember2");
  GroupMemberEntity groupMemberEntity = new GroupMemberEntity();
  groupMemberEntity.setId(groupMemberEntities.get(5).getId());

eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/topic/testTopicMapper.java

@@ -35,7 +35,7 @@ public List<TopicEntity> getRemovedTimeList(String topicName, Long clusterId) {
  TopicEntity topicEntity = new TopicEntity();
  topicEntity.setTopicName(topicName);
  topicEntity.setClusterId(clusterId);
- List<TopicEntity> topicEntities = topicMapper.getTopicListByDynamic(topicEntity);
+ List<TopicEntity> topicEntities = topicMapper.getTopicList(topicEntity);
  for (TopicEntity topic : topicEntities) {
  topic.setCreateTime(null);
  topic.setUpdateTime(null);
@@ -44,26 +44,26 @@ public List<TopicEntity> getRemovedTimeList(String topicName, Long clusterId) {
  }
 
  @Test
- public void test_selectTopicByClusterId() {
+ public void testSelectTopicByClusterId() {
  List<TopicEntity> topicEntities = this.insertGroupData("SelectById111");
  TopicEntity topicEntity = new TopicEntity();
  topicEntity.setClusterId(topicEntities.get(9).getClusterId());
- List<TopicEntity> topicEntity1 = topicMapper.getTopicListByDynamic(topicEntity);
+ List<TopicEntity> topicEntity1 = topicMapper.getTopicList(topicEntity);
  topicEntity1.get(0).setCreateTime(null);
  topicEntity1.get(0).setUpdateTime(null);
  Assert.assertEquals(topicEntity1.get(0), topicEntities.get(9));
  Assert.assertEquals(1, topicEntity1.size());
  }
 
  @Test
- public void test_addTopic() {
+ public void testAddTopic() {
  List<TopicEntity> topicEntities = this.insertGroupData("add111");
  List<TopicEntity> add111 = this.getRemovedTimeList("add111", null);
  Assert.assertEquals(add111, topicEntities);
  }
 
  @Test
- public void test_UpdateTopic() {
+ public void testUpdateTopic() {
  List<TopicEntity> topicEntities = this.insertGroupData("update2");
  topicEntities.get(5).setDescription("updateTest1");
  topicEntities.get(5).setType(-1);
@@ -79,19 +79,19 @@ public void test_UpdateTopic() {
  }
 
  @Test
- public void test_DeleteTopic() {
+ public void testDeleteTopic() {
  List<TopicEntity> topicEntities = this.insertGroupData("update72");
  TopicEntity topicEntity = new TopicEntity();
  topicEntity.setId(topicEntities.get(5).getId());
  topicEntity.setClusterId(topicEntities.get(5).getClusterId());
  topicEntity.setTopicName("update72");
  topicMapper.deleteTopic(topicEntity);
- List<TopicEntity> topicEntity1 = topicMapper.getTopicListByDynamic(topicEntity);
+ List<TopicEntity> topicEntity1 = topicMapper.getTopicList(topicEntity);
  Assert.assertEquals(true, topicEntity1.isEmpty());
  }
 
  @Test
- public void test_selectTopicByUnique() {
+ public void testSelectTopicByUnique() {
  List<TopicEntity> topicEntities = this.insertGroupData("unique11");
  TopicEntity topicEntity = new TopicEntity();
  topicEntity.setTopicName("unique11");
@@ -103,7 +103,7 @@ public void test_selectTopicByUnique() {
  }
 
  @Test
- public void test_selectTopicById() {
+ public void testSelectTopicById() {
  List<TopicEntity> topicEntities = this.insertGroupData("id1");
  TopicEntity topicEntity = new TopicEntity();
  topicEntity.setId(topicEntities.get(2).getId());