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

controllers/cygx/activity_video.go

@@ -493,9 +493,9 @@ func (this *ActivityVideoCoAntroller) ActivityVoiceAndVideoList() {
 	}
 	//类型 1 路演反馈 ，2：调研反馈
 	if searchType == 1 {
-		condition += ` AND art.activity_type_id IN (2,7)   AND  art.is_yidong_conduct = 1 `
+		condition += ` AND v.file_type = 1 `
 	} else if searchType == 2 {
-		condition += ` AND  (	  art.activity_type_id NOT IN (2,7)  OR  art.is_yidong_conduct = 0)  `
+		condition += ` AND v.file_type = 2   `
 	}
 
 	var conditionOrder string

models/cygx/activity_video.go

@@ -16,6 +16,8 @@ type CygxActivityVideo struct {
 	VideoUrl      string `description:"视频地址"`
 	BackgroundImg string `description:"封面图片"`
 	ShareImg      string `description:"分享图片"`
+	IsByHand      int    `description:"是否手动修改过"`
+	FileType      int    `description:"文件类型，1：路演回放，2：调研反馈"`
 	CreateTime    string `description:"创建时间"`
 }
 
@@ -69,6 +71,7 @@ func UpdateCygxActivityVideo(item *CygxActivityVideo) (err error) {
 	updateParams["VideoUrl"] = item.VideoUrl
 	updateParams["BackgroundImg"] = item.BackgroundImg
 	updateParams["ShareImg"] = item.ShareImg
+	updateParams["FileType"] = item.FileType
 	updateParams["ModifyDate"] = time.Now()
 	ptrStructOrTableName := "cygx_activity_video"
 	whereParam := map[string]interface{}{"activity_id": item.ActivityId}

models/cygx/activity_voice.go

@@ -14,6 +14,8 @@ type CygxActivityVoice struct {
 	VoicePlaySeconds string    `description:"音频时长"`
 	BackgroundImg    string    `description:"封面图片"`
 	ShareImg         string    `description:"分享图片"`
+	IsByHand         int       `description:"是否手动修改过"`
+	FileType         int       `description:"文件类型，1：路演回放，2：调研反馈"`
 	CreateTime       time.Time `description:"创建时间"`
 }
 
@@ -43,6 +45,7 @@ func UpdateCygxActivityVoice(item *CygxActivityVoice) (err error) {
 	updateParams["VoiceUrl"] = item.VoiceUrl
 	updateParams["BackgroundImg"] = item.BackgroundImg
 	updateParams["ShareImg"] = item.ShareImg
+	updateParams["FileType"] = item.FileType
 	ptrStructOrTableName := "cygx_activity_voice"
 	whereParam := map[string]interface{}{"activity_id": item.ActivityId}
 	qs := to.QueryTable(ptrStructOrTableName)
@@ -89,6 +92,26 @@ func GetActivityVoiceList(condition string, pars []interface{}) (items []*CygxAc
 	return
 }
 
+// 列表
+func GetActivityVoiceListNew(condition string, pars []interface{}) (items []*CygxActivityVoice, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := ` SELECT
+	v.*
+FROM
+	cygx_activity_voice as v  
+	INNER JOIN cygx_activity as  a ON a.activity_id = v.activity_id
+WHERE
+	1= 1 
+	AND a.activity_time > '2023-09-22'
+	AND  v.voice_name NOT LIKE '%调研反馈%'
+	AND  v.voice_name NOT LIKE '%【%'  `
+	if condition != "" {
+		sql += condition
+	}
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}
+
 func GetCygxActivityVoiceReqDetail(activityId int) (item *CygxActivityVoice, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *  FROM cygx_activity_voice  WHERE activity_id= ? `
@@ -111,3 +134,11 @@ func GetCygxActivityVoiceReqDetailByActivityVoiceId(activityVoiceId int) (item *
 	err = o.Raw(sql, activityVoiceId).QueryRow(&item)
 	return
 }
+
+// 根据活动ID获取详情
+func GetCygxActivityVoiceReqDetailByActivityId(activityId int) (item *CygxActivityVoice, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT *  FROM cygx_activity_voice  WHERE activity_id= ? `
+	err = o.Raw(sql, activityId).QueryRow(&item)
+	return
+}

models/cygx/askserie_video.go

@@ -27,6 +27,7 @@ type CygxAskserieVideo struct {
 	ModifyDate          time.Time `description:"更新时间"`
 	PublishDate         time.Time `description:"发布时间"`
 	CreateTime          time.Time `description:"创建时间"`
+	ActivityId          int       ` description:"活动ID"`
 }
 
 type AddAskserieVideoReq struct {

services/cygx/activity_ocr.go

@@ -175,6 +175,21 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 			err = errors.New("GetCygxActivityVoiceCount" + e.Error())
 			return
 		}
+
+		activityId := itemVoice.ActivityId
+		//获取活动详情
+		activityInfo, e := cygx.GetAddActivityInfoById(activityId)
+		if e != nil {
+			err = errors.New("GetAddActivityInfoById, Err: " + e.Error())
+			return
+		}
+		//易董办会的分析师电话会，为路演回放
+		if (activityInfo.ActivityTypeId == 2 || activityInfo.ActivityTypeId == 7) && activityInfo.IsYidongConduct == 1 {
+			itemVoice.FileType = 1
+		} else {
+			itemVoice.FileType = 2
+		}
+
 		shareImg, _ := MakeCygxMp3HtmlImg(itemVoice.VoicePlaySeconds) //生成分享图片
 		itemVoice.ShareImg = shareImg
 		//如果等于0就新增，反之就修改
@@ -188,6 +203,16 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 
 			go SendWxMsgWithUpdateActivityVideoAndVoice(activityId, itemVoice.VoiceName) //  已结束的活动上传音频或视频后给已关注这个活动关联的产业的正式、试用 客户发送模板信息
 		} else {
+			//获取音频详情
+			voiceDetail, e := cygx.GetCygxActivityVoiceReqDetailByActivityId(activityId)
+			if e != nil {
+				err = errors.New("GetCygxActivityVoiceReqDetail" + e.Error())
+				return
+			}
+			//手动修改过的，二次编辑，文件类型不变
+			if voiceDetail.IsByHand == 1 {
+				itemVoice.FileType = voiceDetail.FileType
+			}
 			e = cygx.UpdateCygxActivityVoice(itemVoice)
 			if e != nil {
 				err = errors.New("UpdateCygxActivityVoice" + e.Error())
@@ -219,10 +244,22 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 			err = errors.New("GetActivityVideoCount" + e.Error())
 			return
 		}
+		activityId := itemVoice.ActivityId
+		//获取活动详情
+		activityInfo, e := cygx.GetAddActivityInfoById(activityId)
+		if e != nil {
+			err = errors.New("GetAddActivityInfoById, Err: " + e.Error())
+			return
+		}
+		//易董办会的分析师电话会，为路演回放
+		if (activityInfo.ActivityTypeId == 2 || activityInfo.ActivityTypeId == 7) && activityInfo.IsYidongConduct == 1 {
+			itemVideo.FileType = 1
+		} else {
+			itemVideo.FileType = 2
+		}
 
 		shareImg, _ := MakeCygxMp4HtmlImg(itemVideo.VideoDuration) //生成分享图片
 		itemVideo.ShareImg = shareImg
-
 		//视频文件更换阿里云oss地址 避免卡顿
 		var newOssUrl string
 		newOssUrl = strings.Replace(itemVideo.VideoUrl, "https://hzstatic.hzinsights.com", "https://hzchart.oss-accelerate.aliyuncs.com", -1)
@@ -237,6 +274,17 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 			go UpdateActivityVideoResourceData(int(newId))                               //写入首页最新  cygx_resource_data 表
 			go SendWxMsgWithUpdateActivityVideoAndVoice(activityId, itemVideo.VideoName) //  已结束的活动上传音频或视频后给已关注这个活动关联的产业的正式、试用 客户发送模板信息
 		} else {
+			//获取视频详情
+			videoDetail, e := cygx.GetCygxActivityVideoReqDetail(activityId)
+			if e != nil {
+				err = errors.New("GetCygxActivityVideoReqDetail" + e.Error())
+				return
+			}
+			//手动修改过的，二次编辑，文件类型不变
+			if videoDetail.IsByHand == 1 {
+				itemVideo.FileType = videoDetail.FileType
+			}
+
 			e = cygx.UpdateCygxActivityVideo(itemVideo)
 			if e != nil {
 				err = errors.New("UpdateCygxActivityVideo" + e.Error())

services/cygx/askserie_video.go

@@ -77,8 +77,8 @@ func GetCygxAskserieVideoLabelMap(askserieVideoIds []int) (mapResp map[int]strin
 func init12() {
 	var conditionupload string
 	var pars []interface{}
-	conditionupload = " AND  voice_name LIKE '%科技问答%' "
-	listVoice, err := cygx.GetActivityVoiceList(conditionupload, pars)
+	conditionupload = " "
+	listVoice, err := cygx.GetActivityVoiceListNew(conditionupload, pars)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		fmt.Println(err)
 		return
@@ -115,6 +115,7 @@ func init12() {
 			item.PublishStatus = 1
 			item.BackgroundImg = v.BackgroundImg
 			item.ShareImg = v.ShareImg
+			item.ActivityId = v.ActivityId
 			//item.AdminId = sysUser.AdminId
 			item.ModifyDate = time.Now()
 			item.PublishDate = utils.StrTimeToTime(activityInfo.ActivityTime)
@@ -124,7 +125,7 @@ func init12() {
 			fmt.Println(item.ShareImg, "ShareImg")
 			fmt.Println(item.PublishDate, "PublishDate")
 			//fmt.Println(item, strings.Join(industrialManagementIds, ","))
-
+			//continue
 			newId, err := cygx.AddCygxAskserieVideo(item, strings.Join(industrialManagementIds, ","))
 			fmt.Println(newId)
 			if err != nil {

services/cygx/resource_data.go

@@ -870,7 +870,7 @@ func UpdateActivityVoiceResourceData(sourceId int) {
 		item.SourceId = sourceId
 		item.Source = source
 		//易董办会的分析师电话会，为路演回放
-		if (activityInfo.ActivityTypeId == 2 || activityInfo.ActivityTypeId == 7) && activityInfo.IsYidongConduct == 1 {
+		if voiceDetail.FileType == 1 {
 			item.SearchTag = "路演回放"
 		} else {
 			item.SearchTag = "调研反馈"
@@ -946,11 +946,12 @@ func UpdateActivityVideoResourceData(sourceId int) {
 		item.SourceId = sourceId
 		item.Source = source
 		//易董办会的分析师电话会，为路演回放
-		if (activityInfo.ActivityTypeId == 2 || activityInfo.ActivityTypeId == 7) && activityInfo.IsYidongConduct == 1 {
+		if videoDetail.FileType == 1 {
 			item.SearchTag = "路演回放"
 		} else {
 			item.SearchTag = "调研反馈"
 		}
+
 		item.PublishDate = publishDate
 		item.ChartPermissionId = activityInfo.ChartPermissionId
 		item.CreateTime = utils.StrDateToDate(activityInfo.ActivityTime)