首页最新配合前端修改

models/home.go

@@ -38,6 +38,7 @@ type HomeArticle struct {
 	IsNeedJump      bool                 `description:"是否需要跳转链接地址"`
 	Source          int                  `description:"来源  1:文章, 2:图表"`
 	Annotation      string               `description:"核心观点"`
+	ArticleTypeId   int                  `description:"文章类型ID判断是否是研选使用"`
 	HomeType        int                  `description:"数据类型：0-纪要(默认); 1-微路演音频"`
 	MicroAudio      *MicroAudioUnionList `description:"微路演音频"`
 	List            []*IndustrialManagementIdInt
@@ -60,6 +61,8 @@ type ArticleListResp struct {
 	Source              int    `description:"来源  1:文章, 2:图表"`
 	Annotation          string `description:"核心观点"`
 	ChartPermissionName string `description:"权限名称"`
+	ArticleTypeId       int    `description:"文章类型ID判断是否是研选使用"`
+	BodyImg             string `description:"文章封面图片"`
 	List                []*IndustrialManagementIdInt
 }
 

models/resource_data.go

@@ -22,6 +22,9 @@ type CygxResourceDataResp struct {
 	SourceId                int    `description:"资源ID"`
 	Source                  string `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
 	Title                   string `description:"标题"`
+	IsResearch              bool   `description:"是否属于研选"`
+	BodyImg                 string `description:"文章封面图片"`
+	Pv                      int    `description:"PV"`
 	Annotation              string `description:"核心观点"`
 	PublishDate             string `description:"发布时间"`
 	Abstract                string `description:"摘要"`

services/article.go

@@ -116,6 +116,12 @@ func HandleArticleCategoryImg(list []*models.ArticleListResp) (items []*models.A
 		mapChartPerssion[strconv.Itoa(v.CategoryId)] = v.ChartPermissionName
 	}
 	for k, v := range list {
+		if list[k].Annotation == "" {
+			imgurl, _ := FixArticleImgUrl(html.UnescapeString(list[k].Body))
+			if imgurl != "" {
+				list[k].BodyImg = imgurl
+			}
+		}
 		item := list[k]
 		//如果文章一开始的内容是图片，优先展示第一张图片
 		//newBody, _ := GetReportContentTextSubByarticle(item.Body, item.Annotation, item.ArticleId)
@@ -123,9 +129,7 @@ func HandleArticleCategoryImg(list []*models.ArticleListResp) (items []*models.A
 		list[k].Body = ""
 		list[k].Abstract, _ = GetReportContentTextSub(v.Abstract)
 		list[k].PublishDate = utils.StrTimeToTime(item.PublishDate).Format(utils.FormatDate) //时间字符串格式转时间格式
-		if item.Pv > 999 {
-			list[k].Pv = 999
-		}
+
 		list[k].ChartPermissionName = mapChartPerssion[v.CategoryId]
 		//如果是研选系列的任意取五张图片的中的一张
 		if v.CategoryId == "0" || v.ArticleId > utils.SummaryArticleId {
@@ -151,6 +155,8 @@ func HandleArticleCategoryImg(list []*models.ArticleListResp) (items []*models.A
 				list[k].ImgUrlPc = utils.ZHI_ZAO_OTHER_IMG
 			}
 		}
+		list[k].IsResearch = utils.InArrayByInt(utils.YAN_XUAN_ARTICLE_TYPE_ID, v.ArticleTypeId)
+
 	}
 
 	articleIds := make([]int, 0)
@@ -286,8 +292,6 @@ func GetSpecialArticleDetailUserPower(user *models.WxUserItem, articleInfo *mode
 func ArticleAnnotation(item *models.ArticleListResp) (annotation string) {
 	if item.Annotation != "" {
 		annotation = strings.Replace(item.Annotation, "<br>", "", -1)
-	} else {
-		annotation = item.Abstract
 	}
 	return
 }

services/resource_data.go

@@ -28,7 +28,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		item.Title = v.Title
 		item.Annotation = v.Annotation
 		item.Abstract = v.Abstract
-		item.PublishDate = utils.TimeRemoveHms(v.PublishDate)
+		item.PublishDate = utils.TimeRemoveHms2(v.PublishDate)
 		mapItems[fmt.Sprint(v.Source, v.SourceId)] = item
 	}
 
@@ -111,6 +111,9 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			mapItems[fmt.Sprint("article", v.ArticleId)].Annotation = v.Annotation
 			mapItems[fmt.Sprint("article", v.ArticleId)].Abstract = v.Abstract
 			mapItems[fmt.Sprint("article", v.ArticleId)].PublishDate = v.PublishDate
+			mapItems[fmt.Sprint("article", v.ArticleId)].Pv = v.Pv
+			mapItems[fmt.Sprint("article", v.ArticleId)].IsResearch = v.IsResearch
+			mapItems[fmt.Sprint("article", v.ArticleId)].BodyImg = v.BodyImg
 		}
 	}
 

utils/constants.go

@@ -116,6 +116,8 @@ const (
 	YAN_XUAN_IMG = "https://hzstatic.hzinsights.com/static/temp/20221027202210/20221027/Dd8TrsMh8tNx2tGd5VeaQDyJVQfV.png"
 )
 
+var YAN_XUAN_ARTICLE_TYPE_ID = []int{1, 2, 12}
+
 const (
 	YD_TOKEN = "yidong_token"
 )
@@ -148,4 +150,3 @@ const (
 const (
 	SendTemplateMsgAuthorization = "dc855fce962a639faa779cbdd4cd332f"
 )
-