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

services/article.go

@@ -2127,3 +2127,60 @@ func GetUserArticleHistoryIndustrialNewPublishDate(user *models.WxUserItem, indu
 	}
 	return
 }
+
+//func init() {
+//	initcygx15_0()
+//}
+
+func initcygx15_0() {
+	var condition string
+	var pars []interface{}
+	condition = ` AND   source_id >= 7000 AND   source = 'article'   `
+	//全部都是标题搜索
+	list, e := models.GetResourceDataListCondition(condition, pars, 0, 10000)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		fmt.Println(e)
+		return
+	}
+	fmt.Println(len(list))
+
+	//return
+
+	for k, v := range list {
+		sourceId := v.SourceId
+		fmt.Println(k, "+++", v.SourceId, "___", v.SearchTitle)
+		var industrialName string
+		var subjectName string
+		//建立首页资源表，与产业的关系
+		industrialList, e := models.GetIndustrialArticleGroupManagementListByArticleId(sourceId)
+		if e != nil && e.Error() != utils.ErrNoRow() {
+			fmt.Println("GetIndustrialArticleGroupManagementListByArticleId", e)
+		}
+
+		for _, v := range industrialList {
+			industrialName += v.IndustryName
+		}
+
+		//建立首页资源表，与标的 的关系
+		subjectList, e := models.GetSubjectArticleGroupManagementListByArtcileId(sourceId)
+		if e != nil && e.Error() != utils.ErrNoRow() {
+			fmt.Println("GetSubjectArticleGroupManagementListByArtcileId", e)
+		}
+
+		for _, vs := range subjectList {
+			subjectName += vs.SubjectName
+		}
+		detail, e := models.GetArticleDetailById(sourceId)
+		if e != nil {
+			fmt.Println("GetArticleDetailById", e)
+			continue
+		}
+		searchTitle := detail.Title + "{|}" + detail.FieldName + "{|}" + detail.Stock + "{|}" + industrialName + "{|}" + subjectName
+		//fmt.Println(searchTitle)
+		e = models.UpdatecygxResourceDatasearchTitle(searchTitle, sourceId)
+		if e != nil {
+			fmt.Println("UpdatecygxResourceDatasearchTitle", e)
+		}
+	}
+	return
+}

services/es_comprehensive.go

@@ -1726,6 +1726,9 @@ func SqlComprehensiveSearch2(keyWord string, startSize, pageSize int) (result []
 		conditionTitle = " AND is_hide = 0  AND search_title LIKE ? AND IF   ( source IN('activityvoice','activityvideo') , chart_permission_id != 31 ,1=1 ) " + conditionActivity
 		parsTitle = append(parsTitle, keyWord)
 	}
+	// 深度报告搜索最近两年的数据
+	conditionTitle += " AND  IF   ( search_tag = '行业深度' , search_order_time > ?  ,1=1 ) "
+	parsTitle = append(parsTitle, time.Now().AddDate(-2, 0, 0).Format(utils.FormatDate))
 	totalTitle, e := models.GetResourceDataCount(conditionTitle, parsTitle)
 	if e != nil {
 		err = errors.New("GetResourceDataCount, Err: " + e.Error())

services/resource_data.go

@@ -729,7 +729,7 @@ func UpdateArticleResourceData(sourceId int) {
 		item.Source = source
 		item.PublishDate = publishDate
 		item.CreateTime = time.Now()
-		item.SearchTitle = detail.Title
+		item.SearchTitle = detail.Title + "{|}" + detail.FieldName + "{|}" + detail.Stock + "{|}" + industrialName + "{|}" + subjectName
 		if detail.SeriesName == "行业深度" || detail.SeriesName == "季度策略" {
 			item.Sort = 100 // 这两个类型优先展示
 		}