From 5d90bbad1f1e418a5c3942f4072db5e5961a154f Mon Sep 17 00:00:00 2001 From: jagger Date: Thu, 21 Mar 2024 15:16:38 +0800 Subject: [PATCH] :bug: fix bugs Signed-off-by: jagger Former-commit-id: 29128e0ca2063bc6aeb6b12a91cf5c535e3fa113 --- .../handler/adapters/getadapterrelationhandler.go | 2 +- api/internal/logic/adapters/getadapterrelationlogic.go | 2 +- api/internal/types/types.go | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/api/internal/handler/adapters/getadapterrelationhandler.go b/api/internal/handler/adapters/getadapterrelationhandler.go index 5695767b..1f265676 100644 --- a/api/internal/handler/adapters/getadapterrelationhandler.go +++ b/api/internal/handler/adapters/getadapterrelationhandler.go @@ -11,7 +11,7 @@ import ( func GetAdapterRelationHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { - var req types.AdapterQueryReq + var req types.AdapterRelationQueryReq if err := httpx.Parse(r, &req); err != nil { result.ParamErrorResult(r, w, err) return diff --git a/api/internal/logic/adapters/getadapterrelationlogic.go b/api/internal/logic/adapters/getadapterrelationlogic.go index c2e21e44..afc6952b 100644 --- a/api/internal/logic/adapters/getadapterrelationlogic.go +++ b/api/internal/logic/adapters/getadapterrelationlogic.go @@ -24,7 +24,7 @@ func NewGetAdapterRelationLogic(ctx context.Context, svcCtx *svc.ServiceContext) } } -func (l *GetAdapterRelationLogic) GetAdapterRelation(req *types.AdapterQueryReq) (resp *types.PageResult, err error) { +func (l *GetAdapterRelationLogic) GetAdapterRelation(req *types.AdapterRelationQueryReq) (resp *types.PageResult, err error) { resp = &types.PageResult{} var list []types.AdapterInfo db := l.svcCtx.DbEngin.Model(&types.AdapterInfo{}).Table("t_adapter") diff --git a/api/internal/types/types.go b/api/internal/types/types.go index b502caac..049345c2 100644 --- a/api/internal/types/types.go +++ b/api/internal/types/types.go @@ -525,6 +525,15 @@ type AdapterQueryReq struct { PageInfo } +type AdapterRelationQueryReq struct { + Id string `form:"id,optional" db:"id"` + Name string `form:"name,optional"` + Type string `form:"type,optional"` + Nickname string `form:"nickname,optional"` + Version string `form:"version,optional"` + Server string `form:"server,optional"` +} + type AdapterReq struct { Id string `json:"id,optional" db:"id"` Name string `json:"name,optional"`