Merge branch 'cygx_12.4' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/micro_roadshow.go

@@ -21,14 +21,11 @@ type MicroRoadShowController struct {
 // @Param   PageSize		query	int		true	"每页数据条数"
 // @Param   CurrentIndex	query	int		true	"当前页页码，从1开始"
 // @Param   KeyWord			query	string	false	"搜索关键词"
-// @Param   AudioId			query	int		false	"音频ID"
-// @Param   VideoId			query	int		false	"视频ID"
-// @Param   AudioIds			query	string		false	"活动音频IDs"
-// @Param   ActivityVideoIds	query	string		false	"活动视频IDs"
-// @Param   VideoIds			query	string		false	"视频IDs"
-// @Param   ActivityVideoId			query	int		false	"活动视频ID"
 // @Param   Filter			query	string		false	"筛选条件 为空:全部 1:视频 2:音频 3:逻辑解析 4：路演回放 多个用 , 隔开"
 // @Param   ChartPermissionIds   query   string  false     "行业id 多个用 , 隔开"
+// @Param   SourceId		query	int		true	"资源ID"
+// @Param   SourceType		query	int		true	" 1:活动音频  2:活动视频 3:产业视频 4：问答系列"
+// @Param   SearchType	string	int		true	"搜索类型: 1-路演回放; 2-问答系列； 3-调研反馈   多个用 , 隔开"
 // @Success 200 {object} models.HomeListResp
 // @router /list [get]
 func (this *MicroRoadShowController) List() {
@@ -47,14 +44,17 @@ func (this *MicroRoadShowController) List() {
 	pageSize, _ := this.GetInt("PageSize")
 	currentIndex, _ := this.GetInt("CurrentIndex")
 	keywords := this.GetString("KeyWord")
-	audioId, _ := this.GetInt("AudioId")
-	videoId, _ := this.GetInt("VideoId")
-	audioIds := this.GetString("AudioIds")
-	videoIds := this.GetString("VideoIds")
-	activityVideoIds := this.GetString("ActivityVideoIds")
-	activityVideoId, _ := this.GetInt("ActivityVideoId")
+	//audioId, _ := this.GetInt("AudioId")
+	//videoId, _ := this.GetInt("VideoId")
+	//audioIds := this.GetString("AudioIds")
+	//videoIds := this.GetString("VideoIds")
+	//activityVideoIds := this.GetString("ActivityVideoIds")
+	//activityVideoId, _ := this.GetInt("ActivityVideoId")
 	filter := this.GetString("Filter")
 	chartPermissionIds := this.GetString("ChartPermissionIds")
+	sourceId, _ := this.GetInt("SourceId")
+	sourceType, _ := this.GetInt("SourceType")
+	searchType := this.GetString("SearchType")
 	if pageSize <= 0 {
 		pageSize = utils.PageSize20
 	}
@@ -76,41 +76,13 @@ func (this *MicroRoadShowController) List() {
 	var total int
 	var e error
 	// 微路演列表
-	list, total, e = services.GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activityVideoId, filter, keywords, audioIds, videoIds, activityVideoIds, chartPermissionIds)
+	list, total, e = services.GetMicroRoadShowPageListV12(pageSize, currentIndex, sourceId, sourceType, filter, keywords, searchType, chartPermissionIds)
 	if e != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取微路演列表失败, Err: " + e.Error()
 		return
 	}
-	if keywords != "" {
-		var pageSizeIk int
-		//获取总的数量
-		totalIk, e := services.CountMicroRoadShowPageListIkWord(audioId, videoId, activityVideoId, keyWordArr, filter, audioIds, videoIds, activityVideoIds)
-		if e != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取微路演联想词列表失败, Err: " + e.Error()
-			return
-		}
-		pageSizeIk = totalIk - len(list)
-		//处理IK分词部分的分页获取条数
-		startSizeIk := utils.StartIndex(currentIndex, pageSize)
-		startSizeIk = startSizeIk - total
-		if startSizeIk < 0 {
-			startSizeIk = 0
-		}
-		if pageSizeIk > 0 {
-			lisIk, e := services.GetMicroRoadShowPageListIkWord(startSizeIk, pageSizeIk, audioId, videoId, activityVideoId, keyWordArr, filter, audioIds, videoIds, activityVideoIds, keywords)
-			if e != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取微路演列表失败, Err: " + e.Error()
-				return
-			}
-			for _, item := range lisIk {
-				list = append(list, item)
-			}
-		}
-		total = totalIk
-	}
+
 	userId := user.UserId
 	listMycollect, err := models.GetUserMicroRoadshowCollectList(userId)
 	if err != nil {
@@ -250,11 +222,9 @@ func (this *MicroRoadShowController) VideoHistoryAdd() {
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
-
 	videoId := req.VideoId
 	playSeconds := req.PlaySeconds
 	sourceType := req.SourceType
-
 	if sourceType == 0 {
 		sourceType = 1
 	}
@@ -266,6 +236,17 @@ func (this *MicroRoadShowController) VideoHistoryAdd() {
 		return
 	}
 	if sourceType == 1 {
+		//添加活动音频的播放记录
+		go services.AddActivityVoiceHistory(user, videoId, playSeconds)
+	} else if sourceType == 2 {
+		//添加活动视频的播放记录
+		go services.AddActivityVideoHistory(user, videoId, playSeconds)
+		//if err != nil {
+		//	br.Msg = "更新失败"
+		//	br.ErrMsg = "更新失败,AddActivityVideoHistory Err:" + err.Error()
+		//	return
+		//}
+	} else if sourceType == 3 {
 		item := models.CygxMicroRoadshowVideoHistory{
 			VideoId:     videoId,
 			UserId:      uid,
@@ -307,13 +288,8 @@ func (this *MicroRoadShowController) VideoHistoryAdd() {
 			}
 		}
 		go services.MicroRoadshowVideoUserRmind(user, videoId)
-	} else if sourceType == 2 {
-		err = services.AddActivityVideoHistory(user, videoId)
-		if err != nil {
-			br.Msg = "更新失败"
-			br.ErrMsg = "更新失败,AddActivityVideoHistory Err:" + err.Error()
-			return
-		}
+	} else if sourceType == 4 {
+		go services.AddAskserieVideoHistoryRecord(user, videoId, playSeconds)
 	}
 	br.Ret = 200
 	br.Success = true
@@ -396,6 +372,10 @@ func (this *MicroRoadShowController) CommentAdd() {
 		}
 		item.IndustryId = microVideo.IndustryId
 		//resourceId = microVideo.IndustryId
+	} else if sourceType == 4 {
+		item.AskserieVideoId = req.Id
+
+		go services.AddCygxAskserieVideoCollection(user, item.AskserieVideoId, req.Content)
 	}
 
 	if sourceType == 2 || sourceType == 3 {
@@ -522,6 +502,7 @@ func (this *MicroRoadShowController) Collect() {
 			item.ActivityVideoId = req.Id
 			item.UserId = uid
 			item.CreateTime = time.Now()
+			item.ModifyTime = time.Now()
 			item.Mobile = user.Mobile
 			item.Email = user.Email
 			item.CompanyId = user.CompanyId
@@ -611,6 +592,49 @@ func (this *MicroRoadShowController) Collect() {
 		br.Ret = 200
 		br.Success = true
 		br.Data = resp
+	} else if req.SourceType == 4 {
+		// 系列问答视频收藏
+		count, err := models.GetAskserieVideoCount(uid, req.Id)
+		if err != nil {
+			br.Msg = "获取数据失败！"
+			br.ErrMsg = "获取数据失败，Err:" + err.Error()
+			return
+		}
+		resp := new(models.ArticleCollectResp)
+		if count <= 0 {
+			item := new(models.CygxAskserieVideoCollect)
+			item.AskserieVideoId = 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.RegisterPlatform = utils.REGISTER_PLATFORM
+			err = models.AddCygxAskserieVideoCollect(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.RemoveAskserieVideoCollect(uid, req.Id)
+			if err != nil {
+				br.Msg = "取消收藏失败"
+				br.ErrMsg = "取消收藏失败,Err:" + err.Error()
+				return
+			}
+			br.Msg = "已取消收藏"
+			resp.Status = 2
+		}
+		br.Ret = 200
+		br.Success = true
+		br.Data = resp
 	}
 }
 
@@ -650,9 +674,17 @@ func (this *MicroRoadShowController) Mycollect() {
 		return
 	}
 
+	listAskserieVideoCollect, err := models.GetUserCygxAskserieVideoCollectList(userId)
+	if err != nil {
+		br.Msg = "获取数据失败"
+		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		return
+	}
+
 	var audioIds []string
 	var videoIds []string
 	var activityVideoIds []string
+	var askserieVideoIds []string //问答系列视频
 	for _, item := range listMycollect {
 		if item.ActivityVoiceId > 0 {
 			audioIds = append(audioIds, strconv.Itoa(item.ActivityVoiceId))
@@ -662,7 +694,10 @@ func (this *MicroRoadShowController) Mycollect() {
 			activityVideoIds = append(activityVideoIds, strconv.Itoa(item.ActivityVideoId))
 		}
 	}
-	if len(audioIds) == 0 && len(videoIds) == 0 && len(activityVideoIds) == 0 {
+	for _, item := range listAskserieVideoCollect {
+		askserieVideoIds = append(askserieVideoIds, strconv.Itoa(item.AskserieVideoId))
+	}
+	if len(audioIds) == 0 && len(videoIds) == 0 && len(activityVideoIds) == 0 && len(askserieVideoIds) == 0 {
 		resp := new(models.MicroRoadShowListResp)
 		page := paging.GetPaging(currentIndex, pageSize, 0)
 		resp.List = make([]*models.MicroRoadShowPageList, 0)
@@ -677,48 +712,51 @@ func (this *MicroRoadShowController) Mycollect() {
 	audioIdstr := strings.Join(audioIds, ",")
 	ideoIdsStr := strings.Join(videoIds, ",")
 	activityVideoIdsStr := strings.Join(activityVideoIds, ",")
+	askserieVideoIdsStr := strings.Join(askserieVideoIds, ",")
 	// 微路演列表
-	list, total, e := services.GetMicroRoadShowMycollect(pageSize, currentIndex, audioIdstr, ideoIdsStr, activityVideoIdsStr)
+	list, total, e := services.GetMicroRoadShowMycollectV12(pageSize, currentIndex, audioIdstr, activityVideoIdsStr, ideoIdsStr, askserieVideoIdsStr)
 	if e != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取微路演列表失败, Err: " + e.Error()
 		return
 	}
 	for _, item := range list {
-		if item.Type == 1 {
-			//音频
-			count, err := models.GetVoiceCollectCount(user.UserId, item.Id)
-			if err != nil {
-				br.Msg = "获取数据失败！"
-				br.ErrMsg = "获取数据失败，Err:" + err.Error()
-				return
-			}
-			if count > 0 {
-				item.IsCollect = true
-			}
-		} else if item.Type == 2 {
-			//活动视频
-			count, err := models.GetActivityVideoCollectCount(user.UserId, item.Id)
-			if err != nil {
-				br.Msg = "获取数据失败！"
-				br.ErrMsg = "获取数据失败，Err:" + err.Error()
-				return
-			}
-			if count > 0 {
-				item.IsCollect = true
-			}
-		} else if item.Type == 3 {
-			//微路演视频
-			count, err := models.GetVideoCollectCount(user.UserId, item.Id)
-			if err != nil {
-				br.Msg = "获取数据失败！"
-				br.ErrMsg = "获取数据失败，Err:" + err.Error()
-				return
-			}
-			if count > 0 {
-				item.IsCollect = true
-			}
-		}
+		//if item.Type == 1 {
+		//	//音频
+		//	count, err := models.GetVoiceCollectCount(user.UserId, item.Id)
+		//	if err != nil {
+		//		br.Msg = "获取数据失败！"
+		//		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		//		return
+		//	}
+		//	if count > 0 {
+		//		item.IsCollect = true
+		//	}
+		//} else if item.Type == 2 {
+		//	//活动视频
+		//	count, err := models.GetActivityVideoCollectCount(user.UserId, item.Id)
+		//	if err != nil {
+		//		br.Msg = "获取数据失败！"
+		//		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		//		return
+		//	}
+		//	if count > 0 {
+		//		item.IsCollect = true
+		//	}
+		//} else if item.Type == 3 {
+		//	//微路演视频
+		//	count, err := models.GetVideoCollectCount(user.UserId, item.Id)
+		//	if err != nil {
+		//		br.Msg = "获取数据失败！"
+		//		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		//		return
+		//	}
+		//	if count > 0 {
+		//		item.IsCollect = true
+		//	}
+		//}
+
+		item.IsCollect = true
 	}
 	// 用户权限
 	authInfo, permissionArr, e := services.GetUserRaiPermissionInfo(user.UserId, user.CompanyId)

models/activity_video_history.go

@@ -6,29 +6,30 @@ import (
 )
 
 type CygxActivityVideoHistory struct {
-	Id          int       `orm:"column(id);pk"description:"音频id"`
-	VideoId     int       `description:"微路演音频id"`
-	ActivityId  int       `description:"活动id"`
-	UserId      int       `description:"用户id"`
-	Mobile      string    `description:"手机号"`
-	Email       string    `description:"邮箱"`
-	CompanyId   int       `description:"公司Id"`
-	CompanyName string    `description:"公司名称"`
-	RealName    string    `description:"用户实际名称"`
-	SellerName  string    `description:"所属销售"`
-	PlaySeconds string    `description:"播放时间 单位s"`
-	CreateTime  time.Time `description:"视频创建时间"`
-	ModifyTime  time.Time `description:"视频修改时间"`
+	Id               int       `orm:"column(id);pk"description:"音频id"`
+	VideoId          int       `description:"微路演音频id"`
+	ActivityId       int       `description:"活动id"`
+	UserId           int       `description:"用户id"`
+	Mobile           string    `description:"手机号"`
+	Email            string    `description:"邮箱"`
+	CompanyId        int       `description:"公司Id"`
+	CompanyName      string    `description:"公司名称"`
+	RealName         string    `description:"用户实际名称"`
+	SellerName       string    `description:"所属销售"`
+	PlaySeconds      string    `description:"播放时间 单位s"`
+	CreateTime       time.Time `description:"视频创建时间"`
+	ModifyTime       time.Time `description:"视频修改时间"`
+	RegisterPlatform int       // 来源 1小程序，2：网页
 }
 
-//添加
+// 添加
 func AddCygxActivityVideoHistory(item *CygxActivityVideoHistory) (err error) {
 	o := orm.NewOrm()
 	_, err = o.Insert(item)
 	return
 }
 
-//获取列表信息根据手机号分组
+// 获取列表信息根据手机号分组
 func GetActivityVideoHistoryByMobileList(condition string) (items []*CygxActivityVideoHistory, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM cygx_activity_video_history  WHERE 1 =1  ` + condition + `  GROUP BY user_id  `
@@ -36,7 +37,7 @@ func GetActivityVideoHistoryByMobileList(condition string) (items []*CygxActivit
 	return
 }
 
-//修改用户浏览活动视频的相关信息
+// 修改用户浏览活动视频的相关信息
 func UpdateCygxActivityVideoHistory(wxUser *WxUserItem) (err error) {
 	o := orm.NewOrm()
 	var sql string

models/activity_voice_history.go

@@ -6,21 +6,22 @@ import (
 )
 
 type CygxActivityVoiceHistory struct {
-	Id          int       `orm:"column(id);pk"`
-	ActivityId  int       `description:"活动ID"`
-	UserId      int       `description:"用户ID"`
-	CreateTime  time.Time `description:"创建时间"`
-	Mobile      string    `description:"手机号"`
-	Email       string    `description:"邮箱"`
-	CompanyId   int       `description:"公司id"`
-	CompanyName string    `description:"公司名称"`
-	RealName    string    `description:"用户实际名称"`
-	SellerName  string    `description:"所属销售"`
-	PlaySeconds string    `description:"播放时间 单位s"`
-	ModifyTime  time.Time `description:"视频修改时间"`
+	Id               int       `orm:"column(id);pk"`
+	ActivityId       int       `description:"活动ID"`
+	UserId           int       `description:"用户ID"`
+	CreateTime       time.Time `description:"创建时间"`
+	Mobile           string    `description:"手机号"`
+	Email            string    `description:"邮箱"`
+	CompanyId        int       `description:"公司id"`
+	CompanyName      string    `description:"公司名称"`
+	RealName         string    `description:"用户实际名称"`
+	SellerName       string    `description:"所属销售"`
+	PlaySeconds      string    `description:"播放时间 单位s"`
+	ModifyTime       time.Time `description:"视频修改时间"`
+	RegisterPlatform int       // 来源 1小程序，2：网页
 }
 
-//添加
+// 添加
 func AddCygxActivityVoiceHistory(item *CygxActivityVoiceHistory) (err error) {
 	o := orm.NewOrm()
 	_, err = o.Insert(item)
@@ -41,7 +42,7 @@ func UpdateLastCygxActivityVoiceHistory(playSeconds string, lastId int) (err err
 	return
 }
 
-//获取列表信息根据手机号分组
+// 获取列表信息根据手机号分组
 func GetActivityVoiceHistoryByMobileList(condition string) (items []*CygxActivityVoiceHistory, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM cygx_activity_voice_history  WHERE 1 =1  ` + condition + `  GROUP BY user_id  `
@@ -49,7 +50,7 @@ func GetActivityVoiceHistoryByMobileList(condition string) (items []*CygxActivit
 	return
 }
 
-//修改用户浏览活动音频的相关信息
+// 修改用户浏览活动音频的相关信息
 func UpdateCygxActivityVoiceHistory(wxUser *WxUserItem) (err error) {
 	o := orm.NewOrm()
 	var sql string

models/article_collect.go

@@ -14,11 +14,12 @@ type CygxArticleCollect struct {
 	VideoId         int
 	UserId          int
 	CreateTime      time.Time
-	Mobile          string `description:"手机号"`
-	Email           string `description:"邮箱"`
-	CompanyId       int    `description:"公司id"`
-	CompanyName     string `description:"公司名称"`
-	RealName        string `description:"用户实际名称"`
+	ModifyTime      time.Time `description:"更新时间"`
+	Mobile          string    `description:"手机号"`
+	Email           string    `description:"邮箱"`
+	CompanyId       int       `description:"公司id"`
+	CompanyName     string    `description:"公司名称"`
+	RealName        string    `description:"用户实际名称"`
 }
 
 // 添加收藏信息

models/article_comment.go

@@ -13,6 +13,7 @@ type CygxArticleComment struct {
 	ActivityId      int       `description:"活动id"`
 	VideoId         int       `description:"视频id"`
 	ActivityVoiceId int       `description:"活动音频ID"`
+	AskserieVideoId int       `description:" 系列问答视频ID askserie_video_id"`
 	IndustryId      int       `description:"产业id"`
 	CreateTime      time.Time `description:"创建时间"`
 	Mobile          string    `description:"手机号"`

models/askserie_video_collect.go

@@ -0,0 +1,49 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+type CygxAskserieVideoCollect struct {
+	Id               int       `orm:"column(id);pk"`
+	AskserieVideoId  int       `description:"askserie_video_id"`
+	UserId           int       `description:"用户ID"`
+	CreateTime       time.Time `description:"创建时间"`
+	Mobile           string    `description:"手机号"`
+	Email            string    `description:"邮箱"`
+	CompanyId        int       `description:"公司id"`
+	CompanyName      string    `description:"公司名称"`
+	RealName         string    `description:"用户实际名称"`
+	SellerName       string    `description:"所属销售"`
+	RegisterPlatform int       `description:"来源 1小程序，2：网页"`
+	ModifyTime       time.Time `description:"更新时间"`
+}
+
+// 添加
+func AddCygxAskserieVideoCollect(item *CygxAskserieVideoCollect) (err error) {
+	o := orm.NewOrm()
+	_, err = o.Insert(item)
+	return
+}
+
+func RemoveAskserieVideoCollect(userId, askserieVideoId int) (err error) {
+	o := orm.NewOrm()
+	sql := `DELETE FROM cygx_askserie_video_collect WHERE user_id=? AND askserie_video_id=? `
+	_, err = o.Raw(sql, userId, askserieVideoId).Exec()
+	return
+}
+
+func GetAskserieVideoCount(userId, askserieVideoId int) (count int, err error) {
+	sql := `SELECT COUNT(1) AS count FROM cygx_askserie_video_collect WHERE user_id=? AND askserie_video_id=? `
+	err = orm.NewOrm().Raw(sql, userId, askserieVideoId).QueryRow(&count)
+	return
+}
+
+func GetUserCygxAskserieVideoCollectList(userId int) (items []*CygxAskserieVideoCollect, err error) {
+	sql := `SELECT a.* FROM cygx_askserie_video_collect AS a 
+			WHERE a.user_id=?
+           ORDER BY a.id DESC `
+	_, err = orm.NewOrm().Raw(sql, userId).QueryRows(&items)
+	return
+}

models/askserie_video_collection.go

@@ -0,0 +1,36 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+type CygxAskserieVideoCollection struct {
+	Id               int       `orm:"column(id);pk"`
+	AskserieVideoId  int       `description:"askserie_video_id"`
+	UserId           int       `description:"用户ID"`
+	CreateTime       time.Time `description:"创建时间"`
+	Mobile           string    `description:"手机号"`
+	Email            string    `description:"邮箱"`
+	CompanyId        int       `description:"公司id"`
+	CompanyName      string    `description:"公司名称"`
+	RealName         string    `description:"用户实际名称"`
+	SellerName       string    `description:"所属销售"`
+	RegisterPlatform int       `description:"来源 1小程序，2：网页"`
+	ModifyTime       time.Time `description:"更新时间"`
+	Content          string    `description:"留言内容"`
+}
+
+// 添加
+func AddCygxAskserieVideoCollection(item *CygxAskserieVideoCollection) (err error) {
+	o := orm.NewOrm()
+	_, err = o.Insert(item)
+	return
+}
+
+func UpdateAskserieVideoCommentNum(askserieVideoId int) (err error) {
+	sql := `UPDATE cygx_askserie_video SET comment_num = comment_num+1 WHERE askserie_video_id = ?  `
+	o := orm.NewOrm()
+	_, err = o.Raw(sql, askserieVideoId).Exec()
+	return
+}

models/askserie_video_history_record.go

@@ -0,0 +1,36 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+type CygxAskserieVideoHistoryRecord struct {
+	Id               int       `orm:"column(id);pk"`
+	AskserieVideoId  int       `description:"askserie_video_id"`
+	UserId           int       `description:"用户ID"`
+	CreateTime       time.Time `description:"创建时间"`
+	Mobile           string    `description:"手机号"`
+	Email            string    `description:"邮箱"`
+	CompanyId        int       `description:"公司id"`
+	CompanyName      string    `description:"公司名称"`
+	RealName         string    `description:"用户实际名称"`
+	SellerName       string    `description:"所属销售"`
+	RegisterPlatform int       `description:"来源 1小程序，2：网页"`
+	ModifyTime       time.Time `description:"更新时间"`
+	VideoDuration    int       `description:"播放时长"`
+}
+
+// 添加
+func AddCygxAskserieVideoHistoryRecord(item *CygxAskserieVideoHistoryRecord) (err error) {
+	o := orm.NewOrm()
+	_, err = o.Insert(item)
+	return
+}
+
+func UpdateAskserieVideoCounts(askserieVideoId int) (err error) {
+	sql := `UPDATE cygx_askserie_video SET video_counts = video_counts+1 WHERE askserie_video_id = ?  `
+	o := orm.NewOrm()
+	_, err = o.Raw(sql, askserieVideoId).Exec()
+	return
+}

models/db.go

@@ -180,6 +180,9 @@ func init() {
 		new(CygxQuestionnaireVote),
 		new(CygxQuestionnaireVoteOtherTheme),
 		new(CygxMorningMeetingReviewChapterHistory),
+		new(CygxAskserieVideoHistoryRecord),
+		new(CygxAskserieVideoCollection),
+		new(CygxAskserieVideoCollect),
 	)
 	// 记录ORM查询日志
 	orm.Debug = true

models/micro_roadshow.go

@@ -44,9 +44,10 @@ func GetMicroRoadshowVideoByVideoId(videoId int) (item *CygxMicroRoadshowVideo,
 // MicroRoadShowPageList 微路演列表
 type MicroRoadShowPageList struct {
 	Id                  int    `description:"音视频ID"`
+	SourceId            int    `description:"资源ID"`
 	Title               string `description:"标题"`
 	ResourceUrl         string `description:"链接"`
-	Type                int    `description:"类型: 1-音频; 2-活动视频； 3-产业视频"`
+	Type                int    `description:"类型: 1-活动音频; 2-活动视频； 3-产业视频; 4-系列问答"`
 	PublishTime         string `description:"发布时间"`
 	BackgroundImg       string `description:"背景图"`
 	ShareImg            string `description:"分享封面图"`
@@ -152,6 +153,120 @@ func GetMicroRoadShowVideoPageListV8(startSize, pageSize int, condition string,
 	return
 }
 
+// GetMicroRoadShowVideoPageList 获取微路演视频列表-分页
+func GetMicroRoadShowVideoPageListV12(startSize, pageSize int, audioAct string, audioActPars []interface{}, videoAct string, videoActPars []interface{}, videoMico string, videoMicoPars []interface{}, conditionAskserie string, askseriePars []interface{}) (total int, list []*MicroRoadShowPageList, err error) {
+	o := orm.NewOrm()
+	var sql string
+
+	//活动音频1
+	sql += `
+			SELECT
+			a.activity_voice_id AS id,
+			a.activity_id AS source_id,
+			a.voice_name AS title,
+			a.voice_url AS resource_url,
+			1 AS type,
+			b.activity_time AS publish_time,
+			b.chart_permission_id,
+			b.chart_permission_name,
+			a.voice_play_seconds AS play_seconds,
+			a.background_img,
+			"" AS industry_name,
+			"",
+			a.share_img,
+			a.activity_id 
+		FROM
+			cygx_activity_voice AS a
+			JOIN cygx_activity AS b ON a.activity_id = b.activity_id  WHERE 1= 1  `
+	if audioAct != `` {
+		sql += audioAct
+	}
+
+	//活动视频2
+	sql += `  UNION ALL `
+	sql += `
+		SELECT
+			a.video_id AS id,
+			a.activity_id AS source_id,
+			a.video_name AS title,
+			a.video_url AS resource_url,
+			2 AS type,
+	    	b.activity_time as publish_time,
+			b.chart_permission_id,
+			b.chart_permission_name,
+			"" AS play_seconds,
+			a.background_img,
+			"" AS industry_name,
+			"",
+			a.share_img,
+			a.activity_id
+		FROM
+			cygx_activity_video as a
+			INNER JOIN cygx_activity as b on a.activity_id = b.activity_id WHERE 1= 1  `
+	if videoAct != `` {
+		sql += videoAct
+	}
+	sql += `  UNION ALL `
+
+	// 产业视频3
+	sql += `SELECT
+			video_id AS id,
+			video_id AS source_id,
+			video_name AS title,
+			video_url AS resource_url,
+			3 AS type,
+			publish_date AS publish_time,
+			chart_permission_id,
+			chart_permission_name,
+			video_duration AS play_seconds,
+			img_url AS background_img,            
+			industry_name,
+			industry_id,
+			share_img_url AS share_img,
+			"" as  activity_id
+		FROM
+			cygx_micro_roadshow_video  as a
+		WHERE
+			publish_status = 1 `
+	if videoMico != `` {
+		sql += videoMico
+	}
+
+	//系列问答
+	sql += `  UNION ALL `
+	sql += `
+			SELECT
+			a.askserie_video_id AS id,
+			a.askserie_video_id AS source_id,
+			a.video_name AS title,
+			a.video_url AS resource_url,
+			4 AS type,
+			a.publish_date AS publish_time,
+			a.chart_permission_id,
+			a.chart_permission_name,
+			a.video_duration AS play_seconds,
+			a.background_img,
+			"" AS industry_name,
+			"",
+			a.share_img,
+			0  as activity_id 
+		FROM
+			cygx_askserie_video AS a WHERE 1= 1 `
+	if conditionAskserie != `` {
+		sql += conditionAskserie
+	}
+
+	sql += ` ORDER BY publish_time DESC`
+	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z `
+	err = o.Raw(totalSql, audioActPars, videoActPars, videoMicoPars, askseriePars).QueryRow(&total)
+	if err != nil {
+		return
+	}
+	sql += ` LIMIT ?,?`
+	_, err = o.Raw(sql, audioActPars, videoActPars, videoMicoPars, askseriePars, startSize, pageSize).QueryRows(&list)
+	return
+}
+
 // CountMicroRoadShowVideoPageList 获取微路演视频数量
 func CountMicroRoadShowVideoPageList(condition string, pars []interface{}, conditionAct string, parsAct []interface{}, conditionAudio string, parsAudio []interface{}) (total int, err error) {
 	o := orm.NewOrm()
@@ -312,7 +427,8 @@ func GetMicroRoadShowVideoPageListIkWord(startSize, pageSize int, condition stri
 type AddVideoHistoryReq struct {
 	VideoId     int `description:"视频ID"`
 	PlaySeconds int `description:"播放时长"`
-	SourceType  int `description:"视频来源: 1-微路演; 2-活动 (不传默认为1)"`
+	//SourceType  int `description:"视频来源: 1-微路演; 2-活动 (不传默认为1)"`
+	SourceType int `description:"音视频来源: 1-活动音频; 2-活动视频； 3-产业视频; 4-系列问答"`
 }
 
 func GetLastCygxMicroRoadshowVideoHistory(videoId, userId int) (item *CygxMicroRoadshowVideoHistory, err error) {

models/resource_data.go

@@ -39,6 +39,7 @@ type CygxResourceDataResp struct {
 	IndustrialResource *IndustrialManagementHotResp            `description:"产业资源包"`
 	ReportSelection    *CygxReportSelectionRep                 `description:"重点公司（原报告精选）"`
 	YanxuanSpecial     *CygxYanxuanSpecialCenterResp           `description:"研选专栏"`
+	AskserieVideo      *MicroRoadShowPageList                  `description:"活动音频"`
 }
 
 // Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`

services/askserie_video.go

@@ -0,0 +1,93 @@
+package services
+
+import (
+	"errors"
+	"fmt"
+	"hongze/hongze_cygx/models"
+	"hongze/hongze_cygx/utils"
+	"time"
+)
+
+// 记录用户活动音频播放记录
+func AddAskserieVideoHistoryRecord(user *models.WxUserItem, askserieVideoId, playSeconds int) {
+	var err error
+	defer func() {
+		if err != nil {
+			go utils.SendAlarmMsg(fmt.Sprint("记录用户活动音频播放记录失败 AddAskserieVideoHistoryRecord Err:", err.Error(), "askserieVideoId：", askserieVideoId, "UserId：", user.UserId), 2)
+		}
+	}()
+	item := new(models.CygxAskserieVideoHistoryRecord)
+	item.UserId = user.UserId
+	item.AskserieVideoId = askserieVideoId
+	item.VideoDuration = playSeconds
+	item.Mobile = user.Mobile
+	item.Email = user.Email
+	item.CompanyId = user.CompanyId
+	item.CompanyName = user.CompanyName
+	item.CreateTime = time.Now()
+	item.ModifyTime = time.Now()
+	item.RegisterPlatform = utils.REGISTER_PLATFORM
+	sellerItem, e := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetSellerByCompanyIdCheckFicc, Err: " + e.Error())
+		return
+	}
+	if sellerItem != nil {
+		item.SellerName = sellerItem.RealName
+	}
+	//添加记录
+	e = models.AddCygxAskserieVideoHistoryRecord(item)
+	if e != nil {
+		err = errors.New("AddCygxAskserieVideoHistoryRecord, Err: " + e.Error())
+		return
+	}
+	//播放记录加1
+	e = models.UpdateAskserieVideoCounts(askserieVideoId)
+	if e != nil {
+		err = errors.New("UpdateAskserieVideoCounts, Err: " + e.Error())
+		return
+	}
+	return
+}
+
+// 系列问答视频留言记录
+func AddCygxAskserieVideoCollection(user *models.WxUserItem, askserieVideoId int, content string) {
+	var err error
+	defer func() {
+		if err != nil {
+			go utils.SendAlarmMsg(fmt.Sprint("记录用户活动音频播放记录失败 AddAskserieVideoHistoryRecord Err:", err.Error(), "askserieVideoId：", askserieVideoId, "UserId：", user.UserId), 2)
+		}
+	}()
+	item := new(models.CygxAskserieVideoCollection)
+	item.UserId = user.UserId
+	item.AskserieVideoId = askserieVideoId
+	item.Content = content
+	item.Mobile = user.Mobile
+	item.Email = user.Email
+	item.CompanyId = user.CompanyId
+	item.CompanyName = user.CompanyName
+	item.CreateTime = time.Now()
+	item.ModifyTime = time.Now()
+	item.RegisterPlatform = utils.REGISTER_PLATFORM
+	sellerItem, e := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetSellerByCompanyIdCheckFicc, Err: " + e.Error())
+		return
+	}
+	if sellerItem != nil {
+		item.SellerName = sellerItem.RealName
+	}
+	//添加记录
+	e = models.AddCygxAskserieVideoCollection(item)
+	if e != nil {
+		err = errors.New("AddCygxAskserieVideoCollection, Err: " + e.Error())
+		return
+	}
+	//播放记录加1
+	e = models.UpdateAskserieVideoCommentNum(askserieVideoId)
+	if e != nil {
+		err = errors.New("UpdateAskserieVideoCommentNum, Err: " + e.Error())
+		return
+	}
+	return
+}

services/cygx_activity_video_history.go

@@ -1,45 +1,137 @@
 package services
 
 import (
+	"errors"
+	"fmt"
 	"hongze/hongze_cygx/models"
+	"hongze/hongze_cygx/utils"
+	"strconv"
 	"time"
 )
 
-//添加活动的视频播放记录
-func AddActivityVideoHistory(user *models.WxUserItem, activityId int) (err error) {
-	activityInfo, errInfo := models.GetCygxActivityVideoByActivityId(activityId)
-	if activityInfo == nil {
+// 添加活动的视频播放记录
+//func AddActivityVideoHistory(user *models.WxUserItem, activityId int) (err error) {
+//	activityInfo, errInfo := models.GetCygxActivityVideoByActivityId(activityId)
+//	if activityInfo == nil {
+//		return
+//	}
+//	if errInfo != nil {
+//		return
+//	}
+//	var sellerName string
+//	sellerName, err = models.GetCompanySellerName(user.CompanyId)
+//	if err != nil {
+//		return
+//	}
+//	item := models.CygxActivityVideoHistory{
+//		ActivityId:  activityInfo.ActivityId,
+//		VideoId:     activityInfo.VideoId,
+//		UserId:      user.UserId,
+//		CreateTime:  time.Now(),
+//		Mobile:      user.Mobile,
+//		Email:       user.Email,
+//		CompanyId:   user.CompanyId,
+//		CompanyName: user.CompanyName,
+//		RealName:    user.RealName,
+//		SellerName:  sellerName,
+//		ModifyTime:  time.Now(),
+//	}
+//	err = models.AddCygxActivityVideoHistory(&item)
+//	if err != nil {
+//		return
+//	}
+//	err = models.UpdateActivityVideoCounts(activityInfo.ActivityId)
+//	if err != nil {
+//		return
+//	}
+//	go ActivityVideoUserRmind(user, activityId, 1)
+//	return
+//}
+
+// 记录用户活动音频播放记录
+func AddActivityVideoHistory(user *models.WxUserItem, activityId, playSeconds int) {
+	var err error
+	defer func() {
+		if err != nil {
+			go utils.SendAlarmMsg(fmt.Sprint("记录用户活动音频播放记录失败 AddActivityVoiceHistory Err:", err.Error(), "活动ID：", activityId, "UserId：", user.UserId), 2)
+		}
+	}()
+	item := new(models.CygxActivityVideoHistory)
+	item.UserId = user.UserId
+	item.ActivityId = activityId
+	item.PlaySeconds = strconv.Itoa(playSeconds)
+	item.Mobile = user.Mobile
+	item.Email = user.Email
+	item.CompanyId = user.CompanyId
+	item.CompanyName = user.CompanyName
+	item.CreateTime = time.Now()
+	item.ModifyTime = time.Now()
+	item.RegisterPlatform = utils.REGISTER_PLATFORM
+	sellerItem, e := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetSellerByCompanyIdCheckFicc, Err: " + e.Error())
 		return
 	}
-	if errInfo != nil {
+	if sellerItem != nil {
+		item.SellerName = sellerItem.RealName
+	}
+	//添加记录
+	e = models.AddCygxActivityVideoHistory(item)
+	if e != nil {
+		err = errors.New("AddCygxActivityVoiceHistory, Err: " + e.Error())
 		return
 	}
-	var sellerName string
-	sellerName, err = models.GetCompanySellerName(user.CompanyId)
-	if err != nil {
+	//播放记录加1
+	e = models.UpdateActivityVideoCounts(activityId)
+	if e != nil {
+		err = errors.New("UpdateCygxActivityVoiceCounts, Err: " + e.Error())
+		return
+	}
+	//设置消息提醒
+	go ActivityVideoUserRmind(user, activityId, 1)
+	return
+}
+
+// 记录用户活动音频播放记录
+func AddActivityVoiceHistory(user *models.WxUserItem, activityId, playSeconds int) {
+	var err error
+	defer func() {
+		if err != nil {
+			go utils.SendAlarmMsg(fmt.Sprint("记录用户活动音频播放记录失败 AddActivityVoiceHistory Err:", err.Error(), "活动ID：", activityId, "UserId：", user.UserId), 2)
+		}
+	}()
+	item := new(models.CygxActivityVoiceHistory)
+	item.UserId = user.UserId
+	item.ActivityId = activityId
+	item.PlaySeconds = strconv.Itoa(playSeconds)
+	item.Mobile = user.Mobile
+	item.Email = user.Email
+	item.CompanyId = user.CompanyId
+	item.CompanyName = user.CompanyName
+	item.CreateTime = time.Now()
+	item.ModifyTime = time.Now()
+	item.RegisterPlatform = utils.REGISTER_PLATFORM
+	sellerItem, e := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetSellerByCompanyIdCheckFicc, Err: " + e.Error())
 		return
 	}
-	item := models.CygxActivityVideoHistory{
-		ActivityId:  activityInfo.ActivityId,
-		VideoId:     activityInfo.VideoId,
-		UserId:      user.UserId,
-		CreateTime:  time.Now(),
-		Mobile:      user.Mobile,
-		Email:       user.Email,
-		CompanyId:   user.CompanyId,
-		CompanyName: user.CompanyName,
-		RealName:    user.RealName,
-		SellerName:  sellerName,
-		ModifyTime:  time.Now(),
-	}
-	err = models.AddCygxActivityVideoHistory(&item)
-	if err != nil {
+	if sellerItem != nil {
+		item.SellerName = sellerItem.RealName
+	}
+	//添加记录
+	e = models.AddCygxActivityVoiceHistory(item)
+	if e != nil {
+		err = errors.New("AddCygxActivityVoiceHistory, Err: " + e.Error())
 		return
 	}
-	err = models.UpdateActivityVideoCounts(activityInfo.ActivityId)
-	if err != nil {
+	//播放记录加1
+	e = models.UpdateCygxActivityVoiceCounts(activityId)
+	if e != nil {
+		err = errors.New("UpdateCygxActivityVoiceCounts, Err: " + e.Error())
 		return
 	}
-	go ActivityVideoUserRmind(user, activityId, 1)
+	//设置消息提醒
+	go ActivityVideoUserRmind(user, activityId, 2)
 	return
 }

services/micro_roadshow.go

@@ -291,6 +291,106 @@ func GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activi
 	return
 }
 
+// GetMicroRoadShowPageList 获取微路演列表添加活动视频 更新与8.1版本
+func GetMicroRoadShowPageListV12(pageSize, currentIndex, sourceId, tableType int, filter, keywords, searchType, chartPermissionIds string) (respList []*models.MicroRoadShowPageList, total int, err error) {
+	//Type                int    `description:"类型: 1-活动音频; 2-活动视频； 3-产业视频; 4-系列问答"`
+	var e error
+	// 根据每页数据量获取音视频配比
+	startSize := utils.StartIndex(currentIndex, pageSize)
+	videoList := make([]*models.MicroRoadShowPageList, 0)
+
+	var audioAct string // 活动音频 1
+	var audioActPars []interface{}
+
+	var videoAct string // 活动视频 2
+	var videoActPars []interface{}
+
+	//视频的处理
+	var videoMico string //产业视频 3
+	var videoMicoPars []interface{}
+
+	var conditionAskserie string // 系列问答 4
+	var askseriePars []interface{}
+
+	if sourceId > 0 && tableType > 0 {
+		//先给不相干的表查询ID = 0
+		audioAct += ` AND b.chart_permission_id  = 0 `
+		videoAct += ` AND b.chart_permission_id = 0`
+		videoMico += ` AND a.chart_permission_id  = 0 `
+		conditionAskserie += ` AND a.chart_permission_id   = 0 `
+		switch tableType {
+		case 1:
+			audioAct += ` OR  a.activity_id =  ` + strconv.Itoa(sourceId)
+		case 2:
+			videoAct += ` OR  a.activity_id =  ` + strconv.Itoa(sourceId)
+		case 3:
+			videoMico += ` OR  a.id =  ` + strconv.Itoa(sourceId)
+		case 4:
+			conditionAskserie += ` OR  a.askserie_video_id =  ` + strconv.Itoa(sourceId)
+		}
+	}
+
+	if filter == "1" {
+		audioAct += ` AND b.chart_permission_id  = 0 `
+	} else if filter == "2" {
+		videoAct += ` AND b.chart_permission_id = 0`
+		videoMico += ` AND a.chart_permission_id  = 0 `
+		conditionAskserie += ` AND a.chart_permission_id   = 0 `
+	}
+
+	if searchType != "" {
+		// @Param   SearchType	string	int		true	"搜索类型: 1-路演回放; 2-问答系列； 3-调研反馈   多个用 , 隔开"
+		videoMico += ` AND a.chart_permission_id  = 0 ` // 产业视频不在搜索范围内
+		if !strings.Contains(searchType, "1") {
+			audioAct += ` AND b.activity_type_id  != 2 `
+			videoAct += ` AND b.activity_type_id != 2`
+		}
+
+		if !strings.Contains(searchType, "2") {
+			conditionAskserie += ` AND a.chart_permission_id   = 0 `
+		}
+
+		if !strings.Contains(searchType, "3") && !strings.Contains(searchType, "1") {
+			audioAct += ` AND b.chart_permission_id  = 0  `
+			videoAct += ` AND b.chart_permission_id  = 0 `
+		}
+	}
+
+	if keywords != "" {
+		keywords = "%" + keywords + "%"
+
+		audioAct += ` AND  a.voice_name LIKE ? `
+		videoAct += ` AND  a.video_name LIKE ? `
+		videoMico += ` AND  a.video_name LIKE ? `
+		conditionAskserie += ` AND  a.video_name LIKE ? `
+
+		audioActPars = append(audioActPars, keywords)
+		videoActPars = append(videoActPars, keywords)
+		videoMicoPars = append(videoMicoPars, keywords)
+		askseriePars = append(askseriePars, keywords)
+	}
+	//行业筛选
+	if chartPermissionIds != "" {
+		audioAct += ` AND  b.chart_permission_id IN (` + chartPermissionIds + `)`
+		videoAct += ` AND b.chart_permission_id IN (` + chartPermissionIds + `)`
+		videoMico += ` AND a.chart_permission_id IN (` + chartPermissionIds + `)`
+		conditionAskserie += ` AND a.chart_permission_id IN (` + chartPermissionIds + `)`
+	}
+	//发布状态
+	audioAct += ` AND  b.publish_status = 1 `
+	videoAct += ` AND  b.publish_status = 1 `
+	videoMico += ` AND  a.publish_status = 1 `
+	conditionAskserie += ` AND  a.publish_status = 1 `
+
+	total, videoList, e = models.GetMicroRoadShowVideoPageListV12(startSize, pageSize, audioAct, audioActPars, videoAct, videoActPars, videoMico, videoMicoPars, conditionAskserie, askseriePars)
+	if e != nil {
+		err = errors.New("获取微路演音视频列表失败, Err: " + e.Error())
+		return
+	}
+	respList = videoList
+	return
+}
+
 // GetMicroRoadShowPageListIkWord  添加IK分词联想词 获取微路演列表添加活动视频 更新与8.1版本
 func CountMicroRoadShowPageListIkWord(audioId, videoId, activityVideoId int, keywordArr []string, filter, audioIds, videoIds, activityVideoIds string) (total int, err error) {
 	var e error
@@ -593,6 +693,70 @@ func GetMicroRoadShowMycollect(pageSize, currentIndex int, audioIds, videoIds, a
 	return
 }
 
+// 我的收藏
+func GetMicroRoadShowMycollectV12(pageSize, currentIndex int, audioIds, activityVideoIds, roadshowIdsStr, askserieVideoIds string) (respList []*models.MicroRoadShowPageList, total int, err error) {
+	//Type                int    `description:"类型: 1-活动音频; 2-活动视频； 3-产业视频; 4-系列问答"`
+	var e error
+	// 根据每页数据量获取音视频配比
+	startSize := utils.StartIndex(currentIndex, pageSize)
+	videoList := make([]*models.MicroRoadShowPageList, 0)
+
+	var audioAct string // 活动音频 1
+	var audioActPars []interface{}
+
+	var videoAct string // 活动视频 2
+	var videoActPars []interface{}
+
+	//视频的处理
+	var videoMico string //产业视频 3
+	var videoMicoPars []interface{}
+
+	var conditionAskserie string // 系列问答 4
+	var askseriePars []interface{}
+
+	if audioIds != "" {
+		sliceId := strings.Split(audioIds, ",")
+		audioAct += ` AND a.activity_voice_id IN (` + strings.Join(sliceId, ",") + `)`
+	} else {
+		audioAct += ` AND a.activity_voice_id = 0 `
+	}
+
+	if activityVideoIds != "" {
+		sliceId := strings.Split(activityVideoIds, ",")
+		videoAct += ` AND a.video_id IN (` + strings.Join(sliceId, ",") + `)`
+	} else {
+		videoAct += ` AND a.video_id = 0 `
+	}
+
+	if roadshowIdsStr != "" {
+		sliceId := strings.Split(roadshowIdsStr, ",")
+		videoMico += ` AND a.video_id IN (` + strings.Join(sliceId, ",") + `)`
+	} else {
+		videoMico += ` AND a.video_id = 0 `
+	}
+
+	if askserieVideoIds != "" {
+		sliceId := strings.Split(askserieVideoIds, ",")
+		conditionAskserie += ` AND a.askserie_video_id IN (` + strings.Join(sliceId, ",") + `)`
+	} else {
+		conditionAskserie += ` AND a.askserie_video_id = 0 `
+	}
+
+	//发布状态
+	audioAct += ` AND  b.publish_status = 1 `
+	videoAct += ` AND  b.publish_status = 1 `
+	videoMico += ` AND  a.publish_status = 1 `
+	conditionAskserie += ` AND  a.publish_status = 1 `
+
+	total, videoList, e = models.GetMicroRoadShowVideoPageListV12(startSize, pageSize, audioAct, audioActPars, videoAct, videoActPars, videoMico, videoMicoPars, conditionAskserie, askseriePars)
+	if e != nil {
+		err = errors.New("获取微路演音视频列表失败, Err: " + e.Error())
+		return
+	}
+	respList = videoList
+	return
+}
+
 // GetMicroRoadshowVideoMap 获取已经发布的微路演的产业ID
 func GetMicroRoadshowVideoMap() (items map[int]int, err error) {
 	list, e := models.GetMicroRoadshowVideoList()

services/resource_data.go

@@ -40,8 +40,9 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 	var minutessummaryIds []int
 	var meetingreviewchaptIds []int
 	var productinteriorIds []int
-	var reportselectionIds []int // 报告精选
-	var yanxuanSpecialIds []int  // 研选专栏
+	var reportselectionIds []int  // 报告精选
+	var yanxuanSpecialIds []int   // 研选专栏
+	var askserieVideoIds []string //问答系列视频
 	//Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial 、 本周研究汇总： researchsummary 、 上周纪要汇总 ：minutessummary 、晨会精华 ：meetingreviewchapt "`
 	for _, v := range list {
 		if v.Source == "article" {
@@ -70,7 +71,10 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			reportselectionIds = append(reportselectionIds, v.SourceId)
 		} else if v.Source == utils.CYGX_OBJ_YANXUANSPECIAL {
 			yanxuanSpecialIds = append(yanxuanSpecialIds, v.SourceId)
+		} else if v.Source == utils.CYGX_OBJ_ASKSERIEVIDEO {
+			askserieVideoIds = append(askserieVideoIds, strconv.Itoa(v.SourceId))
 		}
+
 	}
 	//处理文章
 	if len(articleIds) > 0 {
@@ -310,13 +314,14 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		}
 	}
 
-	if len(roadshowIds)+len(activityvideoIds)+len(activityvoiceIds) > 0 {
+	if len(roadshowIds)+len(activityvideoIds)+len(activityvoiceIds)+len(askserieVideoIds) > 0 {
 
 		audioIdstr := strings.Join(activityvoiceIds, ",")
-		ideoIdsStr := strings.Join(roadshowIds, ",")
 		activityVideoIdsStr := strings.Join(activityvideoIds, ",")
+		roadshowIdsStr := strings.Join(roadshowIds, ",")
+		askserieVideoIdsStr := strings.Join(askserieVideoIds, ",")
 
-		list, _, e := GetMicroRoadShowMycollect(len(roadshowIds)+len(activityvideoIds)+len(activityvoiceIds), 0, audioIdstr, ideoIdsStr, activityVideoIdsStr)
+		list, _, e := GetMicroRoadShowMycollectV12(len(roadshowIds)+len(activityvideoIds)+len(activityvoiceIds)+len(askserieVideoIds), 0, audioIdstr, activityVideoIdsStr, roadshowIdsStr, askserieVideoIdsStr)
 		if e != nil {
 			err = errors.New("GetMicroRoadShowMycollect, Err: " + e.Error())
 			return
@@ -425,6 +430,8 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 				mapItems[fmt.Sprint("activityvideo", item.Id)].Activityvideo = item
 			} else if item.Type == 3 {
 				mapItems[fmt.Sprint("roadshow", item.Id)].Roadshow = item
+			} else if item.Type == 4 {
+				mapItems[fmt.Sprint(utils.CYGX_OBJ_ASKSERIEVIDEO, item.Id)].AskserieVideo = item
 			}
 		}
 	}
@@ -475,7 +482,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 	for _, vList := range list {
 		for _, v := range mapItems {
 			//如果这些类型都为空，那么就不合并
-			if v.Article == nil && v.Newchart == nil && v.Roadshow == nil && v.Activity == nil && v.Activityvideo == nil && v.Activityvoice == nil && v.Activityspecial == nil && v.Researchsummary == nil && v.Minutessummary == nil && v.Meetingreviewchapt == nil && v.ProductInterior == nil && v.IndustrialResource == nil && v.ReportSelection == nil && v.YanxuanSpecial == nil {
+			if v.Article == nil && v.Newchart == nil && v.Roadshow == nil && v.Activity == nil && v.Activityvideo == nil && v.Activityvoice == nil && v.Activityspecial == nil && v.Researchsummary == nil && v.Minutessummary == nil && v.Meetingreviewchapt == nil && v.ProductInterior == nil && v.IndustrialResource == nil && v.ReportSelection == nil && v.YanxuanSpecial == nil && v.AskserieVideo == nil {
 				continue
 			}
 			if v.SourceId == vList.SourceId {

utils/constants.go

@@ -242,6 +242,7 @@ const (
 	CYGX_OBJ_RESEARCHSUMMARY    string = "researchsummary"    // 对象类型：本周研究汇总
 	CYGX_OBJ_MINUTESSUMMARY     string = "minutessummary"     // 对象类型：上周纪要汇总
 	CYGX_OBJ_YANXUANSPECIAL     string = "yanxuanspecial"     // 对象类型：研选专栏
+	CYGX_OBJ_ASKSERIEVIDEO      string = "askserievideo"      // 对象类型：问答系列视频
 )
 
 const (