fixes apache#21

fixed according to PR#22 conversation
Database schema definition modified

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/EventmeshConsoleApplication.java → eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/EventMeshDashboardApplication.java

@@ -24,16 +24,14 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import lombok.extern.slf4j.Slf4j;
-
 @Slf4j
 @SpringBootApplication
 @EnableScheduling
 @ComponentScan({"org.apache.eventmesh.dashboard.service", "org.apache.eventmesh.dashboard.console"})
-public class EventmeshConsoleApplication {
+public class EventMeshDashboardApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(EventmeshConsoleApplication.class, args);
-        log.info("{} Successfully booted.", EventmeshConsoleApplication.class.getSimpleName());
+        SpringApplication.run(EventMeshDashboardApplication.class, args);
+        log.info("{} Successfully booted.", EventMeshDashboardApplication.class.getSimpleName());
     }
 }

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/connection/ConnectionResponseEntity.java → eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/dto/ConnectionResponse.java

@@ -15,17 +15,18 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.console.entity.connection;
+package org.apache.eventmesh.dashboard.console.dto;
 
 import java.io.Serializable;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
 
-public class ConnectionResponseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
+public class ConnectionResponse implements Serializable {
 
-    @Schema(name = "id", description = "primary key")
+    private static final long serialVersionUID = -7317308457824435889L;
+
+    @Schema(name = "id", description = "primary key of table connection")
     private Long id;
 
     @Schema(name = "sourceType", defaultValue = "connector", allowableValues = {"connector", "client"})
@@ -37,6 +38,9 @@ public class ConnectionResponseEntity implements Serializable {
     @Schema(name = "sourceStatus", defaultValue = "0", allowableValues = {"0", "1"}, description = "0:not active, 1:active")
     private Integer sourceStatus;
 
+    @Schema(name = "sourceConfigList", description = "source config list")
+    private List<ConfigEntity> sourceConfigList;
+
     @Schema(name = "sinkType", defaultValue = "connector", allowableValues = {"connector", "client"})
     private String sinkType;
 
@@ -46,6 +50,9 @@ public class ConnectionResponseEntity implements Serializable {
     @Schema(name = "sinkStatus", defaultValue = "0", allowableValues = {"0", "1"}, description = "0:not active, 1:active")
     private Integer sinkStatus;
 
+    @Schema(name = "sinkConfigList", description = "sink config list")
+    private List<ConfigEntity> sinkConfigList;
+
     private Long runtimeId;
 
     @Schema(name = "status", defaultValue = "0", allowableValues = {"0", "1"}, description = "0:not active, 1:active")

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/base/BaseEntity.java

@@ -28,7 +28,9 @@
 @Schema(name = "BaseEntity", description = "Base entity")
 public class BaseEntity implements Serializable {
 
-    private Long clusterPhyId;
+    private static final long serialVersionUID = -2697805837923579585L;
+
+    private Long clusterId;
 
     protected Timestamp createTime;
 

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/client/ClientEntity.java

@@ -19,19 +19,18 @@
 
 import org.apache.eventmesh.dashboard.console.entity.base.BaseEntity;
 
+import java.sql.Timestamp;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 
 public class ClientEntity extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
-
+    private static final long serialVersionUID = 8204133370609215856L;
     @Schema(name = "id", description = "primary key")
     private Long id;
 
     private String name;
 
-    private String eventmeshAddress;
-
     private String platform;
 
     private String language;
@@ -50,6 +49,10 @@ public class ClientEntity extends BaseEntity {
     @Schema(name = "status", defaultValue = "0", allowableValues = {"0", "1"}, description = "0:not active, 1:active")
     private Integer status;
 
+    private String configIds;
+
     private String description;
+
+    private Timestamp endTime;
 }
 

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/connection/ConnectionEntity.java

@@ -19,6 +19,7 @@
 
 import org.apache.eventmesh.dashboard.console.entity.base.BaseEntity;
 
+import java.sql.Timestamp;
 import java.util.Objects;
 
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -32,52 +33,38 @@
 @Data
 public class ConnectionEntity extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
-
+    private static final long serialVersionUID = 6565578252656944905L;
     @Schema(name = "id", description = "primary key")
     private Long id;
 
+    /**
+     * The type of source. Possible values are "connector" or "client".
+     */
     @Schema(name = "sourceType", defaultValue = "connector", allowableValues = {"connector", "client"})
     private String sourceType;
 
-    /**
-     * The type of source. Possible values are "connector" and "client".
-     */
     @Schema(name = "sourceId", description = "connectorId or clientId")
     private Long sourceId;
 
     /**
-     * 0: not active, 1: active
-     */
-    @Schema(name = "sourceStatus", defaultValue = "0", allowableValues = {"0", "1"}, description = "0:not active, 1:active")
-    private Integer sourceStatus;
-
-    /**
-     * The type of sink. Possible values are "connector" and "client".
+     * The type of sink. Possible values are "connector" or "client".
      */
     @Schema(name = "sinkType", defaultValue = "connector", allowableValues = {"connector", "client"})
     private String sinkType;
 
     @Schema(name = "sinkId", description = "connectorId or clientId")
     private Long sinkId;
 
-    /**
-     * 0: not active, 1: active
-     */
-    @Schema(name = "sinkStatus", defaultValue = "0", allowableValues = {"0", "1"}, description = "0:not active, 1:active")
-    private Integer sinkStatus;
-
     private Long runtimeId;
 
-    @Schema(name = "status", defaultValue = "0", allowableValues = {"0", "1"}, description = "0:not active, 1:active")
+    @Schema(name = "status", defaultValue = "0", allowableValues = {"0", "1"}, description = "0:inactive, 1:active")
     private Integer status;
 
-    @Schema(name = "topic", description = "related topic name from storage")
     private String topic;
 
     private Long groupId;
 
-    private String groupName;
+    private Timestamp endTime;
 
     private String description;
 
@@ -92,19 +79,13 @@ public boolean equals(Object o) {
         ConnectionEntity that = (ConnectionEntity) o;
         return Objects.equals(sourceType, that.sourceType)
             && Objects.equals(sourceId, that.sourceId)
-            && Objects.equals(sourceStatus, that.sourceStatus)
 
             && Objects.equals(sinkType, that.sinkType)
             && Objects.equals(sinkId, that.sinkId)
-            && Objects.equals(sinkStatus, that.sinkStatus)
 
             && Objects.equals(runtimeId, that.runtimeId)
             && Objects.equals(status, that.status)
 
-            && Objects.equals(topic, that.topic)
-            && Objects.equals(groupId, that.groupId)
-            && Objects.equals(groupName, that.groupName)
-
             && Objects.equals(description, that.description);
     }
 }

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/connector/ConnectorEntity.java

@@ -23,23 +23,25 @@
 
 public class ConnectorEntity extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = -8226303660232951326L;
 
     @Schema(name = "id", description = "primary key")
     private Long id;
 
-    private Long connectClusterId;
+    private String name;
 
-    private String connectorName;
+    private String className;
 
-    private String connectorClassName;
+    private String type;
 
-    private String connectorType;
+    private String status;
 
-    private String state;
-
-    private String topics;
-
-    private Integer taskCount;
+    private Integer podState;
 
+    /**
+     * csv format config id list.<br>
+     * Example value: 1,2,7<br>
+     * This field is updated when the configuration is modified via the web API, but is not used during the configuration retrieval process.
+     */
+    private String configIds;
 }

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/health/HealthCheckResultEntity.java

@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.eventmesh.dashboard.console.entity.health;
+
+import org.apache.eventmesh.dashboard.console.entity.base.BaseEntity;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import lombok.Data;
+
+@Data
+@Schema(name = "HealthCheckResultEntity", description = "Health check result entity")
+public class HealthCheckResultEntity extends BaseEntity {
+
+    private static final long serialVersionUID = -7350585209577598040L;
+    @Schema(name = "id", description = "primary key")
+    private Long id;
+
+    @Schema(description = "Dimension of Health Check;0:Unknown, 1:Cluster, 2:Runtime, 3:Topic, 4:Group", defaultValue = "0", allowableValues = {"0",
+        "1", "2", "3", "4"})
+    private Integer dimension;
+
+    private String configName;
+
+    private String resName;
+
+    private Integer passed;
+
+    public HealthCheckResultEntity() {
+    }
+
+}

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/meta/MetaEntity.java

@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.eventmesh.dashboard.console.entity.meta;
+
+import org.apache.eventmesh.dashboard.console.entity.base.BaseEntity;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import lombok.Data;
+
+@Data
+public class MetaEntity extends BaseEntity {
+
+    private static final long serialVersionUID = 7176263169716424469L;
+
+    /**
+     * Primary key
+     */
+    @Schema(name = "id", description = "Primary key")
+    private Long id;
+
+    private String name;
+
+    private String type;
+
+    private String version;
+
+    private Long clusterId;
+
+    private String host;
+
+    private Integer port;
+
+    private String role;
+
+    private String username;
+
+    private String params;
+
+    private Integer status;
+}

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/enums/KubernetesPodStatus.java

@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.eventmesh.dashboard.console.enums;
+
+public enum KubernetesPodStatus {
+    PENDING(0, "pending"),
+    RUNNING(1, "running"),
+    SUCCEEDED(2, "succeeded"),
+    FAILED(3, "failed"),
+    UNKNOWN(4, "unknown");
+
+    KubernetesPodStatus(Integer number, String status) {
+    }
+}