From 2b48172e6723db27dc150f1b8624b6232cc7669f Mon Sep 17 00:00:00 2001
From: Jimmy Misaka <misakajimmy@gmail.com>
Date: Thu, 9 Mar 2023 00:31:24 +0800
Subject: [PATCH] DEV UPDATE:Resolved #34

---
 internal/app/api/idl/bilbil_video.go       |  5 +++++
 internal/app/api/idl/eoefans_video_page.go | 17 +++++++++--------
 internal/repository/eoefans_video_page.go  |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/internal/app/api/idl/bilbil_video.go b/internal/app/api/idl/bilbil_video.go
index 41773a7..1b5492a 100644
--- a/internal/app/api/idl/bilbil_video.go
+++ b/internal/app/api/idl/bilbil_video.go
@@ -63,6 +63,11 @@ type NewBilibiliVideo struct {
 	TagList pq.StringArray `gorm:"column:tag_list;type:varchar(64)[]"`
 }
 
+// TableName EoefansVideoPageBanner 表名
+func (NewBilibiliVideo) TableName() string {
+	return "bilbil_video"
+}
+
 type BilibiliVideoOrder string
 
 const (
diff --git a/internal/app/api/idl/eoefans_video_page.go b/internal/app/api/idl/eoefans_video_page.go
index e96ee7b..3aed219 100644
--- a/internal/app/api/idl/eoefans_video_page.go
+++ b/internal/app/api/idl/eoefans_video_page.go
@@ -1,6 +1,7 @@
 package idl
 
 import (
+	"github.com/google/uuid"
 	"gorm.io/gorm"
 	"time"
 )
@@ -66,14 +67,14 @@ func (EoefansVideoPageBanner) TableName() string {
 
 type EoefansVideoPageVideo struct {
 	GVA_MODEL
-	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"`
-	CreatedBy          uint              `gorm:"column:created_by;comment:创建者"`
-	UpdatedBy          uint              `gorm:"column:updated_by;comment:更新者"`
-	DeletedBy          uint              `gorm:"column:deleted_by;comment:删除者"`
+	NewBilibiliVideo     NewBilibiliVideo  `json:"video" form:"video" gorm:"foreignKey:NewBilibiliVideoUUID"`
+	NewBilibiliVideoUUID uuid.UUID         `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"`
+	CreatedBy            uint              `gorm:"column:created_by;comment:创建者"`
+	UpdatedBy            uint              `gorm:"column:updated_by;comment:更新者"`
+	DeletedBy            uint              `gorm:"column:deleted_by;comment:删除者"`
 }
 
 // TableName EoefansVideoPageBanner 表名
diff --git a/internal/repository/eoefans_video_page.go b/internal/repository/eoefans_video_page.go
index 2928b82..22e1cf2 100644
--- a/internal/repository/eoefans_video_page.go
+++ b/internal/repository/eoefans_video_page.go
@@ -31,8 +31,8 @@ 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).
+			Preload("NewBilibiliVideo").
 			//Joins("JOIN bilbil_video ON bilbil_video.id = eoefans_video_page_video.bilbil_video_id").
 			//Select("rank").
 			Find(&videoList).Error