最新页面数据类型更换

controllers/home.go

@@ -279,7 +279,7 @@ func (this *MobileHomeController) NewList() {
 	var conditionInit string
 	var pars []interface{}
 	var total int
-	resp := new(models.HomeResourceDataListResp)
+	resp := new(models.HomeResourceDataListNewResp)
 	//查询近一个月的数据
 	conditionInit = " AND publish_date  >   '" + time.Now().AddDate(0, 0, -30).Format(utils.FormatDateTime) + "'"
 	//conditionInit += `  AND source IN ('newchart')`

models/cygx_morning_meeting_gather.go

@@ -74,6 +74,7 @@ type CygxMorningMeetingGatherDetailListResp struct {
 	ChartPermissionId   int    `description:"行业id"` // 行业id
 	MeetingId           int    `description:"主表id"` // 主表id
 	Content             string `description:"内容"`   // 内容
+	PublishTime         string `description:"发布日期"`
 }
 
 type CygxMorningMeetingGatherDetailResp struct {

models/cygx_morning_meeting_review_chapter.go

@@ -23,7 +23,7 @@ type CygxMorningMeetingReviewChapter struct {
 // 列表
 func GetCygxMorningMeetingReviewChapterList(condition string, pars []interface{}) (items []*CygxMorningMeetingGatherDetailListResp, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT c.*
+	sql := `SELECT c.*,r.publish_time
 			FROM cygx_morning_meeting_review_chapter  as  c 
 			INNER JOIN cygx_morning_meeting_reviews as r ON  r.id = c.meeting_id   WHERE 1 = 1  AND r.status = 1 `
 	if condition != "" {

models/report_selection.go

@@ -129,6 +129,18 @@ func GetReportSelectionListPublic(condition, readSql, tbdb string, pars []interf
 	return
 }
 
+// 列表
+func GetReportSelectionListHome(condition, tbdb string, pars []interface{}, startSize, pageSize int) (items []*CygxReportSelectionRep, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT *  FROM  ` + tbdb + ` as art WHERE 1= 1 AND art.publish_status = 1  `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` ORDER BY  art.publish_date  DESC  LIMIT ?,?`
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	return
+}
+
 type CygxReportSelectionLog struct {
 	ArticleSunId           int       `description:"子级报告id"`
 	ArticleId              int       `description:"父级报告Id"`

models/resource_data.go

@@ -74,8 +74,31 @@ type HomeResourceDataListResp struct {
 	List   []*CygxResourceDataResp `description:"列表"`
 }
 
+// Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
+type HomeResourceDataListNewResp struct {
+	Paging *paging.PagingItem
+	List   []*CygxResourceDataNewResp `description:"列表"`
+}
+
+type CygxResourceDataNewResp struct {
+	Id                 int                                     `orm:"column(id);pk"`
+	SourceId           int                                     `description:"资源ID"`
+	Source             string                                  `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
+	PublishDate        string                                  `description:"发布时间"`
+	Article            *ArticleListResp                        `description:"文章"`
+	Newchart           *HomeChartListResp                      `description:"图表"`
+	Roadshow           *MicroRoadShowPageList                  `description:"微路演"`
+	Activity           *ActivityListResp                       `description:"活动"`
+	Activityvideo      *MicroRoadShowPageList                  `description:"活动视频"`
+	Activityvoice      *MicroRoadShowPageList                  `description:"活动音频"`
+	Activityspecial    *CygxActivitySpecialDetail              `description:"专项调研活动"`
+	Researchsummary    *CygxReportSelectionRep                 `description:"本周研究汇总"`
+	Minutessummary     *CygxReportSelectionRep                 `description:"上周纪要汇总"`
+	Meetingreviewchapt *CygxMorningMeetingGatherDetailListResp `description:"晨会精华"`
+}
+
 // 列表
-func GetResourceDataList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxResourceData, err error) {
+func GetResourceDataList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxResourceDataNewResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT	 *   FROM cygx_resource_data  WHERE 1= 1 `
 	if condition != "" {

services/resource_data.go

@@ -10,7 +10,7 @@ import (
 	"time"
 )
 
-func GetResourceDataList(condition string, pars []interface{}, startSize, pageSize int, user *models.WxUserItem) (items []*models.CygxResourceDataResp, err error) {
+func GetResourceDataList(condition string, pars []interface{}, startSize, pageSize int, user *models.WxUserItem) (items []*models.CygxResourceDataNewResp, err error) {
 
 	uid := user.UserId
 	list, e := models.GetResourceDataList(condition, pars, startSize, pageSize)
@@ -18,44 +18,52 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		err = errors.New("GetResourceDataList, Err: " + e.Error())
 		return
 	}
-	mapItems := make(map[string]*models.CygxResourceDataResp)
+	mapItems := make(map[string]*models.CygxResourceDataNewResp)
 	for _, v := range list {
 		//预处理文章
-		item := new(models.CygxResourceDataResp)
+		item := new(models.CygxResourceDataNewResp)
 		item.Id = v.Id
 		item.SourceId = v.SourceId
 		item.Source = v.Source
-		item.Title = v.Title
-		item.Annotation = v.Annotation
-		item.Abstract = v.Abstract
+		//item.Title = v.Title
+		//item.Annotation = v.Annotation
+		//item.Abstract = v.Abstract
 		item.PublishDate = utils.TimeRemoveHms2(v.PublishDate)
 		mapItems[fmt.Sprint(v.Source, v.SourceId)] = item
 	}
 
 	var articleIds []int
 	var newchartIds []int
-	var roadshowIds []int
+	var roadshowIds []string
 	var activityIds []int
-	var activityvideoIds []int
-	var activityvoiceIds []int
+	var activityvideoIds []string
+	var activityvoiceIds []string
 	var activityspecialIds []int
-
-	//Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
+	var researchsummaryIds []int
+	var minutessummaryIds []int
+	var meetingreviewchaptIds []int
+	//Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial 、 本周研究汇总： researchsummary 、 上周纪要汇总 ：minutessummary 、晨会精华 ：meetingreviewchapt "`
 	for _, v := range list {
 		if v.Source == "article" {
 			articleIds = append(articleIds, v.SourceId)
 		} else if v.Source == "newchart" {
 			newchartIds = append(newchartIds, v.SourceId)
 		} else if v.Source == "roadshow" {
-			roadshowIds = append(roadshowIds, v.SourceId)
+			roadshowIds = append(roadshowIds, strconv.Itoa(v.SourceId))
 		} else if v.Source == "activity" {
 			activityIds = append(activityIds, v.SourceId)
 		} else if v.Source == "activityvideo" {
-			activityvideoIds = append(activityvideoIds, v.SourceId)
+			activityvideoIds = append(activityvideoIds, strconv.Itoa(v.SourceId))
 		} else if v.Source == "activityvoice" {
-			activityvoiceIds = append(activityvoiceIds, v.SourceId)
+			activityvoiceIds = append(activityvoiceIds, strconv.Itoa(v.SourceId))
 		} else if v.Source == "activityspecial" {
 			activityspecialIds = append(activityspecialIds, v.SourceId)
+		} else if v.Source == "researchsummary" {
+			researchsummaryIds = append(researchsummaryIds, v.SourceId)
+		} else if v.Source == "minutessummary" {
+			minutessummaryIds = append(minutessummaryIds, v.SourceId)
+		} else if v.Source == "meetingreviewchapt" {
+			meetingreviewchaptIds = append(meetingreviewchaptIds, v.SourceId)
 		}
 	}
 	detail, e := models.GetConfigByCode("city_img_url")
@@ -107,13 +115,59 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			return
 		}
 		for _, v := range articleList {
-			mapItems[fmt.Sprint("article", v.ArticleId)].Title = v.Title
-			mapItems[fmt.Sprint("article", v.ArticleId)].Annotation = v.Annotation
-			mapItems[fmt.Sprint("article", v.ArticleId)].Abstract = v.Abstract
-			mapItems[fmt.Sprint("article", v.ArticleId)].PublishDate = v.PublishDate
-			mapItems[fmt.Sprint("article", v.ArticleId)].Pv = v.Pv
-			mapItems[fmt.Sprint("article", v.ArticleId)].IsResearch = v.IsResearch
-			mapItems[fmt.Sprint("article", v.ArticleId)].BodyImg = v.BodyImg
+			v.Body = ""
+			mapItems[fmt.Sprint("article", v.ArticleId)].Article = v
+		}
+	}
+
+	//处理晨会精华
+	if len(meetingreviewchaptIds) > 0 {
+		pars = make([]interface{}, 0)
+		condition = ` AND c.id IN (` + utils.GetOrmInReplace(len(meetingreviewchaptIds)) + `)`
+		pars = append(pars, meetingreviewchaptIds)
+
+		listrMeet, e := models.GetCygxMorningMeetingReviewChapterList(condition, pars)
+		if e != nil {
+			err = errors.New("GetResourceDataList, Err: " + e.Error())
+			return
+		}
+		for _, v := range listrMeet {
+			v.PublishTime = utils.TimeRemoveHms2(v.PublishTime)
+			mapItems[fmt.Sprint("meetingreviewchapt", v.Id)].Meetingreviewchapt = v
+		}
+	}
+
+	//处理上周纪要汇总
+	if len(minutessummaryIds) > 0 {
+		pars = make([]interface{}, 0)
+		condition = ` AND article_id IN (` + utils.GetOrmInReplace(len(minutessummaryIds)) + `)`
+		pars = append(pars, minutessummaryIds)
+
+		listresearchsummary, e := models.GetReportSelectionListHome(condition, "cygx_minutes_summary", pars, 0, len(minutessummaryIds))
+		if e != nil {
+			err = errors.New("GetResourceDataList, Err: " + e.Error())
+			return
+		}
+		for _, v := range listresearchsummary {
+			v.PublishDate = utils.TimeRemoveHms2(v.PublishDate)
+			mapItems[fmt.Sprint("minutessummary", v.ArticleId)].Minutessummary = v
+		}
+	}
+
+	//处理本周纪要汇总
+	if len(researchsummaryIds) > 0 {
+		pars = make([]interface{}, 0)
+		condition = ` AND article_id IN (` + utils.GetOrmInReplace(len(researchsummaryIds)) + `)`
+		pars = append(pars, researchsummaryIds)
+
+		listresearchsummary, e := models.GetReportSelectionListHome(condition, "cygx_research_summary", pars, 0, len(researchsummaryIds))
+		if e != nil {
+			err = errors.New("GetReportSelectionListHome, Err: " + e.Error())
+			return
+		}
+		for _, v := range listresearchsummary {
+			v.PublishDate = utils.TimeRemoveHms2(v.PublishDate)
+			mapItems[fmt.Sprint("researchsummary", v.ArticleId)].Researchsummary = v
 		}
 	}
 
@@ -155,32 +209,8 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 					imgUrlResp = mapChart[v.ChartPermissionName]
 				}
 			}
-			//IsYidongConduct         bool                       `description:"是否属于易董办会 1：是 、0：否"`
-			mapItems[fmt.Sprint("activity", v.ActivityId)].Title = v.ActivityName
-			mapItems[fmt.Sprint("activity", v.ActivityId)].City = v.City
-			mapItems[fmt.Sprint("activity", v.ActivityId)].IsSignup = v.IsSignup
-			mapItems[fmt.Sprint("activity", v.ActivityId)].IsCancelMeetingReminder = v.IsCancelMeetingReminder
-			mapItems[fmt.Sprint("activity", v.ActivityId)].IsAppointment = v.IsAppointment
-			mapItems[fmt.Sprint("activity", v.ActivityId)].ActiveState = v.ActiveState
-			mapItems[fmt.Sprint("activity", v.ActivityId)].ImgUrlText = v.ImgUrlText
-			mapItems[fmt.Sprint("activity", v.ActivityId)].ActivityType = v.ActivityType
-			mapItems[fmt.Sprint("activity", v.ActivityId)].IsShowOutboundCall = v.IsShowOutboundCall
-			mapItems[fmt.Sprint("activity", v.ActivityId)].IsShowMeetingReminder = v.IsShowMeetingReminder
-			mapItems[fmt.Sprint("activity", v.ActivityId)].IsShowHelpSsk = v.IsShowHelpSsk
-			mapItems[fmt.Sprint("activity", v.ActivityId)].IsShowSignup = v.IsShowSignup
-			mapItems[fmt.Sprint("activity", v.ActivityId)].IsShowAppointment = v.IsShowAppointment
-			mapItems[fmt.Sprint("activity", v.ActivityId)].IsShowDetails = v.IsShowDetails
-			mapItems[fmt.Sprint("activity", v.ActivityId)].ActivityTimeText = v.ActivityTimeText
-			mapItems[fmt.Sprint("activity", v.ActivityId)].Expert = v.Expert
-			mapItems[fmt.Sprint("activity", v.ActivityId)].Speaker = v.Speaker
-			mapItems[fmt.Sprint("activity", v.ActivityId)].DistinguishedGuest = v.DistinguishedGuest
-			mapItems[fmt.Sprint("activity", v.ActivityId)].YidongActivityUrl = v.YidongActivityUrl
-			mapItems[fmt.Sprint("activity", v.ActivityId)].ImgUrl = imgUrlResp
-			mapItems[fmt.Sprint("activity", v.ActivityId)].SignupType = mapActivitySignup[v.ActivityId]
-			mapItems[fmt.Sprint("activity", v.ActivityId)].ActivityTypeId = v.ActivityTypeId
-			mapItems[fmt.Sprint("activity", v.ActivityId)].IsYidongConduct = v.IsYidongConduct
-			mapItems[fmt.Sprint("activity", v.ActivityId)].IsCanOutboundCall = v.IsCanOutboundCall
-			mapItems[fmt.Sprint("activity", v.ActivityId)].IsLimitPeople = v.IsLimitPeople
+			v.SourceType = mapActivitySignup[v.ActivityId]
+			mapItems[fmt.Sprint("activity", v.ActivityId)].Activity = v
 		}
 	}
 
@@ -195,9 +225,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			return
 		}
 		for _, v := range chartDateList {
-			mapItems[fmt.Sprint("newchart", v.ChartId)].Title = v.Title
-			mapItems[fmt.Sprint("newchart", v.ChartId)].ImgUrl = v.BodyHtml
-			mapItems[fmt.Sprint("newchart", v.ChartId)].IsTop = v.IsTop
+			mapItems[fmt.Sprint("newchart", v.ChartId)].Newchart = v
 		}
 	}
 
@@ -221,85 +249,168 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 				imgUrlResp = mapChart[v.ChartPermissionName]
 			}
 			if _, ok := UserMap[v.ActivityId]; ok {
-				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].IsTrip = 1
+				v.IsTrip = 1
 			}
 			if v.Days == 0 {
-				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].TripStatus = 1
-				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].TripImgLink = v.TripImgLink
-				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActivityTimeText = v.ActivityTimeText
+				v.TripStatus = 1
+				v.TripImgLink = v.TripImgLink
 			} else {
-				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].TripStatus = 2
-				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].TripImgLink = v.TripImgLinkFix
-				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActivityTimeText = v.ActivityTimeTextByDay
-				resultTimeStart := utils.StrTimeToTime(v.ActivityTime)  //时间字符串格式转时间格式
-				resultTimeEnd := utils.StrTimeToTime(v.ActivityTimeEnd) //时间字符串格式转时间格式
-				if resultTimeStart.After(time.Now()) {
-					mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActiveState = strconv.Itoa(1)
-				} else if time.Now().After(resultTimeEnd) {
-					mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActiveState = strconv.Itoa(3)
-				} else {
-					mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActiveState = strconv.Itoa(2)
-				}
+				v.TripStatus = 2
+				v.TripImgLink = v.TripImgLinkFix
+				v.ActivityTimeText = v.ActivityTimeTextByDay
 			}
-			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].Title = v.ResearchTheme
-			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActivityType = v.SpecialType
-			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].City = v.City
-			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActivityTime = v.ActivityTime
-			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].IsSignup = v.IsSignup
-			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ImgUrl = imgUrlResp
-		}
-	}
+			resultTimeStart := utils.StrTimeToTime(v.ActivityTime)  //时间字符串格式转时间格式
+			resultTimeEnd := utils.StrTimeToTime(v.ActivityTimeEnd) //时间字符串格式转时间格式
+			if resultTimeStart.After(time.Now()) {
+				v.ActiveState = "1"
+			} else if time.Now().After(resultTimeEnd) {
+				v.ActiveState = "3"
+			} else {
+				v.ActiveState = "2"
+			}
+			v.ImgUrl = imgUrlResp
+			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].Activityspecial = v
 
-	//处理路演
-	if len(roadshowIds) > 0 {
-		pars = make([]interface{}, 0)
-		condition = ` AND video_id IN (` + utils.GetOrmInReplace(len(roadshowIds)) + `)`
-		pars = append(pars, roadshowIds)
-		roadshowVideoList, e := models.GetMicroRoadshowVideoListBycondition(condition, pars, 0, len(roadshowIds))
-		if e != nil {
-			err = errors.New("GetResourceDataList, Err: " + e.Error())
-			return
-		}
-		for _, v := range roadshowVideoList {
-			mapItems[fmt.Sprint("roadshow", v.VideoId)].Title = v.VideoName
-			mapItems[fmt.Sprint("roadshow", v.VideoId)].ImgUrl = v.ImgUrl
-			mapItems[fmt.Sprint("roadshow", v.VideoId)].PublishDate = v.CreateTime.Format(utils.FormatDateTime)
-		}
-	}
-	//处理路活动视频
-	if len(activityvideoIds) > 0 {
-		pars = make([]interface{}, 0)
-		condition = ` AND video_id IN (` + utils.GetOrmInReplace(len(activityvideoIds)) + `)`
-		pars = append(pars, activityvideoIds)
-		activityVideoList, e := models.GetActivityVideoList(condition, pars, 0, len(activityvideoIds))
-		if e != nil {
-			err = errors.New("GetResourceDataList, Err: " + e.Error())
-			return
-		}
-		//// 获取默认图配置
-		_, videoMap, _, _, e := GetMicroRoadShowDefaultImgConfig()
-		if e != nil {
-			err = errors.New("GetMicroRoadShowDefaultImgConfig, Err: " + e.Error())
-			return
-		}
-		for _, v := range activityVideoList {
-			mapItems[fmt.Sprint("activityvideo", v.VideoId)].Title = v.VideoName
-			mapItems[fmt.Sprint("activityvideo", v.VideoId)].ImgUrl = videoMap[v.ChartPermissionId]
-			mapItems[fmt.Sprint("activityvideo", v.VideoId)].ChartPermissionId = v.ChartPermissionId
 		}
 	}
 
-	//处理路活音频
-	if len(activityvoiceIds) > 0 {
-		pars = make([]interface{}, 0)
-		condition = ` AND activity_voice_id IN (` + utils.GetOrmInReplace(len(activityvoiceIds)) + `)`
-		pars = append(pars, activityvoiceIds)
-		activityVoiceList, e := models.GetActivityVoiceList(condition, pars, 0, len(activityvoiceIds))
+	////处理路演
+	//if len(roadshowIds) > 0 {
+	//	pars = make([]interface{}, 0)
+	//	condition = ` AND video_id IN (` + utils.GetOrmInReplace(len(roadshowIds)) + `)`
+	//	pars = append(pars, roadshowIds)
+	//	roadshowVideoList, e := models.GetMicroRoadshowVideoListBycondition(condition, pars, 0, len(roadshowIds))
+	//	if e != nil {
+	//		err = errors.New("GetResourceDataList, Err: " + e.Error())
+	//		return
+	//	}
+	//	for _, v := range roadshowVideoList {
+	//		mapItems[fmt.Sprint("roadshow", v.VideoId)].Title = v.VideoName
+	//		mapItems[fmt.Sprint("roadshow", v.VideoId)].ImgUrl = v.ImgUrl
+	//		mapItems[fmt.Sprint("roadshow", v.VideoId)].PublishDate = v.CreateTime.Format(utils.FormatDateTime)
+	//	}
+	//}
+	////处理路活动视频
+	//if len(activityvideoIds) > 0 {
+	//	pars = make([]interface{}, 0)
+	//	condition = ` AND video_id IN (` + utils.GetOrmInReplace(len(activityvideoIds)) + `)`
+	//	pars = append(pars, activityvideoIds)
+	//	activityVideoList, e := models.GetActivityVideoList(condition, pars, 0, len(activityvideoIds))
+	//	if e != nil {
+	//		err = errors.New("GetResourceDataList, Err: " + e.Error())
+	//		return
+	//	}
+	//	//// 获取默认图配置
+	//	_, videoMap, _, _, e := GetMicroRoadShowDefaultImgConfig()
+	//	if e != nil {
+	//		err = errors.New("GetMicroRoadShowDefaultImgConfig, Err: " + e.Error())
+	//		return
+	//	}
+	//	for _, v := range activityVideoList {
+	//		mapItems[fmt.Sprint("activityvideo", v.VideoId)].Title = v.VideoName
+	//		mapItems[fmt.Sprint("activityvideo", v.VideoId)].ImgUrl = videoMap[v.ChartPermissionId]
+	//		mapItems[fmt.Sprint("activityvideo", v.VideoId)].ChartPermissionId = v.ChartPermissionId
+	//	}
+	//}
+	////处理路活音频
+	//if len(activityvoiceIds) > 0 {
+	//	pars = make([]interface{}, 0)
+	//	condition = ` AND activity_voice_id IN (` + utils.GetOrmInReplace(len(activityvoiceIds)) + `)`
+	//	pars = append(pars, activityvoiceIds)
+	//	activityVoiceList, e := models.GetActivityVoiceList(condition, pars, 0, len(activityvoiceIds))
+	//	if e != nil {
+	//		err = errors.New("GetResourceDataList, Err: " + e.Error())
+	//		return
+	//	}
+	//
+	//	// 用户权限
+	//	authInfo, permissionArr, e := GetUserRaiPermissionInfo(user.UserId, user.CompanyId)
+	//	if e != nil {
+	//		err = errors.New("GetUserRaiPermissionInfo, Err: " + e.Error())
+	//		return
+	//	}
+	//
+	//	// 获取默认图配置
+	//	audioMap, _, _, _, e := GetMicroRoadShowDefaultImgConfig()
+	//	if e != nil {
+	//		err = errors.New("GetMicroRoadShowDefaultImgConfig, Err: " + e.Error())
+	//		return
+	//	}
+	//	for i, v := range activityVoiceList {
+	//		au := new(models.UserPermissionAuthInfo)
+	//		au.SellerName = authInfo.SellerName
+	//		au.SellerMobile = authInfo.SellerMobile
+	//		au.HasPermission = authInfo.HasPermission
+	//		au.OperationMode = authInfo.OperationMode
+	//		if au.HasPermission == 1 {
+	//			// 非宏观权限进一步判断是否有权限
+	//			if activityVoiceList[i].ChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, activityVoiceList[i].ChartPermissionName) {
+	//				au.HasPermission = 2
+	//			}
+	//		}
+	//		// 无权限的弹框提示
+	//		if au.HasPermission != 1 {
+	//			if au.OperationMode == UserPermissionOperationModeCall {
+	//				au.PopupMsg = UserPermissionPopupMsgCallActivity
+	//			} else {
+	//				au.PopupMsg = UserPermissionPopupMsgApplyActivity
+	//			}
+	//		}
+	//		mapItems[fmt.Sprint("activityvoice", v.ActivityVoiceId)].AuthInfo = au
+	//		mapItems[fmt.Sprint("activityvoice", v.ActivityVoiceId)].Title = v.VoiceName
+	//		mapItems[fmt.Sprint("activityvoice", v.ActivityVoiceId)].ImgUrl = audioMap[v.ChartPermissionId]
+	//		if au.HasPermission == 1 {
+	//			mapItems[fmt.Sprint("activityvoice", v.ActivityVoiceId)].ResourceUrl = v.VoiceUrl
+	//		}
+	//	}
+	//}
+
+	//处理路演 处理路活动视频 处理路活音频
+	if len(roadshowIds)+len(activityvideoIds)+len(activityvoiceIds) > 0 {
+
+		audioIdstr := strings.Join(activityvoiceIds, ",")
+		ideoIdsStr := strings.Join(roadshowIds, ",")
+		activityVideoIdsStr := strings.Join(activityvideoIds, ",")
+
+		list, _, e := GetMicroRoadShowMycollect(len(roadshowIds)+len(activityvideoIds)+len(activityvoiceIds), 0, audioIdstr, ideoIdsStr, activityVideoIdsStr)
 		if e != nil {
-			err = errors.New("GetResourceDataList, Err: " + e.Error())
+			err = errors.New("GetMicroRoadShowMycollect, Err: " + e.Error())
 			return
 		}
 
+		for _, item := range list {
+			if item.Type == 1 {
+				//音频
+				count, e := models.GetVoiceCollectCount(user.UserId, item.Id)
+				if e != nil {
+					err = errors.New("GetVoiceCollectCount, Err: " + e.Error())
+					return
+				}
+				if count > 0 {
+					item.IsCollect = true
+				}
+			} else if item.Type == 2 {
+				//活动视频
+				count, e := models.GetActivityVideoCollectCount(user.UserId, item.Id)
+				if e != nil {
+					err = errors.New("GetActivityVideoCollectCount, Err: " + e.Error())
+					return
+				}
+				if count > 0 {
+					item.IsCollect = true
+				}
+			} else if item.Type == 3 {
+				//微路演视频
+				count, e := models.GetVideoCollectCount(user.UserId, item.Id)
+				if e != nil {
+					err = errors.New("GetVideoCollectCount, Err: " + e.Error())
+					return
+				}
+				if count > 0 {
+					item.IsCollect = true
+				}
+			}
+		}
 		// 用户权限
 		authInfo, permissionArr, e := GetUserRaiPermissionInfo(user.UserId, user.CompanyId)
 		if e != nil {
@@ -308,12 +419,14 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		}
 
 		// 获取默认图配置
-		audioMap, _, _, _, e := GetMicroRoadShowDefaultImgConfig()
+		audioMap, videoMap, audioShareMap, videoShareMap, e := GetMicroRoadShowDefaultImgConfig()
 		if e != nil {
 			err = errors.New("GetMicroRoadShowDefaultImgConfig, Err: " + e.Error())
 			return
 		}
-		for i, v := range activityVoiceList {
+		//Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
+		for i := range list {
+			// 权限
 			au := new(models.UserPermissionAuthInfo)
 			au.SellerName = authInfo.SellerName
 			au.SellerMobile = authInfo.SellerMobile
@@ -321,26 +434,57 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			au.OperationMode = authInfo.OperationMode
 			if au.HasPermission == 1 {
 				// 非宏观权限进一步判断是否有权限
-				if activityVoiceList[i].ChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, activityVoiceList[i].ChartPermissionName) {
+				if list[i].ChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, list[i].ChartPermissionName) {
 					au.HasPermission = 2
 				}
 			}
 			// 无权限的弹框提示
 			if au.HasPermission != 1 {
 				if au.OperationMode == UserPermissionOperationModeCall {
-					au.PopupMsg = UserPermissionPopupMsgCallActivity
+					if list[i].Type == 1 {
+						au.PopupMsg = UserPermissionPopupMsgCallActivity
+					} else {
+						au.PopupMsg = UserPermissionPopupMsgCallMicroVideo
+					}
 				} else {
-					au.PopupMsg = UserPermissionPopupMsgApplyActivity
+					if list[i].Type == 1 {
+						au.PopupMsg = UserPermissionPopupMsgApplyActivity
+					} else {
+						au.PopupMsg = UserPermissionPopupMsgApplyMicroVideo
+					}
 				}
 			}
-			mapItems[fmt.Sprint("activityvoice", v.ActivityVoiceId)].AuthInfo = au
-			mapItems[fmt.Sprint("activityvoice", v.ActivityVoiceId)].Title = v.VoiceName
-			mapItems[fmt.Sprint("activityvoice", v.ActivityVoiceId)].ImgUrl = audioMap[v.ChartPermissionId]
-			if au.HasPermission == 1 {
-				mapItems[fmt.Sprint("activityvoice", v.ActivityVoiceId)].ResourceUrl = v.VoiceUrl
+			list[i].AuthInfo = au
+			list[i].PublishTime = utils.StrTimeToTime(list[i].PublishTime).Format(utils.FormatDate)
+			// 默认图
+			if list[i].BackgroundImg == "" {
+				if list[i].Type == 1 {
+					list[i].BackgroundImg = audioMap[list[i].ChartPermissionId]
+				} else {
+					list[i].BackgroundImg = videoMap[list[i].ChartPermissionId]
+				}
+			}
+			// 分享图
+			if list[i].ShareImg == "" {
+				if list[i].Type == 1 {
+					list[i].ShareImg = audioShareMap[list[i].ChartPermissionId]
+				} else {
+					list[i].ShareImg = videoShareMap[list[i].ChartPermissionId]
+				}
+			}
+		}
+		//Type                int    `description:"类型: 1-音频; 2-活动视频； 3-产业视频"`
+		for _, item := range list {
+			if item.Type == 1 {
+				mapItems[fmt.Sprint("activityvoice", item.Id)].Activityvoice = item
+			} else if item.Type == 2 {
+				mapItems[fmt.Sprint("activityvideo", item.Id)].Activityvideo = item
+			} else if item.Type == 3 {
+				mapItems[fmt.Sprint("roadshow", item.Id)].Roadshow = item
 			}
 		}
 	}
+
 	for _, vList := range list {
 		for _, v := range mapItems {
 			if v.SourceId == vList.SourceId {