|
@@ -192,6 +192,10 @@ func (this *ActivityVideoCoAntroller) VideoDeatil() {
|
|
|
br.ErrMsg = "获取数据失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
+ for _, v := range list {
|
|
|
+ v.RegisterPlatform = utils.CYGX_REGISTER_PLATFORM_MAP[v.RegisterPlatform]
|
|
|
+ }
|
|
|
br.Ret = 200
|
|
|
br.Success = true
|
|
|
br.Msg = "获取成功"
|
|
@@ -349,6 +353,7 @@ func (this *ActivityVideoCoAntroller) CommentList() {
|
|
|
// @Description 获取音视频上传之后的封面图
|
|
|
// @Param ActivityId query int true "活动ID"
|
|
|
// @Param FileType query int true "音视频文件类型 。1:音频。2:视频"
|
|
|
+// @Param ChartPermissionId query int true "行业ID"
|
|
|
// @Success 200 {object} cygx.ChartPermissionRepMoreList
|
|
|
// @router /activityVideo/video_and_voice/img [get]
|
|
|
func (this *ActivityVideoCoAntroller) VideoAndVoice() {
|
|
@@ -364,19 +369,6 @@ func (this *ActivityVideoCoAntroller) VideoAndVoice() {
|
|
|
br.Ret = 408
|
|
|
return
|
|
|
}
|
|
|
- activityId, _ := this.GetInt("ActivityId")
|
|
|
- fileType, _ := this.GetInt("FileType")
|
|
|
- if activityId < 1 {
|
|
|
- br.Msg = "请输入活动ID"
|
|
|
- return
|
|
|
- }
|
|
|
- activityInfo, err := cygx.GetAddActivityInfoById(activityId)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "活动不存在"
|
|
|
- br.ErrMsg = "活动ID错误,Err:" + err.Error() + "activityId:" + strconv.Itoa(activityId)
|
|
|
- return
|
|
|
- }
|
|
|
- //key := utils.MicroRoadshowDefaultImgKey
|
|
|
conf, err := cygx.GetCygxConfigDetailByCode("activity_video_default_img")
|
|
|
if err != nil {
|
|
|
br.Msg = "获取微路演默认图配置失败" + err.Error()
|
|
@@ -388,19 +380,43 @@ func (this *ActivityVideoCoAntroller) VideoAndVoice() {
|
|
|
return
|
|
|
}
|
|
|
resp := new(cygx.ActivityVideoDefaultImgListResp)
|
|
|
- if fileType == 1 {
|
|
|
+ chartPermissionId, _ := this.GetInt("ChartPermissionId")
|
|
|
+ activityId, _ := this.GetInt("ActivityId")
|
|
|
+ fileType, _ := this.GetInt("FileType")
|
|
|
+
|
|
|
+ if chartPermissionId > 0 {
|
|
|
for _, v := range list.Audio {
|
|
|
- if v.ChartPermissionId == activityInfo.ChartPermissionId {
|
|
|
+ if v.ChartPermissionId == chartPermissionId {
|
|
|
resp.List = v.List
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
- for _, v := range list.Video {
|
|
|
- if v.ChartPermissionId == activityInfo.ChartPermissionId {
|
|
|
- resp.List = v.List
|
|
|
+ if activityId < 1 {
|
|
|
+ br.Msg = "请输入活动ID"
|
|
|
+ return
|
|
|
+ }
|
|
|
+ activityInfo, err := cygx.GetAddActivityInfoById(activityId)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "活动不存在"
|
|
|
+ br.ErrMsg = "活动ID错误,Err:" + err.Error() + "activityId:" + strconv.Itoa(activityId)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ //key := utils.MicroRoadshowDefaultImgKey
|
|
|
+ if fileType == 1 {
|
|
|
+ for _, v := range list.Audio {
|
|
|
+ if v.ChartPermissionId == activityInfo.ChartPermissionId {
|
|
|
+ resp.List = v.List
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ for _, v := range list.Video {
|
|
|
+ if v.ChartPermissionId == activityInfo.ChartPermissionId {
|
|
|
+ resp.List = v.List
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
br.Ret = 200
|
|
|
br.Success = true
|
|
|
br.Msg = "获取成功"
|