diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/groupmember/OprGroupMemberMapper.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/groupmember/OprGroupMemberMapper.java index f3644c2f..40849035 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/groupmember/OprGroupMemberMapper.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/groupmember/OprGroupMemberMapper.java @@ -62,14 +62,14 @@ public interface OprGroupMemberMapper { @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id") void updateGroupMember(GroupMemberEntity groupMemberEntity); - @Delete("UPDATE group_member SET is_delete=1 WHERE id=#{id} ") + @Delete("UPDATE group_member SET status=0 WHERE id=#{id} ") @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id") GroupMemberEntity deleteGroupMember(GroupMemberEntity groupMemberEntity); - @Select("SELECT * FROM group_member WHERE cluster_id=#{clusterId} AND group_name=#{groupName} AND topic_name=#{topicName} AND is_delete=0") + @Select("SELECT * FROM group_member WHERE cluster_id=#{clusterId} AND group_name=#{groupName} AND topic_name=#{topicName} AND status=1") GroupMemberEntity selectGroupMemberByUnique(GroupMemberEntity groupMemberEntity); - @Select("SELECT * FROM group_member WHERE id=#{id} AND is_delete=0") + @Select("SELECT * FROM group_member WHERE id=#{id} AND status=1") GroupMemberEntity selectGroupMemberById(GroupMemberEntity groupMemberEntity); @Select({ @@ -86,7 +86,7 @@ public interface OprGroupMemberMapper { " AND topic_name=#{topicName}", " ", " ", - " AND is_delete=0", + " AND status=1", ""}) List selectMember(GroupMemberEntity groupMemberEntity); diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/storage/StoreMapper.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/storage/StoreMapper.java index ef8a3ed0..804a3711 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/storage/StoreMapper.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/storage/StoreMapper.java @@ -55,10 +55,10 @@ public interface StoreMapper { @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id") void addStore(StoreEntity storeEntity); - @Update("UPDATE store SET is_delete=1 WHERE cluster_id=#{clusterId} AND store_id=#{storeId}") + @Update("UPDATE store SET status=0 WHERE cluster_id=#{clusterId} AND store_id=#{storeId}") void deleteStoreByUnique(StoreEntity storeEntity); - @Select("SELECT * FROM store WHERE cluster_id=#{clusterId} AND is_delete=0") + @Select("SELECT * FROM store WHERE cluster_id=#{clusterId} AND status=1") List selectStoreByCluster(StoreEntity storeEntity); @Update("UPDATE store SET status=#{status} WHERE cluster_id=#{clusterId} AND store_id=#{storeId}") diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/topic/TopicMapper.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/topic/TopicMapper.java index cc2c051d..48d6a0c7 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/topic/TopicMapper.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/topic/TopicMapper.java @@ -61,7 +61,7 @@ public interface TopicMapper { " ", " AND cluster_id=#{clusterId} ", " ", - " AND is_delete=0", + " AND status=1", " ", ""}) List getTopicList(TopicEntity topicEntity);