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

controllers/cygx/askserie_video.go

@@ -47,6 +47,7 @@ func (this *AskserieVideoController) PreserveAndPublish() {
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
+	req.VideoName = utils.RemoveFileSuffixName(req.VideoName) //去掉后缀名称
 	askserieVideoId := req.AskserieVideoId
 	videoName := req.VideoName
 	videoUrl := req.VideoUrl

controllers/cygx/micro_roadshow.go

@@ -256,6 +256,7 @@ func (this *MicroRoadshowController) Add() {
 	}
 	shareImg, _ := cygxService.MakeCygxMp4HtmlImg(req.VideoDuration) //生成分享图片
 	req.ShareImgUrl = shareImg
+	nameItem.IndustryName = utils.RemoveFileSuffixName(nameItem.IndustryName) //去掉后缀名称
 	if req.VideoId > 0 {
 		//更新
 		item := cygx.CygxMicroRoadshowVideo{

models/cygx/activity_video.go

@@ -172,6 +172,17 @@ func GetActivityVideoList(condition string, pars []interface{}) (items []*CygxAc
 	return
 }
 
+// 列表
+func GetCygxActivityVideoList(condition string, pars []interface{}) (items []*CygxActivityVideo, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := ` SELECT  * FROM  cygx_activity_video  WHERE  1=1  `
+	if condition != "" {
+		sql += condition
+	}
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}
+
 // MicroRoadShowDefaultImgList 微路演行业默认背景图列表
 type MicroRoadShowDefaultImgList struct {
 	Audio []*MicroRoadShowDefaultImg `description:"音频"`

models/cygx/askserie_video.go

@@ -205,3 +205,19 @@ func EditCygxAskserieVideoStatus(status, askserieVideoId int) (err error) {
 	_, err = o.Raw(sql, status, askserieVideoId).Exec()
 	return
 }
+
+// 修改分享图片
+func EditCygxAskserieVideoShareImg(shareImg string, askserieVideoId int) (err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `UPDATE cygx_askserie_video SET share_img=?   WHERE askserie_video_id=? `
+	_, err = o.Raw(sql, shareImg, askserieVideoId).Exec()
+	return
+}
+
+// 修改文件名称
+func EditCygxAskserieVideoVideoName(videoName string, askserieVideoId int) (err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `UPDATE cygx_askserie_video SET video_name=?   WHERE askserie_video_id=? `
+	_, err = o.Raw(sql, videoName, askserieVideoId).Exec()
+	return
+}

models/cygx/micro_roadshow.go

@@ -68,6 +68,17 @@ func GetMicroRoadshowVideoList(condition, sortStr string, pars []interface{}, st
 	return
 }
 
+func GetCygxMicroRoadshowVideoList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxMicroRoadshowVideo, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := ` SELECT * FROM cygx_micro_roadshow_video as v  WHERE 1=1 `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` LIMIT ?,? `
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	return
+}
+
 func GetMicroRoadshowVideoListCount(condition string, pars []interface{}) (count int, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT COUNT(1) AS count FROM cygx_micro_roadshow_video WHERE 1=1 `
@@ -131,6 +142,21 @@ func EditVideo(item *CygxMicroRoadshowVideo) (err error) {
 	return
 }
 
+// 修改
+func UpdateCygxMicroRoadshowVideo(item *CygxMicroRoadshowVideo) (err error) {
+	to := orm.NewOrmUsingDB("hz_cygx")
+	updateParams := make(map[string]interface{})
+	updateParams["ShareImgUrl"] = item.ShareImgUrl
+	ptrStructOrTableName := "cygx_micro_roadshow_video"
+	whereParam := map[string]interface{}{"video_id": item.VideoId}
+	qs := to.QueryTable(ptrStructOrTableName)
+	for expr, exprV := range whereParam {
+		qs = qs.Filter(expr, exprV)
+	}
+	_, err = qs.Update(updateParams)
+	return
+}
+
 func PublishVideoCancel(videoId, publishOrCancle int) (err error) {
 
 	if publishOrCancle == 0 {

services/cygx/activity_ocr.go

@@ -192,6 +192,7 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 
 		shareImg, _ := MakeCygxMp3HtmlImg(itemVoice.VoicePlaySeconds) //生成分享图片
 		itemVoice.ShareImg = shareImg
+		itemVoice.VoiceName = utils.RemoveFileSuffixName(itemVoice.VoiceName) //去掉后缀名称
 		//如果等于0就新增，反之就修改
 		if total == 0 {
 			newId, e := cygx.AddCygxActivityVoice(itemVoice)
@@ -260,6 +261,8 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 
 		shareImg, _ := MakeCygxMp4HtmlImg(itemVideo.VideoDuration) //生成分享图片
 		itemVideo.ShareImg = shareImg
+		itemVideo.VideoName = utils.RemoveFileSuffixName(itemVideo.VideoName) //去掉后缀名称
+
 		//视频文件更换阿里云oss地址 避免卡顿
 		var newOssUrl string
 		newOssUrl = strings.Replace(itemVideo.VideoUrl, "https://hzstatic.hzinsights.com", "https://hzchart.oss-accelerate.aliyuncs.com", -1)

services/cygx/activity_poster.go

@@ -250,7 +250,14 @@ func MakeCygxMp3HtmlImg(videoDuration string) (imgUrl string, err error) {
 		err = errors.New("GetCygxConfigDetailByCode 获取配置生成音视频分享封面图格式信息失败, Err: " + e.Error())
 		return
 	}
-
+	// 处理时长带有小数点的字符串
+	slice := strings.Split(videoDuration, ".")
+	for k, v := range slice {
+		if k != 0 {
+			continue
+		}
+		videoDuration = v
+	}
 	//先转换时长展示样式再替换
 	secondNum, _ := strconv.Atoi(videoDuration)
 	videoDuration = utils.HideSecondsToMs(secondNum)
@@ -290,6 +297,14 @@ func MakeCygxMp4HtmlImg(videoDuration string) (imgUrl string, err error) {
 		return
 	}
 
+	// 处理时长带有小数点的字符串
+	slice := strings.Split(videoDuration, ".")
+	for k, v := range slice {
+		if k != 0 {
+			continue
+		}
+		videoDuration = v
+	}
 	//先转换时长展示样式再替换
 	secondNum, _ := strconv.Atoi(videoDuration)
 	videoDuration = utils.HideSecondsToMs(secondNum)

services/cygx/askserie_video.go

@@ -135,3 +135,151 @@ func init12() {
 		}
 	}
 }
+
+// 修改分享图片脚本
+func initpy() {
+
+	//python3 main.py
+	var condition string
+	var pars []interface{}
+	listVoice, err := cygx.GetActivityVoiceList(condition, pars)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		fmt.Println(err)
+		return
+	}
+
+	for _, v := range listVoice {
+		shareImg, _ := MakeCygxMp3HtmlImg(v.VoicePlaySeconds) //生成分享图片
+		v.ShareImg = shareImg
+		err = cygx.UpdateCygxActivityVoice(v)
+		if err != nil {
+			err = errors.New("UpdateCygxActivityVoice" + err.Error())
+			return
+		}
+		fmt.Println(err)
+	}
+
+	listVideo, err := cygx.GetCygxActivityVideoList(condition, pars)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		fmt.Println(err)
+		return
+	}
+
+	for _, v := range listVideo {
+		shareImg, _ := MakeCygxMp4HtmlImg(v.VideoDuration) //生成分享图片
+		v.ShareImg = shareImg
+		err = cygx.UpdateCygxActivityVideo(v)
+		if err != nil {
+			err = errors.New("UpdateCygxActivityVideo" + err.Error())
+			return
+		}
+		fmt.Println(err)
+	}
+
+	listVideoRoadshow, err := cygx.GetCygxMicroRoadshowVideoList(condition, pars, 0, 1000)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		fmt.Println(err)
+		return
+	}
+
+	for _, v := range listVideoRoadshow {
+		shareImg, _ := MakeCygxMp4HtmlImg(v.VideoDuration) //生成分享图片
+		v.ShareImgUrl = shareImg
+		err = cygx.UpdateCygxMicroRoadshowVideo(v)
+		if err != nil {
+			err = errors.New("UpdateCygxMicroRoadshowVideo" + err.Error())
+			return
+		}
+		fmt.Println(err)
+	}
+
+	listAskserVoice, err := cygx.GetCygxAskserieVideoList(condition, pars, 0, 1000)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		fmt.Println(err)
+		return
+	}
+
+	for _, v := range listAskserVoice {
+		shareImg, _ := MakeCygxMp3HtmlImg(v.VideoDuration) //生成分享图片
+		v.ShareImg = shareImg
+		err = cygx.EditCygxAskserieVideoShareImg(shareImg, v.AskserieVideoId)
+		if err != nil {
+			err = errors.New("EditCygxAskserieVideoShareImg" + err.Error())
+			return
+		}
+		fmt.Println(err)
+	}
+
+	return
+}
+
+// 去掉后缀名脚本
+func initFileName() {
+	var condition string
+	var pars []interface{}
+	listVoice, err := cygx.GetActivityVoiceList(condition, pars)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		fmt.Println(err)
+		return
+	}
+
+	for _, v := range listVoice {
+		v.VoiceName = utils.RemoveFileSuffixName(v.VoiceName) //去掉后缀名称
+		err = cygx.UpdateCygxActivityVoice(v)
+		if err != nil {
+			err = errors.New("UpdateCygxActivityVoice" + err.Error())
+			return
+		}
+		fmt.Println(err)
+	}
+
+	listVideo, err := cygx.GetCygxActivityVideoList(condition, pars)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		fmt.Println(err)
+		return
+	}
+
+	for _, v := range listVideo {
+		v.VideoName = utils.RemoveFileSuffixName(v.VideoName) //去掉后缀名称
+		err = cygx.UpdateCygxActivityVideo(v)
+		if err != nil {
+			err = errors.New("UpdateCygxActivityVideo" + err.Error())
+			return
+		}
+		fmt.Println(err)
+	}
+
+	listVideoRoadshow, err := cygx.GetCygxMicroRoadshowVideoList(condition, pars, 0, 1000)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		fmt.Println(err)
+		return
+	}
+
+	for _, v := range listVideoRoadshow {
+		v.VideoName = utils.RemoveFileSuffixName(v.VideoName) //去掉后缀名称
+		err = cygx.UpdateCygxMicroRoadshowVideo(v)
+		if err != nil {
+			err = errors.New("UpdateCygxMicroRoadshowVideo" + err.Error())
+			return
+		}
+		fmt.Println(err)
+	}
+
+	listAskserVoice, err := cygx.GetCygxAskserieVideoList(condition, pars, 0, 1000)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		fmt.Println(err)
+		return
+	}
+
+	for _, v := range listAskserVoice {
+		v.VideoName = utils.RemoveFileSuffixName(v.VideoName) //去掉后缀名称
+		err = cygx.EditCygxAskserieVideoVideoName(v.VideoName, v.AskserieVideoId)
+		if err != nil {
+			err = errors.New("EditCygxAskserieVideoShareImg" + err.Error())
+			return
+		}
+		fmt.Println(err)
+	}
+
+	return
+}

utils/common.go

@@ -2135,3 +2135,15 @@ func ArticleHasImgUrl(body string) (hasImg bool, err error) {
 	})
 	return
 }
+
+// 移除文件后缀名称
+func RemoveFileSuffixName(fileName string) (removedName string) {
+	slice := strings.Split(fileName, ".")
+	var suffixName string
+	for _, v := range slice {
+		suffixName = v
+	}
+	suffixName = "." + suffixName
+	removedName = strings.TrimRight(fileName, suffixName)
+	return
+}