This is an automated email from the ASF dual-hosted git repository.
xiatian pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/eventmesh-dashboard.git
The following commit(s) were added to refs/heads/dev by this push:
new a165e04 [ISSUE #57] Modify the field, synchronize the modification,
and add the mapper method (#58)
a165e04 is described below
commit a165e04e4e96b424e9bf1faa6390f888278e8abd
Author: zzx <[email protected]>
AuthorDate: Tue Mar 12 23:21:42 2024 +0800
[ISSUE #57] Modify the field, synchronize the modification, and add the
mapper method (#58)
* refactor: add dependency of console module and move controllers into
console module.
* fix: add logback config, fix application-dev.yml and move
`</dependencyManagement>` to root `pom.xml` as pointed out in PR#19.
* FirstCommit
* remerge
* first improve
* second improve
* third improve
* fourth improve
* fourth improve
* fourth improve
* Update and rename EventmeshConsoleApplication.java to
EventMeshDashboardApplication.java
* rename this starter class file to EventMeshDashboardApplication
* rename this starter class file to EventMeshDashboardApplication
* change some resource file
* improve name
* improve name
* Modify the fields of the synchronized log table
* improve name
* improve name
* config basic function and config ,runtime,store,cluster sql
* try to resolve build error
* Some changes in the specification
* something rename
* one sql update
* tag something to do
* The distinction between state and status is_delete fields is unified, and
selectAll() and batchInsert() are added to all instance tables for subsequent
data synchronization. Modification of some fields.
* Delete
eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/meta/ClusterEntity1.java
delete something no use
* Delete
eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/meta/RuntimeEntity1.java
delete something no use
* improve something checkstyle error
* try to solve something sql test error
* try to resolve something test error
* try to resolve something test error
* something is_delete(error) change to status (#3)
Co-authored-by: 周倬贤 <[email protected]>
---------
Co-authored-by: lambert@arch <[email protected]>
Co-authored-by: 周倬贤 <[email protected]>
---
.../console/entity/cluster/ClusterEntity.java | 8 ++-
.../console/entity/config/ConfigEntity.java | 4 +-
.../console/entity/group/GroupEntity.java | 7 +-
.../entity/groupmember/GroupMemberEntity.java | 7 +-
.../entity/health/HealthCheckResultEntity.java | 4 +-
.../dashboard/console/entity/log/LogEntity.java | 6 +-
.../console/entity/runtime/RuntimeEntity.java | 4 +-
.../console/entity/storage/StoreEntity.java | 4 +-
.../console/entity/topic/TopicEntity.java | 6 +-
.../console/function/health/HealthExecutor.java | 2 +-
.../eventmesh/dashboard/console/log/OprLog.java | 6 +-
.../console/mapper/client/ClientMapper.java | 16 +++++
.../console/mapper/cluster/ClusterMapper.java | 23 +++++--
.../console/mapper/config/ConfigMapper.java | 24 +++++--
.../mapper/connection/ConnectionMapper.java | 2 +-
.../console/mapper/connector/ConnectorMapper.java | 3 +
.../console/mapper/group/OprGroupMapper.java | 23 +++++--
.../mapper/groupmember/OprGroupMemberMapper.java | 25 +++++--
.../mapper/health/HealthCheckResultMapper.java | 17 +++--
.../dashboard/console/mapper/log/OprLogMapper.java | 2 +-
.../dashboard/console/mapper/meta/MetaMapper.java | 14 ++++
.../console/mapper/runtime/RuntimeMapper.java | 19 +++++-
.../console/mapper/storage/StoreMapper.java | 19 +++++-
.../console/mapper/topic/TopicMapper.java | 19 +++++-
.../console/service/client/ClientDataService.java | 7 ++
.../Impl/ClientDataServiceImpl.java} | 30 +++++----
.../console/service/cluster/ClusterService.java | 4 ++
.../service/cluster/impl/ClusterServiceImpl.java | 10 +++
.../console/service/config/ConfigService.java | 4 ++
.../service/config/Impl/ConfigServiceImpl.java | 10 +++
.../console/service/group/GroupService.java | 4 ++
.../service/group/{ => Impl}/GroupServiceImpl.java | 13 +++-
.../service/groupmember/GroupMemberService.java | 4 ++
.../{ => Impl}/GroupMemberServiceImp.java | 13 +++-
.../service/runtime/Impl/RuntimeServiceImpl.java | 10 +++
.../console/service/runtime/RuntimeService.java | 4 ++
.../service/store/Impl/StoreServiceImpl.java | 10 +++
.../console/service/store/StoreService.java | 4 ++
.../console/service/topic/TopicService.java | 4 ++
.../console/service/topic/TopicServiceImpl.java | 10 +++
.../src/main/resources/eventmesh-dashboard.sql | 76 ++++++++++++++++++----
.../function/health/HealthExecutorTest.java | 6 +-
.../dashboard/console/linkage/log/TestOprLog.java | 2 +-
.../mapper/health/HealthCheckResultMapperTest.java | 16 ++---
.../console/unit/cluster/TestClusterMapper.java | 12 ++--
.../console/unit/group/GroupMapperTest.java | 2 +-
.../unit/groupmember/GroupMemberMapperTest.java | 2 +-
.../console/unit/topic/TopicMapperTest.java | 2 +-
.../src/test/resources/health-test.sql | 14 ++--
49 files changed, 427 insertions(+), 110 deletions(-)
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/ClusterEntity.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/ClusterEntity.java
index f81237d..dc1f4e4 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/ClusterEntity.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/ClusterEntity.java
@@ -17,6 +17,8 @@
package org.apache.eventmesh.dashboard.console.entity.cluster;
+import org.apache.eventmesh.dashboard.console.entity.base.BaseEntity;
+
import java.sql.Timestamp;
import lombok.AllArgsConstructor;
@@ -26,7 +28,7 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class ClusterEntity {
+public class ClusterEntity extends BaseEntity {
private Long id;
@@ -50,7 +52,11 @@ public class ClusterEntity {
private Integer runState;
+ private Integer status;
+
private Timestamp createTime;
private Timestamp updateTime;
+
+ private Integer storeType;
}
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/config/ConfigEntity.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/config/ConfigEntity.java
index dd726a8..07b979b 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/config/ConfigEntity.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/config/ConfigEntity.java
@@ -17,6 +17,8 @@
package org.apache.eventmesh.dashboard.console.entity.config;
+import org.apache.eventmesh.dashboard.console.entity.base.BaseEntity;
+
import java.sql.Timestamp;
import lombok.AllArgsConstructor;
@@ -26,7 +28,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@AllArgsConstructor
@Data
-public class ConfigEntity {
+public class ConfigEntity extends BaseEntity {
private Long id;
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/group/GroupEntity.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/group/GroupEntity.java
index c395bac..52d15d2 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/group/GroupEntity.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/group/GroupEntity.java
@@ -17,6 +17,8 @@
package org.apache.eventmesh.dashboard.console.entity.group;
+import org.apache.eventmesh.dashboard.console.entity.base.BaseEntity;
+
import java.sql.Timestamp;
import lombok.AllArgsConstructor;
@@ -26,7 +28,8 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@AllArgsConstructor
@Data
-public class GroupEntity {
+public class GroupEntity extends BaseEntity {
+
private Long id;
private Long clusterId;
@@ -45,6 +48,6 @@ public class GroupEntity {
private Timestamp updateTime;
-
+ private Integer status;
}
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/groupmember/GroupMemberEntity.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/groupmember/GroupMemberEntity.java
index dbadc1e..9b56cbe 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/groupmember/GroupMemberEntity.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/groupmember/GroupMemberEntity.java
@@ -17,6 +17,8 @@
package org.apache.eventmesh.dashboard.console.entity.groupmember;
+import org.apache.eventmesh.dashboard.console.entity.base.BaseEntity;
+
import java.sql.Timestamp;
import lombok.AllArgsConstructor;
@@ -26,7 +28,8 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class GroupMemberEntity {
+public class GroupMemberEntity extends BaseEntity {
+
private Long id;
private Long clusterId;
@@ -43,5 +46,5 @@ public class GroupMemberEntity {
private Timestamp updateTime;
-
+ private Integer status;
}
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/health/HealthCheckResultEntity.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/health/HealthCheckResultEntity.java
index f427b66..f2b65ad 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/health/HealthCheckResultEntity.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/health/HealthCheckResultEntity.java
@@ -44,7 +44,7 @@ public class HealthCheckResultEntity extends BaseEntity {
private String resultDesc;
- @Schema(description = "status of a health check, 0: failed, 1: passed, 2:
doing check, 3: out of time")
- private Integer status;
+ @Schema(description = "state of a health check, 0: failed, 1: passed, 2:
doing check, 3: out of time")
+ private Integer state;
}
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/log/LogEntity.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/log/LogEntity.java
index ac7c30a..f2483f5 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/log/LogEntity.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/log/LogEntity.java
@@ -17,6 +17,8 @@
package org.apache.eventmesh.dashboard.console.entity.log;
+import org.apache.eventmesh.dashboard.console.entity.base.BaseEntity;
+
import java.sql.Timestamp;
import lombok.AllArgsConstructor;
@@ -26,7 +28,7 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class LogEntity {
+public class LogEntity extends BaseEntity {
private Long id;
@@ -36,7 +38,7 @@ public class LogEntity {
private String targetType;
- private Integer status;
+ private Integer state;
private String content;
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/runtime/RuntimeEntity.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/runtime/RuntimeEntity.java
index e070075..2cc3f5c 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/runtime/RuntimeEntity.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/runtime/RuntimeEntity.java
@@ -17,6 +17,8 @@
package org.apache.eventmesh.dashboard.console.entity.runtime;
+import org.apache.eventmesh.dashboard.console.entity.base.BaseEntity;
+
import java.sql.Timestamp;
import lombok.AllArgsConstructor;
@@ -26,7 +28,7 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class RuntimeEntity {
+public class RuntimeEntity extends BaseEntity {
private Long id;
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/storage/StoreEntity.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/storage/StoreEntity.java
index dd7f4d2..3f3d326 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/storage/StoreEntity.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/storage/StoreEntity.java
@@ -18,6 +18,8 @@
package org.apache.eventmesh.dashboard.console.entity.storage;
+import org.apache.eventmesh.dashboard.console.entity.base.BaseEntity;
+
import java.sql.Timestamp;
import lombok.AllArgsConstructor;
@@ -27,7 +29,7 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class StoreEntity {
+public class StoreEntity extends BaseEntity {
private Long id;
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/topic/TopicEntity.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/topic/TopicEntity.java
index 6b4bd09..a5784f0 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/topic/TopicEntity.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/topic/TopicEntity.java
@@ -17,6 +17,8 @@
package org.apache.eventmesh.dashboard.console.entity.topic;
+import org.apache.eventmesh.dashboard.console.entity.base.BaseEntity;
+
import java.sql.Timestamp;
import lombok.AllArgsConstructor;
@@ -26,7 +28,8 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class TopicEntity {
+public class TopicEntity extends BaseEntity {
+
private Long id;
private Long clusterId;
@@ -47,4 +50,5 @@ public class TopicEntity {
private Timestamp updateTime;
+ private Integer status;
}
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/health/HealthExecutor.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/health/HealthExecutor.java
index fac6eb7..5cb0e02 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/health/HealthExecutor.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/health/HealthExecutor.java
@@ -137,7 +137,7 @@ public class HealthExecutor {
newEntity.setType(HealthCheckType.toNumber(result.getConfig().getHealthCheckResourceType()));
newEntity.setTypeId(result.getConfig().getInstanceId());
newEntity.setResultDesc(result.getResultDesc());
- newEntity.setStatus(result.getStatus().getNumber());
+ newEntity.setState(result.getStatus().getNumber());
resultList.add(newEntity);
}
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/log/OprLog.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/log/OprLog.java
index 9df7e23..f0ac9f6 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/log/OprLog.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/log/OprLog.java
@@ -70,11 +70,11 @@ public class OprLog implements Ordered,
ApplicationContextAware {
Object proceed = null;
try {
proceed = joinPoint.proceed();
- logEntity.setStatus(2);
+ logEntity.setState(2);
logEntity.setResult(Objects.isNull(proceed) ? "" :
proceed.toString());
return proceed;
} catch (Throwable e) {
- logEntity.setStatus(3);
+ logEntity.setState(3);
throw new RuntimeException(e);
} finally {
logEntity.setResult(proceed.toString());
@@ -97,7 +97,7 @@ public class OprLog implements Ordered,
ApplicationContextAware {
logEntity.setContent(model.toString());
logEntity.setOperationType(declaredAnnotation.OprType());
logEntity.setTargetType(declaredAnnotation.OprTarget());
- logEntity.setStatus(1);
+ logEntity.setState(1);
logEntity.setCreateTime(new Timestamp(System.currentTimeMillis()));
return logEntity;
}
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/client/ClientMapper.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/client/ClientMapper.java
index 3adab3b..ddce0f2 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/client/ClientMapper.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/client/ClientMapper.java
@@ -27,12 +27,28 @@ import org.apache.ibatis.annotations.Update;
import java.util.List;
+
/**
* Mybatis Mapper for the table of client.
*/
@Mapper
public interface ClientMapper {
+ @Select("select * from client where status=1")
+ List<ClientEntity> selectAll();
+
+ @Select({
+ "<script>",
+ " INSERT INTO client (cluster_id, name, platform, language, pid,
host, port, protocol, status,",
+ " config_ids, description) VALUES ",
+ " <foreach collection='list' item='c' index='index' separator=','>",
+ " (#{c.clusterId}, #{c.name}, #{c.platform},#{c.language},
#{c.pid}, #{c.host}, #{c.port}, #{c.protocol},",
+ " #{c.status}, #{c.configIds}, #{c.description})",
+ " </foreach>",
+ "</script>"})
+ @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
+ void batchInsert(List<ClientEntity> clientEntityList);
+
@Select("SELECT * FROM `client` WHERE `id` = #{id}")
ClientEntity selectById(ClientEntity clientEntity);
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/cluster/ClusterMapper.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/cluster/ClusterMapper.java
index eea050a..23608bf 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/cluster/ClusterMapper.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/cluster/ClusterMapper.java
@@ -34,15 +34,28 @@ import java.util.List;
@Mapper
public interface ClusterMapper {
- @Select("SELECT * FROM cluster WHERE is_delete=0")
+ @Select("SELECT * FROM cluster WHERE status=1")
List<ClusterEntity> selectAllCluster();
- @Select("SELECT * FROM cluster WHERE id=#{id} AND is_delete=0")
+ @Insert({
+ "<script>",
+ " INSERT INTO cluster (name, register_name_list, bootstrap_servers,
eventmesh_version, client_properties, jmx_properties,",
+ "reg_properties, description, auth_type,run_state, store_type) VALUES
",
+ " <foreach collection='list' item='c' index='index' separator=','>",
+ " (#{c.name}, #{c.registerNameList}, #{c.bootstrapServers},
#{c.eventmeshVersion}, #{c.clientProperties}, #{c.jmxProperties}, ",
+ " #{c.regProperties}, #{c.description}, #{c.authType},
#{c.runState},#{c.storeType})",
+ " </foreach>",
+ "</script>"})
+ @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
+ void batchInsert(List<ClusterEntity> clusterEntities);
+
+ @Select("SELECT * FROM cluster WHERE id=#{id} AND status=1")
ClusterEntity selectClusterById(ClusterEntity cluster);
@Insert("INSERT INTO cluster (name, register_name_list, bootstrap_servers,
eventmesh_version, client_properties, "
- + "jmx_properties, reg_properties, description, auth_type, run_state)
VALUES (#{name},#{registerNameList},"
- +
"#{bootstrapServers},#{eventmeshVersion},#{clientProperties},#{jmxProperties},#{regProperties},#{description},#{authType},#{runState})")
+ + "jmx_properties, reg_properties, description, auth_type,
run_state,store_type) VALUES (#{name},#{registerNameList},"
+ +
"#{bootstrapServers},#{eventmeshVersion},#{clientProperties},#{jmxProperties},#{regProperties},#{description},#{authType},"
+ + "#{runState},#{storeType})")
@Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
void addCluster(ClusterEntity cluster);
@@ -52,7 +65,7 @@ public interface ClusterMapper {
+ "register_name_list=#{registerNameList} WHERE id=#{id}")
void updateClusterById(ClusterEntity cluster);
- @Delete("UPDATE cluster SET is_delete=1 WHERE id=#{id}")
+ @Delete("UPDATE cluster SET status=0 WHERE id=#{id}")
void deleteClusterById(ClusterEntity clusterEntity);
}
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/config/ConfigMapper.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/config/ConfigMapper.java
index e7ee325..167c7b2 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/config/ConfigMapper.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/config/ConfigMapper.java
@@ -33,14 +33,30 @@ import java.util.List;
@Mapper
public interface ConfigMapper {
- @Insert("INSERT INTO config (cluster_id, business_type, instance_type,
instance_id, config_name,"
- + " config_value, start_version,eventmesh_version, description,
edit,end_version,is_default,is_modify) VALUE "
+ @Select("SELECT * FROM config WHERE status=1")
+ List<ConfigEntity> selectAll();
+
+ @Insert({
+ "<script>",
+ " INSERT INTO config (cluster_id, business_type, instance_type,
instance_id, config_name, config_value, start_version,",
+ " eventmesh_version,end_version, diff_type, description, edit,
is_default, is_modify) VALUES ",
+ " <foreach collection='list' item='c' index='index' separator=','>",
+ " (#{c.clusterId}, #{c.businessType}, #{c.instanceType},
#{c.instanceId},#{c.configName},",
+ " #{c.configValue}, #{c.startVersion},
#{c.eventmeshVersion},#{c.endVersion},#{c.diffType},#{c.description},",
+ " #{c.edit},#{c.isDefault},#{c.isModify})",
+ " </foreach>",
+ "</script>"})
+ @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
+ void batchInsert(List<ConfigEntity> configEntityList);
+
+ @Insert("INSERT INTO config (cluster_id, business_type, instance_type,
instance_id, config_name, config_value, start_version, "
+ + "status, is_default, end_version, diff_type, description, edit,
is_modify, eventmesh_version) VALUE "
+
"(#{clusterId},#{businessType},#{instanceType},#{instanceId},#{configName},"
- +
"#{configValue},#{startVersion},#{eventmeshVersion},#{description},#{edit},#{endVersion},#{isDefault},#{isModify})")
+ +
"#{configValue},#{startVersion},#{status},#{isDefault},#{endVersion},#{diffType},#{description},#{edit},#{isModify},#{eventmeshVersion})")
@Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
Integer addConfig(ConfigEntity configEntity);
- @Update("UPDATE config SET status=2 WHERE id=#{id}")
+ @Update("UPDATE config SET status=0 WHERE id=#{id}")
Integer deleteConfig(ConfigEntity configEntity);
@Update("UPDATE config SET config_value=#{configValue} WHERE status=1 AND
edit=2")
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/connection/ConnectionMapper.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/connection/ConnectionMapper.java
index 82ebc5c..38903cd 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/connection/ConnectionMapper.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/connection/ConnectionMapper.java
@@ -91,4 +91,4 @@ public interface ConnectionMapper {
"</script>"})
void batchEndConnectionById(List<ConnectionEntity> connectionEntityList);
-}
+}
\ No newline at end of file
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/connector/ConnectorMapper.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/connector/ConnectorMapper.java
index 2f5101a..ba0724c 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/connector/ConnectorMapper.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/connector/ConnectorMapper.java
@@ -33,6 +33,9 @@ import java.util.List;
@Mapper
public interface ConnectorMapper {
+ @Select("SELECT * FROM connector WHERE status=1")
+ ConnectorEntity selectAll();
+
@Select("SELECT * FROM connector WHERE id = #{id}")
ConnectorEntity selectById(ConnectorEntity connectorEntity);
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/group/OprGroupMapper.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/group/OprGroupMapper.java
index 321e76c..fe228ab 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/group/OprGroupMapper.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/group/OprGroupMapper.java
@@ -36,23 +36,36 @@ public interface OprGroupMapper {
@Insert("INSERT INTO `group` (cluster_id, name, member_count, members,
type, state)"
+ "VALUE
(#{clusterId},#{name},#{memberCount},#{members},#{type},#{state}) "
- + "ON DUPLICATE KEY UPDATE is_delete=0")
+ + "ON DUPLICATE KEY UPDATE status=1")
@Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
void addGroup(GroupEntity groupEntity);
+ @Insert({
+ "<script>",
+ " INSERT INTO `group` (cluster_id, name, member_count, members,
type, state) VALUES ",
+ " <foreach collection='list' item='c' index='index' separator=','>",
+ "
(#{c.clusterId},#{c.name},#{c.memberCount},#{c.members},#{c.type},#{c.state})",
+ " </foreach>",
+ "</script>"})
+ @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
+ void batchInsert(List<GroupEntity> groupEntities);
+
+ @Select("SELECT * FROM `group` WHERE status=1")
+ List<GroupEntity> selectAll();
+
@Update("UPDATE `group` SET member_count=#{memberCount},"
+ "members=#{members},type=#{type},state=#{state} WHERE id=#{id}")
@Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
Integer updateGroup(GroupEntity groupEntity);
- @Delete("UPDATE `group` SET is_delete=1 WHERE id=#{id}")
+ @Delete("UPDATE `group` SET status=1 WHERE id=#{id}")
@Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
Integer deleteGroup(GroupEntity groupEntity);
- @Select("SELECT * FROM `group` WHERE cluster_id=#{clusterId} AND
name=#{name} AND is_delete=0")
+ @Select("SELECT * FROM `group` WHERE cluster_id=#{clusterId} AND
name=#{name} AND status=1")
GroupEntity selectGroupByUnique(GroupEntity groupEntity);
- @Select("SELECT * FROM `group` WHERE id=#{id} AND is_delete=0")
+ @Select("SELECT * FROM `group` WHERE id=#{id} AND status=1")
GroupEntity selectGroupById(GroupEntity groupEntity);
@Select({
@@ -65,7 +78,7 @@ public interface OprGroupMapper {
" <if test='name != null'>",
" AND name LIKE concat('%',#{name},'%')",
" </if>",
- " AND is_delete=0",
+ " AND status=1",
" </where>",
"</script>"})
List<GroupEntity> selectGroup(GroupEntity groupEntity);
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 b3dab8a..4084903 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
@@ -36,12 +36,25 @@ import java.util.List;
@Mapper
public interface OprGroupMemberMapper {
- @Select("SELECT * FROM group_member WHERE cluster_id=#{clusterId} AND
is_delete=0")
+ @Select("SELECT * FROM group_member WHERE status=1")
+ List<GroupMemberEntity> selectAll();
+
+ @Insert({
+ "<script>",
+ " INSERT INTO group_member (cluster_id, topic_name, group_name,
eventmesh_user, state) VALUES ",
+ " <foreach collection='list' item='c' index='index' separator=','>",
+
"(#{c.clusterId},#{c.topicName},#{c.groupName},#{c.eventMeshUser},#{c.state})",
+ " </foreach>",
+ "</script>"})
+ @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
+ void batchInsert(List<GroupMemberEntity> groupMemberEntities);
+
+ @Select("SELECT * FROM group_member WHERE cluster_id=#{clusterId} AND
status=1")
List<GroupMemberEntity> getGroupByClusterId(GroupMemberEntity
groupMemberEntity);
@Insert("INSERT INTO group_member (cluster_id, topic_name, group_name,
eventmesh_user,state)"
+ " VALUE
(#{clusterId},#{topicName},#{groupName},#{eventMeshUser},#{state})"
- + "ON DUPLICATE KEY UPDATE is_delete=0")
+ + "ON DUPLICATE KEY UPDATE status=0")
@Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
void addGroupMember(GroupMemberEntity groupMemberEntity);
@@ -49,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({
@@ -73,7 +86,7 @@ public interface OprGroupMemberMapper {
" AND topic_name=#{topicName}",
" </if>",
" </where>",
- " AND is_delete=0",
+ " AND status=1",
"</script>"})
List<GroupMemberEntity> selectMember(GroupMemberEntity groupMemberEntity);
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/health/HealthCheckResultMapper.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/health/HealthCheckResultMapper.java
index d5d5aab..01930c5 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/health/HealthCheckResultMapper.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/health/HealthCheckResultMapper.java
@@ -35,6 +35,9 @@ import java.util.List;
@Mapper
public interface HealthCheckResultMapper {
+ @Select("SELECT * FROM health_check_result")
+ List<HealthCheckResultEntity> selectAll();
+
@Select("SELECT * FROM health_check_result WHERE id = #{id}")
HealthCheckResultEntity selectById(HealthCheckResultEntity
healthCheckResultEntity);
@@ -49,28 +52,28 @@ public interface HealthCheckResultMapper {
@Param("startTime") Timestamp startTime, @Param("endTime") Timestamp
endTime);
@Options(useGeneratedKeys = true, keyProperty = "id")
- @Insert("INSERT INTO health_check_result(type,type_id, cluster_id,
status,result_desc)"
- + " VALUES( #{type}, #{typeId}, #{clusterId}, #{status},
#{resultDesc})")
+ @Insert("INSERT INTO health_check_result(type,type_id, cluster_id,
state,result_desc)"
+ + " VALUES( #{type}, #{typeId}, #{clusterId}, #{state},
#{resultDesc})")
void insert(HealthCheckResultEntity healthCheckResultEntity);
@Insert({
"<script>",
- " INSERT INTO health_check_result(type, type_id, cluster_id, status,
result_desc) VALUES ",
+ " INSERT INTO health_check_result(type, type_id, cluster_id, state,
result_desc) VALUES ",
" <foreach collection='list' item='healthCheckResultEntity'
index='index' separator=','>",
" (#{healthCheckResultEntity.type},
#{healthCheckResultEntity.typeId}, #{healthCheckResultEntity.clusterId},",
- " #{healthCheckResultEntity.status},
#{healthCheckResultEntity.resultDesc})",
+ " #{healthCheckResultEntity.state},
#{healthCheckResultEntity.resultDesc})",
" </foreach>",
"</script>"
})
void batchInsert(List<HealthCheckResultEntity>
healthCheckResultEntityList);
- @Update("UPDATE health_check_result SET status = #{status}, result_desc =
#{resultDesc} WHERE id = #{id}")
+ @Update("UPDATE health_check_result SET state = #{state}, result_desc =
#{resultDesc} WHERE id = #{id}")
void update(HealthCheckResultEntity healthCheckResultEntity);
@Update({
"<script>",
" <foreach collection='list' item='healthCheckResultEntity'
index='index' separator=';'>",
- " UPDATE health_check_result SET status =
#{healthCheckResultEntity.status},",
+ " UPDATE health_check_result SET state =
#{healthCheckResultEntity.state},",
" result_desc = #{healthCheckResultEntity.resultDesc} WHERE id =
#{healthCheckResultEntity.id}",
" </foreach>",
"</script>"})
@@ -79,7 +82,7 @@ public interface HealthCheckResultMapper {
@Select({
"<script>",
" SELECT * FROM health_check_result",
- " WHERE (cluster_id, type, type_id, status) IN",
+ " WHERE (cluster_id, type, type_id, state) IN",
" <foreach collection='list' item='item' open='(' separator=','
close=')'>",
" (#{item.clusterId}, #{item.type}, #{item.typeId}, 2)",
" </foreach>",
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/log/OprLogMapper.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/log/OprLogMapper.java
index fcc7dc9..9c48eef 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/log/OprLogMapper.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/log/OprLogMapper.java
@@ -56,6 +56,6 @@ public interface OprLogMapper {
@Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
Long addLog(LogEntity logEntity);
- @Update("UPDATE operation_log SET status=#{status}
,result=#{resultContent} WHERE id=#{id}")
+ @Update("UPDATE operation_log SET state=#{state} ,result=#{resultContent}
WHERE id=#{id}")
Integer updateLog(LogEntity logEntity);
}
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/meta/MetaMapper.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/meta/MetaMapper.java
index d51a9ef..f2261c8 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/meta/MetaMapper.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/meta/MetaMapper.java
@@ -33,6 +33,20 @@ import java.util.List;
*/
@Mapper
public interface MetaMapper {
+
+ @Select("SELECT * FROM meta WHERE status=1")
+ List<MetaEntity> selectAll();
+
+ @Insert({
+ "<script>",
+ " INSERT INTO meta (name, type, version, cluster_id, host, port,
role, username, params,status) VALUES ",
+ " <foreach collection='list' item='c' index='index' separator=','>",
+ " (#{c.name}, #{c.type}, #{c.version}, #{c.clusterId}, #{c.host},
#{c.port}, #{c.role}, #{c.username}, #{c.params}, #{c.status})",
+ "</foreach>",
+ "</script>"})
+ @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
+ void batchInsert(List<MetaEntity> metaEntities);
+
@Select("SELECT * FROM meta WHERE id = #{id}")
MetaEntity selectById(MetaEntity metaEntity);
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/runtime/RuntimeMapper.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/runtime/RuntimeMapper.java
index a9db87f..4c6e8ce 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/runtime/RuntimeMapper.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/runtime/RuntimeMapper.java
@@ -34,18 +34,31 @@ import java.util.List;
@Mapper
public interface RuntimeMapper {
+ @Select("SELECT * FROM runtime WHERE status=1")
+ List<RuntimeEntity> selectAll();
+
+ @Insert({
+ "<script>",
+ " INSERT INTO runtime (cluster_id, host, storage_cluster_id, port,
jmx_port, start_timestamp, rack, status, endpoint_map) VALUES",
+ " <foreach collection='list' item='c' index='index' separator=','>",
+ "
(#{c.clusterId},#{c.host},#{c.storageClusterId},#{c.port},#{c.jmxPort},#{c.startTimestamp},#{c.rack},#{c.status},#{c.endpointMap})",
+ " </foreach>",
+ "</script>"})
+ @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
+ void batchInsert(List<RuntimeEntity> runtimeEntities);
+
@Insert("INSERT INTO runtime (cluster_id, host, storage_cluster_id, port,
jmx_port, start_timestamp, rack, status, "
+ "endpoint_map)
VALUES(#{clusterId},#{host},#{storageClusterId},#{port},#{jmxPort},#{startTimestamp},#{rack},#{status},#{endpointMap})")
@Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
void addRuntime(RuntimeEntity runtimeEntity);
- @Select("SELECT * FROM runtime WHERE cluster_id=#{clusterId} AND
is_delete=0")
+ @Select("SELECT * FROM runtime WHERE cluster_id=#{clusterId} AND status=1")
List<RuntimeEntity> selectRuntimeByCluster(RuntimeEntity runtimeEntity);
- @Update("UPDATE runtime SET port=#{port} ,jmx_port=#{jmxPort}
,status=#{status} WHERE cluster_id=#{clusterId} AND is_delete=0")
+ @Update("UPDATE runtime SET port=#{port} ,jmx_port=#{jmxPort}
,status=#{status} WHERE cluster_id=#{clusterId} AND status=1")
void updateRuntimeByCluster(RuntimeEntity runtimeEntity);
- @Delete("UPDATE runtime SET is_delete=1 WHERE cluster_id=#{clusterId}")
+ @Delete("UPDATE runtime SET status=0 WHERE cluster_id=#{clusterId}")
void deleteRuntimeByCluster(RuntimeEntity runtimeEntity);
}
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 0207903..804a371 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
@@ -33,6 +33,21 @@ import java.util.List;
@Mapper
public interface StoreMapper {
+ @Select("SELECT * FROM store WHERE status=1")
+ List<StoreEntity> selectAll();
+
+ @Insert({
+ "<script>",
+ "INSERT INTO store (cluster_id, store_id, store_type, host,
runtime_id, topic_list, diff_type, port, jmx_port,start_timestamp, rack,",
+ " status, endpoint_map) VALUES ",
+ " <foreach collection='list' item='c' index='index' separator=','>",
+ " (#{c.clusterId}, #{c.storeId}, #{c.storeType}, #{c.host},
#{c.runtimeId}, #{c.topicList}, #{c.diffType}, #{c.port}, #{c.jmxPort},",
+ " #{c.startTimestamp}, #{c.rack}, #{c.status},
#{c.endpointMap})",
+ " </foreach>",
+ "</script>"})
+ @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
+ void batchInsert(List<StoreEntity> storeEntities);
+
@Insert("INSERT INTO store (cluster_id, store_id, store_type, host,
runtime_id, topic_list, diff_type"
+ ", port, jmx_port, start_timestamp, rack, status, endpoint_map )
VALUES ("
+
"#{clusterId},#{storeId},#{storeType},#{host},#{runtimeId},#{topicList},#{diffType},#{port},#{jmxPort}"
@@ -40,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<StoreEntity> 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 0fe2cad..48d6a0c 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
@@ -35,6 +35,19 @@ import java.util.List;
@Mapper
public interface TopicMapper {
+ @Select("SELECT * FROM topic WHERE status=1")
+ List<TopicEntity> selectAll();
+
+ @Insert({
+ "<script>",
+ "INSERT INTO topic (cluster_id, topic_name, runtime_id, storage_id,
retention_ms, type, description) VALUES ",
+ " <foreach collection='list' item='c' index='index' separator=','>",
+ "
(#{c.clusterId},#{c.topicName},#{c.runtimeId},#{c.storageId},#{c.retentionMs},#{c.type},#{c.description})",
+ " </foreach>",
+ "</script>"})
+ @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
+ void batchInsert(List<TopicEntity> topicEntities);
+
@Select("SELECT count(*) FROM topic WHERE cluster_id=#{clusterId}")
Integer selectTopicNumByCluster(TopicEntity topicEntity);
@@ -48,21 +61,21 @@ public interface TopicMapper {
" <if test='clusterId!=null'>",
" AND cluster_id=#{clusterId} ",
" </if>",
- " AND is_delete=0",
+ " AND status=1",
" </where>",
"</script>"})
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})"
- + "ON DUPLICATE KEY UPDATE is_delete = 0")
+ + "ON DUPLICATE KEY UPDATE status = 1")
@Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
void addTopic(TopicEntity topicEntity);
@Update("UPDATE topic SET type=#{type},description=#{description} WHERE
id=#{id}")
void updateTopic(TopicEntity topicEntity);
- @Delete("UPDATE `topic` SET is_delete=1 WHERE id=#{id}")
+ @Delete("UPDATE `topic` SET status=0 WHERE id=#{id}")
void deleteTopic(TopicEntity topicEntity);
@Select("SELECT * FROM topic WHERE cluster_id=#{clusterId} AND
topic_name=#{topicName}")
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/client/ClientDataService.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/client/ClientDataService.java
index 4daa5ff..22a0712 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/client/ClientDataService.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/client/ClientDataService.java
@@ -17,9 +17,16 @@
package org.apache.eventmesh.dashboard.console.service.client;
+import org.apache.eventmesh.dashboard.console.entity.client.ClientEntity;
+
+import java.util.List;
+
/**
* Service providing data of clients.
*/
public interface ClientDataService {
+ List<ClientEntity> selectAll();
+
+ void batchInsert(List<ClientEntity> clientEntityList);
}
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/ClusterService.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/client/Impl/ClientDataServiceImpl.java
similarity index 51%
copy from
eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/ClusterService.java
copy to
eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/client/Impl/ClientDataServiceImpl.java
index 6f0d7cf..7a153fc 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/ClusterService.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/client/Impl/ClientDataServiceImpl.java
@@ -15,24 +15,30 @@
* limitations under the License.
*/
-package org.apache.eventmesh.dashboard.console.service.cluster;
+package org.apache.eventmesh.dashboard.console.service.client.Impl;
-import org.apache.eventmesh.dashboard.console.entity.cluster.ClusterEntity;
+import org.apache.eventmesh.dashboard.console.entity.client.ClientEntity;
+import org.apache.eventmesh.dashboard.console.mapper.client.ClientMapper;
+import org.apache.eventmesh.dashboard.console.service.client.ClientDataService;
import java.util.List;
-/**
- * cluster data service
- */
-public interface ClusterService {
-
- void addCluster(ClusterEntity cluster);
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
- List<ClusterEntity> selectAllCluster();
+@Service
+public class ClientDataServiceImpl implements ClientDataService {
- ClusterEntity selectClusterById(ClusterEntity cluster);
+ @Autowired
+ private ClientMapper clientMapper;
- void updateClusterById(ClusterEntity cluster);
+ @Override
+ public List<ClientEntity> selectAll() {
+ return clientMapper.selectAll();
+ }
- void deleteClusterById(ClusterEntity cluster);
+ @Override
+ public void batchInsert(List<ClientEntity> clientEntityList) {
+ clientMapper.batchInsert(clientEntityList);
+ }
}
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/ClusterService.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/ClusterService.java
index 6f0d7cf..754c223 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/ClusterService.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/ClusterService.java
@@ -26,6 +26,10 @@ import java.util.List;
*/
public interface ClusterService {
+ void batchInsert(List<ClusterEntity> clusterEntities);
+
+ List<ClusterEntity> selectAll();
+
void addCluster(ClusterEntity cluster);
List<ClusterEntity> selectAllCluster();
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/impl/ClusterServiceImpl.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/impl/ClusterServiceImpl.java
index b669c4e..f4b7e9a 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/impl/ClusterServiceImpl.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/impl/ClusterServiceImpl.java
@@ -33,6 +33,16 @@ public class ClusterServiceImpl implements ClusterService {
@Autowired
private ClusterMapper clusterMapper;
+ @Override
+ public void batchInsert(List<ClusterEntity> clusterEntities) {
+ clusterMapper.batchInsert(clusterEntities);
+ }
+
+ @Override
+ public List<ClusterEntity> selectAll() {
+ return clusterMapper.selectAllCluster();
+ }
+
@Override
public void addCluster(ClusterEntity cluster) {
clusterMapper.addCluster(cluster);
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/config/ConfigService.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/config/ConfigService.java
index d2dea9e..c05d5da 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/config/ConfigService.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/config/ConfigService.java
@@ -29,6 +29,10 @@ import java.util.Map;
*/
public interface ConfigService {
+ List<ConfigEntity> selectAll();
+
+ void batchInsert(List<ConfigEntity> configEntityList);
+
String mapToYaml(Map<String, String> stringMap);
Integer addConfig(ConfigEntity configEntity);
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/config/Impl/ConfigServiceImpl.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/config/Impl/ConfigServiceImpl.java
index 9bab90c..b8d32b4 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/config/Impl/ConfigServiceImpl.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/config/Impl/ConfigServiceImpl.java
@@ -36,6 +36,16 @@ public class ConfigServiceImpl implements ConfigService {
@Autowired
ConfigMapper configMapper;
+ @Override
+ public List<ConfigEntity> selectAll() {
+ return configMapper.selectAll();
+ }
+
+ @Override
+ public void batchInsert(List<ConfigEntity> configEntityList) {
+ configMapper.batchInsert(configEntityList);
+ }
+
@Override
public String mapToYaml(Map<String, String> stringMap) {
Yaml yaml = new Yaml();
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/group/GroupService.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/group/GroupService.java
index 2afda6e..1663632 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/group/GroupService.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/group/GroupService.java
@@ -28,6 +28,10 @@ import java.util.List;
public interface GroupService {
+ List<GroupEntity> selectAll();
+
+ void batchInsert(List<GroupEntity> groupEntities);
+
List<GroupEntity> getGroupByClusterId(GroupEntity groupEntity);
GroupEntity addGroup(GroupEntity groupEntity);
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/group/GroupServiceImpl.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/group/Impl/GroupServiceImpl.java
similarity index 91%
rename from
eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/group/GroupServiceImpl.java
rename to
eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/group/Impl/GroupServiceImpl.java
index 3647a5a..cfcfe31 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/group/GroupServiceImpl.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/group/Impl/GroupServiceImpl.java
@@ -15,12 +15,13 @@
* limitations under the License.
*/
-package org.apache.eventmesh.dashboard.console.service.group;
+package org.apache.eventmesh.dashboard.console.service.group.Impl;
import org.apache.eventmesh.dashboard.console.annotation.EmLog;
import org.apache.eventmesh.dashboard.console.entity.group.GroupEntity;
import
org.apache.eventmesh.dashboard.console.entity.groupmember.GroupMemberEntity;
import org.apache.eventmesh.dashboard.console.mapper.group.OprGroupMapper;
+import org.apache.eventmesh.dashboard.console.service.group.GroupService;
import
org.apache.eventmesh.dashboard.console.service.groupmember.GroupMemberService;
import java.sql.Timestamp;
@@ -38,6 +39,16 @@ public class GroupServiceImpl implements GroupService {
@Autowired
GroupMemberService groupMemberService;
+ @Override
+ public List<GroupEntity> selectAll() {
+ return oprGroupMapper.selectAll();
+ }
+
+ @Override
+ public void batchInsert(List<GroupEntity> groupEntities) {
+ oprGroupMapper.batchInsert(groupEntities);
+ }
+
@EmLog(OprType = "search", OprTarget = "Group")
@Override
public List<GroupEntity> getGroupByClusterId(GroupEntity groupEntity) {
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/groupmember/GroupMemberService.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/groupmember/GroupMemberService.java
index 28f9516..25bdbeb 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/groupmember/GroupMemberService.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/groupmember/GroupMemberService.java
@@ -27,6 +27,10 @@ import java.util.List;
*/
public interface GroupMemberService {
+ List<GroupMemberEntity> selectAll();
+
+ void batchInsert(List<GroupMemberEntity> groupMemberEntities);
+
List<GroupMemberEntity> getGroupMemberByClusterId(GroupMemberEntity
groupMemberEntity);
void addGroupMember(GroupMemberEntity groupMemberEntity);
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/groupmember/GroupMemberServiceImp.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/groupmember/Impl/GroupMemberServiceImp.java
similarity index 89%
rename from
eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/groupmember/GroupMemberServiceImp.java
rename to
eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/groupmember/Impl/GroupMemberServiceImp.java
index d50173e..2ce9fac 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/groupmember/GroupMemberServiceImp.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/groupmember/Impl/GroupMemberServiceImp.java
@@ -15,12 +15,13 @@
* limitations under the License.
*/
-package org.apache.eventmesh.dashboard.console.service.groupmember;
+package org.apache.eventmesh.dashboard.console.service.groupmember.Impl;
import org.apache.eventmesh.dashboard.console.annotation.EmLog;
import org.apache.eventmesh.dashboard.console.entity.group.GroupEntity;
import
org.apache.eventmesh.dashboard.console.entity.groupmember.GroupMemberEntity;
import
org.apache.eventmesh.dashboard.console.mapper.groupmember.OprGroupMemberMapper;
+import
org.apache.eventmesh.dashboard.console.service.groupmember.GroupMemberService;
import java.util.List;
@@ -33,6 +34,16 @@ public class GroupMemberServiceImp implements
GroupMemberService {
@Autowired
OprGroupMemberMapper oprGroupMemberMapper;
+ @Override
+ public List<GroupMemberEntity> selectAll() {
+ return oprGroupMemberMapper.selectAll();
+ }
+
+ @Override
+ public void batchInsert(List<GroupMemberEntity> groupMemberEntities) {
+ oprGroupMemberMapper.batchInsert(groupMemberEntities);
+ }
+
@Override
@EmLog(OprType = "View", OprTarget = "GroupMember")
public List<GroupMemberEntity> getGroupMemberByClusterId(GroupMemberEntity
groupMemberEntity) {
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/runtime/Impl/RuntimeServiceImpl.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/runtime/Impl/RuntimeServiceImpl.java
index 7b7ec07..da6cd0f 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/runtime/Impl/RuntimeServiceImpl.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/runtime/Impl/RuntimeServiceImpl.java
@@ -32,6 +32,16 @@ public class RuntimeServiceImpl implements RuntimeService {
@Autowired
private RuntimeMapper runtimeMapper;
+ @Override
+ public void batchInsert(List<RuntimeEntity> runtimeEntities) {
+ runtimeMapper.batchInsert(runtimeEntities);
+ }
+
+ @Override
+ public List<RuntimeEntity> selectAll() {
+ return runtimeMapper.selectAll();
+ }
+
@Override
public List<RuntimeEntity> getRuntimeByClusterId(Long clusterId) {
RuntimeEntity runtimeEntity = new RuntimeEntity();
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/runtime/RuntimeService.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/runtime/RuntimeService.java
index c4569ce..65f1a4e 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/runtime/RuntimeService.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/runtime/RuntimeService.java
@@ -26,6 +26,10 @@ import java.util.List;
*/
public interface RuntimeService {
+ void batchInsert(List<RuntimeEntity> runtimeEntities);
+
+ List<RuntimeEntity> selectAll();
+
List<RuntimeEntity> getRuntimeByClusterId(Long cluster);
void addRuntime(RuntimeEntity runtimeEntity);
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/store/Impl/StoreServiceImpl.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/store/Impl/StoreServiceImpl.java
index 4e4469b..db992e2 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/store/Impl/StoreServiceImpl.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/store/Impl/StoreServiceImpl.java
@@ -32,6 +32,16 @@ public class StoreServiceImpl implements StoreService {
@Autowired
private StoreMapper storeMapper;
+ @Override
+ public List<StoreEntity> selectAll() {
+ return storeMapper.selectAll();
+ }
+
+ @Override
+ public void batchInsert(List<StoreEntity> storeEntities) {
+ storeMapper.batchInsert(storeEntities);
+ }
+
@Override
public void addStore(StoreEntity storeEntity) {
storeMapper.addStore(storeEntity);
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/store/StoreService.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/store/StoreService.java
index 9fdaf4f..605b8b5 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/store/StoreService.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/store/StoreService.java
@@ -26,6 +26,10 @@ import java.util.List;
*/
public interface StoreService {
+ List<StoreEntity> selectAll();
+
+ void batchInsert(List<StoreEntity> storeEntities);
+
void addStore(StoreEntity storeEntity);
void deleteStoreByUnique(StoreEntity storeEntity);
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/topic/TopicService.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/topic/TopicService.java
index 2f8696d..3f0b986 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/topic/TopicService.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/topic/TopicService.java
@@ -26,6 +26,10 @@ import java.util.List;
*/
public interface TopicService {
+ void batchInsert(List<TopicEntity> topicEntities);
+
+ List<TopicEntity> selectAll();
+
Integer selectTopicNumByCluster(Long clusterId);
List<TopicEntity> getTopicList(TopicEntity topicEntity);
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/topic/TopicServiceImpl.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/topic/TopicServiceImpl.java
index 444de27..e15f7c4 100644
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/topic/TopicServiceImpl.java
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/topic/TopicServiceImpl.java
@@ -37,6 +37,16 @@ public class TopicServiceImpl implements TopicService {
OprGroupMemberMapper oprGroupMemberMapper;
+ @Override
+ public void batchInsert(List<TopicEntity> topicEntities) {
+ topicMapper.batchInsert(topicEntities);
+ }
+
+ @Override
+ public List<TopicEntity> selectAll() {
+ return topicMapper.selectAll();
+ }
+
@Override
public Integer selectTopicNumByCluster(Long clusterId) {
TopicEntity topicEntity = new TopicEntity();
diff --git
a/eventmesh-dashboard-console/src/main/resources/eventmesh-dashboard.sql
b/eventmesh-dashboard-console/src/main/resources/eventmesh-dashboard.sql
index 7c5e38b..fa1ccb3 100644
--- a/eventmesh-dashboard-console/src/main/resources/eventmesh-dashboard.sql
+++ b/eventmesh-dashboard-console/src/main/resources/eventmesh-dashboard.sql
@@ -31,7 +31,8 @@ create table cluster
run_state tinyint default 1 not null
comment '运行状态, 0表示未监控, 1监控中，有注册中心，2:监控中，无注册中心',
create_time timestamp default CURRENT_TIMESTAMP not null
comment '接入时间',
update_time timestamp default CURRENT_TIMESTAMP not null on
update CURRENT_TIMESTAMP comment '修改时间',
- is_delete int default 0 not null
comment '0',
+ status int default 1 not null
comment '0',
+ store_type int default 0 not null,
constraint uniq_name
unique (name)
)
@@ -53,14 +54,14 @@ create table config
config_name varchar(192) default '' not null comment
'配置名称',
config_value text null comment
'配置值',
start_version varchar(64) default '' not null comment
'配置开始使用的版本',
- status int default 1 not null comment
'1 正常 2 禁用',
+ status int default 1 not null comment
'0 关闭 1 开启 ',
+ is_default int default 1 null,
end_version varchar(64) default '' not null comment
'配置结束使用的版本',
diff_type int default -1 not null comment
'差异类型',
description varchar(1000) default '' not null comment
'备注',
edit int default 1 not null comment
'是否可以编辑 1 不可编辑（程序获取） 2 可编辑',
create_time timestamp default CURRENT_TIMESTAMP not null comment
'创建时间',
update_time timestamp default CURRENT_TIMESTAMP not null on
update CURRENT_TIMESTAMP comment '修改时间',
- is_default int not null comment
'是否是默认值，0默认，1自定义的',
is_modify int default 0 not null,
eventmesh_version varchar(64) default ' ' not null,
constraint uniq_instance_type_instance_id_config_name
@@ -72,7 +73,56 @@ create index idx_phy_id_instance_id
on config (cluster_id, instance_id);
-DROP TABLE IF EXISTS `runtime`;
+
+drop table if exists `group`;
+create table `group`
+(
+ id bigint unsigned auto_increment comment 'id'
+ primary key,
+ cluster_id bigint default -1 not
null comment '集群id',
+ name varchar(192) collate utf8_bin default '' not
null comment 'Group名称',
+ member_count int unsigned default '0' not
null comment '成员数',
+ members text null
comment 'group的member列表',
+ type tinyint not
null comment 'group类型 0：consumer 1：producer',
+ state varchar(64) default '' not
null comment '状态',
+ create_time timestamp default CURRENT_TIMESTAMP not
null comment '创建时间',
+ update_time timestamp default CURRENT_TIMESTAMP not
null on update CURRENT_TIMESTAMP comment '修改时间',
+ status int default 1 not
null,
+ constraint uniq_cluster_phy_id_name
+ unique (cluster_id, name)
+)
+ comment 'Group信息表';
+
+create index cluster_id
+ on `group` (cluster_id, name);
+
+
+drop table if exists group_member;
+create table group_member
+(
+ id bigint unsigned auto_increment comment 'id'
+ primary key,
+ cluster_id bigint default -1 not null comment
'集群ID',
+ topic_name varchar(192) default '' not null comment
'Topic名称',
+ group_name varchar(192) default '' not null comment
'Group名称',
+ eventmesh_user varchar(192) default '' not null comment
'EventMesh用户',
+ state varchar(64) default '' not null comment
'状态',
+ create_time timestamp default CURRENT_TIMESTAMP not null comment
'创建时间',
+ update_time timestamp default CURRENT_TIMESTAMP not null on update
CURRENT_TIMESTAMP comment '修改时间',
+ status int default 1 not null,
+ constraint uniq_cluster_topic_group
+ unique (cluster_id, topic_name, group_name)
+)
+ comment 'GroupMember信息表';
+
+create index cluster_id
+ on group_member (cluster_id, topic_name, group_name);
+
+
+
+
+
+drop table if exists runtime;
create table runtime
(
id bigint auto_increment comment 'id'
@@ -84,11 +134,10 @@ create table runtime
jmx_port int default -1 not null
comment 'Jmx端口',
start_timestamp bigint default -1 not null
comment '启动时间',
rack varchar(128) default '' not null
comment 'Rack信息',
- status int default 0 not null
comment '状态: 1启用，0未启用',
+ status int default 1 not null
comment '状态: 1启用，0未启用',
create_time timestamp default CURRENT_TIMESTAMP not null
comment '创建时间',
update_time timestamp default CURRENT_TIMESTAMP not null on
update CURRENT_TIMESTAMP comment '修改时间',
endpoint_map varchar(1024) default '' not null
comment '监听信息',
- is_delete int default 0 not null
comment '0',
constraint uniq_cluster_phy_id__host_port
unique (cluster_id, host)
)
@@ -114,11 +163,10 @@ create table store
jmx_port int default -1 not null comment
'Jmx端口',
start_timestamp bigint default -1 not null comment
'启动时间',
rack varchar(128) default '' not null comment
'Rack信息',
- status int default 0 not null comment
'状态: 1启用，0未启用',
+ status int default 1 not null comment
'状态: 1启用，0未启用',
create_time timestamp default CURRENT_TIMESTAMP not null comment
'创建时间',
update_time timestamp default CURRENT_TIMESTAMP not null on update
CURRENT_TIMESTAMP comment '修改时间',
endpoint_map varchar(1024) default '' not null comment
'监听信息',
- is_delete int default 0 not null,
constraint uniq_cluster_phy_id__storage_id
unique (cluster_id, store_id)
)
@@ -141,7 +189,7 @@ CREATE TABLE `group`
`state` varchar(64) NOT
NULL DEFAULT '' COMMENT '状态',
`create_time` timestamp NOT
NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`update_time` timestamp NOT
NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
- `is_delete` int NOT
NULL DEFAULT '0',
+ `status` int NOT
NULL DEFAULT '1',
PRIMARY KEY (`id`),
UNIQUE KEY `uniq_cluster_phy_id_name` (`cluster_id`, `name`),
KEY `cluster_id` (`cluster_id`, `name`)
@@ -162,7 +210,7 @@ CREATE TABLE `group_member`
`state` varchar(64) NOT NULL DEFAULT '' COMMENT '状态',
`create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
`update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON
UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
- `is_delete` int NOT NULL DEFAULT '0',
+ `status` int NOT NULL DEFAULT '1',
PRIMARY KEY (`id`),
UNIQUE KEY `uniq_cluster_topic_group` (`cluster_id`, `topic_name`,
`group_name`),
KEY `cluster_id` (`cluster_id`, `topic_name`, `group_name`)
@@ -178,7 +226,7 @@ CREATE TABLE `operation_log`
`id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
`cluster_id` bigint NOT NULL DEFAULT '-1' COMMENT '物理集群ID',
`operation_type` varchar(192) NOT NULL DEFAULT '' COMMENT
'操作类型,如:启动，停止，重启，添加，删除，修改',
- `status` int NOT NULL DEFAULT '0' COMMENT '操作状态
0:未知，1:执行中，2:成功，3:失败',
+ `state` int NOT NULL DEFAULT '0' COMMENT '操作状态
0:未知，1:执行中，2:成功，3:失败',
`content` varchar(1024) COMMENT '备注信息',
`create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
`end_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '结束时间',
@@ -188,7 +236,7 @@ CREATE TABLE `operation_log`
`is_delete` int NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
KEY `idx_cluster_phy_id` (`cluster_id`),
- KEY `idx_status` (`status`)
+ KEY `idx_state` (`state`)
) ENGINE = InnoDB
AUTO_INCREMENT = 68
DEFAULT CHARSET = utf8mb4,
@@ -209,7 +257,7 @@ CREATE TABLE `topic`
`description` varchar(1024) DEFAULT '' COMMENT '备注信息',
`create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT
'创建时间(尽量与Topic实际创建时间一致)',
`update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT
'修改时间(尽量与Topic实际创建时间一致)',
- `is_delete` int NOT NULL DEFAULT '0',
+ `status` int NOT NULL DEFAULT '1',
PRIMARY KEY (`id`),
UNIQUE KEY `uniq_cluster_phy_id_topic_name` (`cluster_id`, `topic_name`),
KEY `cluster_id` (`cluster_id`, `topic_name`)
@@ -300,7 +348,7 @@ CREATE TABLE `health_check_result`
`type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '检查维度(0:未知,
1:Cluster, 2:Runtime, 3:Topic, 4:Storage)',
`type_id` bigint(20) unsigned NOT NULL COMMENT '对应检查维度的实例id',
`cluster_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '集群ID',
- `status` tinyint(4) NOT NULL DEFAULT '0' COMMENT
'检查状态(0:未通过，1:通过,2:正在检查,3:超时)',
+ `state` tinyint(4) NOT NULL DEFAULT '0' COMMENT
'检查状态(0:未通过，1:通过,2:正在检查,3:超时)',
`result_desc` varchar(1024) NOT NULL DEFAULT '' COMMENT '检查结果描述',
`create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
`update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON
UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
diff --git
a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/function/health/HealthExecutorTest.java
b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/function/health/HealthExecutorTest.java
index e36eb61..9ce9abd 100644
---
a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/function/health/HealthExecutorTest.java
+++
b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/function/health/HealthExecutorTest.java
@@ -133,7 +133,7 @@ class HealthExecutorTest {
query.setClusterId(1L);
query.setType(HealthCheckType.STORAGE.getNumber());
query.setTypeId(2L);
-
assertNotNull(healthDataService.queryHealthCheckResultByClusterIdAndTypeAndTypeId(query).get(0).getStatus());
+
assertNotNull(healthDataService.queryHealthCheckResultByClusterIdAndTypeAndTypeId(query).get(0).getState());
}
@Test
@@ -147,7 +147,7 @@ class HealthExecutorTest {
query.setClusterId(1L);
query.setType(HealthCheckType.STORAGE.getNumber());
query.setTypeId(1L);
- assertEquals(1,
healthDataService.queryHealthCheckResultByClusterIdAndTypeAndTypeId(query).get(0).getStatus());
+ assertEquals(1,
healthDataService.queryHealthCheckResultByClusterIdAndTypeAndTypeId(query).get(0).getState());
}
@Test
@@ -161,7 +161,7 @@ class HealthExecutorTest {
query.setType(HealthCheckType.STORAGE.getNumber());
query.setTypeId(1L);
assertEquals(HealthCheckStatus.TIMEOUT.getNumber(),
-
healthDataService.queryHealthCheckResultByClusterIdAndTypeAndTypeId(query).get(0).getStatus());
+
healthDataService.queryHealthCheckResultByClusterIdAndTypeAndTypeId(query).get(0).getState());
}
@Test
diff --git
a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/linkage/log/TestOprLog.java
b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/linkage/log/TestOprLog.java
index 9004738..29a3511 100644
---
a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/linkage/log/TestOprLog.java
+++
b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/linkage/log/TestOprLog.java
@@ -44,7 +44,7 @@ public class TestOprLog {
@Test
public void testGroupServiceOprLog() {
- GroupEntity groupEntity = new GroupEntity(null, 1L, "logTest", 0,
null, 1, "OK", null, null);
+ GroupEntity groupEntity = new GroupEntity(null, 1L, "logTest", 0,
null, 1, "OK", null, null, 0);
GroupEntity groupEntity1 = groupService.addGroup(groupEntity);
LogEntity logEntity = new LogEntity(null, 1L, "add", "Group", 2,
groupEntity1.toString(), null, null, null, null);
logEntity.setResult(groupEntity.toString());
diff --git
a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/mapper/health/HealthCheckResultMapperTest.java
b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/mapper/health/HealthCheckResultMapperTest.java
index 30e6690..39e7ecf 100644
---
a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/mapper/health/HealthCheckResultMapperTest.java
+++
b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/mapper/health/HealthCheckResultMapperTest.java
@@ -53,7 +53,7 @@ class HealthCheckResultMapperTest {
healthCheckResultEntity.setId(1L);
healthCheckResultEntity =
healthCheckResultMapper.selectById(healthCheckResultEntity);
assertEquals(1, healthCheckResultEntity.getId());
- assertEquals(0, healthCheckResultEntity.getStatus());
+ assertEquals(0, healthCheckResultEntity.getState());
}
@Test
@@ -61,7 +61,7 @@ class HealthCheckResultMapperTest {
HealthCheckResultEntity healthCheckResultEntity = new
HealthCheckResultEntity(1L, 1, 1L, "", 1);
healthCheckResultEntity =
healthCheckResultMapper.selectByClusterIdAndTypeAndTypeId(healthCheckResultEntity).get(0);
assertEquals(1, healthCheckResultEntity.getId());
- assertEquals(0, healthCheckResultEntity.getStatus());
+ assertEquals(0, healthCheckResultEntity.getState());
}
@Test
@@ -104,7 +104,7 @@ class HealthCheckResultMapperTest {
HealthCheckResultEntity healthCheckResultEntity = new
HealthCheckResultEntity(1L, 1, 1L, "reason", 0);
healthCheckResultMapper.update(healthCheckResultEntity);
healthCheckResultEntity =
healthCheckResultMapper.selectByClusterIdAndTypeAndTypeId(healthCheckResultEntity).get(0);
- assertEquals(0, healthCheckResultEntity.getStatus());
+ assertEquals(0, healthCheckResultEntity.getState());
}
@Test
@@ -117,8 +117,8 @@ class HealthCheckResultMapperTest {
healthCheckResultEntity1 =
healthCheckResultMapper.selectById(healthCheckResultEntity1);
healthCheckResultEntity2 =
healthCheckResultMapper.selectById(healthCheckResultEntity2);
- assertEquals(0, healthCheckResultEntity1.getStatus());
- assertEquals(0, healthCheckResultEntity2.getStatus());
+ assertEquals(0, healthCheckResultEntity1.getState());
+ assertEquals(0, healthCheckResultEntity2.getState());
}
@Test
@@ -130,13 +130,13 @@ class HealthCheckResultMapperTest {
List<HealthCheckResultEntity> toBeUpdate =
healthCheckResultMapper.getIdsNeedToBeUpdateByClusterIdAndTypeAndTypeId(
Arrays.asList(entity1, entity2));
- toBeUpdate.forEach(entity -> entity.setStatus(2));
+ toBeUpdate.forEach(entity -> entity.setState(2));
healthCheckResultMapper.batchUpdate(toBeUpdate);
entity1.setId(7L);
- assertEquals(2,
healthCheckResultMapper.selectById(entity1).getStatus());
+ assertEquals(2,
healthCheckResultMapper.selectById(entity1).getState());
entity2.setId(1L);
- assertEquals(0,
healthCheckResultMapper.selectById(entity2).getStatus());
+ assertEquals(0,
healthCheckResultMapper.selectById(entity2).getState());
}
}
\ No newline at end of file
diff --git
a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/cluster/TestClusterMapper.java
b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/cluster/TestClusterMapper.java
index 192c4e0..c8625aa 100644
---
a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/cluster/TestClusterMapper.java
+++
b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/cluster/TestClusterMapper.java
@@ -23,7 +23,7 @@ public class TestClusterMapper {
@Test
public void testAddCluster() {
ClusterEntity clusterEntity =
- new ClusterEntity(null, "cl1", "registerList", "server", "1.7.0",
"null", "null", "null", "no", 0, 0, null, null);
+ new ClusterEntity(null, "cl1", "registerList", "server", "1.7.0",
"null", "null", "null", "no", 0, 0, 0, null, null, 0);
clusterMapper.addCluster(clusterEntity);
ClusterEntity clusterEntity1 =
clusterMapper.selectClusterById(clusterEntity);
clusterEntity1.setUpdateTime(null);
@@ -34,9 +34,9 @@ public class TestClusterMapper {
@Test
public void testSelectAllCluster() {
ClusterEntity clusterEntity =
- new ClusterEntity(null, "cl1", "registerList", "server", "1.7.0",
"null", "null", "null", "no", 0, 0, null, null);
+ new ClusterEntity(null, "cl1", "registerList", "server", "1.7.0",
"null", "null", "null", "no", 0, 0, 0, null, null, 0);
ClusterEntity clusterEntity1 =
- new ClusterEntity(null, "c1", "registerList", "server", "1.7.0",
"null", "null", "null", "no", 0, 0, null, null);
+ new ClusterEntity(null, "c1", "registerList", "server", "1.7.0",
"null", "null", "null", "no", 0, 0, 0, null, null, 0);
clusterMapper.addCluster(clusterEntity);
clusterMapper.addCluster(clusterEntity1);
List<ClusterEntity> clusterEntities = clusterMapper.selectAllCluster();
@@ -46,7 +46,7 @@ public class TestClusterMapper {
@Test
public void testSelectClusterById() {
ClusterEntity clusterEntity =
- new ClusterEntity(null, "cl1", "registerList", "server", "1.7.0",
"null", "null", "null", "no", 0, 0, null, null);
+ new ClusterEntity(null, "cl1", "registerList", "server", "1.7.0",
"null", "null", "null", "no", 0, 0, 0, null, null, 0);
clusterMapper.addCluster(clusterEntity);
ClusterEntity clusterEntity1 =
clusterMapper.selectClusterById(clusterEntity);
clusterEntity1.setCreateTime(null);
@@ -57,7 +57,7 @@ public class TestClusterMapper {
@Test
public void testUpdateCluster() {
ClusterEntity clusterEntity =
- new ClusterEntity(null, "cl1", "registerList", "server", "1.7.0",
"null", "null", "null", "no", 0, 0, null, null);
+ new ClusterEntity(null, "cl1", "registerList", "server", "1.7.0",
"null", "null", "null", "no", 0, 0, 0, null, null, 0);
clusterMapper.addCluster(clusterEntity);
clusterEntity.setDescription("nothing");
clusterEntity.setName("cl2");
@@ -79,7 +79,7 @@ public class TestClusterMapper {
@Test
public void testDeleteCluster() {
ClusterEntity clusterEntity =
- new ClusterEntity(null, "cl1", "registerList", "server", "1.7.0",
"null", "null", "null", "no", 0, 0, null, null);
+ new ClusterEntity(null, "cl1", "registerList", "server", "1.7.0",
"null", "null", "null", "no", 0, 0, 0, null, null, 0);
clusterMapper.addCluster(clusterEntity);
clusterMapper.deleteClusterById(clusterEntity);
ClusterEntity clusterEntity1 =
clusterMapper.selectClusterById(clusterEntity);
diff --git
a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/group/GroupMapperTest.java
b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/group/GroupMapperTest.java
index 41eca99..6f26339 100644
---
a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/group/GroupMapperTest.java
+++
b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/group/GroupMapperTest.java
@@ -41,7 +41,7 @@ public class GroupMapperTest {
public List<GroupEntity> insertGroupData(String name) {
List<GroupEntity> groupEntities = new ArrayList<>();
for (int i = 0; i < 10; i++) {
- GroupEntity groupEntity = new GroupEntity(null, (long) i, name, 0,
null, 1, "OK", null, null);
+ GroupEntity groupEntity = new GroupEntity(null, (long) i, name, 0,
null, 1, "OK", null, null, 0);
groupMapper.addGroup(groupEntity);
groupEntities.add(groupEntity);
}
diff --git
a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/groupmember/GroupMemberMapperTest.java
b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/groupmember/GroupMemberMapperTest.java
index 76fa849..31d4ce4 100644
---
a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/groupmember/GroupMemberMapperTest.java
+++
b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/groupmember/GroupMemberMapperTest.java
@@ -41,7 +41,7 @@ public class GroupMemberMapperTest {
public List<GroupMemberEntity> insertGroupData(String topicName, String
groupName) {
List<GroupMemberEntity> groupMemberEntities = new ArrayList<>();
for (int i = 0; i < 10; i++) {
- GroupMemberEntity groupMemberEntity = new GroupMemberEntity(null,
(long) i, topicName, groupName, "admin", "active", null, null);
+ GroupMemberEntity groupMemberEntity = new GroupMemberEntity(null,
(long) i, topicName, groupName, "admin", "active", null, null, 0);
groupMemberMapper.addGroupMember(groupMemberEntity);
groupMemberEntities.add(groupMemberEntity);
}
diff --git
a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/topic/TopicMapperTest.java
b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/topic/TopicMapperTest.java
index 929953a..940b1e3 100644
---
a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/topic/TopicMapperTest.java
+++
b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/topic/TopicMapperTest.java
@@ -41,7 +41,7 @@ public class TopicMapperTest {
public List<TopicEntity> insertGroupData(String topicName) {
List<TopicEntity> topicEntities = new ArrayList<>();
for (int i = 0; i < 10; i++) {
- TopicEntity topicEntity = new TopicEntity(null, (long) i,
topicName, "10", "10", 100L, 1, "testTopic", null, null);
+ TopicEntity topicEntity = new TopicEntity(null, (long) i,
topicName, "10", "10", 100L, 1, "testTopic", null, null, 0);
topicMapper.addTopic(topicEntity);
topicEntities.add(topicEntity);
}
diff --git a/eventmesh-dashboard-console/src/test/resources/health-test.sql
b/eventmesh-dashboard-console/src/test/resources/health-test.sql
index 45c3aeb..2640020 100644
--- a/eventmesh-dashboard-console/src/test/resources/health-test.sql
+++ b/eventmesh-dashboard-console/src/test/resources/health-test.sql
@@ -17,10 +17,10 @@
DELETE FROM `eventmesh_dashboard_test`.health_check_result WHERE TRUE;
ALTER TABLE `eventmesh_dashboard_test`.health_check_result AUTO_INCREMENT = 1;
-insert into `eventmesh_dashboard_test`.health_check_result (id, type, type_id,
cluster_id, status, result_desc, create_time, update_time)
-values (1, 1, 1, 1, 0, '', '2024-02-02 18:56:50', '2024-02-02 18:56:50'),
- (2, 2, 2, 1, 1, '', '2024-02-02 18:56:50', '2024-02-02 18:56:50'),
- (3, 3, 3, 1, 1, '', '2024-02-02 18:56:50', '2024-02-02 18:56:50'),
- (4, 4, 4, 1, 1, '', '2024-02-02 18:56:50', '2024-02-02 18:56:50'),
- (5, 1, 2, 1, 1, '', '2024-02-04 18:56:50', '2024-02-02 19:33:13'),
- (6, 4, 2, 2, 0, '', '2024-02-04 18:56:50', '2024-02-02 19:33:13');
\ No newline at end of file
+insert into `eventmesh_dashboard_test`.health_check_result (id, type, type_id,
cluster_id, state, result_desc, create_time, update_time)
+values (1, 1, 1, 1, 0, '', '2024-02-02 18:56:50', '2024-02-02 18:56:50'),
+ (2, 2, 2, 1, 1, '', '2024-02-02 18:56:50', '2024-02-02 18:56:50'),
+ (3, 3, 3, 1, 1, '', '2024-02-02 18:56:50', '2024-02-02 18:56:50'),
+ (4, 4, 4, 1, 1, '', '2024-02-02 18:56:50', '2024-02-02 18:56:50'),
+ (5, 1, 2, 1, 1, '', '2024-02-04 18:56:50', '2024-02-02 19:33:13'),
+ (6, 4, 2, 2, 0, '', '2024-02-04 18:56:50', '2024-02-02 19:33:13');
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
