增加token

config/config.go

@@ -12,6 +12,7 @@ type Config struct {
 	Mongo       Mongo       `mapstructure:"mongo" json:"mongo" yaml:"mongo"`
 	EtaChartLib EtaChartLib `mapstructure:"eta_chart_lib" json:"eta_chart_lib" yaml:"eta_chart_lib"`
 	System      System      `mapstructure:"system" json:"system" yaml:"system"`
+	RaiReportLib RaiReportLib `mapstructure:"rai_report_lib" json:"rai_report_lib" yaml:"rai_report_lib"`
 }
 
 // Serve gin服务配置
@@ -112,3 +113,8 @@ type EtaChartLib struct {
 type System struct {
 	ChromePath string `mapstructure:"chrome-path" json:"chrome-path" yaml:"chrome-path" description:"chrome路径"`
 }
+
+type RaiReportLib struct {
+	ServerUrl string `mapstructure:"server_url" json:"server_url" yaml:"server_url" description:"权益报告查看地址"`
+	Token     string `mapstructure:"token" json:"token" yaml:"token" description:"权益报告查看token"`
+}

controller/pc/pc.go

@@ -442,6 +442,7 @@ func Recommend(c *gin.Context) {
 				Stage:               chapter.Stage,
 				ClassifyNameFirst:   chapter.ClassifyNameFirst,
 				ClassifySecondFirst: chapter.ClassifyNameSecond,
+				RaiReportId:         chapter.RaiReportId,
 			}
 			recommendResp = append(recommendResp, resp)
 		}

models/response/pc/report.go

@@ -32,6 +32,7 @@ type Report struct {
 	ClassifyName       string    `description:"分类名称"`
 	HasPermission      int       `description:"报告权限:0:无权限,1:有权限"`
 	TitleType          string    `description:"标题类型，FICC或者权益"`
+	RaiReportId        int       `description:"权益报告ID"`
 }
 
 func GetLatestReportList() (items []*Report, err error) {
@@ -92,6 +93,7 @@ type RecommendResp struct {
 	Stage               int
 	ClassifyNameFirst   string
 	ClassifySecondFirst string
+	RaiReportId         int
 }
 
 type DetailBannerResp struct {
@@ -136,7 +138,7 @@ type LatestReportBanner struct {
 // @return items []*Report
 // @return err error
 func GetRecommendListV2(reportId, reportType, firstId, secondId, thirdId int) (items []*Report, err error) {
-	sql := `SELECT id,title,classify_name_first,classify_name_second, stage FROM report WHERE state=2 AND id<> ? AND classify_id_first=? AND classify_id_second=? AND classify_id_third=? `
+	sql := `SELECT id,title,classify_name_first,classify_name_second, stage, rai_report_id FROM report WHERE state=2 AND id<> ? AND classify_id_first=? AND classify_id_second=? AND classify_id_third=? `
 	if reportType == 1 {
 		sql += ` AND classify_name_first = ? `
 	} else {
@@ -151,7 +153,7 @@ func GetRecommendListV2(reportId, reportType, firstId, secondId, thirdId int) (i
 func GetRaiRecommendList(reportId, firstId, secondId, thirdId int, publishTime time.Time) (items []*Report, err error) {
 	// 获取发布时间在当前报告之前的报告
 	var beforeItems []*Report
-	beforeSql := `SELECT id,title,classify_name_first,classify_name_second, stage FROM report WHERE state=2 AND id<>? AND classify_id_first=? AND classify_id_second=? AND classify_id_third=? 
+	beforeSql := `SELECT id,title,classify_name_first,classify_name_second, stage, rai_report_id FROM report WHERE state=2 AND id<>? AND classify_id_first=? AND classify_id_second=? AND classify_id_third=? 
 		AND publish_time <= ? ORDER BY publish_time DESC, id DESC LIMIT 3`
 	err = global.MYSQL["rddp"].Raw(beforeSql, reportId, firstId, secondId, thirdId, publishTime).Find(&beforeItems).Error
 	if err != nil {
@@ -164,7 +166,7 @@ func GetRaiRecommendList(reportId, firstId, secondId, thirdId int, publishTime t
 	if len(beforeItems) < 3 {
 		var afterItems []*Report
 		remainCount := 3 - len(beforeItems)
-		afterSql := `SELECT id,title,classify_name_first,classify_name_second, state FROM report WHERE state=2 AND id<>? AND classify_id_first=? AND classify_id_second=? AND classify_id_third=? 
+		afterSql := `SELECT id,title,classify_name_first,classify_name_second, state, rai_report_id FROM report WHERE state=2 AND id<>? AND classify_id_first=? AND classify_id_second=? AND classify_id_third=? 
 			AND publish_time > ? ORDER BY publish_time ASC, id ASC LIMIT ?`
 		err = global.MYSQL["rddp"].Raw(afterSql, reportId, firstId, secondId, thirdId, publishTime, remainCount).Find(&afterItems).Error
 		if err != nil {

models/response/report.go

@@ -15,6 +15,7 @@ type ReportDetail struct {
 	CollectionId         int                      `description:"收藏ID: 大于0则表示已收藏" json:"collection_id"`
 	RoadVideoId          int                      `json:"road_video_id" description:"绑定的路演视频ID"`
 	ReportDetailShowType int                      `description:"报告详情的展示类型：1-拼接；2:目录" json:"report_detail_show_type"`
+	RaiReportUrl         string                   `description:"权益报告查看地址" json:"rai_report_url"`
 }
 
 type ReportChapterListItem struct {
@@ -171,6 +172,7 @@ type ReportCollectListItem struct {
 	ClassifyId           int       `description:"最小分类id" json:"classify_id"`
 	ClassifyName         string    `description:"最小分类名称" json:"classify_name"`
 	ReportDetailShowType int       `description:"报告详情的展示类型：1-拼接；2:目录" json:"report_detail_show_type"`
+	RaiReportId          int       `description:"权益报告ID" json:"rai_report_id"`
 }
 
 type ReportCollectList struct {

models/tables/rddp/report/query.go

@@ -142,7 +142,7 @@ func GetByReportId(id int) (item *Report, err error) {
 func GetByReportIds(ids []int) (list []*Report, err error) {
 	err = global.MYSQL["rddp"].Model(Report{}).
 		Where("id in (?) and state IN (2, 6)", ids).
-		Select("id, create_time").
+		Select("id, create_time, rai_report_id").
 		Scan(&list).Error
 	if err == utils.ErrNoRow {
 		err = nil
@@ -254,7 +254,8 @@ classify_name_second,
 0 as report_chapter_type_id,
 title,
 content_sub,
-publish_time 
+publish_time,
+rai_report_id
 FROM
 	report
 WHERE
@@ -275,7 +276,8 @@ null as classify_name_second,
 type_id as report_chapter_type_id,
 title,
 content_sub,
-publish_time 
+publish_time,
+0 as rai_report_id
 FROM
 	report_chapter
 WHERE
@@ -504,7 +506,8 @@ classify_name_second,
 0 as report_chapter_type_id,
 title,
 content_sub,
-publish_time 
+publish_time,
+rai_report_id
 FROM
 	report
 WHERE
@@ -524,7 +527,8 @@ null as classify_name_second,
 a.type_id as report_chapter_type_id,
 a.title,
 a.content_sub,
-a.publish_time 
+a.publish_time,
+0 as rai_report_id
 FROM
 	report_chapter AS a 
 JOIN report_chapter_permission_mapping AS b on a.report_chapter_id=b.report_chapter_id

services/report/report.go

@@ -621,6 +621,10 @@ func GetReportDetail(userinfo user.UserInfo, reportId int) (reportDetail respons
 	reportDetail.LikeEnabled = likeEnabled
 	reportDetail.ReportShowType = int(firstClassify.ShowType)
 	reportDetail.ReportDetailShowType = int(minClassify.ReportDetailShowType)
+	if reportInfo.RaiReportId > 0 {
+		reportDetail.RaiReportUrl = fmt.Sprintf("%s/v2/articles/%d?token=%s", global.CONFIG.RaiReportLib.ServerUrl, reportInfo.RaiReportId, global.CONFIG.RaiReportLib.Token)
+	}
+
 
 	// 如果分类配置是列表展示，那么就移除content内容
 	if minClassify.ReportDetailShowType == 2 {
@@ -1330,6 +1334,7 @@ func SearchReport(user user.UserInfo, keyWord string, pageIndex, pageSize int) (
 	}
 	var reportList []*response.ReportCollectListItem
 	if searchResp.Hits != nil {
+		reportIds := make([]int, 0)
 		for _, v := range searchResp.Hits.Hits {
 			temp := new(response.ReportCollectListItem)
 			itemJson, tmpErr := v.Source.MarshalJSON()
@@ -1345,6 +1350,7 @@ func SearchReport(user user.UserInfo, keyWord string, pageIndex, pageSize int) (
 				err = errors.New("解析json出错")
 				return
 			}
+			reportIds = append(reportIds, reportItem.ReportId)
 			temp.ReportId = reportItem.ReportId
 			temp.ReportChapterId = reportItem.ReportChapterId
 			temp.ClassifyIdFirst = reportItem.ClassifyIdFirst
@@ -1378,6 +1384,22 @@ func SearchReport(user user.UserInfo, keyWord string, pageIndex, pageSize int) (
 			}
 			reportList = append(reportList, temp)
 		}
+
+		reportInfoList, tmpErr := report.GetByReportIds(reportIds)
+		if tmpErr != nil {
+			errMsg = tmpErr.Error()
+			err = errors.New("查询报告出错")
+			return
+		}
+		reportListMap := make(map[int]*report.Report)
+		for _, temp := range reportInfoList {
+			reportListMap[temp.Id] = temp
+		}
+		for _, reportDetail := range reportList {
+			if v, ok := reportListMap[reportDetail.ReportId]; ok {
+				reportDetail.RaiReportId = v.RaiReportId
+			}
+		}
 	}
 	ret = new(response.ReportSearchResp)
 	ret.List = reportList