|
|
@@ -584,6 +584,41 @@ func AddComprehensiveRoadshow() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+// Es研选专栏
|
|
|
+func AddYanxuanSpecial(sourceId int) {
|
|
|
+ var err error
|
|
|
+ defer func() {
|
|
|
+ if err != nil {
|
|
|
+ fmt.Println("err：", err)
|
|
|
+ go utils.SendAlarmMsg(fmt.Sprint("更新研选专栏失败sourceId: ", sourceId), 2)
|
|
|
+ }
|
|
|
+ }()
|
|
|
+ detail, e := models.GetYanxuanSpecialItemById(sourceId)
|
|
|
+ if e != nil {
|
|
|
+ err = errors.New("GetArticleInfoOtherByArticleId" + e.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
+ content := html.UnescapeString(detail.Content)
|
|
|
+ doc, e := goquery.NewDocumentFromReader(strings.NewReader(content))
|
|
|
+ if e != nil {
|
|
|
+ err = errors.New("goquery.NewDocumentFromReader" + e.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
+ bodyText := doc.Text()
|
|
|
+ item := new(ElasticComprehensiveDetail)
|
|
|
+ item.SourceId = detail.Id
|
|
|
+ item.Source = utils.CYGX_OBJ_YANXUANSPECIAL
|
|
|
+ item.Title = detail.Title
|
|
|
+ item.PublishDate = detail.PublishTime
|
|
|
+ item.BodyText = bodyText
|
|
|
+ if detail.Status == 3 {
|
|
|
+ EsAddOrEditComprehensiveData(item) //如果发布了就新增
|
|
|
+ } else {
|
|
|
+ EsDeleteComprehensiveData(item) // 没有发布就删除
|
|
|
+ }
|
|
|
+ return
|
|
|
+}
|
|
|
+
|
|
|
// 新增和修改数据
|
|
|
func EsAddOrEditComprehensiveData(item *ElasticComprehensiveDetail) (err error) {
|
|
|
indexName := utils.IndexNameComprehensive
|
|
|
@@ -962,6 +997,7 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
|
|
|
var productinteriorIds []int
|
|
|
var industrialResourceIdsHz []int // 弘则产业资源包
|
|
|
var industrialResourceIdsYx []int // 研选产业资源包
|
|
|
+ var yanxuanSpecialIds []int // 研选专栏
|
|
|
//Source string `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial 、 本周研究汇总： researchsummary 、 上周纪要汇总 ：minutessummary 、晨会精华 ：meetingreviewchapt "`
|
|
|
for _, v := range list {
|
|
|
if v.Source == "article" {
|
|
|
@@ -990,6 +1026,8 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
|
|
|
industrialResourceIdsHz = append(industrialResourceIdsHz, v.SourceId)
|
|
|
} else if v.Source == "industrialsourceYx" {
|
|
|
industrialResourceIdsYx = append(industrialResourceIdsYx, v.SourceId)
|
|
|
+ } else if v.Source == utils.CYGX_OBJ_YANXUANSPECIAL {
|
|
|
+ yanxuanSpecialIds = append(yanxuanSpecialIds, v.SourceId)
|
|
|
}
|
|
|
}
|
|
|
//处理文章
|
|
|
@@ -1420,10 +1458,28 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ //处理研选专栏
|
|
|
+ lenyanxuanSpecialIds := len(yanxuanSpecialIds)
|
|
|
+ if lenyanxuanSpecialIds > 0 {
|
|
|
+ pars = make([]interface{}, 0)
|
|
|
+ condition = ` AND a.id IN (` + utils.GetOrmInReplace(lenyanxuanSpecialIds) + `) `
|
|
|
+ pars = append(pars, yanxuanSpecialIds)
|
|
|
+ listyanxuanSpecial, e := models.GetYanxuanSpecialList(user.UserId, condition, pars)
|
|
|
+ if e != nil {
|
|
|
+ err = errors.New("GetYanxuanSpecialList, Err: " + e.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ for _, v := range listyanxuanSpecial {
|
|
|
+ v.Annotation, _ = GetReportContentTextSubNew(v.Content)
|
|
|
+ mapItems[fmt.Sprint(utils.CYGX_OBJ_YANXUANSPECIAL, v.Id)].YanxuanSpecial = v
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
for _, vList := range list {
|
|
|
for _, v := range mapItems {
|
|
|
//如果这些类型都为空，那么就不合并
|
|
|
- if v.Article == nil && v.Newchart == nil && v.Roadshow == nil && v.Activity == nil && v.Activityvideo == nil && v.Activityvoice == nil && v.Activityspecial == nil && v.Researchsummary == nil && v.Minutessummary == nil && v.Meetingreviewchapt == nil && v.ProductInterior == nil && v.IndustrialResource == nil {
|
|
|
+ if v.Article == nil && v.Newchart == nil && v.Roadshow == nil && v.Activity == nil && v.Activityvideo == nil && v.Activityvoice == nil && v.Activityspecial == nil && v.Researchsummary == nil && v.Minutessummary == nil && v.Meetingreviewchapt == nil && v.ProductInterior == nil && v.IndustrialResource == nil && v.YanxuanSpecial == nil {
|
|
|
continue
|
|
|
}
|
|
|
if v.Article != nil && v.SourceId == vList.SourceId {
|
xingzai