媒体搜索不分类

domian/media/media_service.go

@@ -35,20 +35,19 @@ func elastic() *es.ESClient {
 }
 
 type MediaDTO struct {
-	MediaId                int      `json:"mediaId"`
-	AuthorId               int      `json:"authorId"`
-	AuthorName             string   `json:"authorName,omitempty"`
-	MediaType              string   `json:"mediaType"`
-	Src                    string   `json:"src"`
-	MediaName              string   `json:"mediaName"`
-	CoverSrc               string   `json:"coverSrc"`
-	SourceType             string   `json:"sourceType"`
-	MediaPlaySeconds       int      `json:"-"`
-	MediaPlayMillisSeconds int      `json:"mediaPlayMillisSeconds"`
-	PublishedTime          string   `json:"publishedTime"`
-	PermissionIDs          string   `json:"permissionIds"`
-	PermissionNames        []string `json:"permissionNames,omitempty"`
-	Highlight              []string `json:"highlight,omitempty"`
+	MediaId               int      `json:"mediaId"`
+	AuthorId              int      `json:"authorId"`
+	AuthorName            string   `json:"authorName,omitempty"`
+	MediaType             string   `json:"mediaType"`
+	Src                   string   `json:"src"`
+	MediaName             string   `json:"mediaName"`
+	CoverSrc              string   `json:"coverSrc"`
+	SourceType            string   `json:"sourceType"`
+	MediaPlayMilliseconds int      `json:"mediaPlayMilliseconds"`
+	PublishedTime         string   `json:"publishedTime"`
+	PermissionIDs         string   `json:"permissionIds"`
+	PermissionNames       []string `json:"permissionNames,omitempty"`
+	Highlight             []string `json:"highlight,omitempty"`
 }
 
 func SearchMediaList(mediaType string, key string, from int, size int, max int64) (reports []MediaDTO, err error) {
@@ -72,7 +71,6 @@ func SearchMediaList(mediaType string, key string, from int, size int, max int64
 		media.Highlight = content[ESColumn]
 		media.PublishedTime = media.PublishedTime[:10]
 		media.MediaName = media.Highlight[0]
-		media.MediaPlayMillisSeconds = media.MediaPlaySeconds * 1000
 		reports = append(reports, media)
 	}
 	return
@@ -151,33 +149,31 @@ func GetMediaPageByAnalystId(mediaType string, pageInfo page.PageInfo, analystId
 func convertMediaDTO(media mediaDao.Media, fullTime bool) MediaDTO {
 	if fullTime {
 		return MediaDTO{
-			MediaId:                media.Id,
-			AuthorId:               media.AuthorID,
-			AuthorName:             media.AuthorName,
-			MediaType:              string(media.MediaType),
-			Src:                    media.Src,
-			MediaName:              media.MediaName,
-			SourceType:             media.SourceType,
-			CoverSrc:               media.CoverSrc,
-			MediaPlaySeconds:       media.MediaPlayMilliseconds,
-			MediaPlayMillisSeconds: media.MediaPlayMilliseconds,
-			PermissionIDs:          media.PermissionIDs,
-			PublishedTime:          media.PublishedTime.Format(time.DateTime),
+			MediaId:               media.Id,
+			AuthorId:              media.AuthorID,
+			AuthorName:            media.AuthorName,
+			MediaType:             string(media.MediaType),
+			Src:                   media.Src,
+			MediaName:             media.MediaName,
+			SourceType:            media.SourceType,
+			CoverSrc:              media.CoverSrc,
+			MediaPlayMilliseconds: media.MediaPlayMilliseconds,
+			PermissionIDs:         media.PermissionIDs,
+			PublishedTime:         media.PublishedTime.Format(time.DateTime),
 		}
 	} else {
 		return MediaDTO{
-			MediaId:                media.Id,
-			AuthorId:               media.AuthorID,
-			AuthorName:             media.AuthorName,
-			MediaType:              string(media.MediaType),
-			Src:                    media.Src,
-			MediaName:              media.MediaName,
-			SourceType:             media.SourceType,
-			CoverSrc:               media.CoverSrc,
-			MediaPlaySeconds:       media.MediaPlayMilliseconds,
-			MediaPlayMillisSeconds: media.MediaPlayMilliseconds,
-			PermissionIDs:          media.PermissionIDs,
-			PublishedTime:          media.PublishedTime.Format(time.DateOnly),
+			MediaId:               media.Id,
+			AuthorId:              media.AuthorID,
+			AuthorName:            media.AuthorName,
+			MediaType:             string(media.MediaType),
+			Src:                   media.Src,
+			MediaName:             media.MediaName,
+			SourceType:            media.SourceType,
+			CoverSrc:              media.CoverSrc,
+			MediaPlayMilliseconds: media.MediaPlayMilliseconds,
+			PermissionIDs:         media.PermissionIDs,
+			PublishedTime:         media.PublishedTime.Format(time.DateOnly),
 		}
 	}
 }

service/media/media_service.go

@@ -86,12 +86,14 @@ func GetMediaById(mediaType string, mediaId int) (media mediaService.MediaDTO, e
 	media, err = mediaService.GetMediaById(mediaType, mediaId)
 	if err != nil {
 		err = exception.New(exception.MediaFoundFailed)
+		return
 	}
 	idStr := strings.Split(media.PermissionIDs, ",")
 	var ids []int
 	ids, err = stringUtils.StringToIntSlice(idStr)
 	if err != nil {
 		logger.Error("品种名称列表转换失败:%v", err)
+		return
 	}
 	media.PermissionNames = getMediaPermissionNames(ids)
 	return