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

controllers/cygx/micro_roadshow.go

@@ -283,8 +283,9 @@ func (this *MicroRoadshowController) Add() {
 			go cygxService.SendWxMsgWithCygxMicroRoadshowVideo(req.VideoId)
 		}
 
-		go cygxService.UpdateResourceData(req.VideoId, "roadshow", "update", publishDate.Format(utils.FormatDateTime))
-		go elastic.AddComprehensiveRoadshow(req.VideoId) //Es添加微路演
+		//go cygxService.UpdateResourceData(req.VideoId, "roadshow", "update", publishDate.Format(utils.FormatDateTime))
+		go cygxService.UpdateMicroRoadshowResourceData(req.VideoId) //写入首页最新  cygx_resource_data 表
+		go elastic.AddComprehensiveRoadshow(req.VideoId)            //Es添加微路演
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "编辑成功"
@@ -327,8 +328,9 @@ func (this *MicroRoadshowController) Add() {
 
 		if req.PublishOrSave == 1 {
 			go cygxService.SendWxMsgWithCygxMicroRoadshowVideo(int(newId))
-			go cygxService.UpdateResourceData(int(newId), "roadshow", "add", publishDate.Format(utils.FormatDateTime))
-			go elastic.AddComprehensiveRoadshow(req.VideoId) //Es添加微路演
+			//go cygxService.UpdateResourceData(int(newId), "roadshow", "add", publishDate.Format(utils.FormatDateTime))
+			go cygxService.UpdateMicroRoadshowResourceData(int(newId)) //写入首页最新  cygx_resource_data 表
+			go elastic.AddComprehensiveRoadshow(req.VideoId)           //Es添加微路演
 		}
 
 		br.Ret = 200
@@ -448,10 +450,12 @@ func (this *MicroRoadshowController) PublishCancel() {
 	br.Success = true
 	if publishOrCancle == 0 {
 		br.Msg = "取消发布成功"
-		go cygxService.UpdateResourceData(int(videoId), "roadshow", "delete", time.Now().Format(utils.FormatDateTime))
+		//go cygxService.UpdateResourceData(int(videoId), "roadshow", "delete", time.Now().Format(utils.FormatDateTime))
+		go cygxService.UpdateMicroRoadshowResourceData(int(videoId)) //写入首页最新  cygx_resource_data 表
 	} else {
 		go cygxService.SendWxMsgWithCygxMicroRoadshowVideo(videoId)
-		go cygxService.UpdateResourceData(int(videoId), "roadshow", "add", videoInfo.PublishDate.Format(utils.FormatDateTime))
+		//go cygxService.UpdateResourceData(int(videoId), "roadshow", "add", videoInfo.PublishDate.Format(utils.FormatDateTime))
+		go cygxService.UpdateMicroRoadshowResourceData(int(videoId)) //写入首页最新  cygx_resource_data 表
 		br.Msg = "发布成功"
 	}
 	go elastic.AddComprehensiveRoadshow(videoId) //Es添加微路演

controllers/cygx/report_article.go

@@ -349,7 +349,6 @@ func (this *ReportArticleController) ReportArticleList() {
 		list[k].ListIndustrial = mapIndustrialList[v.ArticleId]
 		list[k].ListSubject = mapSubjectList[v.ArticleId]
 	}
-	fmt.Println(mapCommment)
 	page := paging.GetPaging(currentIndex, pageSize, total)
 	resp := new(cygx.GetReportArticleListRep)
 	resp.List = list

models/cygx/activity_voice.go

@@ -103,3 +103,11 @@ func DeleteCygxActivityVoice(activityId int) (err error) {
 	_, err = o.Raw(sql, activityId).Exec()
 	return
 }
+
+// 根据音频ID获取详情
+func GetCygxActivityVoiceReqDetailByActivityVoiceId(activityVoiceId int) (item *CygxActivityVoice, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT *  FROM cygx_activity_voice  WHERE activity_voice_id= ? `
+	err = o.Raw(sql, activityVoiceId).QueryRow(&item)
+	return
+}

models/cygx/report_mapping_celue.go

@@ -45,6 +45,14 @@ func GetCygxReportMappingCelueMaxDetail() (item *CygxReportMappingCelue, err err
 	return
 }
 
+// 通过 categoryId 获取详情
+func GetCygxReportMappingCelueMaxDetailByCategoryId(categoryId int) (item *CygxReportMappingCelue, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT  * FROM cygx_report_mapping_celue  WHERE  category_id = ?  LIMIT 1 `
+	err = o.Raw(sql, categoryId).QueryRow(&item)
+	return
+}
+
 // 列表
 func GetCygxReportMappingList(condition string, pars []interface{}) (items []*CygxReportMappingCelueResp, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")

models/cygx/resource_data.go

@@ -6,15 +6,16 @@ import (
 )
 
 type CygxResourceData struct {
-	Id          int       `orm:"column(id);pk"`
-	SourceId    int       `description:"资源ID"`
-	Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
-	Title       string    `description:"标题"`
-	Annotation  string    `description:"核心观点"`
-	CreateTime  time.Time `description:"创建时间"`
-	PublishDate string    `description:"发布时间"`
-	Abstract    string    `description:"摘要"`
-	SearchTag   string    `description:"搜索标签"`
+	Id                int       `orm:"column(id);pk"`
+	SourceId          int       `description:"资源ID"`
+	Source            string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
+	Title             string    `description:"标题"`
+	Annotation        string    `description:"核心观点"`
+	CreateTime        time.Time `description:"创建时间"`
+	PublishDate       string    `description:"发布时间"`
+	Abstract          string    `description:"摘要"`
+	SearchTag         string    `description:"搜索标签"`
+	ChartPermissionId int       `description:"行业id"`
 }
 
 // 根据资源类型获取列表
@@ -54,6 +55,7 @@ func UpdateResourceDataByItem(item *CygxResourceData) (err error) {
 	updateParams := make(map[string]interface{})
 	updateParams["PublishDate"] = item.PublishDate
 	updateParams["SearchTag"] = item.SearchTag
+	updateParams["ChartPermissionId"] = item.ChartPermissionId
 	ptrStructOrTableName := "cygx_resource_data"
 	whereParam := map[string]interface{}{"source_id": item.SourceId, "source": item.Source}
 	qs := o.QueryTable(ptrStructOrTableName)

services/cygx/activity_ocr.go

@@ -182,7 +182,8 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 				err = errors.New("GetCygxActivityVoiceCount" + e.Error())
 				return
 			}
-			go UpdateResourceData(int(newId), utils.CYGX_OBJ_ACTIVITYVOICE, "add", activityInfo.ActivityTime) // 把活动音频的数据添加到 cygx_resource_data 表
+			go UpdateActivityVoiceResourceData(int(newId)) //写入首页最新  cygx_resource_data 表
+			//go UpdateResourceData(int(newId), utils.CYGX_OBJ_ACTIVITYVOICE, "add", activityInfo.ActivityTime) // 把活动音频的数据添加到 cygx_resource_data 表
 
 			go SendWxMsgWithUpdateActivityVideoAndVoice(activityId, itemVoice.VoiceName) //  已结束的活动上传音频或视频后给已关注这个活动关联的产业的正式、试用 客户发送模板信息
 		} else {
@@ -214,7 +215,8 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 				err = errors.New("AddCygxActivityVideo" + e.Error())
 				return
 			}
-			go UpdateResourceData(int(newId), utils.CYGX_OBJ_ACTIVITYVIDEO, "add", activityInfo.ActivityTime) // 把活动视频的数据添加到 cygx_resource_data 表
+			go UpdateActivityVideoResourceData(int(newId)) //写入首页最新  cygx_resource_data 表
+			//go UpdateResourceData(int(newId), utils.CYGX_OBJ_ACTIVITYVIDEO, "add", activityInfo.ActivityTime) // 把活动视频的数据添加到 cygx_resource_data 表
 
 			go SendWxMsgWithUpdateActivityVideoAndVoice(activityId, itemVideo.VideoName) //  已结束的活动上传音频或视频后给已关注这个活动关联的产业的正式、试用 客户发送模板信息
 		} else {
@@ -239,7 +241,9 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 				err = errors.New("DeleteCygxActivityVoice" + e.Error())
 				return
 			}
-			go UpdateResourceData(voiceDetail.ActivityVoiceId, utils.CYGX_OBJ_ACTIVITYVOICE, "delete", time.Now().Format(utils.FormatDateTime)) // 把活动音频在 cygx_resource_data 表中删除
+
+			go UpdateActivityVoiceResourceData(voiceDetail.ActivityVoiceId) //写入首页最新  cygx_resource_data 表
+			//go UpdateResourceData(voiceDetail.ActivityVoiceId, utils.CYGX_OBJ_ACTIVITYVOICE, "delete", time.Now().Format(utils.FormatDateTime)) // 把活动音频在 cygx_resource_data 表中删除
 		}
 
 		//删除原有的视频数据
@@ -254,7 +258,9 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 				err = errors.New("DeleteCygxActivityVideo" + e.Error())
 				return
 			}
-			go UpdateResourceData(videoDetail.VideoId, utils.CYGX_OBJ_ACTIVITYVIDEO, "delete", time.Now().Format(utils.FormatDateTime)) // 把活动视频在 cygx_resource_data 表中删除
+
+			go UpdateActivityVideoResourceData(videoDetail.VideoId) //写入首页最新  cygx_resource_data 表
+			//go UpdateResourceData(videoDetail.VideoId, utils.CYGX_OBJ_ACTIVITYVIDEO, "delete", time.Now().Format(utils.FormatDateTime)) // 把活动视频在 cygx_resource_data 表中删除
 		}
 	}
 	return

services/cygx/resource_data.go

@@ -26,7 +26,7 @@ import (
 //roadshow
 
 //func init() {
-//	UpdateMeetingreviewchaptResourceData(141)
+//	UpdateMicroRoadshowResourceData(1)
 //}
 
 // 更新活动
@@ -81,6 +81,7 @@ func UpdateActivityResourceData(sourceId int) {
 		item.Source = source
 		//分析师电话会（C类）
 		item.SearchTag = detail.ActivityTypeName
+		item.ChartPermissionId = detail.ChartPermissionId
 		item.PublishDate = publishDate
 		item.CreateTime = time.Now()
 		if totalData == 0 {
@@ -167,6 +168,11 @@ func UpdateActivitySpecialResourceData(sourceId int) {
 		err = errors.New("GetCygxReportSelection, Err: " + e.Error())
 		return
 	}
+	activityInfo, e := cygx.GetAddActivityInfoSpecialById(sourceId)
+	if e != nil {
+		err = errors.New("GetAddActivityInfoSpecialById, Err: " + e.Error())
+		return
+	}
 	//如果取消发布了就做删除处理
 	if total == 0 {
 		e = cygx.DeleteResourceData(sourceId, source)
@@ -195,6 +201,7 @@ func UpdateActivitySpecialResourceData(sourceId int) {
 		//分析师电话会（C类）
 		item.SearchTag = ""
 		item.PublishDate = publishDate
+		item.ChartPermissionId = activityInfo.ChartPermissionId
 		item.CreateTime = time.Now()
 		if totalData == 0 {
 			newId, e := cygx.AddCygxResourceData(item)
@@ -304,14 +311,22 @@ func UpdateArticleResourceData(sourceId int) {
 			err = errors.New("GetCygxReportSelectionInfoById, Err: " + e.Error())
 			return
 		}
+
 		var resourceDataId int
 		publishDate := time.Now().Format(utils.FormatDateTime)
 		item := new(cygx.CygxResourceData)
 		if detail.ArticleTypeId > 0 {
 			item.SearchTag = detail.ArticleTypeName // 研选类型名称
+			item.ChartPermissionId = utils.CHART_PERMISSION_ID_YANXUAN
 		} else {
 			item.SearchTag = detail.MatchTypeName
+			//获取文章分类详情
+			detailCategory, _ := cygx.GetCygxReportMappingCelueMaxDetailByCategoryId(detail.CategoryId)
+			if detailCategory != nil {
+				item.ChartPermissionId = detailCategory.ChartPermissionId
+			}
 		}
+
 		item.SourceId = sourceId
 		item.Source = source
 		item.PublishDate = publishDate
@@ -434,6 +449,7 @@ func UpdateProductInteriorResourceData(sourceId int) {
 		item.Source = source
 		item.SearchTag = mapMatchTypeName[detail.MatchTypeId]
 		item.PublishDate = publishDate
+		item.ChartPermissionId = detail.ChartPermissionId
 		item.CreateTime = time.Now()
 		if totalData == 0 {
 			newId, e := cygx.AddCygxResourceData(item)
@@ -548,6 +564,7 @@ func UpdateMeetingreviewchaptResourceData(sourceId int) {
 		item.Source = source
 		item.SearchTag = "晨会精华"
 		item.PublishDate = publishDate
+		item.ChartPermissionId = detail.ChartPermissionId
 		item.CreateTime = time.Now()
 		if totalData == 0 {
 			newId, e := cygx.AddCygxResourceData(item)
@@ -800,6 +817,213 @@ func UpdateMinutesSummaryResourceData(sourceId int) {
 	return
 }
 
+// 更新活动音频
+func UpdateActivityVoiceResourceData(sourceId int) {
+	time.Sleep(1 * time.Second) // 添加1秒的延迟
+	var err error
+	defer func() {
+		if err != nil {
+			fmt.Println("err：", err)
+			go alarm_msg.SendAlarmMsg("更新更新活动音频 失败，UpdateActivityVoiceResourceData Err："+err.Error()+"资源ID"+strconv.Itoa(sourceId), 3)
+		}
+	}()
+	var source = utils.CYGX_OBJ_ACTIVITYVOICE
+
+	var condition string
+	var pars []interface{}
+	condition = ` AND activity_voice_id = ? `
+	pars = append(pars, sourceId)
+	total, e := cygx.GetCygxActivityVoiceCount(condition, pars)
+	if e != nil {
+		err = errors.New("GetCygxResearchSummary, Err: " + e.Error())
+		return
+	}
+	//如果取消发布了就做删除处理
+	if total == 0 {
+		e = cygx.DeleteResourceData(sourceId, source)
+		if e != nil {
+			err = errors.New("DeleteResourceData, Err: " + e.Error())
+			return
+		}
+	} else {
+		//获取音频详情
+		voiceDetail, e := cygx.GetCygxActivityVoiceReqDetailByActivityVoiceId(sourceId)
+		if e != nil {
+			err = errors.New("GetCygxActivityVoiceReqDetail" + e.Error())
+			return
+		}
+		activityId := voiceDetail.ActivityId
+		//获取活动详情
+		activityInfo, e := cygx.GetAddActivityInfoById(activityId)
+		if e != nil {
+			err = errors.New("GetAddActivityInfoById, Err: " + e.Error())
+			return
+		}
+		//判断是否存在，如果不存在就新增，存在就更新
+		totalData, e := cygx.GetCygxReportSelectionBySourceAndId(sourceId, source)
+		if e != nil {
+			err = errors.New("GetCygxReportSelectionBySourceAndId, Err: " + e.Error())
+			return
+		}
+		publishDate := time.Now().Format(utils.FormatDateTime)
+		item := new(cygx.CygxResourceData)
+		item.SourceId = sourceId
+		item.Source = source
+		item.SearchTag = ""
+		item.PublishDate = publishDate
+		item.ChartPermissionId = activityInfo.ChartPermissionId
+		item.CreateTime = utils.StrDateToDate(activityInfo.ActivityTime)
+		if totalData == 0 {
+			_, e := cygx.AddCygxResourceData(item)
+			if e != nil {
+				err = errors.New("AddCygxResourceData, Err: " + e.Error())
+				return
+			}
+		} else {
+			e = cygx.UpdateResourceDataByItem(item)
+			if e != nil {
+				err = errors.New("UpdateResourceDataByItem, Err: " + e.Error())
+				return
+			}
+		}
+	}
+	return
+}
+
+// 更新活动视频
+func UpdateActivityVideoResourceData(sourceId int) {
+	time.Sleep(1 * time.Second) // 添加1秒的延迟
+	var err error
+	defer func() {
+		if err != nil {
+			fmt.Println("err：", err)
+			go alarm_msg.SendAlarmMsg("更新更新活动视频 失败，UpdateActivityVideoResourceData Err："+err.Error()+"资源ID"+strconv.Itoa(sourceId), 3)
+		}
+	}()
+	var source = utils.CYGX_OBJ_ACTIVITYVIDEO
+	var condition string
+	var pars []interface{}
+	condition = ` AND v.video_id = ? `
+	pars = append(pars, sourceId)
+	total, e := cygx.GetActivityVideoCount(condition, pars)
+	if e != nil {
+		err = errors.New("GetCygxResearchSummary, Err: " + e.Error())
+		return
+	}
+	//如果取消发布了就做删除处理
+	if total == 0 {
+		e = cygx.DeleteResourceData(sourceId, source)
+		if e != nil {
+			err = errors.New("DeleteResourceData, Err: " + e.Error())
+			return
+		}
+	} else {
+		videoDetail, e := cygx.GetCygxActivityVideoReqDetailByVideoId(sourceId)
+		if e != nil {
+			err = errors.New("GetCygxActivityVoiceReqDetail" + e.Error())
+			return
+		}
+		activityId := videoDetail.ActivityId
+
+		activityInfo, e := cygx.GetAddActivityInfoById(activityId)
+		if e != nil {
+			err = errors.New("GetAddActivityInfoById, Err: " + e.Error())
+			return
+		}
+		//判断是否存在，如果不存在就新增，存在就更新
+		totalData, e := cygx.GetCygxReportSelectionBySourceAndId(sourceId, source)
+		if e != nil {
+			err = errors.New("GetCygxReportSelectionBySourceAndId, Err: " + e.Error())
+			return
+		}
+		publishDate := time.Now().Format(utils.FormatDateTime)
+		item := new(cygx.CygxResourceData)
+		item.SourceId = sourceId
+		item.Source = source
+		item.SearchTag = ""
+		item.PublishDate = publishDate
+		item.ChartPermissionId = activityInfo.ChartPermissionId
+		item.CreateTime = utils.StrDateToDate(activityInfo.ActivityTime)
+		if totalData == 0 {
+			_, e := cygx.AddCygxResourceData(item)
+			if e != nil {
+				err = errors.New("AddCygxResourceData, Err: " + e.Error())
+				return
+			}
+		} else {
+			e = cygx.UpdateResourceDataByItem(item)
+			if e != nil {
+				err = errors.New("UpdateResourceDataByItem, Err: " + e.Error())
+				return
+			}
+		}
+	}
+	return
+}
+
+// 更新产业视频
+func UpdateMicroRoadshowResourceData(sourceId int) {
+	var err error
+	defer func() {
+		if err != nil {
+			fmt.Println("err：", err)
+			go alarm_msg.SendAlarmMsg("更新产业视频 失败，UpdateMicroRoadshowResourceData Err："+err.Error()+"资源ID"+strconv.Itoa(sourceId), 3)
+		}
+	}()
+	var source = utils.CYGX_OBJ_ROADSHOW
+	var condition string
+	var pars []interface{}
+	condition = ` AND publish_status = 1  AND video_id = ? `
+	pars = append(pars, sourceId)
+	total, e := cygx.GetMicroRoadshowVideoListCount(condition, pars)
+	if e != nil {
+		err = errors.New("GetMicroRoadshowVideoListCount, Err: " + e.Error())
+		return
+	}
+	//如果取消发布了就做删除处理
+	if total == 0 {
+		e = cygx.DeleteResourceData(sourceId, source)
+		if e != nil {
+			err = errors.New("DeleteResourceData, Err: " + e.Error())
+			return
+		}
+	} else {
+		//判断是否存在，如果不存在就新增，存在就更新
+		totalData, e := cygx.GetCygxReportSelectionBySourceAndId(sourceId, source)
+		if e != nil {
+			err = errors.New("GetCygxReportSelectionBySourceAndId, Err: " + e.Error())
+			return
+		}
+		detail, e := cygx.GetMicroRoadshowVideoByVideoId(sourceId)
+		if e != nil {
+			err = errors.New("GetCygxReportSelectionBySourceAndId, Err: " + e.Error())
+			return
+		}
+		publishDate := time.Now().Format(utils.FormatDateTime)
+		item := new(cygx.CygxResourceData)
+		item.SourceId = sourceId
+		item.Source = source
+		item.SearchTag = ""
+		item.PublishDate = publishDate
+		item.ChartPermissionId = detail.ChartPermissionId
+		item.CreateTime = time.Now()
+		if totalData == 0 {
+			_, e := cygx.AddCygxResourceData(item)
+			if e != nil {
+				err = errors.New("AddCygxResourceData, Err: " + e.Error())
+				return
+			}
+		} else {
+			e = cygx.UpdateResourceDataByItem(item)
+			if e != nil {
+				err = errors.New("UpdateResourceDataByItem, Err: " + e.Error())
+				return
+			}
+		}
+	}
+	return
+}
+
 func init1123232() {
 	//var condition string
 	//var pars []interface{}