From 9fee3124d8025e2a366a67ce55e853e934960e85 Mon Sep 17 00:00:00 2001 From: Jimmy Misaka Date: Thu, 9 Mar 2023 00:20:35 +0800 Subject: [PATCH] =?UTF-8?q?DEV=20UPDATE:=E8=BF=98=E6=98=AF=E6=9F=A5?= =?UTF-8?q?=E4=B8=8D=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/app/api/idl/eoefans_video_page.go | 5 ++--- internal/repository/eoefans_video_page.go | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/internal/app/api/idl/eoefans_video_page.go b/internal/app/api/idl/eoefans_video_page.go index e4300fd..e96ee7b 100644 --- a/internal/app/api/idl/eoefans_video_page.go +++ b/internal/app/api/idl/eoefans_video_page.go @@ -1,7 +1,6 @@ package idl import ( - "github.com/google/uuid" "gorm.io/gorm" "time" ) @@ -67,8 +66,8 @@ func (EoefansVideoPageBanner) TableName() string { type EoefansVideoPageVideo struct { GVA_MODEL - BilbilVideo NewBilibiliVideo `json:"video" form:"video" gorm:"foreignKey:BilbilVideoId"` - BilbilVideoId uuid.UUID `json:"videoId" form:"videoId"` + BilbilVideo NewBilibiliVideo `json:"video" form:"video" gorm:"foreignKey:BilbilVideoUUID"` + BilbilVideoUUID string `json:"videoId" form:"videoId" gorm:"column:bilbil_video_id"` EoefansVideoPages EoefansVideoPages `json:"vPage" form:"vPage" gorm:"foreignKey:EoefansVideoPageId"` EoefansVideoPageId uint `json:"pageId" form:"pageId"` Rank uint `json:"rank" form:"rank"` diff --git a/internal/repository/eoefans_video_page.go b/internal/repository/eoefans_video_page.go index 7c016ef..2928b82 100644 --- a/internal/repository/eoefans_video_page.go +++ b/internal/repository/eoefans_video_page.go @@ -31,9 +31,9 @@ func (impl *EoefansVideoPageMysqlImpl) FindAll() (list []*idl.EoefansVideoPageRe Find(&bannerList).Error fmt.Println("aaaaaaaaaaaaa") err = impl.tx.Table(idl.EoefansVideoPageVideo{}.TableName()). + Preload("BilbilVideo"). Where("eoefans_video_page_id = ?", pageList[i].ID). //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{