Merge branch 'cygx/cygx_11.3' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/activity.go

@@ -1501,132 +1501,3 @@ func (this *ActivityCoAntroller) DeadlineSet() {
 	br.Success = true
 	br.Data = list
 }
-
-/*******
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/
-*/
-
-// @Title 获取音视频上传之后的封面图
-// @Description 获取音视频上传之后的封面图
-// @Param   ActivityId   query   int  true       "活动ID"
-// @Param   FileType   query   int  true       "音视频文件类型 。1：音频。2：视频"
-// @Success 200 {object} cygx.ChartPermissionRepMoreList
-// @router /activity/video_and_voice/img [get]
-func (this *ActivityCoAntroller) VideoAndVoice() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	AdminUser := this.SysUser
-	if AdminUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，用户信息为空"
-		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()
-		return
-	}
-	list := new(cygx.ActivityVideoDefaultImgList)
-	if err = json.Unmarshal([]byte(conf.ConfigValue), &list); err != nil {
-		br.Msg = "微路演默认图配置配置值解析失败" + err.Error()
-		return
-	}
-	resp := new(cygx.ActivityVideoDefaultImgListResp)
-	if fileType == 1 {
-		for _, v := range list.Audio {
-			if v.ChartPermissionId == activityInfo.ChartPermissionId {
-				resp.List = v.List
-			}
-		}
-	} else {
-		for _, v := range list.Audio {
-			if v.ChartPermissionId == activityInfo.ChartPermissionId {
-				resp.List = v.List
-			}
-		}
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}

controllers/cygx/activity_video.go

@@ -1,6 +1,7 @@
 package cygx
 
 import (
+	"encoding/json"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
@@ -343,3 +344,65 @@ func (this *ActivityVideoCoAntroller) CommentList() {
 	br.Msg = "获取成功"
 	br.Data = resp
 }
+
+// @Title 获取音视频上传之后的封面图
+// @Description 获取音视频上传之后的封面图
+// @Param   ActivityId   query   int  true       "活动ID"
+// @Param   FileType   query   int  true       "音视频文件类型 。1：音频。2：视频"
+// @Success 200 {object} cygx.ChartPermissionRepMoreList
+// @router /activityVideo/video_and_voice/img [get]
+func (this *ActivityVideoCoAntroller) VideoAndVoice() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	AdminUser := this.SysUser
+	if AdminUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，用户信息为空"
+		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()
+		return
+	}
+	list := new(cygx.ActivityVideoDefaultImgList)
+	if err = json.Unmarshal([]byte(conf.ConfigValue), &list); err != nil {
+		br.Msg = "微路演默认图配置配置值解析失败" + err.Error()
+		return
+	}
+	resp := new(cygx.ActivityVideoDefaultImgListResp)
+	if fileType == 1 {
+		for _, v := range list.Audio {
+			if v.ChartPermissionId == activityInfo.ChartPermissionId {
+				resp.List = v.List
+			}
+		}
+	} else {
+		for _, v := range list.Audio {
+			if v.ChartPermissionId == activityInfo.ChartPermissionId {
+				resp.List = v.List
+			}
+		}
+	}
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}

routers/commentsRouter.go

@@ -556,15 +556,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "VideoAndVoice",
-            Router: `/activity/video_and_voice/img`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:ActivityLossCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:ActivityLossCoAntroller"],
         beego.ControllerComments{
             Method: "CompanyList",
@@ -1240,6 +1231,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:ActivityVideoCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:ActivityVideoCoAntroller"],
+        beego.ControllerComments{
+            Method: "VideoAndVoice",
+            Router: `/activityVideo/video_and_voice/img`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:AdviceController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:AdviceController"],
         beego.ControllerComments{
             Method: "List",