Merge branch 'cygx_8.7' into debug

controllers/micro_roadshow.go

@@ -311,10 +311,10 @@ func (this *MicroRoadShowController) CommentAdd() {
 
 // @Title 收藏
 // @Description 收藏
-// @Param	request	body models.ArticleCollectReq true "type json string"
+// @Param	request	body models.MicroRoadshowCollectReq true "type json string"
 // @Success 200 {object} models.FontsCollectResp
 // @router /collect [post]
-func (this *ArticleController) Collect() {
+func (this *MicroRoadShowController) Collect() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -327,65 +327,122 @@ func (this *ArticleController) Collect() {
 		return
 	}
 	uid := user.UserId
-	var req models.ArticleCollectReq
+	var req models.MicroRoadshowCollectReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常！"
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
-	articleId := req.ArticleId
-	detail, err := models.GetArticleDetailById(articleId)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取信息失败,Err:" + err.Error()
-		return
-	}
-	count, err := models.GetArticleCollectCount(uid, articleId)
-	if err != nil {
-		br.Msg = "获取数据失败！"
-		br.ErrMsg = "获取数据失败，Err:" + err.Error()
-		return
-	}
-	resp := new(models.ArticleCollectResp)
-	if count <= 0 {
-		item := new(models.CygxArticleCollect)
-		item.ArticleId = req.ArticleId
-		item.UserId = uid
-		item.CreateTime = time.Now()
-		item.Mobile = user.Mobile
-		item.Email = user.Email
-		item.CompanyId = user.CompanyId
-		item.CompanyName = user.CompanyName
-		item.RealName = user.RealName
-		_, err = models.AddCygxArticleCollect(item)
+
+	if req.SourceType == 1 {
+		_, err := models.GetCygxActivityVoiceById(req.Id)
 		if err != nil {
-			br.Msg = "收藏失败"
-			br.ErrMsg = "收藏失败,Err:" + err.Error()
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取信息失败,Err:" + err.Error()
 			return
 		}
-		br.Msg = "收藏成功"
-		resp.Status = 1
-		// 文章收藏消息发送
-		go services.ArticleUserRemind(user, detail, 2)
-	} else {
-		err = models.RemoveArticleCollect(uid, articleId)
+		count, err := models.GetVoiceCollectCount(uid, req.Id)
 		if err != nil {
-			br.Msg = "取消收藏失败"
-			br.ErrMsg = "取消收藏失败,Err:" + err.Error()
+			br.Msg = "获取数据失败！"
+			br.ErrMsg = "获取数据失败，Err:" + err.Error()
 			return
 		}
-		br.Msg = "已取消收藏"
-		resp.Status = 2
-	}
-	collectTotal, err := models.GetArticleCollectUsersCount(articleId)
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据失败，Err:" + err.Error()
-		return
+		resp := new(models.ArticleCollectResp)
+		if count <= 0 {
+			item := new(models.CygxArticleCollect)
+			item.ArticleId = req.Id
+			item.UserId = uid
+			item.CreateTime = time.Now()
+			item.Mobile = user.Mobile
+			item.Email = user.Email
+			item.CompanyId = user.CompanyId
+			item.CompanyName = user.CompanyName
+			item.RealName = user.RealName
+			_, err = models.AddCygxArticleCollect(item)
+			if err != nil {
+				br.Msg = "收藏失败"
+				br.ErrMsg = "收藏失败,Err:" + err.Error()
+				return
+			}
+			br.Msg = "收藏成功"
+			resp.Status = 1
+			// 文章收藏消息发送
+			//go services.ArticleUserRemind(user, detail, 2)
+		} else {
+			err = models.RemoveVoiceCollect(uid, req.Id)
+			if err != nil {
+				br.Msg = "取消收藏失败"
+				br.ErrMsg = "取消收藏失败,Err:" + err.Error()
+				return
+			}
+			br.Msg = "已取消收藏"
+			resp.Status = 2
+		}
+		collectTotal, err := models.GetVoiceCollectUsersCount(req.Id)
+		if err != nil {
+			br.Msg = "获取数据失败"
+			br.ErrMsg = "获取数据失败，Err:" + err.Error()
+			return
+		}
+		resp.CollectCount = collectTotal
+		br.Ret = 200
+		br.Success = true
+		br.Data = resp
+	} else if req.SourceType == 2 {
+		_, err := models.GetMicroRoadshowVideoById(req.Id)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取信息失败,Err:" + err.Error()
+			return
+		}
+		count, err := models.GetVideoCollectCount(uid, req.Id)
+		if err != nil {
+			br.Msg = "获取数据失败！"
+			br.ErrMsg = "获取数据失败，Err:" + err.Error()
+			return
+		}
+		resp := new(models.ArticleCollectResp)
+		if count <= 0 {
+			item := new(models.CygxArticleCollect)
+			item.VideoId = req.Id
+			item.UserId = uid
+			item.CreateTime = time.Now()
+			item.Mobile = user.Mobile
+			item.Email = user.Email
+			item.CompanyId = user.CompanyId
+			item.CompanyName = user.CompanyName
+			item.RealName = user.RealName
+			item.Title = req.Title
+			_, err = models.AddCygxArticleCollect(item)
+			if err != nil {
+				br.Msg = "收藏失败"
+				br.ErrMsg = "收藏失败,Err:" + err.Error()
+				return
+			}
+			br.Msg = "收藏成功"
+			resp.Status = 1
+			// 文章收藏消息发送
+			//go services.ArticleUserRemind(user, detail, 2)
+		} else {
+			err = models.RemoveVideoCollect(uid, req.Id)
+			if err != nil {
+				br.Msg = "取消收藏失败"
+				br.ErrMsg = "取消收藏失败,Err:" + err.Error()
+				return
+			}
+			br.Msg = "已取消收藏"
+			resp.Status = 2
+		}
+		collectTotal, err := models.GetVideoCollectUsersCount(req.Id)
+		if err != nil {
+			br.Msg = "获取数据失败"
+			br.ErrMsg = "获取数据失败，Err:" + err.Error()
+			return
+		}
+		resp.CollectCount = collectTotal
+		br.Ret = 200
+		br.Success = true
+		br.Data = resp
 	}
-	resp.CollectCount = collectTotal
-	br.Ret = 200
-	br.Success = true
-	br.Data = resp
 }

models/article_collect.go

@@ -7,17 +7,18 @@ import (
 )
 
 type CygxArticleCollect struct {
-	Id          int `orm:"column(id);pk"`
-	ArticleId   int
-	ActivityVoiceId   int
-	VideoId   int
-	UserId      int
-	CreateTime  time.Time
-	Mobile      string `description:"手机号"`
-	Email       string `description:"邮箱"`
-	CompanyId   int    `description:"公司id"`
-	CompanyName string `description:"公司名称"`
-	RealName    string `description:"用户实际名称"`
+	Id              int `orm:"column(id);pk"`
+	ArticleId       int
+	ActivityVoiceId int
+	VideoId         int
+	UserId          int
+	CreateTime      time.Time
+	Mobile          string `description:"手机号"`
+	Email           string `description:"邮箱"`
+	CompanyId       int    `description:"公司id"`
+	CompanyName     string `description:"公司名称"`
+	RealName        string `description:"用户实际名称"`
+	Title           string `description:"标题"`
 }
 
 //添加收藏信息
@@ -155,4 +156,42 @@ func GetArticleCollectNum(articleId []string, uid int) (items []*CygxArticleNum,
 type MicroRoadshowCollectList struct {
 	AudioIds string
 	VideoIds string
+}
+
+func GetVideoCollectCount(userId, videoId int) (count int, err error) {
+	sql := `SELECT COUNT(1) AS count FROM cygx_article_collect WHERE user_id=? AND video_id=? `
+	err = orm.NewOrm().Raw(sql, userId, videoId).QueryRow(&count)
+	return
+}
+
+func RemoveVideoCollect(userId, videoId int) (err error) {
+	o := orm.NewOrm()
+	sql := `DELETE FROM cygx_article_collect WHERE user_id=? AND video_id=? `
+	_, err = o.Raw(sql, userId, videoId).Exec()
+	return
+}
+
+func GetVideoCollectUsersCount(videoId int) (count int, err error) {
+	sql := `SELECT COUNT(user_id) AS count FROM cygx_article_collect WHERE video_id=? `
+	err = orm.NewOrm().Raw(sql, videoId).QueryRow(&count)
+	return
+}
+
+func GetVoiceCollectCount(userId, voiceId int) (count int, err error) {
+	sql := `SELECT COUNT(1) AS count FROM cygx_article_collect WHERE user_id=? AND activity_voice_id=? `
+	err = orm.NewOrm().Raw(sql, userId, voiceId).QueryRow(&count)
+	return
+}
+
+func RemoveVoiceCollect(userId, voiceId int) (err error) {
+	o := orm.NewOrm()
+	sql := `DELETE FROM cygx_article_collect WHERE user_id=? AND activity_voice_id=? `
+	_, err = o.Raw(sql, userId, voiceId).Exec()
+	return
+}
+
+func GetVoiceCollectUsersCount(voiceId int) (count int, err error) {
+	sql := `SELECT COUNT(user_id) AS count FROM cygx_article_collect WHERE activity_voice_id=? `
+	err = orm.NewOrm().Raw(sql, voiceId).QueryRow(&count)
+	return
 }

models/micro_roadshow.go

@@ -311,3 +311,9 @@ type AddVideoCommnetReq struct {
 	Content    string `description:"内容"`
 	Title      string `description:"标题"`
 }
+
+type MicroRoadshowCollectReq struct {
+	Id         int    `description:"音频或视频ID"`
+	SourceType int    `description:"视频来源: 1-音频; 2-视频 (不传默认为1)"`
+	Title      string `description:"标题"`
+}

routers/commentsRouter.go

@@ -331,15 +331,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleController"],
-        beego.ControllerComments{
-            Method: "Collect",
-            Router: `/collect`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleController"],
         beego.ControllerComments{
             Method: "ArticleCollect",
@@ -691,6 +682,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:MicroRoadShowController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:MicroRoadShowController"],
+        beego.ControllerComments{
+            Method: "Collect",
+            Router: `/collect`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:MicroRoadShowController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:MicroRoadShowController"],
         beego.ControllerComments{
             Method: "CommentAdd",