Merge branch 'debug' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/report.go

@@ -260,6 +260,14 @@ func (this *ReportController) IndustryList() {
 		}
 	}
 	if industrialManagementIds != "" {
+		// 获取默认图配置
+		_, videoMap, _, _, e := services.GetMicroRoadShowDefaultImgConfig()
+		if e != nil {
+			br.Msg = "获取视频默认配置图失败"
+			br.ErrMsg = "获取视频默认配置图失败, Err: " + e.Error()
+			return
+		}
+
 		industrialManagementIds = strings.Trim(industrialManagementIds, ",")
 		videoList, err := models.GetMicroRoadshowVideoByIndustryIds(industrialManagementIds)
 		if err != nil {
@@ -270,11 +278,14 @@ func (this *ReportController) IndustryList() {
 		for _, v := range videoList {
 			tmp := &models.MicroVideoSimpleInfo{
 				Id:            v.VideoId,
-				Title:         "5min逻辑解析",
+				Title:         "5min逻辑【"+v.IndustryName+"】解析",
 				ResourceUrl:   v.VideoUrl,
 				BackgroundImg: v.ImgUrl,
 				PlaySeconds:   v.VideoDuration,
 			}
+			if tmp.BackgroundImg == "" {
+				tmp.BackgroundImg = videoMap[v.ChartPermissionId]
+			}
 			industrialVideoMap[v.IndustryId] = tmp
 		}
 	}
@@ -425,8 +436,18 @@ func (this *ReportController) ArticleCategoryList() {
 		}
 	}else{
 		videoSimple.Id = video.VideoId
-		videoSimple.Title = "5min逻辑解析"
+		videoSimple.Title = "5min逻辑【"+video.IndustryName+"】解析"
 		videoSimple.BackgroundImg = video.ImgUrl
+		if videoSimple.BackgroundImg == "" {
+			// 获取默认图配置
+			_, videoMap, _, _, e := services.GetMicroRoadShowDefaultImgConfig()
+			if e != nil {
+				br.Msg = "获取视频默认配置图失败"
+				br.ErrMsg = "获取视频默认配置图失败, Err: " + e.Error()
+				return
+			}
+			videoSimple.BackgroundImg = videoMap[video.ChartPermissionId]
+		}
 		videoSimple.PlaySeconds = video.VideoDuration
 		videoSimple.ResourceUrl = video.VideoUrl
 	}