From f18a483d39eab3b8870d050a7c0d716ea05a3340 Mon Sep 17 00:00:00 2001 From: Leufolium Date: Wed, 11 Sep 2024 11:23:40 +0800 Subject: [PATCH 1/2] by Robin at 20240911; separate --- app/mix/service/utilservice.go | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/app/mix/service/utilservice.go b/app/mix/service/utilservice.go index ad355e56..ce7f1fbe 100644 --- a/app/mix/service/utilservice.go +++ b/app/mix/service/utilservice.go @@ -1688,33 +1688,6 @@ func (s *Service) utilGetZonePreviews(ctx *gin.Context, zid int64) (previews *db } } - if len(imageIds) == 0 { - vzmlist := make([]*dbstruct.ZoneMoment, 0) - vzmlist, err = _DefaultZoneMoment.OpListByZid(ctx, &zonemomentproto.OpListByZidReq{ - Zid: goproto.Int64(zid), - MType: goproto.Int64(consts.MediaTypeVideo), - CType: goproto.Int64(consts.ZoneMomentCType_Free), - Status: goproto.Int64(consts.ZoneMoment_Public), - Limit: 4, - }) - if err != nil { - logger.Error("_DefaultZoneMoment OpListByZid fail, req: %v, err: %v", err) - return - } - - objectMediaNum := 1 // 单个空间服务总共5个媒体类 - mediaFillableList := make([]mediafiller.MediaFillable, len(vzmlist)*objectMediaNum) - for i, vo := range vzmlist { - mediaFillableList[objectMediaNum*i+0] = vo.MediaComp - } - - imageIds, err = mediafiller.GetCoverIds(ctx, mediaFillableList) - if err != nil { - logger.Error("GetCoverIds fail, req: %v, err: %v", err) - return - } - } - previews = &dbstruct.MediaComponent{ ImageIds: util.Int64Slice(imageIds), } -- 2.41.0 From 63cf9f1b21c7aa793b284b2e18cf0cc5f9a089a6 Mon Sep 17 00:00:00 2001 From: Leufolium Date: Wed, 11 Sep 2024 11:26:43 +0800 Subject: [PATCH 2/2] by Robin at 20240911; separate --- library/mediafiller/mediafiller.go | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/library/mediafiller/mediafiller.go b/library/mediafiller/mediafiller.go index 62835c43..25a37a30 100644 --- a/library/mediafiller/mediafiller.go +++ b/library/mediafiller/mediafiller.go @@ -184,22 +184,3 @@ func FillListInternal(ctx *gin.Context, list []MediaFillable) error { return nil } - -func GetCoverIds(ctx *gin.Context, list []MediaFillable) ([]int64, error) { - coverIds := make([]int64, 0) - videoIds := make([]int64, 0) - for _, v := range list { - videoIds = append(videoIds, v.GetVideoIds()...) - } - videoMap, err := getVideoMapByIds(ctx, videoIds) - if err != nil { - logger.Error("mediafiller component getVideoMapByIds failed : %v", err) - return make([]int64, 0), err - } - - // 获取视频封面 - for _, v := range videoMap { - coverIds = append(coverIds, v.CoverId) - } - return coverIds, nil -} -- 2.41.0