fix: 优化阅读数量统计

models/article_top_history_record.go

@@ -22,7 +22,7 @@ func (item *ArticleTopHistoryRecord) TableName() string {
 }
 
 // GetTopReadRecordArticleListFromSource 获取阅读量排行榜源报告
-func GetTopReadRecordArticleListFromSource(limit int, startTime, endTime time.Time) (list []*ArticleTopHistoryRecord, err error) {
+func GetTopReadRecordArticleListFromSource(startTime, endTime time.Time) (list []*ArticleTopHistoryRecord, err error) {
 	sql := `SELECT
 				a.article_id,
 				a.title,
@@ -31,19 +31,17 @@ func GetTopReadRecordArticleListFromSource(limit int, startTime, endTime time.Ti
 				m.chart_permission_name as permission_name,
 				COUNT(1) AS pv
 			FROM
-				cygx_article_history_record_all AS l
+				cygx_article_history_record_newpv AS l
 			JOIN cygx_article AS a ON a.article_id = l.article_id
 			JOIN cygx_report_mapping AS m ON m.category_id = a.category_id
 			WHERE
-				1 = 1
-				AND l.platfor = 1 AND a.publish_status = 1 AND l.create_time BETWEEN ? AND ?
+				a.publish_status = 1 AND l.create_time BETWEEN ? AND ?
 			GROUP BY
 				l.article_id
 			ORDER BY
 				pv DESC,
-				a.publish_date DESC
-			LIMIT ?`
-	_, err = orm.NewOrm().Raw(sql, startTime, endTime, limit).QueryRows(&list)
+				a.publish_date DESC`
+	_, err = orm.NewOrm().Raw(sql, startTime, endTime).QueryRows(&list)
 	return
 }
 

models/industrial_management.go

@@ -310,7 +310,7 @@ func IndustrialManagementAll() (items []*IndustrialManagement, err error) {
 
 func GetIndustrialManagementArtCount(industrialManagementId int) (count int, err error) {
 	sqlCount := ` SELECT COUNT(1) AS count  
-	 			FROM  cygx_article_history_record AS h
+	 			FROM  cygx_article_history_record_newpv AS h
 				INNER JOIN cygx_industrial_article_group_management as mg ON  mg.article_id = h.article_id
 				WHERE mg.industrial_management_id = ?  AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( h.create_time ) `
 	o := orm.NewOrm()

services/report_billboard.go

@@ -16,14 +16,13 @@ func UpdateDailyMonthReadBillboard(cont context.Context) (err error) {
 		}
 	}()
 
-	// 获取上个月至昨日报告阅读增量最多的报告(暂取100篇)
-	max := 100
+	// 获取上个月至昨日报告阅读增量最多的报告
 	nowTime := time.Now().Local()
 	startTime := nowTime.AddDate(0, -1, 0)
 	endTime := nowTime.AddDate(0, 0, -1)
 	// TODO:方便测试，暂时调整
 	endTime = nowTime
-	list, e := models.GetTopReadRecordArticleListFromSource(max, startTime, endTime)
+	list, e := models.GetTopReadRecordArticleListFromSource(startTime, endTime)
 	if e != nil {
 		err = errors.New("获取阅读量排行榜失败, Err: " + e.Error())
 		return