no message

models/article.go

@@ -114,7 +114,7 @@ type HomeArticle struct {
 	ArticleResponse     int                  `description:"报告类型 0：啥也不是，1研选报告，2：研选纪要，3：研选沙龙，4;研选观点"`
 	Readnum             int                  `description:"阅读数量"`
 	Cover               string               `description:"封面图片"`
-	BodyHeight          []string             `description:"高亮内容"`
+	BodyHighlight       []string             `description:"搜索高亮展示结果"`
 	List                []*IndustrialManagementIdInt
 }
 

models/resource_data.go

@@ -19,7 +19,7 @@ type CygxResourceData struct {
 
 type CygxResourceDataResp struct {
 	Id                 int                                     `orm:"column(id);pk"`
-	BodyHeight         []string                                `description:"搜索结果"`
+	BodyHighlight      []string                                `description:"搜索高亮展示结果"`
 	IsSummary          int                                     `description:"是否是纪要"`
 	SourceId           int                                     `description:"资源ID"`
 	Source             string                                  `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`

services/es_comprehensive.go

@@ -830,7 +830,9 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 	var condition string
 	var pars []interface{}
 	uid := user.UserId
-	titleHeight := make(map[int]string)
+	titleHighlight := make(map[int]string)
+	bodyHighlight := make(map[int][]string)
+	//var bodyHighlight []string
 	mapItems := make(map[string]*models.CygxResourceDataResp)
 	for _, v := range list {
 		//预处理文章
@@ -838,11 +840,12 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 		item.SourceId = v.SourceId
 		item.Source = v.Source
 		if v.IsSummary == 1 {
-			item.BodyHeight = v.Body
-			titleHeight[v.SourceId] = v.Title
+			item.BodyHighlight = v.Body
+			titleHighlight[v.SourceId] = v.Title
+			bodyHighlight[v.SourceId] = v.Body
 			//fmt.Println(v.Title)
 		} else {
-			item.BodyHeight = make([]string, 0)
+			item.BodyHighlight = make([]string, 0)
 		}
 		item.PublishDate = utils.TimeRemoveHms2(v.PublishDate)
 		mapItems[fmt.Sprint(v.Source, v.SourceId)] = item
@@ -909,8 +912,13 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 		for _, v := range listArticle {
 			v.Body = ""
 			v.BodyHtml = ""
-			if titleHeight[v.ArticleId] != "" {
-				v.Title = titleHeight[v.ArticleId]
+			if titleHighlight[v.ArticleId] != "" {
+				v.Title = titleHighlight[v.ArticleId]
+			}
+			if len(bodyHighlight[v.ArticleId]) > 0 {
+				v.Abstract = ""
+				v.Annotation = ""
+				v.BodyHighlight = bodyHighlight[v.ArticleId]
 			}
 			mapItems[fmt.Sprint("article", v.ArticleId)].Article = v
 		}