Browse Source

阅读记录优化

xingzai 3 years ago
parent
commit
99991e80a2
3 changed files with 19 additions and 5 deletions
  1. 7 1
      controllers/article.go
  2. 8 1
      controllers/tactics.go
  3. 4 3
      models/article_history_record.go

+ 7 - 1
controllers/article.go

@@ -134,7 +134,13 @@ func (this *ArticleController) Detail() {
 
 			if strings.Contains(companyPermission, articlePermissionPermissionName) {
 				hasPermission = 1
-				recordCount, _ := models.GetNoAddStoptimeArticleCount(uid, articleId)
+				detailNew, err := models.GetNewArticleHistoryRecord(uid, articleId)
+				if err != nil {
+					br.Msg = "获取信息失败"
+					br.ErrMsg = "获取信息失败,Err:" + err.Error()
+					return
+				}
+				recordCount, _ := models.GetNoAddStoptimeArticleCount(detailNew.Id)
 				if recordCount < 1 {
 					historyRecord := new(models.CygxArticleHistoryRecord)
 					historyRecord.UserId = uid

+ 8 - 1
controllers/tactics.go

@@ -206,7 +206,14 @@ func (this *TacticsController) Detail() {
 			}
 			if strings.Contains(companyPermission, articlePermissionPermissionName) {
 				hasPermission = 1
-				recordCount, _ := models.GetNoAddStoptimeArticleCount(uid, articleId)
+				hasPermission = 1
+				detailNew, err := models.GetNewArticleHistoryRecord(uid, articleId)
+				if err != nil {
+					br.Msg = "获取信息失败"
+					br.ErrMsg = "获取信息失败,Err:" + err.Error()
+					return
+				}
+				recordCount, _ := models.GetNoAddStoptimeArticleCount(detailNew.Id)
 				if recordCount < 1 {
 					historyRecord := new(models.CygxArticleHistoryRecord)
 					historyRecord.UserId = uid

+ 4 - 3
models/article_history_record.go

@@ -100,9 +100,10 @@ func GetNewArticleHistoryRecord(uid, articleId int) (item *AddStopTimeNewRep, er
 }
 
 //获取用户阅读记录
-func GetNoAddStoptimeArticleCount(uid, articleId int) (count int, err error) {
-	sqlCount := `SELECT COUNT(1) AS count FROM cygx_article_history_record WHERE user_id=? AND article_id=? AND create_time > '` + utils.OnlineTime + `' AND stop_time = 0 `
+func GetNoAddStoptimeArticleCount(id int) (count int, err error) {
+	//sqlCount := `SELECT COUNT(1) AS count FROM cygx_article_history_record WHERE user_id=? AND article_id=? AND create_time > '` + utils.OnlineTime + `' AND stop_time = 0 `
+	sqlCount := `SELECT COUNT(1) AS count FROM cygx_article_history_record WHERE id = ? AND stop_time = 0 `
 	o := orm.NewOrm()
-	err = o.Raw(sqlCount, uid, articleId).QueryRow(&count)
+	err = o.Raw(sqlCount, id).QueryRow(&count)
 	return
 }