From 4f9b7291535587a4e80418fe0d7c21aff0fe5964 Mon Sep 17 00:00:00 2001 From: Jimmy Misaka Date: Thu, 9 Mar 2023 01:05:47 +0800 Subject: [PATCH] DEV UPDATE:Complete /v1/video-page --- internal/app/api/idl/eoefans_video_page.go | 6 +++--- internal/repository/eoefans_video_page.go | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/internal/app/api/idl/eoefans_video_page.go b/internal/app/api/idl/eoefans_video_page.go index 3aed219..8c57e30 100644 --- a/internal/app/api/idl/eoefans_video_page.go +++ b/internal/app/api/idl/eoefans_video_page.go @@ -10,7 +10,7 @@ type EoefansVideoPageResp struct { Key string `json:"key"` Name string `json:"name"` Banners []*EoefansVideoPageBannerResp `json:"banners"` - Videos []*EoefansVideoPageVideo `json:"videos"` + Videos []*EoefansVideoPageVideo `json:"videos"` } type EoefansVideoPageBannerResp struct { @@ -20,8 +20,8 @@ type EoefansVideoPageBannerResp struct { } type EoefansVideoPageVideoResp struct { - Video NewBilibiliVideo `json:"video"` - Rank uint `json:"rank"` + NewBilibiliVideo NewBilibiliVideo `json:"video"` + Rank uint `json:"rank"` } type GVA_MODEL struct { diff --git a/internal/repository/eoefans_video_page.go b/internal/repository/eoefans_video_page.go index 22e1cf2..1b42574 100644 --- a/internal/repository/eoefans_video_page.go +++ b/internal/repository/eoefans_video_page.go @@ -1,7 +1,6 @@ package repository import ( - "fmt" "gorm.io/gorm" "vlink.dev/eoefans/internal/app/api/idl" ) @@ -22,19 +21,15 @@ func (impl *EoefansVideoPageMysqlImpl) FindAll() (list []*idl.EoefansVideoPageRe return nil, err } for i := range pageList { - fmt.Println(pageList[i].Name) var bannerList []*idl.EoefansVideoPageBannerResp var videoList []*idl.EoefansVideoPageVideo err = impl.tx.Table(idl.EoefansVideoPageBanner{}.TableName()). Select("image,url,rank"). Where("eoefans_video_page_id = ?", pageList[i].ID). Find(&bannerList).Error - fmt.Println("aaaaaaaaaaaaa") err = impl.tx.Table(idl.EoefansVideoPageVideo{}.TableName()). Where("eoefans_video_page_id = ?", pageList[i].ID). Preload("NewBilibiliVideo"). - //Joins("JOIN bilbil_video ON bilbil_video.id = eoefans_video_page_video.bilbil_video_id"). - //Select("rank"). Find(&videoList).Error res := idl.EoefansVideoPageResp{ Key: pageList[i].Key,