no message

models/cygx/activity_special.go

@@ -95,6 +95,7 @@ type ActivitySpecialDetail struct {
 	DateYmdList           []*DateYmdList `description:"时间年月日"`
 	IsSubmitMeeting       int            `description:"是否提交过到会信息 ，1是，0否"`
 	LastUpdatedTime       time.Time      `description:"更新时间"`
+	PublishDate           string         `description:"发布时间"`
 }
 
 type ActivityDetailSpecialRep struct {

models/cygx/report_article.go

@@ -463,6 +463,7 @@ type ArticleDetail struct {
 	CreateDate           string `description:"创建时间"`
 	PublishDate          string `description:"发布时间"`
 	Body                 string `description:"内容"`
+	Annotation           string `description:"核心观点"`
 	Abstract             string `description:"摘要"`
 	CategoryName         string `description:"一级分类"`
 	SubCategoryName      string `description:"二级分类"`
@@ -485,6 +486,8 @@ type ArticleDetail struct {
 	TypeName             string `description:"策略平台类型字段名称"`
 	ArticleTypeId        int    `description:"文章类型ID"`
 	ArticleTypeName      string `description:"文章类型名称"`
+	Stock                string `description:"个股标签（上海策略品台同步）"`
+	FieldName            string `description:"产业标签（上海策略品台同步）"`
 }
 
 func GetArticleDetailById(articleId int) (item *ArticleDetail, err error) {

models/cygx/resource_data.go

@@ -16,6 +16,9 @@ type CygxResourceData struct {
 	Abstract          string    `description:"摘要"`
 	SearchTag         string    `description:"搜索标签"`
 	ChartPermissionId int       `description:"行业id"`
+	SearchTitle       string    `description:"搜索匹配用的标题"`
+	SearchContent     string    `description:"搜索匹配用的内容"`
+	SearchOrderTime   string    `description:"搜索排序时间"`
 }
 
 // 根据资源类型获取列表
@@ -56,6 +59,9 @@ func UpdateResourceDataByItem(item *CygxResourceData) (err error) {
 	updateParams["PublishDate"] = item.PublishDate
 	updateParams["SearchTag"] = item.SearchTag
 	updateParams["ChartPermissionId"] = item.ChartPermissionId
+	updateParams["SearchTitle"] = item.SearchTitle
+	updateParams["SearchContent"] = item.SearchContent
+	updateParams["SearchOrderTime"] = item.SearchOrderTime
 	ptrStructOrTableName := "cygx_resource_data"
 	whereParam := map[string]interface{}{"source_id": item.SourceId, "source": item.Source}
 	qs := o.QueryTable(ptrStructOrTableName)

services/cygx/resource_data.go

@@ -6,6 +6,7 @@ import (
 	"hongze/hz_crm_api/models/cygx"
 	"hongze/hz_crm_api/services/alarm_msg"
 	"hongze/hz_crm_api/utils"
+	"html"
 	"strconv"
 	"time"
 )
@@ -83,6 +84,9 @@ func UpdateActivityResourceData(sourceId int) {
 		item.SearchTag = detail.ActivityTypeName
 		item.ChartPermissionId = detail.ChartPermissionId
 		item.PublishDate = publishDate
+		item.SearchTitle = detail.ActivityName
+		item.SearchContent = detail.Label
+		item.SearchOrderTime = detail.ActivityTime
 		item.CreateTime = time.Now()
 		if totalData == 0 {
 			newId, e := cygx.AddCygxResourceData(item)
@@ -203,6 +207,15 @@ func UpdateActivitySpecialResourceData(sourceId int) {
 		item.PublishDate = publishDate
 		item.ChartPermissionId = activityInfo.ChartPermissionId
 		item.CreateTime = time.Now()
+		item.SearchTitle = activityInfo.ResearchTheme
+		item.SearchContent = activityInfo.Label + activityInfo.IndustrialName + activityInfo.IndustrialSubjectName
+
+		if activityInfo.Days > 0 {
+			item.SearchOrderTime = activityInfo.ActivityTime
+		} else {
+			item.SearchOrderTime = activityInfo.PublishDate
+		}
+
 		if totalData == 0 {
 			newId, e := cygx.AddCygxResourceData(item)
 			if e != nil {
@@ -327,10 +340,37 @@ func UpdateArticleResourceData(sourceId int) {
 			}
 		}
 
+		var industrialName string
+		var subjectName string
+		//建立首页资源表，与产业的关系
+		industrialList, e := cygx.GetIndustrialArticleGroupManagementList(sourceId)
+		if e != nil && e.Error() != utils.ErrNoRow() {
+			err = errors.New("GetIndustrialArticleGroupManagementList, Err: " + e.Error() + "sourceId：" + strconv.Itoa(sourceId))
+			return
+		}
+
+		for _, v := range industrialList {
+			industrialName += v.IndustryName
+		}
+
+		//建立首页资源表，与标的 的关系
+		subjectList, e := cygx.GetSubjectArticleGroupManagementList(sourceId)
+		if e != nil && e.Error() != utils.ErrNoRow() {
+			err = errors.New("GetSubjectArticleGroupManagementList, Err: " + e.Error() + "sourceId：" + strconv.Itoa(sourceId))
+			return
+		}
+
+		for _, v := range subjectList {
+			subjectName += v.SubjectName
+		}
+
 		item.SourceId = sourceId
 		item.Source = source
 		item.PublishDate = publishDate
 		item.CreateTime = time.Now()
+		item.SearchTitle = detail.Title
+		item.SearchContent = html.UnescapeString(detail.Annotation) + html.UnescapeString(detail.Abstract) + detail.FieldName + detail.Stock + industrialName + subjectName
+		item.SearchOrderTime = detail.PublishDate
 		if totalData == 0 {
 			newId, e := cygx.AddCygxResourceData(item)
 			if e != nil {
@@ -341,23 +381,17 @@ func UpdateArticleResourceData(sourceId int) {
 		} else {
 			e = cygx.UpdateResourceDataByItem(item)
 			if e != nil {
-				err = errors.New("UpdateResourceData, Err: " + e.Error())
+				err = errors.New("UpdateResourceDataByItem, Err: " + e.Error())
 				return
 			}
 			sourceDetail, e := cygx.GetCygxResourceDataByIdAndSource(sourceId, source)
 			if e != nil {
-				err = errors.New("UpdateResourceData, Err: " + e.Error())
+				err = errors.New("GetCygxResourceDataByIdAndSource, Err: " + e.Error())
 				return
 			}
 			resourceDataId = sourceDetail.Id
 		}
 
-		//建立首页资源表，与产业的关系
-		industrialList, e := cygx.GetIndustrialArticleGroupManagementList(sourceId)
-		if e != nil && e.Error() != utils.ErrNoRow() {
-			err = errors.New("GetIndustrialArticleGroupManagementList, Err: " + e.Error() + "sourceId：" + strconv.Itoa(sourceId))
-			return
-		}
 		var industrialItems []*cygx.CygxResourceDataIndustrialGroupManagement
 		for _, v := range industrialList {
 			var industrialItem = new(cygx.CygxResourceDataIndustrialGroupManagement)
@@ -367,14 +401,9 @@ func UpdateArticleResourceData(sourceId int) {
 			industrialItem.ResourceDataId = resourceDataId
 			industrialItem.CreateTime = time.Now()
 			industrialItems = append(industrialItems, industrialItem)
+			industrialName += v.IndustryName
 		}
 
-		//建立首页资源表，与标的 的关系
-		subjectList, e := cygx.GetSubjectArticleGroupManagementList(sourceId)
-		if e != nil && e.Error() != utils.ErrNoRow() {
-			err = errors.New("GetSubjectArticleGroupManagementList, Err: " + e.Error() + "sourceId：" + strconv.Itoa(sourceId))
-			return
-		}
 		var subjectItems []*cygx.CygxResourceDataIndustrialGroupSubject
 		for _, v := range subjectList {
 			var subjectItem = new(cygx.CygxResourceDataIndustrialGroupSubject)
@@ -384,6 +413,7 @@ func UpdateArticleResourceData(sourceId int) {
 			subjectItem.ResourceDataId = resourceDataId
 			subjectItem.CreateTime = time.Now()
 			subjectItems = append(subjectItems, subjectItem)
+			subjectName += v.SubjectName
 		}
 
 		//插入关联信息