no message

controllers/report.go

@@ -326,23 +326,6 @@ func (this *ReportController) ArticleCategoryList() {
 		}
 		categoryMap[v.CategoryId] = v.CategoryId
 		list = append(list, v)
-		//recordCount, err := models.IndustrialUserRecordArticleCount(uid, industrialManagementId, v.CategoryId)
-		//if err != nil && err.Error() != utils.ErrNoRow() {
-		//	br.Msg = "获取信息失败"
-		//	br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
-		//	return
-		//}
-		//Newdetail, err := models.GetNewIndustrialUserRecordArticle(industrialManagementId, v.CategoryId)
-		//if err != nil && err.Error() != utils.ErrNoRow() {
-		//	br.Msg = "获取信息失败"
-		//	br.ErrMsg = "获取信息失败,Err:" + err.Error()
-		//	return
-		//}
-		//if Newdetail != nil {
-		//	if recordCount == 0 && user.CreatedTime.Before(utils.StrTimeToTime(Newdetail.PublishDate)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(Newdetail.PublishDate)) {
-		//		list[k].IsRed = true
-		//	}
-		//}
 	}
 
 	// 用户权限

models/article.go

@@ -170,6 +170,7 @@ type ArticleDetail struct {
 	IsFollowButton          bool   `description:"是否关注"`
 	IsRoadShow              bool   `description:"是否是路演精华"`
 	ReportType              int    `description:"报告类型，1行业报告，2产业报告,0无"`
+	FieldName               string `description:"策略平台的领域字段名称"`
 }
 
 type ArticleDetailFileLink struct {

models/industrial_article_group_subject.go

@@ -23,7 +23,7 @@ type SubjectArticlGroupList struct {
 func GetSubjectArticleGroupManagementList(condition string, pars []interface{}) (items []*CygxIndustrialArticleGroupSubject, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-			ag.industrial_subject_id 
+				* 
 			FROM
 			cygx_industrial_article_group_subject AS ag
 			WHERE
@@ -46,3 +46,21 @@ func GetSubjectArticlGroupList(condition string, pars []interface{}) (items []*S
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
+
+// 标的列表
+func GetIndustrialArticleGroupSubjectListByHz(IndustrialManagementId int) (items []*IndustrialSubject, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+			i.* 
+		FROM
+			cygx_industrial_subject AS i
+			INNER JOIN cygx_industrial_article_group_subject AS sg ON sg.industrial_subject_id = i.industrial_subject_id
+			INNER JOIN cygx_article AS a ON a.article_id = sg.article_id 
+		WHERE
+			i.industrial_management_id = ? 
+			AND a.article_type_id = 0 
+		GROUP BY
+			i.industrial_subject_id `
+	_, err = o.Raw(sql, IndustrialManagementId).QueryRows(&items)
+	return
+}

services/es_comprehensive.go

@@ -47,7 +47,8 @@ type ElasticComprehensiveDetail struct {
 
 //func init() {
 //AddComprehensiveIndustrialSource("Hz", 0)
-//AddComprehensiveActivityVoice()
+//AddComprehensiveArticle(0)
+//AddComprehensiveMeetingreviewchapt()
 //}
 
 // 添加文章：报告、纪要
@@ -59,6 +60,37 @@ func AddComprehensiveArticle(articleId int) {
 			go utils.SendAlarmMsg("删除数据综合页面数据Es失败"+err.Error(), 2)
 		}
 	}()
+
+	IndustrialManagementRespMap, _ := GetIndustrialManagementRespMap()
+	IndustrialSubjectMap, _ := GetCygxIndustrialSubjectMap()
+	var condition1 string
+	var pars1 []interface{}
+	mapActivityIndustrialManagement := make(map[int][]string)
+	industrialgroupList, e := models.GetIndustrialArticleGroupManagementList(condition1, pars1)
+	if e != nil {
+		fmt.Println(e)
+		return
+	}
+	for _, v := range industrialgroupList {
+		if v.ArticleId == 0 {
+			continue
+		}
+		mapActivityIndustrialManagement[v.ArticleId] = append(mapActivityIndustrialManagement[v.ArticleId], IndustrialManagementRespMap[v.IndustrialManagementId])
+	}
+
+	mapActivitySubject := make(map[int][]string)
+	SubjectgroupList, e := models.GetSubjectArticleGroupManagementList(condition1, pars1)
+	if e != nil {
+		fmt.Println(e)
+		return
+	}
+	for _, v := range SubjectgroupList {
+		if v.ArticleId == 0 {
+			continue
+		}
+		mapActivitySubject[v.ArticleId] = append(mapActivitySubject[v.ArticleId], IndustrialSubjectMap[v.IndustrialSubjectId])
+	}
+
 	var condition string
 	var pars []interface{}
 	condition += ` AND publish_status  = 1  `
@@ -87,11 +119,14 @@ func AddComprehensiveArticle(articleId int) {
 		item.Source = "article"
 		item.Title = v.Title
 		item.PublishDate = v.PublishDate
-		item.BodyText = bodyText
+		item.BodyText = bodyText + v.FieldName
+		item.SubjectNames = strings.Join(mapActivitySubject[v.ArticleId], ",")
+		item.IndustryName = strings.Join(mapActivityIndustrialManagement[v.ArticleId], ",")
 		item.Annotation, _ = GetReportContentTextSubNew(v.Annotation)
 		item.Abstract, _ = GetReportContentTextSubNew(v.Abstract)
 		EsAddOrEditComprehensiveData(item)
-		fmt.Println(v.ArticleId)
+		fmt.Println(item.IndustryName)
+		fmt.Println(item.SubjectNames)
 	}
 }
 
@@ -140,6 +175,13 @@ func AddComprehensiveIndustrialSource(sourceType string, articleId int) {
 	var condition string
 	var pars []interface{}
 	mapActivitySubject := make(map[int][]string, 0)
+	maplistMeetingTime := make(map[int]time.Time, 0)
+
+	listMeeting, err := models.GetCygxMorningMeetingReviewChapterList(" GROUP BY c.industry_id  ORDER BY r.publish_time DESC ", pars)
+	for _, v := range listMeeting {
+		resultTime := utils.StrTimeToTime(v.PublishTime)
+		maplistMeetingTime[v.IndustryId] = resultTime
+	}
 	listsubject, e := models.GetCygxIndustrialSubjectListCondition(condition, pars)
 	if e != nil {
 		err = errors.New("GetIndustrialManagementRepList, Err: " + e.Error())
@@ -172,8 +214,14 @@ func AddComprehensiveIndustrialSource(sourceType string, articleId int) {
 		item.IndustryName = v.IndustryName
 		item.SubjectNames = strings.Join(mapActivitySubject[v.IndustrialManagementId], ",")
 		item.PublishDate = v.PublishDate + " 00:00:00"
+		if sourceType == "Hz" {
+			//如果时间晚就进行替换
+			resultTime := utils.StrTimeToTime(item.PublishDate)
+			if maplistMeetingTime[v.IndustrialManagementId].After(resultTime) {
+				item.PublishDate = maplistMeetingTime[v.IndustrialManagementId].Format(utils.FormatDateTime)
+			}
+		}
 		EsAddOrEditComprehensiveData(item)
-		fmt.Println(item)
 	}
 }
 
@@ -202,7 +250,7 @@ func AddComprehensiveMeetingreviewchapt() {
 		item.Source = "meetingreviewchapt"
 		item.IndustryName = IndustrialManagementRespMap[v.IndustryId]
 		item.PublishDate = v.PublishTime
-		item.BodyText = bodyText
+		item.Abstract = bodyText
 		EsAddOrEditComprehensiveData(item)
 		fmt.Println(item)
 	}
@@ -249,8 +297,7 @@ func AddComprehensiveActivity() {
 		}
 		mapActivitySubject[v.ActivityId] = append(mapActivitySubject[v.ActivityId], IndustrialSubjectMap[v.IndustrialSubjectId])
 	}
-	fmt.Println(mapActivitySubject[141])
-	fmt.Println(mapActivityIndustrialManagement[141])
+
 	//return
 	for _, v := range list {
 		item := new(ElasticComprehensiveDetail)
@@ -933,7 +980,6 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 			industrialResourceIdsYx = append(industrialResourceIdsYx, v.SourceId)
 		}
 	}
-	fmt.Println(industrialResourceIdsYx)
 	//处理文章
 	if len(articleIds) > 0 {
 		pars = make([]interface{}, 0)
@@ -1401,6 +1447,7 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 			}
 			if v.IndustrialResource != nil && v.SourceId == vList.SourceId {
 				v.Source = "industrialsource"
+				v.IndustrialResource.PublishDate = vList.PublishDate
 			}
 			if v.SourceId == vList.SourceId {
 				items = append(items, v)