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

controllers/cygx/askserie_video.go

@@ -126,6 +126,7 @@ func (this *AskserieVideoController) PreserveAndPublish() {
 // @Param   PublishStatus   query   int  true       "发布状态: -1-默认全部; 0-未发布; 1-已关注"
 // @Param   ChartPermissionId   query   string  false       "行业Id"
 // @Param   KeyWord   query   string  false       "搜索关键词"
+// @Param   SortType          query   string    false		"排序顺序：asc、desc"
 // @Success Ret=200 {object} cygx.GetCygxTacticsTimeLineResp
 // @router /askserie_video/list [get]
 func (this *AskserieVideoController) List() {
@@ -151,6 +152,7 @@ func (this *AskserieVideoController) List() {
 	keyWord := this.GetString("KeyWord")
 	keyWord = strings.Trim(keyWord, " ")
 	keyWord = strings.Replace(keyWord, "'", "", -1)
+	sortType := this.GetString("SortType")
 	var startSize int
 	if pageSize <= 0 {
 		pageSize = utils.PageSize20
@@ -185,7 +187,15 @@ func (this *AskserieVideoController) List() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-	condition += "	ORDER BY art.modify_date DESC  "
+
+	var conditionOrder string
+	if sortType == "asc" || sortType == "desc" {
+		conditionOrder += ` ORDER BY art.video_counts   ` + sortType
+	} else {
+		conditionOrder += ` 	ORDER BY art.modify_date DESC  `
+	}
+	//condition += "	ORDER BY art.modify_date DESC  "
+	condition += conditionOrder
 	list, err := cygx.GetCygxAskserieVideoList(condition, pars, startSize, pageSize)
 	if err != nil {
 		br.Msg = "获取失败"

services/cygx/askserie_video.go

@@ -6,6 +6,7 @@ import (
 	"hongze/hz_crm_api/models/cygx"
 	"hongze/hz_crm_api/services/alarm_msg"
 	"hongze/hz_crm_api/utils"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -129,3 +130,64 @@ func UpdateAskserieVideoResourceData(sourceId int) {
 	}
 	return
 }
+
+func init12() {
+	var conditionupload string
+	var pars []interface{}
+	conditionupload = " AND  voice_name LIKE '%科技问答%' "
+	listVoice, err := cygx.GetActivityVoiceList(conditionupload, pars)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		fmt.Println(err)
+		return
+	}
+
+	for _, v := range listVoice {
+		activityId := v.ActivityId
+		var industrialManagementIds []string
+		industrialList, err := cygx.GetIndustrialActivityGroupManagementList(activityId, 1)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			fmt.Println(v.ActivityId)
+			fmt.Println(err)
+			return
+		}
+		for _, vi := range industrialList {
+			industrialManagementIds = append(industrialManagementIds, strconv.Itoa(vi.IndustrialManagementId))
+		}
+
+		activityInfo, err := cygx.GetAddActivityInfoById(activityId)
+		if err != nil {
+			fmt.Println(v.ActivityId)
+			fmt.Println(err)
+			return
+		}
+		if activityInfo != nil {
+
+			item := new(cygx.CygxAskserieVideo)
+			//item.AskserieVideoId = askserieVideoId
+			item.VideoName = v.VoiceName
+			item.VideoUrl = v.VoiceUrl
+			item.VideoDuration = v.VoicePlaySeconds
+			item.ChartPermissionId = activityInfo.ChartPermissionId
+			item.ChartPermissionName = activityInfo.ChartPermissionName
+			item.PublishStatus = 1
+			item.BackgroundImg = v.BackgroundImg
+			item.ShareImg = v.ShareImg
+			//item.AdminId = sysUser.AdminId
+			item.ModifyDate = time.Now()
+			item.PublishDate = utils.StrTimeToTime(activityInfo.ActivityTime)
+			item.CreateTime = time.Now()
+
+			fmt.Println(item.VideoDuration, "VideoDuration")
+			fmt.Println(item.ShareImg, "ShareImg")
+			fmt.Println(item.PublishDate, "PublishDate")
+			//fmt.Println(item, strings.Join(industrialManagementIds, ","))
+
+			//newId, err := cygx.AddCygxAskserieVideo(item, strings.Join(industrialManagementIds, ","))
+			//fmt.Println(newId)
+			//if err != nil {
+			//	fmt.Println(err)
+			//	return
+			//}
+		}
+	}
+}