最新接口展示处理

models/activity_video.go

@@ -16,6 +16,18 @@ type CygxActivityVideo struct {
 	CreateTime    string `description:"创建时间"`
 }
 
+type CygxActivityVideoResp struct {
+	VideoId           int    `orm:"column(video_id);pk"description:"视频id"`
+	ChartPermissionId int    `description:"权限id"`
+	VideoName         string `description:"视频名称"`
+	ActivityId        int    ` description:"活动ID"`
+	ModifyDate        string `description:"更新时间"`
+	VideoDuration     string `description:"视频时长"`
+	VideoCounts       int    `description:"播放量"`
+	VideoUrl          string `description:"视频地址"`
+	CreateTime        string `description:"创建时间"`
+}
+
 type CygxActivityVideoReq struct {
 	VideoName     string `description:"视频名称"`
 	VideoDuration string `description:"视频时长"`
@@ -48,6 +60,22 @@ func GetActivityVideoListAll(condition string, pars []interface{}, startSize, pa
 	return
 }
 
+//列表
+func GetActivityVideoList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityVideoResp, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+	v.*,art.chart_permission_id
+FROM
+	cygx_activity_video AS v 
+	INNER JOIN cygx_activity as art ON art.activity_id = v.activity_id    WHERE 1= 1  `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` LIMIT ?,?`
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	return
+}
+
 func UpdateActivityVideoCounts(activityId int) (err error) {
 	sql := `UPDATE cygx_activity_video SET video_counts = video_counts+1 WHERE activity_id = ?  `
 	o := orm.NewOrm()

models/activity_voice.go

@@ -18,6 +18,19 @@ type CygxActivityVoice struct {
 	CreateTime       time.Time `description:"创建时间"`
 }
 
+// ActivityVoice 活动语音表结构体
+type CygxActivityVoiceResp struct {
+	ActivityVoiceId   int    `orm:"column(activity_voice_id);pk" description:"活动音频ID"`
+	ActivityId        int    ` description:"活动ID"`
+	VoiceUrl          string `description:"音频地址"`
+	VoiceName         string `description:"音频名称"`
+	VoicePlaySeconds  string `description:"音频时长"`
+	VoiceCounts       int    `description:"播放量"`
+	ModifyTime        string `description:"更新时间"`
+	CreateTime        string `description:"创建时间"`
+	ChartPermissionId int    `description:"权限id"`
+}
+
 // ActivityVoiceReq 音频数据
 type CygxActivityVoiceReq struct {
 	ActivityId  int    ` description:"活动ID"`
@@ -74,3 +87,19 @@ func GetActivityVoiceListAll(condition string, pars []interface{}, startSize, pa
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }
+
+//列表
+func GetActivityVoiceList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityVoiceResp, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+	v.*,art.chart_permission_id
+FROM
+	cygx_activity_voice AS v 
+	INNER JOIN cygx_activity as art ON art.activity_id = v.activity_id    WHERE 1= 1  `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` LIMIT ?,?`
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	return
+}

models/micro_roadshow.go

@@ -28,6 +28,7 @@ type MicroRoadShowPageList struct {
 	PlaySeconds            string `description:"音视频时长"`
 	ActivityId             int    `description:"活动ID"`
 	IndustrialManagementId int    `description:"产业ID"`
+	CreateTime             string `description:"视频创建时间"`
 	AuthInfo               *UserPermissionAuthInfo
 }
 
@@ -153,6 +154,17 @@ func GetMicroRoadshowVideoByIndustryIds(industrialIdArr []int) (list []*MicroRoa
 	return
 }
 
+// GetMicroRoadshowVideoListBycondition 根据搜索条件获取搜索列表
+func GetMicroRoadshowVideoListBycondition(condition string, pars []interface{}, startSize, pageSize int) (list []*MicroRoadshowVideo, err error) {
+	sql := `SELECT * FROM cygx_micro_roadshow_video WHERE  1 =1 `
+	if condition != "" {
+		sql += condition
+	}
+	sql += `  LIMIT ?,? `
+	_, err = orm.NewOrm().Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	return
+}
+
 // GetMicroRoadshowVideoByIndustryId 根据行业ID查询产业视频列表
 func GetMicroRoadshowVideoByIndustryId(industryId int) (item *MicroRoadshowVideo, err error) {
 	sql := `SELECT * FROM cygx_micro_roadshow_video WHERE industry_id = ? and publish_status = 1`

models/resource_data.go

@@ -60,7 +60,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 	if condition != "" {
 		sql += condition
 	}
-	sql += ` ORDER BY publish_date  DESC   LIMIT ?,? `
+	sql += ` ORDER BY publish_date  DESC ,  id  DESC   LIMIT ?,? `
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }

services/resource_data.go

@@ -18,7 +18,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		err = errors.New("GetResourceDataList, Err: " + e.Error())
 		return
 	}
-	mapItems := make(map[int]*models.CygxResourceDataResp)
+	mapItems := make(map[string]*models.CygxResourceDataResp)
 	for _, v := range list {
 		//预处理文章
 		item := new(models.CygxResourceDataResp)
@@ -28,8 +28,10 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		item.Title = v.Title
 		item.Annotation = v.Annotation
 		item.Abstract = v.Abstract
-		mapItems[v.SourceId] = item
+		item.PublishDate = utils.TimeRemoveHms(v.PublishDate)
+		mapItems[fmt.Sprint(v.Source, v.SourceId)] = item
 	}
+
 	var articleIds []int
 	var newchartIds []int
 	var roadshowIds []int
@@ -90,6 +92,9 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 
 	//处理活动
 	if len(activityIds) > 0 {
+		for _, vss := range activityIds {
+			imgUrlResp += strconv.Itoa(vss) + ","
+		}
 		pars = make([]interface{}, 0)
 		condition = ` AND art.activity_id IN (` + utils.GetOrmInReplace(len(activityIds)) + `)`
 		pars = append(pars, activityIds)
@@ -100,10 +105,13 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		}
 		var activityListRersp []*models.ActivityListResp
 		for _, v := range activityList {
+
 			activityListRersp = append(activityListRersp, ActivityButtonShow(v))
 		}
-
 		for _, v := range activityListRersp {
+			if v == nil {
+				continue
+			}
 			if v.ActivityType == 0 {
 				if mapAddress[v.City] != "" {
 					imgUrlResp = mapAddress[v.City]
@@ -115,22 +123,25 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 					imgUrlResp = mapChart[v.ChartPermissionName]
 				}
 			}
-			mapItems[v.ActivityId].Title = v.ActivityName
-			mapItems[v.ActivityId].City = v.City
-			mapItems[v.ActivityId].IsSignup = v.IsSignup
-			mapItems[v.ActivityId].IsCancelMeetingReminder = v.IsCancelMeetingReminder
-			mapItems[v.ActivityId].IsAppointment = v.IsAppointment
-			mapItems[v.ActivityId].ActiveState = v.ActiveState
-			mapItems[v.ActivityId].ImgUrlText = v.ImgUrlText
-			mapItems[v.ActivityId].ActivityType = v.ActivityType
-			mapItems[v.ActivityId].IsShowOutboundCall = v.IsShowOutboundCall
-			mapItems[v.ActivityId].IsShowMeetingReminder = v.IsShowMeetingReminder
-			mapItems[v.ActivityId].IsShowHelpSsk = v.IsShowHelpSsk
-			mapItems[v.ActivityId].IsShowSignup = v.IsShowSignup
-			mapItems[v.ActivityId].IsShowAppointment = v.IsShowAppointment
-			mapItems[v.ActivityId].IsShowDetails = v.IsShowDetails
-			mapItems[v.ActivityId].ActivityTimeText = v.ActivityTimeText
-			mapItems[v.ActivityId].ImgUrl = imgUrlResp
+
+			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)].PublishDate = v.ActivityTime
+			mapItems[fmt.Sprint("activity", v.ActivityId)].ImgUrl = imgUrlResp
+			//fmt.Println(v)
 		}
 	}
 
@@ -145,9 +156,10 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			return
 		}
 		for _, v := range chartDateList {
-			mapItems[v.ChartId].Title = v.Title
-			mapItems[v.ChartId].ImgUrl = v.BodyHtml
-			mapItems[v.ChartId].IsTop = v.IsTop
+			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)].PublishDate = v.CreateDate
 		}
 	}
 
@@ -171,36 +183,99 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 				imgUrlResp = mapChart[v.ChartPermissionName]
 			}
 			if _, ok := UserMap[v.ActivityId]; ok {
-				mapItems[v.ActivityId].IsTrip = 1
+				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].IsTrip = 1
 			}
 			if v.Days == 0 {
-				mapItems[v.ActivityId].TripStatus = 1
+				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].TripStatus = 1
 			} else {
-				mapItems[v.ActivityId].TripStatus = 2
+				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].TripStatus = 2
 			}
 			resultTimeStart := utils.StrTimeToTime(v.ActivityTime)  //时间字符串格式转时间格式
 			resultTimeEnd := utils.StrTimeToTime(v.ActivityTimeEnd) //时间字符串格式转时间格式
 			if resultTimeStart.After(time.Now()) {
-				mapItems[v.ActivityId].ActiveState = strconv.Itoa(1)
+				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActiveState = strconv.Itoa(1)
 			} else if time.Now().After(resultTimeEnd) {
-				mapItems[v.ActivityId].ActiveState = strconv.Itoa(3)
+				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActiveState = strconv.Itoa(3)
 			} else {
-				mapItems[v.ActivityId].ActiveState = strconv.Itoa(2)
+				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActiveState = strconv.Itoa(2)
 			}
-			mapItems[v.ActivityId].Title = v.ResearchTheme
-			mapItems[v.ActivityId].ActivityType = v.SpecialType
-			mapItems[v.ActivityId].City = v.City
-			mapItems[v.ActivityId].ActivityTimeText = v.ActivityTimeText
-			mapItems[v.ActivityId].TripImgLink = v.TripImgLink
-			mapItems[v.ActivityId].IsSignup = v.IsSignup
-			mapItems[v.ActivityId].ImgUrl = imgUrlResp
+			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)].ActivityTimeText = v.ActivityTimeText
+			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].TripImgLink = v.TripImgLink
+			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].IsSignup = v.IsSignup
+			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ImgUrl = imgUrlResp
+			//mapItems[fmt.Sprint("activityspecial", v.ActivityId)].PublishDate = v.ActivityTime
 		}
 	}
 
+	//处理路演
+	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, startSize, 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, startSize, len(roadshowIds))
+		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)].PublishDate = utils.TimeRemoveHms(v.CreateTime)
+		}
+	}
+
+	//处理路活音频
+	if len(activityvoiceIds) > 0 {
+		pars = make([]interface{}, 0)
+		condition = ` AND video_id IN (` + utils.GetOrmInReplace(len(activityvoiceIds)) + `)`
+		pars = append(pars, activityvoiceIds)
+		activityVoiceList, e := models.GetActivityVoiceList(condition, pars, startSize, len(activityvoiceIds))
+		if e != nil {
+			err = errors.New("GetResourceDataList, Err: " + e.Error())
+			return
+		}
+
+		// 获取默认图配置
+		audioMap, _, _, _, e := GetMicroRoadShowDefaultImgConfig()
+		if e != nil {
+			err = errors.New("GetMicroRoadShowDefaultImgConfig, Err: " + e.Error())
+			return
+		}
+		for _, v := range activityVoiceList {
+			mapItems[fmt.Sprint("activityvideo", v.ActivityVoiceId)].Title = v.VoiceName
+			mapItems[fmt.Sprint("activityvideo", v.ActivityVoiceId)].ImgUrl = audioMap[v.ChartPermissionId]
+			//mapItems[fmt.Sprint("activityvideo", v.Id)].PublishDate = v.CreateTime
+		}
+	}
 	for _, v := range mapItems {
-		fmt.Println(v)
 		items = append(items, v)
 	}
-	fmt.Println(activityIds)
 	return
 }