Explorar el Código

微路演分享图

hsun hace 2 años
padre
commit
e1ee5e8173
Se han modificado 5 ficheros con 48 adiciones y 29 borrados
  1. 8 2
      controllers/micro_roadshow.go
  2. 21 21
      models/article.go
  3. 1 0
      models/config.go
  4. 4 2
      models/micro_roadshow.go
  5. 14 4
      services/micro_roadshow.go

+ 8 - 2
controllers/micro_roadshow.go

@@ -67,7 +67,7 @@ func (this *MicroRoadShowController) List() {
 	}
 
 	// 获取默认图配置
-	audioMap, videoMap, e := services.GetMicroRoadShowDefaultImgConfig()
+	audioMap, videoMap, audioShareMap, videoShareMap, e := services.GetMicroRoadShowDefaultImgConfig()
 	if e != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取微路演列表失败, Err: " + e.Error()
@@ -101,6 +101,7 @@ func (this *MicroRoadShowController) List() {
 			}
 		}
 		list[i].AuthInfo = au
+		list[i].PublishTime = utils.StrTimeToTime(list[i].PublishTime).Format(utils.FormatDate)
 		// 默认图
 		if list[i].BackgroundImg == "" {
 			if list[i].Type == 1 {
@@ -109,7 +110,12 @@ func (this *MicroRoadShowController) List() {
 				list[i].BackgroundImg = videoMap[list[i].ChartPermissionId]
 			}
 		}
-		list[i].PublishTime = utils.StrTimeToTime(list[i].PublishTime).Format(utils.FormatDate)
+		// 分享图
+		if list[i].Type == 1 {
+			list[i].ShareImg = audioShareMap[list[i].ChartPermissionId]
+		} else {
+			list[i].ShareImg = videoShareMap[list[i].ChartPermissionId]
+		}
 	}
 
 	resp := new(models.MicroRoadShowListResp)

+ 21 - 21
models/article.go

@@ -82,27 +82,27 @@ func AddCygxArticle(item *CygxArticle) (lastId int64, err error) {
 }
 
 type HomeArticle struct {
-	ArticleId        int                 `description:"文章id"`
-	Title            string              `description:"标题"`
-	TitleEn          string              `description:"英文标题 "`
-	UpdateFrequency  string              `description:"更新周期"`
-	CreateDate       string              `description:"创建时间"`
-	PublishDate      string              `description:"发布时间"`
-	Body             string              `description:"内容"`
-	BodyHtml         string              `description:"内容带有HTML标签"`
-	Abstract         string              `description:"摘要"`
-	CategoryName     string              `description:"一级分类"`
-	SubCategoryName  string              `description:"二级分类"`
-	ExpertBackground string              `description:"专家背景"`
-	IsResearch       bool                `description:"是否属于研选"`
-	Pv               int                 `description:"PV"`
-	ImgUrlPc         string              `description:"图片链接"`
-	CategoryId       string              `description:"文章分类"`
-	HttpUrl          string              `description:"文章链接跳转地址"`
-	IsNeedJump       bool                `description:"是否需要跳转链接地址"`
-	Source           int                 `description:"来源  1:文章, 2:图表"`
-	Annotation       string              `description:"核心观点"`
-	HomeType         int                 `description:"数据类型:0-纪要(默认); 1-微路演音频"`
+	ArticleId        int                  `description:"文章id"`
+	Title            string               `description:"标题"`
+	TitleEn          string               `description:"英文标题 "`
+	UpdateFrequency  string               `description:"更新周期"`
+	CreateDate       string               `description:"创建时间"`
+	PublishDate      string               `description:"发布时间"`
+	Body             string               `description:"内容"`
+	BodyHtml         string               `description:"内容带有HTML标签"`
+	Abstract         string               `description:"摘要"`
+	CategoryName     string               `description:"一级分类"`
+	SubCategoryName  string               `description:"二级分类"`
+	ExpertBackground string               `description:"专家背景"`
+	IsResearch       bool                 `description:"是否属于研选"`
+	Pv               int                  `description:"PV"`
+	ImgUrlPc         string               `description:"图片链接"`
+	CategoryId       string               `description:"文章分类"`
+	HttpUrl          string               `description:"文章链接跳转地址"`
+	IsNeedJump       bool                 `description:"是否需要跳转链接地址"`
+	Source           int                  `description:"来源  1:文章, 2:图表"`
+	Annotation       string               `description:"核心观点"`
+	HomeType         int                  `description:"数据类型:0-纪要(默认); 1-微路演音频"`
 	MicroAudio       *MicroAudioUnionList `description:"微路演音频"`
 }
 

+ 1 - 0
models/config.go

@@ -95,4 +95,5 @@ type MicroRoadShowDefaultImg struct {
 	ChartPermissionId   int    `description:"行业ID"`
 	ChartPermissionName string `description:"行业名称"`
 	ImgUrl              string `description:"背景图"`
+	ShareImg            string `description:"分享图"`
 }

+ 4 - 2
models/micro_roadshow.go

@@ -20,6 +20,7 @@ type MicroRoadShowPageList struct {
 	Type                int    `description:"类型: 1-音频; 2-视频"`
 	PublishTime         string `description:"发布时间"`
 	BackgroundImg       string `description:"背景图"`
+	ShareImg            string `description:"分享封面图"`
 	ChartPermissionId   int    `description:"行业ID"`
 	ChartPermissionName string `description:"行业名称"`
 	PlaySeconds         string `description:"音视频时长"`
@@ -95,7 +96,7 @@ func GetMicroRoadShowVideoPageList(startSize, pageSize int, condition string, pa
 }
 
 type AddVideoHistoryReq struct {
-	VideoId int  `description:"视频ID"`
+	VideoId     int `description:"视频ID"`
 	PlaySeconds int `description:"播放时长"`
 }
 
@@ -135,6 +136,7 @@ type MicroAudioUnionList struct {
 	AudioType                int    `description:"类型: 1-音频; 2-视频"`
 	AudioPublishTime         string `description:"发布时间"`
 	AudioImgUrl              string `description:"背景图"`
+	AudioShareImg            string `description:"分享图"`
 	AudioChartPermissionId   int    `description:"行业ID"`
 	AudioChartPermissionName string `description:"行业名称"`
 	AudioPlaySeconds         string `description:"音视频时长"`
@@ -261,4 +263,4 @@ func UpdateCygxActivityVideoCounts(activityId int) (err error) {
 	o := orm.NewOrm()
 	_, err = o.Raw(sql, activityId).Exec()
 	return
-}
+}

+ 14 - 4
services/micro_roadshow.go

@@ -166,10 +166,12 @@ func getMicroRoadShowDataRatio(pageSize int) (audioRatio, videoRatio, audioPageN
 	return
 }
 
-// GetMicroRoadShowDefaultImgConfig 获取微路演默认图配置
-func GetMicroRoadShowDefaultImgConfig() (audioMap, videoMap map[int]string, err error) {
+// GetMicroRoadShowDefaultImgConfig 获取微路演默认图/分享图配置
+func GetMicroRoadShowDefaultImgConfig() (audioMap, videoMap, audioShareMap, videoShareMap map[int]string, err error) {
 	audioMap = make(map[int]string, 0)
 	videoMap = make(map[int]string, 0)
+	audioShareMap = make(map[int]string, 0)
+	videoShareMap = make(map[int]string, 0)
 	key := models.MicroRoadshowDefaultImgKey
 	conf, e := models.GetConfigByCode(key)
 	if e != nil {
@@ -188,10 +190,12 @@ func GetMicroRoadShowDefaultImgConfig() (audioMap, videoMap map[int]string, err
 	audioList := list.Audio
 	for i := range audioList {
 		audioMap[audioList[i].ChartPermissionId] = audioList[i].ImgUrl
+		audioShareMap[audioList[i].ChartPermissionId] = audioList[i].ShareImg
 	}
 	videoList := list.Video
 	for i := range videoList {
 		videoMap[videoList[i].ChartPermissionId] = videoList[i].ImgUrl
+		videoShareMap[videoList[i].ChartPermissionId] = videoList[i].ShareImg
 	}
 	return
 }
@@ -219,7 +223,7 @@ func GetHomeNewestList(userId, companyId, startSize, pageSize int, condition str
 	}
 
 	// 获取默认图配置
-	audioMap, videoMap, e := GetMicroRoadShowDefaultImgConfig()
+	audioMap, videoMap, audioShareMap, videoShareMap, e := GetMicroRoadShowDefaultImgConfig()
 	if e != nil {
 		err = errors.New("获取微路演默认图配置失败, Err: " + e.Error())
 		return
@@ -275,6 +279,12 @@ func GetHomeNewestList(userId, companyId, startSize, pageSize int, condition str
 					ad.AudioImgUrl = videoMap[ad.AudioChartPermissionId]
 				}
 			}
+			// 分享图
+			if ad.AudioType == 1 {
+				ad.AudioShareImg = audioShareMap[ad.AudioChartPermissionId]
+			} else {
+				ad.AudioShareImg = videoShareMap[ad.AudioChartPermissionId]
+			}
 			// 权限
 			au := new(models.UserPermissionAuthInfo)
 			au.SellerName = authInfo.SellerName
@@ -305,4 +315,4 @@ func GetHomeNewestList(userId, companyId, startSize, pageSize int, condition str
 		resp = append(resp, item)
 	}
 	return
-}
+}