From a1f460818e4ed5b0f35552304e0ff5b183d2cc22 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sat, 15 Jun 2024 14:43:46 +0800 Subject: [PATCH] 1 --- server/marketserver/api/v1/asset/asset.go | 14 +++++++++----- server/marketserver/cache/cachemgr.go | 5 +++++ server/marketserver/common/types.go | 1 + 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/server/marketserver/api/v1/asset/asset.go b/server/marketserver/api/v1/asset/asset.go index c7009834..a576191a 100644 --- a/server/marketserver/api/v1/asset/asset.go +++ b/server/marketserver/api/v1/asset/asset.go @@ -7,6 +7,7 @@ import ( "main/common" "fmt" "strings" + . "main/global" "github.com/gin-gonic/gin" ) @@ -38,6 +39,12 @@ WHERE A.idx > %d AND A.net_id = %d AND A.owner_address=? LIMIT %d`, } else if filterType == 2 { sql += "B.status <> '" + constant.ORDER_STATUS_ACTIVE + "'" } + rspObj := struct { + ErrCode int32 `json:"errcode"` + ErrMsg string `json:"errmsg"` + Page common.StreamPagination `json:"page"` + Rows []interface{} `json:"rows"` + }{} nfts := []common.NftDto{} f5.GetGoStyleDb().StreamPageQuery( constant.BCNFT_DB, @@ -51,7 +58,7 @@ WHERE A.idx > %d AND A.net_id = %d AND A.owner_address=? LIMIT %d`, ), "", func (err error, pagination *f5.StreamPagination) { - + rspObj.Page.FillPage(pagination) }, func (ds *f5.DataSet) { p := q5.NewSliceElement(&nfts) @@ -59,9 +66,6 @@ WHERE A.idx > %d AND A.net_id = %d AND A.owner_address=? LIMIT %d`, p.ContractAddress = ds.GetByName("contract_address") p.TokenId = ds.GetByName("token_id") }) - rspObj := struct { - Page *common.StreamPagination `json:"page"` - Rows []interface{} `json:"rows"` - }{} + GetCacheMgr().GetNfts(nfts) c.JSON(200, rspObj) } diff --git a/server/marketserver/cache/cachemgr.go b/server/marketserver/cache/cachemgr.go index 685e63eb..b78dff6c 100644 --- a/server/marketserver/cache/cachemgr.go +++ b/server/marketserver/cache/cachemgr.go @@ -2,6 +2,7 @@ package cache import ( "sync" + "main/common" ) type cacheMgr struct { @@ -16,6 +17,10 @@ func (this *cacheMgr) UnInit() { } +func (this *cacheMgr) GetNfts(nfts []common.NftDto) { + +} + func (this *cacheMgr) internalGetNft(netId int32, contractAddress string, tokenId string) *nft { return nil } diff --git a/server/marketserver/common/types.go b/server/marketserver/common/types.go index 7ae18e2d..dfa62051 100644 --- a/server/marketserver/common/types.go +++ b/server/marketserver/common/types.go @@ -64,6 +64,7 @@ type TaskMgr interface{ } type CacheMgr interface{ + GetNfts([]NftDto) }