From 4a7e646e0e38817855c69845dac25c73559979ed Mon Sep 17 00:00:00 2001
From: zhangwei <894646498@qq.com>
Date: Fri, 8 Mar 2024 17:28:50 +0800
Subject: [PATCH] ClusterList

Former-commit-id: 839fd4761ea712bfc0dfccce4c4ad3be2b5784dd
---
 api/desc/core/pcm-core.api                      | 4 ++--
 api/internal/logic/adapters/clusterlistlogic.go | 4 ++++
 api/internal/types/types.go                     | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/api/desc/core/pcm-core.api b/api/desc/core/pcm-core.api
index 463f2137..5f6be796 100644
--- a/api/desc/core/pcm-core.api
+++ b/api/desc/core/pcm-core.api
@@ -726,8 +726,8 @@ type (
 )
 
 type ClusterReq {
-    Id             string `json:"id,optional"`
-    AdapterId      string `json:"adapterId,optional"`
+    Id             string `form:"id,optional"`
+    AdapterId      string `form:"adapterId,optional"`
     Name           string `json:"name,optional"`
     Nickname       string `json:"nickname,optional"`
     Description    string `json:"description,optional"`
diff --git a/api/internal/logic/adapters/clusterlistlogic.go b/api/internal/logic/adapters/clusterlistlogic.go
index 5bf7a5bc..a2806a1e 100644
--- a/api/internal/logic/adapters/clusterlistlogic.go
+++ b/api/internal/logic/adapters/clusterlistlogic.go
@@ -26,7 +26,11 @@ func NewClusterListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Clust
 
 func (l *ClusterListLogic) ClusterList(req *types.ClusterReq) (resp *types.ClusterListResp, err error) {
 	resp = &types.ClusterListResp{}
+
 	sql := fmt.Sprintf(`select c.* from t_cluster c left join t_adapter a on c.adapter_id = a.id where c.deleted_at is null`)
+	if req.AdapterId != "" {
+		sql = fmt.Sprintf(`select * from t_cluster  where adapter_id = %s and deleted_at is null `, req.AdapterId)
+	}
 	if req.Type != "" {
 		sql = fmt.Sprintf(`select c.* from t_cluster c left join t_adapter a on c.adapter_id = a.id where c.deleted_at is null and a.type = %s`, req.Type)
 	}
diff --git a/api/internal/types/types.go b/api/internal/types/types.go
index 002edab4..a38dfb33 100644
--- a/api/internal/types/types.go
+++ b/api/internal/types/types.go
@@ -694,8 +694,8 @@ type AdapterRelation struct {
 }
 
 type ClusterReq struct {
-	Id            string `json:"id,optional"`
-	AdapterId     string `json:"adapterId,optional"`
+	Id            string `form:"id,optional"`
+	AdapterId     string `form:"adapterId,optional"`
 	Name          string `json:"name,optional"`
 	Nickname      string `json:"nickname,optional"`
 	Description   string `json:"description,optional"`