DEV UPDATE:Dev /v1/video-page update

internal/app/api/idl/eoefans_video_page.go

@@ -19,6 +19,11 @@ type EoefansVideoPageBannerResp struct {
 	Rank  uint   `json:"rank"`
 }
 
+type EoefansVideoPageVideoResp struct {
+	Video NewBilibiliVideo `json:"video"`
+	Rank  uint             `json:"rank"`
+}
+
 type GVA_MODEL struct {
 	ID        uint           `gorm:"primarykey"` // 主键ID
 	CreatedAt time.Time      // 创建时间
@@ -62,8 +67,8 @@ func (EoefansVideoPageBanner) TableName() string {
 
 type EoefansVideoPageVideo struct {
 	GVA_MODEL
-	//BilbilVideo        BilibiliVideo     `json:"video" form:"video" gorm:"foreignKey:BilbilVideoId"`
-	BilbilVideoId      uuid.UUID            `json:"videoId" form:"videoId"`
+	BilbilVideo        NewBilibiliVideo  `json:"video" form:"video" gorm:"foreignKey:BilbilVideoId"`
+	BilbilVideoId      uuid.UUID         `json:"videoId" form:"videoId"`
 	EoefansVideoPages  EoefansVideoPages `json:"vPage" form:"vPage" gorm:"foreignKey:EoefansVideoPageId"`
 	EoefansVideoPageId uint              `json:"pageId" form:"pageId"`
 	Rank               uint              `json:"rank" form:"rank"`

internal/repository/eoefans_video_page.go

@@ -29,16 +29,18 @@ func (impl *EoefansVideoPageMysqlImpl) FindAll() (list []*idl.EoefansVideoPageRe
 			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).
-			Joins("JOIN bilbil_video ON bilbil_video.id = eoefans_video_page_video.user_id").
-			//Preload("BilbilVideo").
+			//Joins("JOIN bilbil_video ON bilbil_video.id = eoefans_video_page_video.bilbil_video_id").
+			Preload("BilbilVideo").
+			//Select("rank").
 			Find(&videoList).Error
 		res := idl.EoefansVideoPageResp{
-			Key:  pageList[i].Key,
-			Name: pageList[i].Name,
+			Key:     pageList[i].Key,
+			Name:    pageList[i].Name,
 			Banners: bannerList,
-			Videos: videoList,
+			Videos:  videoList,
 		}
 		list = append(list, &res)
 	}