Merge branch 'yb/8.2' into debug

controller/community/comment.go

@@ -21,24 +21,8 @@ func Comment(c *gin.Context) {
 	}
 	userInfo := userService.GetInfoByClaims(c)
 
+	// 随机头像
 	var qaAvatarUrl string
-	//if userInfo.QaAvatarUrl == "" {
-	//	avatar, err := yb_community_question_comment.GetUserAvatarRandom()
-	//	if err != nil {
-	//		response.FailMsg("发布失败", err.Error(), c)
-	//		return
-	//	}
-	//	qaAvatarUrl = avatar.AvatarUrl
-	//	err = wx_user.ModifyQaAvatarUrl(qaAvatarUrl, userInfo.UserID)
-	//	if err != nil {
-	//		response.FailMsg("发布失败", err.Error(), c)
-	//		return
-	//	}
-	//} else {
-	//	qaAvatarUrl = userInfo.QaAvatarUrl
-	//}
-
-	// 2022-0914修改为全随机
 	avatar, e := yb_community_question_comment.GetUserAvatarRandom()
 	if e != nil {
 		response.FailMsg("发布失败", e.Error(), c)
@@ -50,7 +34,12 @@ func Comment(c *gin.Context) {
 	if userInfo.NickName != `` { //非空串时为实名
 		req.IsShowName = 1
 	}
-	ybCommunityQuestionComment, err, errMsg := yb_community_question.Comment(userInfo, req.CommunityQuestionID, req.Content, req.SourceAgent, req.IsShowName, qaAvatarUrl)
+	// 不传来源默认为问答社区
+	if req.Source == 0 {
+		req.Source = 1
+	}
+
+	ybCommunityQuestionComment, err, errMsg := yb_community_question.Comment(userInfo, req.CommunityQuestionID, req.Content, req.SourceAgent, req.IsShowName, req.Source, qaAvatarUrl)
 	if err != nil {
 		response.FailMsg(errMsg, err.Error(), c)
 		return
@@ -86,11 +75,18 @@ func HotList(c *gin.Context) {
 		response.Fail("问答id异常", c)
 		return
 	}
+	// 来源: 默认为问答社区
+	reqSource := c.DefaultQuery("source", "1")
+	source, _ := strconv.Atoi(reqSource)
+	if source == 0 {
+		source = 1
+	}
+
 	userinfo := userService.GetInfoByClaims(c)
 	page := services.GetCurrPageByClaims(c)
 	pageSize := services.GetPageSizeByClaims(c)
 
-	list, hotTotal, myTotal, err, errMsg := yb_community_question.List(userinfo.UserID, communityQuestionID, true, page, pageSize)
+	list, hotTotal, myTotal, err, errMsg := yb_community_question.List(userinfo.UserID, communityQuestionID, source, true, page, pageSize)
 	if err != nil {
 		response.FailMsg(errMsg, err.Error(), c)
 		return
@@ -113,11 +109,17 @@ func MyList(c *gin.Context) {
 		response.Fail("问答id异常", c)
 		return
 	}
+	// 来源: 默认为问答社区
+	reqSource := c.DefaultQuery("source", "1")
+	source, _ := strconv.Atoi(reqSource)
+	if source == 0 {
+		source = 1
+	}
 	userinfo := userService.GetInfoByClaims(c)
 	page := services.GetCurrPageByClaims(c)
 	pageSize := services.GetPageSizeByClaims(c)
 
-	list, hotTotal, myTotal, err, errMsg := yb_community_question.MyList(userinfo.UserID, communityQuestionID, page, pageSize)
+	list, hotTotal, myTotal, err, errMsg := yb_community_question.MyList(userinfo.UserID, communityQuestionID, source, page, pageSize)
 	if err != nil {
 		response.FailMsg(errMsg, err.Error(), c)
 		return

controller/community/question.go

@@ -352,8 +352,12 @@ func SetLikeOrTease(c *gin.Context) {
 		return
 	}
 	userinfo := userService.GetInfoByClaims(c)
+	// 不传来源默认为问答社区
+	if req.Source == 0 {
+		req.Source = 1
+	}
 
-	communityQuestionLikeTease, likeNum, teaseNum, err, errMsg := yb_community_question.SetLikeOrTease(userinfo.UserID, req.CommunityQuestionId, req.OpType, req.Enable, req.SourceAgent)
+	communityQuestionLikeTease, likeNum, teaseNum, err, errMsg := yb_community_question.SetLikeOrTease(userinfo.UserID, req.CommunityQuestionId, req.OpType, req.Enable, req.SourceAgent, req.Source)
 	if err != nil {
 		response.FailMsg(errMsg, err.Error(), c)
 		return

controller/community/video.go

@@ -1,6 +1,7 @@
 package community
 
 import (
+	"fmt"
 	"github.com/gin-gonic/gin"
 	"hongze/hongze_yb/controller/response"
 	"hongze/hongze_yb/models/request"
@@ -32,11 +33,29 @@ func VideoList(c *gin.Context) {
 	if req.PageSize == 0 {
 		req.PageSize = utils.PageSize20
 	}
+	userInfo := user.GetInfoByClaims(c)
 	list, err := community.GetVideoList(req.PageIndex, req.PageSize, req.VideoId, req.VarietyTagId, req.Keywords)
 	if err != nil {
 		response.FailMsg("获取失败", "VideoList ErrMsg:"+err.Error(), c)
 		return
 	}
+
+	// 点赞/吐槽数据
+	err = community.HandleLikeOrTeaseByCommunityVideoItemList(userInfo.UserID, list)
+	if err != nil {
+		fmt.Println(err.Error())
+		response.FailMsg("获取失败", "QuestionList ErrMsg:"+err.Error(), c)
+		return
+	}
+
+	// 评论数据
+	err = community.HandleCommentByCommunityVideoItemList(list)
+	if err != nil {
+		fmt.Println(err.Error())
+		response.FailMsg("获取失败", "QuestionList ErrMsg:"+err.Error(), c)
+		return
+	}
+
 	response.OkData("获取成功", list, c)
 }
 

logic/yb_community_question/yb_community_question_comment.go

@@ -23,7 +23,7 @@ import (
 )
 
 // Comment 发布留言
-func Comment(user user.UserInfo, communityQuestionID uint32, content string, sourceAgent, isShowName int8, qaAvatarUrl string) (ybCommunityQuestionComment *yb_community_question_comment.YbCommunityQuestionComment, err error, errMsg string) {
+func Comment(user user.UserInfo, communityQuestionID uint32, content string, sourceAgent, isShowName, source int8, qaAvatarUrl string) (ybCommunityQuestionComment *yb_community_question_comment.YbCommunityQuestionComment, err error, errMsg string) {
 	errMsg = "发布留言失败"
 	defer func() {
 		if err != nil {
@@ -51,6 +51,12 @@ func Comment(user user.UserInfo, communityQuestionID uint32, content string, sou
 		err = errors.New(errMsg)
 		return
 	}
+	if source <= 0 {
+		errMsg = "来源有误"
+		err = errors.New(errMsg)
+		return
+	}
+
 	// 敏感词过滤
 	if user.RecordInfo.OpenID != "" && user.RecordInfo.CreatePlatform == 6 { //只有小程序的用户才能走敏感词过滤接口
 		checkResult, tErr := wx_app.MsgSecCheck(user.RecordInfo.OpenID, content)
@@ -95,6 +101,7 @@ func Comment(user user.UserInfo, communityQuestionID uint32, content string, sou
 		ModifyTime:  now,
 		CreateTime:  now,
 		QaAvatarUrl: qaAvatarUrl,
+		Source:      source,
 	}
 	err = ybCommunityQuestionComment.Create()
 	if err != nil {
@@ -155,8 +162,8 @@ func Delete(user user.UserInfo, communityQuestionCommentID uint64) (err error, e
 }
 
 // MyList 我的留言列表
-func MyList(userId uint64, communityQuestionID int, page, pageSize int) (list []*response.RespCommunityQuestionCommentItem, hotTotal, myTotal int64, err error, errMsg string) {
-	list, hotTotal, myTotal, err, errMsg = List(userId, communityQuestionID, false, page, pageSize)
+func MyList(userId uint64, communityQuestionID, source int, page, pageSize int) (list []*response.RespCommunityQuestionCommentItem, hotTotal, myTotal int64, err error, errMsg string) {
+	list, hotTotal, myTotal, err, errMsg = List(userId, communityQuestionID, source, false, page, pageSize)
 	if err != nil {
 		return
 	}
@@ -164,7 +171,7 @@ func MyList(userId uint64, communityQuestionID int, page, pageSize int) (list []
 }
 
 // List 查询精选留言列表或我的留言列表
-func List(userId uint64, communityQuestionID int, hotFlag bool, page, pageSize int) (list []*response.RespCommunityQuestionCommentItem, hotTotal, myTotal int64, err error, errMsg string) {
+func List(userId uint64, communityQuestionID, source int, hotFlag bool, page, pageSize int) (list []*response.RespCommunityQuestionCommentItem, hotTotal, myTotal int64, err error, errMsg string) {
 	defer func() {
 		if err != nil {
 			global.LOG.Critical(fmt.Sprintf("comment List: userId=%d, err:%s， errMsg:%s", userId, err.Error(), errMsg))
@@ -178,14 +185,14 @@ func List(userId uint64, communityQuestionID int, hotFlag bool, page, pageSize i
 	}
 
 	//精选留言数
-	hotTotal, err = yb_community_question_comment.GetHotListTotalByCommunityQuestionID(communityQuestionID)
+	hotTotal, err = yb_community_question_comment.GetHotListTotalByCommunityQuestionID(communityQuestionID, source)
 	if err != nil {
 		errMsg = `查询精选留言总数出错`
 		return
 	}
 
 	// 我的留言数
-	myTotal, err = yb_community_question_comment.GetListTotalByUserIdCommunityQuestionID(userId, communityQuestionID)
+	myTotal, err = yb_community_question_comment.GetListTotalByUserIdCommunityQuestionID(userId, communityQuestionID, source)
 	if err != nil {
 		errMsg = `查询我的留言总数出错`
 		return
@@ -194,7 +201,7 @@ func List(userId uint64, communityQuestionID int, hotFlag bool, page, pageSize i
 	var commentList []*yb_community_question_comment.YbCommunityQuestionComment
 	//查询精选留言
 	if hotFlag {
-		commentList, err = yb_community_question_comment.GetHotListByCommunityQuestionID(communityQuestionID, (page-1)*pageSize, pageSize)
+		commentList, err = yb_community_question_comment.GetHotListByCommunityQuestionID(communityQuestionID, (page-1)*pageSize, pageSize, source)
 		if err != nil {
 			errMsg = `查询精选留言列表出错`
 			return
@@ -202,7 +209,7 @@ func List(userId uint64, communityQuestionID int, hotFlag bool, page, pageSize i
 
 	} else {
 		//查询个人留言
-		commentList, err = yb_community_question_comment.GetListByUserIdCommunityQuestionID(userId, communityQuestionID)
+		commentList, err = yb_community_question_comment.GetListByUserIdCommunityQuestionID(userId, communityQuestionID, source)
 		if err != nil {
 			errMsg = `查询我的留言列表出错`
 			return
@@ -329,14 +336,14 @@ func HandleCommentByCommunityQuestionItemList(userId uint64, questionList []*res
 	}
 
 	// 精选评论数据
-	hotList, err := yb_community_question_comment.GetHotListByCommunityQuestionIds(idArr)
+	hotList, err := yb_community_question_comment.GetHotListByCommunityQuestionIds(idArr, yb_community_question_comment.SourceQuestion)
 	if err != nil {
 		return
 	}
 	for _, v := range hotList {
 		questionIdCommentsMap[v.CommunityQuestionID] = append(questionIdCommentsMap[v.CommunityQuestionID], &response.CommunityQuestionCommentListItem{
 			QaAvatarUrl: v.QaAvatarUrl,
-			Comment: v.Content,
+			Comment:     v.Content,
 		})
 	}
 

logic/yb_community_question/yb_community_question_like_tease.go

@@ -10,7 +10,7 @@ import (
 )
 
 // SetLikeOrTease 用户对问答进行(取消)点赞或(取消)吐槽
-func SetLikeOrTease(userId uint64, communityQuestionId uint32, opType, enable, sourceAgent int8) (ybCommunityQuestionLikeTease *yb_community_question_like_tease.YbCommunityQuestionLikeTease, likeNum, teaseNum int64, err error, errMsg string) {
+func SetLikeOrTease(userId uint64, communityQuestionId uint32, opType, enable, sourceAgent, source int8) (ybCommunityQuestionLikeTease *yb_community_question_like_tease.YbCommunityQuestionLikeTease, likeNum, teaseNum int64, err error, errMsg string) {
 	//user.UserID
 	defer func() {
 		if err != nil {
@@ -33,7 +33,7 @@ func SetLikeOrTease(userId uint64, communityQuestionId uint32, opType, enable, s
 	//}
 
 	//查询用户对问答的点赞/吐槽状态
-	ybCommunityQuestionLikeTease, err = yb_community_question_like_tease.GetByUserIdAndCommunityQuestionId(userId, communityQuestionId)
+	ybCommunityQuestionLikeTease, err = yb_community_question_like_tease.GetByUserIdAndCommunityQuestionId(userId, communityQuestionId, source)
 	if err != nil {
 		errMsg = "查询点赞/吐槽记录出错"
 		return
@@ -50,6 +50,7 @@ func SetLikeOrTease(userId uint64, communityQuestionId uint32, opType, enable, s
 			ModifyTime:          now,
 			CommunityQuestionID: communityQuestionId,
 			SourceAgent:         sourceAgent,
+			Source:              source,
 		}
 		err = ybCommunityQuestionLikeTease.Create()
 		if err != nil {
@@ -70,12 +71,12 @@ func SetLikeOrTease(userId uint64, communityQuestionId uint32, opType, enable, s
 		}
 	}
 	//查询总的点赞数
-	likeNum, err = yb_community_question_like_tease.GetLikeNumByCommunityQuestionId(communityQuestionId)
+	likeNum, err = yb_community_question_like_tease.GetLikeNumByCommunityQuestionId(communityQuestionId, yb_community_question_like_tease.SourceQuestion)
 	if err != nil {
 		errMsg = err.Error()
 		err = errors.New("查询点赞数出错")
 	}
-	teaseNum, err = yb_community_question_like_tease.GetTeaseNumByCommunityQuestionId(communityQuestionId)
+	teaseNum, err = yb_community_question_like_tease.GetTeaseNumByCommunityQuestionId(communityQuestionId, yb_community_question_like_tease.SourceQuestion)
 	if err != nil {
 		errMsg = err.Error()
 		err = errors.New("查询吐槽数出错")
@@ -96,7 +97,7 @@ func HandleLikeOrTeaseByCommunityQuestionItemList(userId uint64, questionList []
 
 	// 获取点赞和吐槽数据
 	ybCommunityQuestionLikeTeaseMap := make(map[uint32]*yb_community_question_like_tease.YbCommunityQuestionLikeTease)
-	ybCommunityQuestionLikeTeaseList, err := yb_community_question_like_tease.GetByUserIdAndCommunityQuestionIds(userId, idArr)
+	ybCommunityQuestionLikeTeaseList, err := yb_community_question_like_tease.GetByUserIdAndCommunityQuestionIds(userId, idArr, yb_community_question_like_tease.SourceQuestion)
 	if err != nil {
 		return
 	}
@@ -108,7 +109,7 @@ func HandleLikeOrTeaseByCommunityQuestionItemList(userId uint64, questionList []
 	likeMap := make(map[uint32]int)
 	teaseMap := make(map[uint32]int)
 
-	likeList, err := yb_community_question_like_tease.GetLikeNumCommentByCommunityQuestionIds(idArr)
+	likeList, err := yb_community_question_like_tease.GetLikeNumCommentByCommunityQuestionIds(idArr, yb_community_question_like_tease.SourceQuestion)
 	if err != nil {
 		return
 	}
@@ -116,7 +117,7 @@ func HandleLikeOrTeaseByCommunityQuestionItemList(userId uint64, questionList []
 		likeMap[v.CommunityQuestionID] = v.Total
 	}
 
-	teaseList, err := yb_community_question_like_tease.GetTeaseNumCommentByCommunityQuestionIds(idArr)
+	teaseList, err := yb_community_question_like_tease.GetTeaseNumCommentByCommunityQuestionIds(idArr, yb_community_question_like_tease.SourceQuestion)
 	if err != nil {
 		return
 	}

models/request/community.go

@@ -74,6 +74,7 @@ type ReqCommunityQuestionLikeTease struct {
 	OpType              int8   `description:"类型. 1-点赞 2-吐槽" json:"op_type"`
 	Enable              int8   `description:"状态. 0-无效数据（已取消点赞/吐槽） 1-有效数据（点赞/吐槽）" json:"enable"`
 	SourceAgent         int8   `description:"点赞入口来源，1：小程序，2：小程序pc" json:"source_agent"`
+	Source              int8   `description:"来源：1-问答社区; 2-视频社区"`
 }
 
 // ReqComment 问答新增评论请求
@@ -82,6 +83,7 @@ type ReqComment struct {
 	Content             string `description:"留言内容" json:"content"`
 	IsShowName          int8   `description:"是否匿名 0-匿名，1-不匿名" json:"is_show_name"`
 	SourceAgent         int8   `description:"留言入口来源，1：小程序，2：pc" json:"source_agent"`
+	Source              int8   `description:"来源：1-问答社区; 2-视频社区"`
 }
 
 // ReqDel 删除评论

models/response/community.go

@@ -74,19 +74,24 @@ type ResearchGroupMember struct {
 
 // CommunityVideoItem 视频社区
 type CommunityVideoItem struct {
-	CommunityVideoID    int    `json:"community_video_id"`
-	Title               string `json:"title"`
-	VarietyTagId        int    `json:"variety_tag_id"`
-	VarietyTagName      string `json:"variety_tag_name"`
-	CoverImgUrl         string `json:"cover_img_url"`
-	VideoUrl            string `json:"video_url"`
-	VideoSeconds        string `json:"video_seconds"`
-	PublishState        int    `json:"publish_state"`
-	PublishTime         string `json:"publish_time"`
-	CreateTime          string `json:"create_time"`
-	ModifyTime          string `json:"modify_time"`
-	ChartPermissionName string `json:"chart_permission_name"`
-	TencentId           string `json:"tencent_id"`
+	CommunityVideoID    int                                 `json:"community_video_id"`
+	Title               string                              `json:"title"`
+	VarietyTagId        int                                 `json:"variety_tag_id"`
+	VarietyTagName      string                              `json:"variety_tag_name"`
+	CoverImgUrl         string                              `json:"cover_img_url"`
+	VideoUrl            string                              `json:"video_url"`
+	VideoSeconds        string                              `json:"video_seconds"`
+	PublishState        int                                 `json:"publish_state"`
+	PublishTime         string                              `json:"publish_time"`
+	CreateTime          string                              `json:"create_time"`
+	ModifyTime          string                              `json:"modify_time"`
+	ChartPermissionName string                              `json:"chart_permission_name"`
+	TencentId           string                              `json:"tencent_id"`
+	OpType              int8                                `description:"类型. 1-点赞 2-吐槽" json:"op_type"`
+	LikeTotal           int                                 `json:"like_total" description:"点赞数"`
+	TeaseTotal          int                                 `json:"tease_total" description:"吐槽数"`
+	CommentTotal        int                                 `json:"comment_total" description:"总共评论数"`
+	CommentList         []*CommunityQuestionCommentListItem `json:"comment_list"`
 }
 
 // RoadVideoItem 线上路演
@@ -107,9 +112,10 @@ type RoadVideoItem struct {
 }
 
 type RoadVideoItemResp struct {
-	List []*RoadVideoItem `json:"list"`
-	Paging *PagingItem  	`json:"paging"`
+	List   []*RoadVideoItem `json:"list"`
+	Paging *PagingItem      `json:"paging"`
 }
+
 // RespCommunityQuestionLikeTease
 type RespCommunityQuestionLikeTease struct {
 	LikeTotal  int64 `description:"点赞总数" json:"like_total"`

models/tables/yb_community_question_comment/query.go

@@ -15,9 +15,9 @@ func GetByCommunityQuestionCommentId(communityQuestionCommentId uint64) (item *Y
 }
 
 // GetListByUserIdCommunityQuestionID 获取用户的留言列表
-func GetListByUserIdCommunityQuestionID(userId uint64, communityQuestionID int) (list []*YbCommunityQuestionComment, err error) {
+func GetListByUserIdCommunityQuestionID(userId uint64, communityQuestionID, source int) (list []*YbCommunityQuestionComment, err error) {
 	err = global.DEFAULT_MYSQL.Model(YbCommunityQuestionComment{}).
-		Where("user_id = ? AND community_question_id = ? AND enabled = 1 ", userId, communityQuestionID).
+		Where("user_id = ? AND community_question_id = ? AND enabled = 1 AND source = ?", userId, communityQuestionID, source).
 		Order("create_time desc, community_question_comment_id desc").
 		Scan(&list).Error
 	if err == utils.ErrNoRow {
@@ -27,17 +27,17 @@ func GetListByUserIdCommunityQuestionID(userId uint64, communityQuestionID int)
 }
 
 // GetListTotalByUserIdCommunityQuestionID 获取用户的留言总条数
-func GetListTotalByUserIdCommunityQuestionID(userId uint64, communityQuestionID int) (total int64, err error) {
+func GetListTotalByUserIdCommunityQuestionID(userId uint64, communityQuestionID, source int) (total int64, err error) {
 	err = global.DEFAULT_MYSQL.Model(YbCommunityQuestionComment{}).
-		Where("user_id = ? AND community_question_id = ? AND enabled = 1 ", userId, communityQuestionID).
+		Where("user_id = ? AND community_question_id = ? AND enabled = 1 AND source = ?", userId, communityQuestionID, source).
 		Count(&total).Error
 	return
 }
 
 // GetHotListByCommunityQuestionID 获取报告的精选留言列表(2022-08-23修改为获取所有留言, 不再精选)
-func GetHotListByCommunityQuestionID(communityQuestionID int, offset, limit int) (list []*YbCommunityQuestionComment, err error) {
+func GetHotListByCommunityQuestionID(communityQuestionID int, offset, limit, source int) (list []*YbCommunityQuestionComment, err error) {
 	err = global.DEFAULT_MYSQL.Model(YbCommunityQuestionComment{}).
-		Where("community_question_id = ? AND enabled = 1 AND type = 1", communityQuestionID).
+		Where("community_question_id = ? AND enabled = 1 AND type = 1 AND source = ?", communityQuestionID, source).
 		//Order("is_top desc, hot_top_time desc, community_question_comment_id desc").
 		Order("create_time DESC").
 		Offset(offset).
@@ -47,9 +47,9 @@ func GetHotListByCommunityQuestionID(communityQuestionID int, offset, limit int)
 }
 
 // GetHotListTotalByCommunityQuestionID 获取精选留言总条数(2022-08-23修改为获取所有留言, 不再精选)
-func GetHotListTotalByCommunityQuestionID(communityQuestionID int) (total int64, err error) {
+func GetHotListTotalByCommunityQuestionID(communityQuestionID, source int) (total int64, err error) {
 	err = global.DEFAULT_MYSQL.Model(YbCommunityQuestionComment{}).
-		Where("community_question_id = ? AND enabled = 1 AND type = 1", communityQuestionID).
+		Where("community_question_id = ? AND enabled = 1 AND type = 1 AND source = ?", communityQuestionID, source).
 		Count(&total).Error
 	return
 }
@@ -130,9 +130,9 @@ func GetUserAvatarRandom() (item *UserAvatarRandom, err error) {
 }
 
 // GetHotListByCommunityQuestionIds 根据问答id列表获取精选留言-精选时间倒序(2022-0823不再精选，获取所有评论)
-func GetHotListByCommunityQuestionIds(communityQuestionIds []uint32) (items []*YbCommunityQuestionComment, err error) {
+func GetHotListByCommunityQuestionIds(communityQuestionIds []uint32, source int) (items []*YbCommunityQuestionComment, err error) {
 	err = global.DEFAULT_MYSQL.Model(YbCommunityQuestionComment{}).
-		Where("community_question_id IN (?) AND enabled = 1 AND type = 1", communityQuestionIds).
+		Where("community_question_id IN (?) AND enabled = 1 AND type = 1 AND source = ?", communityQuestionIds, source).
 		Order("hot_time DESC").
 		Find(&items).Error
 	return

models/tables/yb_community_question_comment/yb_community_question_comment.go

@@ -7,23 +7,24 @@ import (
 // YbCommunityQuestionComment 研报问答社区 用户留言表
 type YbCommunityQuestionComment struct {
 	CommunityQuestionCommentID uint64    `gorm:"primaryKey;column:community_question_comment_id;type:bigint(20) unsigned;not null" json:"-"`
-	CommunityQuestionID        uint32    `gorm:"column:community_question_id;type:int(10) unsigned;not null;default:0" json:"communityQuestionId"` // 问答ID
-	UserID                     uint64    `gorm:"column:user_id;type:bigint(20) unsigned;not null;default:0" json:"userId"`                         // 用户id
-	RealName                   string    `gorm:"column:real_name;type:varchar(255);not null;default:''" json:"realName"`                           // 用户当时昵称
-	Content                    string    `gorm:"column:content;type:text" json:"content"`                                                          // 留言内容
-	ReplyCommentID             uint64    `gorm:"column:reply_comment_id;type:bigint(20) unsigned;not null;default:0" json:"replyCommentId"`        // 回复的留言ID
-	IsTop                      int8      `gorm:"column:is_top;type:tinyint(2);not null;default:0" json:"isTop"`                                    // 是否置顶（0-未置顶，1-置顶）
-	IsHot                      int8      `gorm:"column:is_hot;type:tinyint(2);not null;default:0" json:"isHot"`                                    // 是否设置精选（0-未设置，1-已设置）
-	HotTopTime                 time.Time `gorm:"column:hot_top_time;type:datetime" json:"hotTopTime"`                                              // 设置精选或者设置置顶的时间
-	Type                       int8      `gorm:"column:type;type:tinyint(1);not null;default:1" json:"type"`                                       // 留言类型 1-评论 2-回复
-	Enabled                    int8      `gorm:"column:enabled;type:tinyint(1);not null;default:1" json:"enabled"`                                 // 是否有效, 0-无效留言 1-有效留言
-	IsShowName                 int8      `gorm:"column:is_show_name;type:tinyint(1);not null;default:0" json:"isShowName"`                         // 是否匿名 0-匿名，1-不匿名
-	SourceAgent                int8      `gorm:"column:source_agent;type:tinyint(1);not null;default:1" json:"sourceAgent"`                        // 留言入口来源，1：小程序，2：小程序pc, 4：web pc
-	TopTime                    time.Time `gorm:"column:top_time;type:datetime" json:"topTime"`                                                     // 设置置顶的时间
-	HotTime                    time.Time `gorm:"column:hot_time;type:datetime" json:"hotTime"`                                                     // 设置精选的时间
-	ModifyTime                 time.Time `gorm:"column:modify_time;type:datetime;not null;default:CURRENT_TIMESTAMP" json:"modifyTime"`            // 修改时间
-	CreateTime                 time.Time `gorm:"column:create_time;type:datetime;not null;default:CURRENT_TIMESTAMP" json:"createTime"`            // 创建时间
-	QaAvatarUrl                string    `gorm:"column:qa_avatar_url;type:varchar(255)" json:"qaAvatarUrl"`                                        // 头像
+	CommunityQuestionID        uint32    `gorm:"index:idx_community_question_id;column:community_question_id;type:int(10) unsigned;not null;default:0" json:"communityQuestionId"` // 问答ID
+	UserID                     uint64    `gorm:"index:idx_user_id;column:user_id;type:bigint(20) unsigned;not null;default:0" json:"userId"`                                       // 用户id
+	RealName                   string    `gorm:"column:real_name;type:varchar(255);not null;default:''" json:"realName"`                                                           // 用户当时昵称
+	Content                    string    `gorm:"column:content;type:text" json:"content"`                                                                                          // 留言内容
+	ReplyCommentID             uint64    `gorm:"column:reply_comment_id;type:bigint(20) unsigned;not null;default:0" json:"replyCommentId"`                                        // 回复的留言ID
+	IsTop                      int8      `gorm:"column:is_top;type:tinyint(2);not null;default:0" json:"isTop"`                                                                    // 是否置顶（0-未置顶，1-置顶）
+	IsHot                      int8      `gorm:"column:is_hot;type:tinyint(2);not null;default:0" json:"isHot"`                                                                    // 是否设置精选（0-未设置，1-已设置）
+	HotTopTime                 time.Time `gorm:"column:hot_top_time;type:datetime" json:"hotTopTime"`                                                                              // 设置精选或者设置置顶的时间
+	Type                       int8      `gorm:"column:type;type:tinyint(1);not null;default:1" json:"type"`                                                                       // 留言类型 1-评论 2-回复
+	Enabled                    int8      `gorm:"column:enabled;type:tinyint(1);not null;default:1" json:"enabled"`                                                                 // 是否有效, 0-无效留言 1-有效留言
+	IsShowName                 int8      `gorm:"column:is_show_name;type:tinyint(1);not null;default:0" json:"isShowName"`                                                         // 是否匿名 0-匿名，1-不匿名
+	SourceAgent                int8      `gorm:"column:source_agent;type:tinyint(1);not null;default:1" json:"sourceAgent"`                                                        // 留言入口来源，1：小程序，2：小程序pc, 4：web pc
+	TopTime                    time.Time `gorm:"column:top_time;type:datetime" json:"topTime"`                                                                                     // 设置置顶的时间
+	HotTime                    time.Time `gorm:"column:hot_time;type:datetime" json:"hotTime"`                                                                                     // 设置精选的时间
+	ModifyTime                 time.Time `gorm:"column:modify_time;type:datetime;not null;default:CURRENT_TIMESTAMP" json:"modifyTime"`                                            // 修改时间
+	CreateTime                 time.Time `gorm:"column:create_time;type:datetime;not null;default:CURRENT_TIMESTAMP" json:"createTime"`                                            // 创建时间
+	QaAvatarUrl                string    `gorm:"column:qa_avatar_url;type:varchar(255);default:''" json:"QaAvatarUrl"`                                                             // 头像
+	Source                     int8      `gorm:"column:source;type:tinyint(4);not null;default:1" json:"source"`                                                                   // 来源：1-问答社区(默认); 2-视频社区
 }
 
 // TableName get sql table name.获取数据库表名
@@ -50,6 +51,8 @@ var YbCommunityQuestionCommentColumns = struct {
 	HotTime                    string
 	ModifyTime                 string
 	CreateTime                 string
+	QaAvatarUrl                string
+	Source                     string
 }{
 	CommunityQuestionCommentID: "community_question_comment_id",
 	CommunityQuestionID:        "community_question_id",
@@ -68,4 +71,11 @@ var YbCommunityQuestionCommentColumns = struct {
 	HotTime:                    "hot_time",
 	ModifyTime:                 "modify_time",
 	CreateTime:                 "create_time",
+	QaAvatarUrl:                "qa_avatar_url",
+	Source:                     "source",
 }
+
+const (
+	SourceQuestion = iota + 1 // 问答社区->1
+	SourceVideo               // 视频社区->2
+)

models/tables/yb_community_question_like_tease/query.go

@@ -6,9 +6,9 @@ import (
 )
 
 // GetByUserIdAndCommunityQuestionId 根据用户和问答id获取点赞/吐槽记录
-func GetByUserIdAndCommunityQuestionId(userId uint64, communityQuestionId uint32) (item *YbCommunityQuestionLikeTease, err error) {
+func GetByUserIdAndCommunityQuestionId(userId uint64, communityQuestionId uint32, source int8) (item *YbCommunityQuestionLikeTease, err error) {
 	err = global.DEFAULT_MYSQL.
-		Where("user_id = ? AND community_question_id = ?", userId, communityQuestionId).
+		Where("user_id = ? AND community_question_id = ? AND source = ?", userId, communityQuestionId, source).
 		First(&item).Error
 	if err == utils.ErrNoRow {
 		err = nil
@@ -17,17 +17,17 @@ func GetByUserIdAndCommunityQuestionId(userId uint64, communityQuestionId uint32
 }
 
 // GetLikeNumByCommunityQuestionId 获取某个问答的点赞数
-func GetLikeNumByCommunityQuestionId(communityQuestionId uint32) (num int64, err error) {
+func GetLikeNumByCommunityQuestionId(communityQuestionId uint32, source int) (num int64, err error) {
 	err = global.DEFAULT_MYSQL.Model(YbCommunityQuestionLikeTease{}).
-		Where(" community_question_id = ? AND enabled=1 AND op_type = 1 ", communityQuestionId).
+		Where(" community_question_id = ? AND enabled=1 AND op_type = 1 AND source = ?", communityQuestionId, source).
 		Count(&num).Error
 	return
 }
 
 // GetTeaseNumByCommunityQuestionId 获取某个问答的吐槽数
-func GetTeaseNumByCommunityQuestionId(communityQuestionId uint32) (num int64, err error) {
+func GetTeaseNumByCommunityQuestionId(communityQuestionId uint32, source int) (num int64, err error) {
 	err = global.DEFAULT_MYSQL.Model(YbCommunityQuestionLikeTease{}).
-		Where(" community_question_id = ? AND enabled=1 AND op_type = 2 ", communityQuestionId).
+		Where(" community_question_id = ? AND enabled=1 AND op_type = 2 AND source = ?", communityQuestionId, source).
 		Count(&num).Error
 	return
 }
@@ -39,34 +39,36 @@ type NumCommentByCommunityQuestionIds struct {
 }
 
 // GetLikeNumCommentByCommunityQuestionIds 根据问答id列表获取所有问答的点赞数
-func GetLikeNumCommentByCommunityQuestionIds(communityQuestionIds []uint32) (items []*NumCommentByCommunityQuestionIds, err error) {
+func GetLikeNumCommentByCommunityQuestionIds(communityQuestionIds []uint32, source int) (items []*NumCommentByCommunityQuestionIds, err error) {
 	if len(communityQuestionIds) <= 0 {
 		return
 	}
 	err = global.DEFAULT_MYSQL.Model(YbCommunityQuestionLikeTease{}).
 		Select("community_question_id, count(1) total").
-		Where("community_question_id in (?) AND enabled=1  AND op_type=1", communityQuestionIds).Group("community_question_id").Scan(&items).Error
+		Where("community_question_id in (?) AND enabled=1  AND op_type=1 AND source = ?", communityQuestionIds, source).
+		Group("community_question_id").Scan(&items).Error
 	return
 }
 
 // GetTeaseNumCommentByCommunityQuestionIds 根据问答id列表获取所有问答的吐槽数
-func GetTeaseNumCommentByCommunityQuestionIds(communityQuestionIds []uint32) (items []*NumCommentByCommunityQuestionIds, err error) {
+func GetTeaseNumCommentByCommunityQuestionIds(communityQuestionIds []uint32, source int) (items []*NumCommentByCommunityQuestionIds, err error) {
 	if len(communityQuestionIds) <= 0 {
 		return
 	}
 	err = global.DEFAULT_MYSQL.Model(YbCommunityQuestionLikeTease{}).
 		Select("community_question_id, count(1) total").
-		Where("community_question_id in (?) AND enabled=1  AND op_type=2", communityQuestionIds).Group("community_question_id").Scan(&items).Error
+		Where("community_question_id in (?) AND enabled=1  AND op_type=2 AND source = ?", communityQuestionIds, source).
+		Group("community_question_id").Scan(&items).Error
 	return
 }
 
 // GetByUserIdAndCommunityQuestionIds 根据用户id和问答id列表获取成功点赞/吐槽记录
-func GetByUserIdAndCommunityQuestionIds(userId uint64, communityQuestionIds []uint32) (items []*YbCommunityQuestionLikeTease, err error) {
+func GetByUserIdAndCommunityQuestionIds(userId uint64, communityQuestionIds []uint32, source int) (items []*YbCommunityQuestionLikeTease, err error) {
 	if len(communityQuestionIds) <= 0 {
 		return
 	}
 	err = global.DEFAULT_MYSQL.
-		Where("user_id = ? AND enabled=1  AND community_question_id in (?)", userId, communityQuestionIds).Group("community_question_id").
+		Where("user_id = ? AND enabled=1 AND source = ? AND community_question_id in (?)", userId, source, communityQuestionIds).Group("community_question_id").
 		Find(&items).Error
 	return
 }

models/tables/yb_community_question_like_tease/yb_community_question_like_tease.go

@@ -6,14 +6,15 @@ import (
 
 // YbCommunityQuestionLikeTease 问答点赞/吐槽表
 type YbCommunityQuestionLikeTease struct {
-	CommunityQuestionLikeTeaseID uint64    `gorm:"primaryKey;column:community_question_like_tease_id;type:bigint(20) unsigned;not null" json:"-"`    // 点赞/吐槽自增id
-	UserID                       uint64    `gorm:"column:user_id;type:bigint(20) unsigned;not null;default:0" json:"userId"`                         // 用户id
-	OpType                       int8      `gorm:"column:op_type;type:tinyint(1);not null;default:1" json:"opType"`                                  // 类型. 1-点赞 2-吐槽
-	Enabled                      int8      `gorm:"column:enabled;type:tinyint(1);not null;default:1" json:"enabled"`                                 // 状态. 0-无效数据（已取消点赞/吐槽） 1-有效数据（点赞/吐槽）
-	CreateTime                   time.Time `gorm:"column:create_time;type:datetime;not null;default:CURRENT_TIMESTAMP" json:"createTime"`            // 创建时间
-	ModifyTime                   time.Time `gorm:"column:modify_time;type:datetime;not null;default:CURRENT_TIMESTAMP" json:"modifyTime"`            // 修改时间
-	CommunityQuestionID          uint32    `gorm:"column:community_question_id;type:int(10) unsigned;not null;default:0" json:"communityQuestionId"` // 问答ID
-	SourceAgent                  int8      `gorm:"column:source_agent;type:tinyint(1);not null;default:0" json:"sourceAgent"`                        // 点赞/吐槽入口来源，1：小程序，2：小程序pc, 4：web pc
+	CommunityQuestionLikeTeaseID uint64    `gorm:"primaryKey;column:community_question_like_tease_id;type:bigint(20) unsigned;not null" json:"-"`                                    // 点赞/吐槽自增id
+	UserID                       uint64    `gorm:"index:idx_user_id;column:user_id;type:bigint(20) unsigned;not null;default:0" json:"userId"`                                       // 用户id
+	OpType                       int8      `gorm:"column:op_type;type:tinyint(1);not null;default:1" json:"opType"`                                                                  // 类型. 1-点赞 2-吐槽
+	Enabled                      int8      `gorm:"column:enabled;type:tinyint(1);not null;default:1" json:"enabled"`                                                                 // 状态. 0-无效数据（已取消点赞/吐槽） 1-有效数据（点赞/吐槽）
+	CreateTime                   time.Time `gorm:"column:create_time;type:datetime;not null;default:CURRENT_TIMESTAMP" json:"createTime"`                                            // 创建时间
+	ModifyTime                   time.Time `gorm:"column:modify_time;type:datetime;not null;default:CURRENT_TIMESTAMP" json:"modifyTime"`                                            // 修改时间
+	CommunityQuestionID          uint32    `gorm:"index:idx_community_question_id;column:community_question_id;type:int(10) unsigned;not null;default:0" json:"communityQuestionId"` // 问答ID
+	SourceAgent                  int8      `gorm:"column:source_agent;type:tinyint(1);not null;default:0" json:"sourceAgent"`                                                        // 点赞/吐槽入口来源，1：小程序，2：小程序pc, 4：web pc
+	Source                       int8      `gorm:"column:source;type:tinyint(4);not null;default:1" json:"source"`                                                                   // 来源：1-问答社区(默认); 2-视频社区
 }
 
 // TableName get sql table name.获取数据库表名
@@ -31,6 +32,7 @@ var YbCommunityQuestionLikeTeaseColumns = struct {
 	ModifyTime                   string
 	CommunityQuestionID          string
 	SourceAgent                  string
+	Source                       string
 }{
 	CommunityQuestionLikeTeaseID: "community_question_like_tease_id",
 	UserID:                       "user_id",
@@ -40,4 +42,10 @@ var YbCommunityQuestionLikeTeaseColumns = struct {
 	ModifyTime:                   "modify_time",
 	CommunityQuestionID:          "community_question_id",
 	SourceAgent:                  "source_agent",
+	Source:                       "source",
 }
+
+const (
+	SourceQuestion = iota + 1 // 问答社区->1
+	SourceVideo               // 视频社区->2
+)

services/community/video.go

@@ -5,6 +5,8 @@ import (
 	"hongze/hongze_yb/models/response"
 	"hongze/hongze_yb/models/tables/chart_permission"
 	"hongze/hongze_yb/models/tables/company_product"
+	"hongze/hongze_yb/models/tables/yb_community_question_comment"
+	"hongze/hongze_yb/models/tables/yb_community_question_like_tease"
 	"hongze/hongze_yb/models/tables/yb_community_video"
 	"hongze/hongze_yb/models/tables/yb_community_video_play_log"
 	"hongze/hongze_yb/models/tables/yb_road_video"
@@ -87,11 +89,14 @@ func SaveVideoPlayLog(userInfo user.UserInfo, videoId, sourceAgent int, videoTyp
 	companyName := "潜在客户"
 	companyStatus := "潜在"
 	sellerId := 0
-	if companyInfo != nil && companyInfo.CompanyID > 0 {
-		companyName = companyInfo.CompanyName
-		companyStatus = companyInfo.Status
+	if companyInfo != nil {
+		if companyInfo.CompanyID > 0 {
+			companyName = companyInfo.CompanyName
+			companyStatus = companyInfo.Status
+		}
 		sellerId = companyInfo.SellerID
 	}
+
 	item := &yb_community_video_play_log.YbCommunityVideoPlayLog{
 		CommunityVideoID: videoId,
 		UserID:           int(userInfo.UserID),
@@ -114,7 +119,6 @@ func SaveVideoPlayLog(userInfo user.UserInfo, videoId, sourceAgent int, videoTyp
 	return
 }
 
-
 // getSubTencentUrl 获取腾讯视频链接子字符串
 func getSubTencentUrl(tencentUrl string) (sub string) {
 	if tencentUrl != "" {
@@ -272,3 +276,101 @@ func GetRoadVideoList(userInfo user.UserInfo, pageIndex, pageSize, videoId, char
 	resp.Paging = response.GetPaging(pageIndex, pageSize, int(total))
 	return
 }
+
+// HandleLikeOrTeaseByCommunityVideoItemList 视频社区 点赞/吐槽 数据
+func HandleLikeOrTeaseByCommunityVideoItemList(userId uint64, videoList []*response.CommunityVideoItem) (err error) {
+	listLen := len(videoList)
+	if listLen == 0 {
+		return
+	}
+	idArr := make([]uint32, 0)
+	for i := 0; i < listLen; i++ {
+		idArr = append(idArr, uint32(videoList[i].CommunityVideoID))
+	}
+
+	// 注：此处视频社区CommunityVideoID在点赞吐槽表中为CommunityQuestionID, 以source区分主键
+
+	// 获取点赞和吐槽数据
+	ybCommunityQuestionLikeTeaseMap := make(map[uint32]*yb_community_question_like_tease.YbCommunityQuestionLikeTease)
+	ybCommunityQuestionLikeTeaseList, err := yb_community_question_like_tease.GetByUserIdAndCommunityQuestionIds(userId, idArr, yb_community_question_like_tease.SourceVideo)
+	if err != nil {
+		return
+	}
+	for _, v := range ybCommunityQuestionLikeTeaseList {
+		ybCommunityQuestionLikeTeaseMap[v.CommunityQuestionID] = v
+	}
+
+	// 获取点赞和吐槽汇总数
+	likeMap := make(map[uint32]int)
+	teaseMap := make(map[uint32]int)
+
+	likeList, err := yb_community_question_like_tease.GetLikeNumCommentByCommunityQuestionIds(idArr, yb_community_question_like_tease.SourceVideo)
+	if err != nil {
+		return
+	}
+	for _, v := range likeList {
+		likeMap[v.CommunityQuestionID] = v.Total
+	}
+
+	teaseList, err := yb_community_question_like_tease.GetTeaseNumCommentByCommunityQuestionIds(idArr, yb_community_question_like_tease.SourceVideo)
+	if err != nil {
+		return
+	}
+	for _, v := range teaseList {
+		teaseMap[v.CommunityQuestionID] = v.Total
+	}
+
+	for _, v := range videoList {
+		if tmpTotal, ok := likeMap[uint32(v.CommunityVideoID)]; ok {
+			v.LikeTotal = tmpTotal
+		}
+		if tmpTotal, ok := teaseMap[uint32(v.CommunityVideoID)]; ok {
+			v.TeaseTotal = tmpTotal
+		}
+
+		if ybCommunityQuestionLikeTease, ok := ybCommunityQuestionLikeTeaseMap[uint32(v.CommunityVideoID)]; ok {
+			//类型. 1-点赞 2-吐槽
+			v.OpType = ybCommunityQuestionLikeTease.OpType
+		}
+	}
+	return
+}
+
+// HandleCommentByCommunityVideoItemList 视频 评论 数据
+func HandleCommentByCommunityVideoItemList(questionList []*response.CommunityVideoItem) (err error) {
+	listLen := len(questionList)
+	if listLen == 0 {
+		return
+	}
+	idArr := make([]uint32, 0)
+
+	// 注：此处视频社区CommunityVideoID在评论表中为CommunityQuestionID, 以source区分主键
+
+	// 问题ID-精选评论列表
+	questionIdCommentsMap := make(map[uint32][]*response.CommunityQuestionCommentListItem, 0)
+
+	for i := 0; i < listLen; i++ {
+		idArr = append(idArr, uint32(questionList[i].CommunityVideoID))
+		questionIdCommentsMap[uint32(questionList[i].CommunityVideoID)] = make([]*response.CommunityQuestionCommentListItem, 0)
+	}
+
+	// 精选评论数据
+	hotList, err := yb_community_question_comment.GetHotListByCommunityQuestionIds(idArr, yb_community_question_comment.SourceVideo)
+	if err != nil {
+		return
+	}
+	for _, v := range hotList {
+		questionIdCommentsMap[v.CommunityQuestionID] = append(questionIdCommentsMap[v.CommunityQuestionID], &response.CommunityQuestionCommentListItem{
+			QaAvatarUrl: v.QaAvatarUrl,
+			Comment:     v.Content,
+		})
+	}
+
+	for _, v := range questionList {
+		comments := questionIdCommentsMap[uint32(v.CommunityVideoID)]
+		v.CommentTotal = len(comments)
+		v.CommentList = comments
+	}
+
+	return
+}