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

models/article.go

@@ -8,50 +8,53 @@ import (
 )
 
 type CygxArticle struct {
-	Id               int    `orm:"column(id);pk"`
-	ArticleId        int    `description:"文章id"`
-	Title            string `description:"标题"`
-	TitleEn          string `description:"英文标题 "`
-	UpdateFrequency  string `description:"更新周期"`
-	CreateDate       string `description:"创建时间"`
-	PublishDate      string `description:"发布时间"`
-	Body             string `description:"内容"`
-	BodyText         string `description:"内容"`
-	Abstract         string `description:"摘要"`
-	CategoryName     string `description:"一级分类"`
-	SubCategoryName  string `description:"二级分类"`
-	PublishStatus    int    `description:"发布状态"`
-	CategoryId       int    `description:"分类id"`
-	CategoryIdTwo    int    `description:"分类id用作修改匹配类型使用"`
-	ExpertBackground string `description:"专家背景"`
-	ExpertNumber     string `description:"专家编号"`
-	InterviewDate    string `description:"访谈日期"`
-	Department       string `description:"作者"`
-	ArticleIdMd5     string `description:"ID，md5值"`
-	IsClass          int    `description:"是否归类，1是，0否"`
-	IsSummary        int    `description:"是否是纪要库，1是，0否"`
-	IsReport         int    `description:"是否属于报告，1是，0否"`
-	ReportType       int    `description:"报告类型，1行业报告，2产业报告,0无"`
-	FileLink         string `description:"下载预览链接"`
-	MatchTypeName    string `description:"匹配类型"`
-	Periods          string `description:"期数"`
-	ReportLink       string `description:"报告链接"`
-	ArticleType      string `description:"文章类型 文章类型，lyjh:路演精华 "`
-	HavePublish      int    `description:"是否发布过，1是 ，0 否"`
-	Source           int    `description:"来源 0策略平台同步，1小程序后台添加"`
-	SellerAndMobile  string `description:"销售和手机号"`
-	VideoUrl         string `description:"音频文件URL"`
-	VideoName        string `description:"音频文件名称"`
-	VideoPlaySeconds string `description:"音频播放时长"`
-	Stock            string `description:"个股标签"`
-	FieldName        string `description:"产业标签"`
-	SeriesName       string `description:"系列名称"`
-	Annotation       string `description:"核心观点"`
-	TypeName         string `description:"策略平台报告类型"`
-	ModifyTimeByCl   string `description:"策略平台报告更新时间"`
-	CeLueFieldId     int    `description:"策略平台领域ID"`
-	Cover            string `description:"封面图片"`
-	ReportId         int    `description:"FICC研报ID"`
+	Id                  int       `orm:"column(id);pk"`
+	ArticleId           int       `description:"文章id"`
+	Title               string    `description:"标题"`
+	TitleEn             string    `description:"英文标题 "`
+	UpdateFrequency     string    `description:"更新周期"`
+	CreateDate          string    `description:"创建时间"`
+	PublishDate         string    `description:"发布时间"`
+	Body                string    `description:"内容"`
+	BodyText            string    `description:"内容"`
+	Abstract            string    `description:"摘要"`
+	CategoryName        string    `description:"一级分类"`
+	SubCategoryName     string    `description:"二级分类"`
+	PublishStatus       int       `description:"发布状态"`
+	CategoryId          int       `description:"分类id"`
+	CategoryIdTwo       int       `description:"分类id用作修改匹配类型使用"`
+	ExpertBackground    string    `description:"专家背景"`
+	ExpertNumber        string    `description:"专家编号"`
+	InterviewDate       string    `description:"访谈日期"`
+	Department          string    `description:"作者"`
+	ArticleIdMd5        string    `description:"ID，md5值"`
+	IsClass             int       `description:"是否归类，1是，0否"`
+	IsSummary           int       `description:"是否是纪要库，1是，0否"`
+	IsReport            int       `description:"是否属于报告，1是，0否"`
+	ReportType          int       `description:"报告类型，1行业报告，2产业报告,0无"`
+	FileLink            string    `description:"下载预览链接"`
+	MatchTypeName       string    `description:"匹配类型"`
+	Periods             string    `description:"期数"`
+	ReportLink          string    `description:"报告链接"`
+	ArticleType         string    `description:"文章类型 文章类型，lyjh:路演精华 "`
+	HavePublish         int       `description:"是否发布过，1是 ，0 否"`
+	Source              int       `description:"来源 0策略平台同步，1小程序后台添加"`
+	SellerAndMobile     string    `description:"销售和手机号"`
+	VideoUrl            string    `description:"音频文件URL"`
+	VideoName           string    `description:"音频文件名称"`
+	VideoPlaySeconds    string    `description:"音频播放时长"`
+	Stock               string    `description:"个股标签"`
+	FieldName           string    `description:"产业标签"`
+	SeriesName          string    `description:"系列名称"`
+	Annotation          string    `description:"核心观点"`
+	TypeName            string    `description:"策略平台报告类型"`
+	ModifyTimeByCl      string    `description:"策略平台报告更新时间"`
+	CeLueFieldId        int       `description:"策略平台领域ID"`
+	Cover               string    `description:"封面图片"`
+	ReportId            int       `description:"FICC研报ID"`
+	CreateTime          time.Time `description:"创建时间"`
+	ChartPermissionId   int       `description:"行业id"`
+	ChartPermissionName string    `description:"行业名称"`
 }
 
 type CygxArticleEs struct {

services/article.go

@@ -593,7 +593,7 @@ func GetCeLueArticlePv(cont context.Context) (err error) {
 	//func GetCeLueArticlePv() (err error) {
 	defer func() {
 		if err != nil {
-			go utils.SendAlarmMsg("同步策略平台阅读数据失败", 2)
+			go utils.SendAlarmMsg("同步策略平台阅读数据失败"+err.Error(), 2)
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "GetCeLueArticlePv ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
@@ -1104,7 +1104,17 @@ func HandleArticleListByApi(artcleId int) (err error) {
 				return err
 			}
 			v.CategoryId = detailCategory.CategoryId
-			v.IsSummary = 0
+			matchTypeName = "路演精华"
+			if v.IsClass == 0 {
+				v.IsSummary = 0
+			}
+		}
+		var chartPermissionId int
+		var chartPermissionName string
+		categoryDetail, _ := models.GetdetailByCategoryIdPush(v.CategoryId)
+		if categoryDetail != nil {
+			chartPermissionId = categoryDetail.ChartPermissionId
+			chartPermissionName = categoryDetail.ChartPermissionName
 		}
 
 		if count > 0 {
@@ -1120,7 +1130,7 @@ func HandleArticleListByApi(artcleId int) (err error) {
 				//fmt.Println("触发推送规则")
 				//更新字数大于一百字触发推送规则
 				go DoArticleOnenIdWxTemplateMsg(v.ArticleId)
-				go UpdateArticleResourceData(v.ArticleId) //把数据写入 cygx_resource_data 表
+				UpdateArticleResourceData(v.ArticleId) //把数据写入 cygx_resource_data 表
 				//go UpdateResourceData(v.ArticleId, "article", "update", time.Now().Format(utils.FormatDateTime))
 			}
 			var isCustom bool
@@ -1167,6 +1177,8 @@ func HandleArticleListByApi(artcleId int) (err error) {
 			updateParams["ModifyTimeByCl"] = v.UpdateDate
 			updateParams["CeLueFieldId"] = v.CeLueFieldId
 			updateParams["Cover"] = v.Cover
+			updateParams["ChartPermissionId"] = chartPermissionId
+			updateParams["ChartPermissionName"] = chartPermissionName
 			whereParam := map[string]interface{}{"article_id": v.ArticleId}
 			err = models.UpdateByExpr(models.CygxArticle{}, whereParam, updateParams)
 			if err != nil {
@@ -1212,13 +1224,17 @@ func HandleArticleListByApi(artcleId int) (err error) {
 			item.ModifyTimeByCl = v.UpdateDate
 			item.CeLueFieldId = v.CeLueFieldId
 			item.Cover = v.Cover
+			item.ChartPermissionId = chartPermissionId
+			item.ChartPermissionName = chartPermissionName
+			item.Cover = v.Cover
+			item.CreateTime = time.Now()
 			newId, err := models.AddCygxArticles(item)
 			if err != nil {
 				fmt.Println("AddCygxArticle Err:", err.Error())
 				return err
 			}
 			//go UpdateResourceData(v.ArticleId, "article", "add", time.Now().Format(utils.FormatDateTime))
-			go UpdateArticleResourceData(v.ArticleId) //把数据写入 cygx_resource_data 表
+			UpdateArticleResourceData(v.ArticleId) //把数据写入 cygx_resource_data 表
 			//fmt.Println(newId)
 			//报告自动归类，以及推送相关模板消息
 			if v.ReportType == 2 {

services/rai_company_user_bill.go

@@ -79,7 +79,7 @@ func UpdateCygxRaiCompanyUserBill() (err error) {
 	var condition string
 	var pars []interface{}
 
-	condition = " AND  company_id IN  (" + utils.GetOrmInReplace(lencompanyId) + ")  AND create_time > ?  "
+	condition = " AND  art.company_id IN  (" + utils.GetOrmInReplace(lencompanyId) + ")  AND art.create_time > ?  "
 	pars = append(pars, companyIds, startWeekDate)
 
 	fmt.Println("startWeekDate", startWeekDate)
@@ -160,7 +160,7 @@ func UpdateCygxRaiCompanyUserBill() (err error) {
 
 	//文章阅读记录内容
 	{
-		listArticleRecord, e := models.GetCygxArticleHistoryRecordAllListNoLimit(condition+"  GROUP BY user_id, article_id  ORDER BY create_time ASC ", pars)
+		listArticleRecord, e := models.GetCygxArticleHistoryRecordAllListNoLimit(condition+"  GROUP BY art.user_id, art.article_id  ORDER BY art.create_time ASC ", pars)
 		if e != nil {
 			err = errors.New("GetCygxArticleHistoryRecordAllListNoLimit, Err: " + e.Error())
 			return

services/rai_serve_count.go

@@ -31,10 +31,10 @@ import (
 //}
 
 //func init() {
-//	//UpdateRaiServeCompany()              //1
-//	//UpdateCygxRaiServeBillByCompanyIds() //2
-//	//UpdateCygxRaiServeBillWeekTask() // 3
-//	//UpdateWeekAvg()                      // 4
+//	UpdateRaiServeCompany()              //1
+//	UpdateCygxRaiServeBillByCompanyIds() //2
+//	UpdateCygxRaiServeBillWeekTask()     // 3
+//	UpdateWeekAvg()                      // 4
 //}
 
 // 定时任务处理权益服务公司
@@ -462,13 +462,13 @@ func UpdateCygxRaiServeBillByCompanyIds() (err error) {
 	var condition string
 	var pars []interface{}
 
-	condition = " AND  company_id IN  (" + utils.GetOrmInReplace(lencompanyId) + ")  AND create_time > ?  "
+	condition = " AND  art.company_id IN  (" + utils.GetOrmInReplace(lencompanyId) + ")  AND art.create_time > ?  "
 	pars = append(pars, companyIds, startWeekDate)
 
 	fmt.Println("startWeekDate", startWeekDate)
 	//研选专栏阅读记录内容
 	{
-		listYanxuanSpecialRecord, e := models.GetCygxYanxuanSpecialRecordRespListAll(condition+"  GROUP BY user_id, yanxuan_special_id  ORDER BY create_time ASC ", pars)
+		listYanxuanSpecialRecord, e := models.GetCygxYanxuanSpecialRecordRespListAll(condition+"  GROUP BY art.user_id, art.yanxuan_special_id  ORDER BY art.create_time ASC ", pars)
 		if e != nil {
 			err = errors.New("GetCygxYanxuanSpecialRecordRespListAll, Err: " + e.Error())
 			return
@@ -543,7 +543,7 @@ func UpdateCygxRaiServeBillByCompanyIds() (err error) {
 
 	//文章阅读记录内容
 	{
-		listArticleRecord, e := models.GetCygxArticleHistoryRecordAllListNoLimit(condition+"  GROUP BY user_id, article_id  ORDER BY create_time ASC ", pars)
+		listArticleRecord, e := models.GetCygxArticleHistoryRecordAllListNoLimit(condition+"  GROUP BY art.user_id, art.article_id  ORDER BY art.create_time ASC ", pars)
 		if e != nil {
 			err = errors.New("GetCygxArticleHistoryRecordAllListNoLimit, Err: " + e.Error())
 			return

services/resource_data.go

@@ -639,6 +639,7 @@ func Deletenewchart(chartIdsDelete []int) (err error) {
 
 // 更新文章
 func UpdateArticleResourceData(sourceId int) {
+	time.Sleep(1 * time.Second)
 	var err error
 	defer func() {
 		if err != nil {