no message

services/es_comprehensive.go

@@ -271,461 +271,6 @@ func EsComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*S
 	return
 }
 
-//func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserItem) (items []*models.HomeResourceDataListNewResp, err error) {
-//	var condition string
-//	var pars []interface{}
-//	uid := user.UserId
-//
-//	mapItems := make(map[string]*models.CygxResourceDataNewResp)
-//	for _, v := range list {
-//		//预处理文章
-//		item := new(models.CygxResourceDataNewResp)
-//		item.SourceId = v.SourceId
-//		item.Source = v.Source
-//		if v.IsSummary == 1 {
-//			item.BodyHeight = v.Body
-//		} else {
-//			item.BodyHeight = make([]string, 0)
-//		}
-//		item.PublishDate = utils.TimeRemoveHms2(v.PublishDate)
-//		mapItems[fmt.Sprint(v.Source, v.SourceId)] = item
-//	}
-//
-//	var articleIds []int
-//	var newchartIds []int
-//	var roadshowIds []string
-//	var activityIds []int
-//	var activityvideoIds []string
-//	var activityvoiceIds []string
-//	var activityspecialIds []int
-//	var researchsummaryIds []int
-//	var minutessummaryIds []int
-//	var meetingreviewchaptIds []int
-//	var productinteriorIds []int
-//	var industrialResourceIds []int
-//	//Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial 、 本周研究汇总： researchsummary 、 上周纪要汇总 ：minutessummary 、晨会精华 ：meetingreviewchapt "`
-//	for _, v := range list {
-//		if v.Source == "article" {
-//			articleIds = append(articleIds, v.SourceId)
-//		} else if v.Source == "newchart" {
-//			newchartIds = append(newchartIds, v.SourceId)
-//		} else if v.Source == "roadshow" {
-//			roadshowIds = append(roadshowIds, strconv.Itoa(v.SourceId))
-//		} else if v.Source == "activity" {
-//			activityIds = append(activityIds, v.SourceId)
-//		} else if v.Source == "activityvideo" {
-//			activityvideoIds = append(activityvideoIds, strconv.Itoa(v.SourceId))
-//		} else if v.Source == "activityvoice" {
-//			activityvoiceIds = append(activityvoiceIds, strconv.Itoa(v.SourceId))
-//		} else if v.Source == "activityspecial" {
-//			activityspecialIds = append(activityspecialIds, v.SourceId)
-//		} else if v.Source == "researchsummary" {
-//			researchsummaryIds = append(researchsummaryIds, v.SourceId)
-//		} else if v.Source == "minutessummary" {
-//			minutessummaryIds = append(minutessummaryIds, v.SourceId)
-//		} else if v.Source == "meetingreviewchapt" {
-//			meetingreviewchaptIds = append(meetingreviewchaptIds, v.SourceId)
-//		} else if v.Source == "productinterior" {
-//			productinteriorIds = append(productinteriorIds, v.SourceId)
-//		} else if v.Source == "industrialsource" {
-//			industrialResourceIds = append(industrialResourceIds, v.SourceId)
-//		}
-//
-//	}
-//	//处理文章
-//	if len(articleIds) > 0 {
-//		pars = make([]interface{}, 0)
-//		condition = ` AND a.article_id IN (` + utils.GetOrmInReplace(len(articleIds)) + `)`
-//		pars = append(pars, articleIds)
-//
-//		listArticle, e := models.GetHomeList(condition, pars, 0, len(articleIds))
-//		if e != nil {
-//			err = errors.New("GetResourceDataList, Err: " + e.Error())
-//			return
-//		}
-//
-//		listArticle, e = HandleArticleCategoryImg(listArticle)
-//		if e != nil {
-//			err = errors.New("HandleArticleCategoryImg, Err: " + e.Error())
-//			return
-//		}
-//		for _, v := range listArticle {
-//			v.Body = ""
-//			v.BodyHtml = ""
-//			mapItems[fmt.Sprint("article", v.ArticleId)].Article = v
-//		}
-//	}
-//
-//	//处理晨会精华
-//	if len(meetingreviewchaptIds) > 0 {
-//		pars = make([]interface{}, 0)
-//		condition = ` AND c.id IN (` + utils.GetOrmInReplace(len(meetingreviewchaptIds)) + `)`
-//		pars = append(pars, meetingreviewchaptIds)
-//
-//		listrMeet, e := models.GetCygxMorningMeetingReviewChapterList(condition, pars)
-//		if e != nil {
-//			err = errors.New("GetResourceDataList, Err: " + e.Error())
-//			return
-//		}
-//		for _, v := range listrMeet {
-//			v.Content = AnnotationHtml(v.Content)
-//			v.PublishTime = utils.TimeRemoveHms2(v.PublishTime)
-//			mapItems[fmt.Sprint("meetingreviewchapt", v.Id)].Meetingreviewchapt = v
-//		}
-//	}
-//
-//	//处理上周纪要汇总
-//	if len(minutessummaryIds) > 0 {
-//		pars = make([]interface{}, 0)
-//		condition = ` AND article_id IN (` + utils.GetOrmInReplace(len(minutessummaryIds)) + `)`
-//		pars = append(pars, minutessummaryIds)
-//
-//		listresearchsummary, e := models.GetReportSelectionListHome(condition, "cygx_minutes_summary", pars, 0, len(minutessummaryIds))
-//		if e != nil {
-//			err = errors.New("GetResourceDataList, Err: " + e.Error())
-//			return
-//		}
-//		for _, v := range listresearchsummary {
-//			v.PublishDate = utils.TimeRemoveHms2(v.PublishDate)
-//			mapItems[fmt.Sprint("minutessummary", v.ArticleId)].Minutessummary = v
-//		}
-//	}
-//
-//	//处理本周纪要汇总
-//	if len(researchsummaryIds) > 0 {
-//		pars = make([]interface{}, 0)
-//		condition = ` AND article_id IN (` + utils.GetOrmInReplace(len(researchsummaryIds)) + `)`
-//		pars = append(pars, researchsummaryIds)
-//
-//		listresearchsummary, e := models.GetReportSelectionListHome(condition, "cygx_research_summary", pars, 0, len(researchsummaryIds))
-//		if e != nil {
-//			err = errors.New("GetReportSelectionListHome, Err: " + e.Error())
-//			return
-//		}
-//		for _, v := range listresearchsummary {
-//			v.PublishDate = utils.TimeRemoveHms2(v.PublishDate)
-//			mapItems[fmt.Sprint("researchsummary", v.ArticleId)].Researchsummary = v
-//		}
-//	}
-//
-//	//处理产品内测
-//	if len(productinteriorIds) > 0 {
-//		pars = make([]interface{}, 0)
-//		condition = `  AND art.status = 1 AND art.product_interior_id  IN (` + utils.GetOrmInReplace(len(productinteriorIds)) + `)`
-//		pars = append(pars, productinteriorIds)
-//		listProductInterior, e := models.GetCygxProductInteriorList(condition, pars, 0, len(productinteriorIds))
-//		if e != nil {
-//			err = errors.New("GetCygxProductInteriorList, Err: " + e.Error())
-//			return
-//		}
-//		for _, v := range listProductInterior {
-//			v.Body = ProductInteriorHtml(v.Body)
-//			v.PublishTime = utils.TimeRemoveHms2(v.PublishTime)
-//			mapItems[fmt.Sprint("productinterior", v.ProductInteriorId)].ProductInterior = v
-//		}
-//	}
-//
-//	detail, e := models.GetConfigByCode("city_img_url")
-//	if e != nil {
-//		err = errors.New("GetResourceDataList, Err: " + e.Error())
-//		return
-//	}
-//	detailChart, e := models.GetConfigByCode("chart_img_url")
-//	if e != nil {
-//		err = errors.New("GetResourceDataList, Err: " + e.Error())
-//		return
-//	}
-//	addressList := strings.Split(detail.ConfigValue, "{|}")
-//	mapAddress := make(map[string]string)
-//	chartList := strings.Split(detailChart.ConfigValue, "{|}")
-//	mapChart := make(map[string]string)
-//	var cityName string
-//	var chartName string
-//	var imgUrl string
-//	var imgUrlChart string
-//	for _, v := range addressList {
-//		vslice := strings.Split(v, "_")
-//		cityName = vslice[0]
-//		imgUrl = vslice[len(vslice)-1]
-//		mapAddress[cityName] = imgUrl
-//	}
-//	for _, v := range chartList {
-//		vslice := strings.Split(v, "_")
-//		chartName = vslice[0]
-//		imgUrlChart = vslice[len(vslice)-1]
-//		mapChart[chartName] = imgUrlChart
-//	}
-//	var imgUrlResp string
-//	fmt.Println(activityIds)
-//	//处理活动
-//	if len(activityIds) > 0 {
-//		for _, vss := range activityIds {
-//			imgUrlResp += strconv.Itoa(vss) + ","
-//		}
-//		pars = make([]interface{}, 0)
-//		condition = ` AND art.activity_id IN (` + utils.GetOrmInReplace(len(activityIds)) + `)`
-//		pars = append(pars, activityIds)
-//		activityList, e := models.GetActivityListNew(condition, pars, uid, 0, len(activityIds), 0, 0, "")
-//		if e != nil {
-//			err = errors.New("GetResourceDataList, Err: " + e.Error())
-//			return
-//		}
-//		//处理不同的报名方式按钮回显
-//		mapActivitySignup, e := GetActivitySignupResp(activityIds, user)
-//		if e != nil {
-//			e = errors.New("GetActivitySignupResp, Err: " + e.Error())
-//			return
-//		}
-//
-//		var activityListRersp []*models.ActivityDetail
-//		for _, v := range activityList {
-//			v.SignupType = mapActivitySignup[v.ActivityId]
-//			activityListRersp = append(activityListRersp, ActivityButtonShow(v))
-//		}
-//		for _, v := range activityListRersp {
-//			if v == nil {
-//				continue
-//			}
-//			if v.ActivityType == 0 {
-//				if mapAddress[v.City] != "" {
-//					imgUrlResp = mapAddress[v.City]
-//				} else {
-//					imgUrlResp = mapAddress["其它"]
-//				}
-//			} else {
-//				if mapChart[v.ChartPermissionName] != "" {
-//					imgUrlResp = mapChart[v.ChartPermissionName]
-//				}
-//			}
-//			v.SourceType = 1
-//			v.Expert, _ = GetReportContentTextSub(v.Expert)
-//			mapItems[fmt.Sprint("activity", v.ActivityId)].Activity = v
-//		}
-//	}
-//
-//	//产业资源包
-//	if len(industrialResourceIds) > 0 {
-//		pars = make([]interface{}, 0)
-//
-//		var industrialResourceIdstring []string
-//		for _, v := range industrialResourceIds {
-//			industrialResourceIdstring = append(industrialResourceIdstring, strconv.Itoa(v))
-//		}
-//		industrialId := strings.Join(industrialResourceIdstring, ",")
-//		condition = ` AND  m.industrial_management_id IN  (` + industrialId + `) `
-//		listIndustrialResourceIds, e := models.GetSearchResourceList(user.UserId, condition, 0, len(industrialResourceIds))
-//		if e != nil {
-//			err = errors.New("GetSearchResourceList, Err: " + e.Error())
-//			return
-//		}
-//		//合并产业关联的标的
-//		listSubjcet, e := models.GetIndustrialSubjectAllByIndustrialId(industrialResourceIds)
-//		if e != nil {
-//			e = errors.New("GetIndustrialSubjectAllByIndustrialId, Err: " + e.Error())
-//			return
-//		}
-//		mapIndustrial := make(map[string]int)
-//		for _, v := range listSubjcet {
-//			for k2, v2 := range listIndustrialResourceIds {
-//				if v2.IndustrialManagementId == v.IndustrialManagementId && mapIndustrial[fmt.Sprint(v2.IndustrialManagementId, "Yx", v.SubjectName)] == 0 {
-//					listIndustrialResourceIds[k2].IndustrialSubjectList = append(listIndustrialResourceIds[k2].IndustrialSubjectList, v)
-//				}
-//			}
-//		}
-//		for _, v := range listIndustrialResourceIds {
-//			mapItems[fmt.Sprint("industrialsource", v.IndustrialManagementId)].IndustrialResource = v
-//		}
-//	}
-//
-//	//处理图表
-//	if len(newchartIds) > 0 {
-//		pars = make([]interface{}, 0)
-//		condition = ` AND a.chart_id IN (` + utils.GetOrmInReplace(len(newchartIds)) + `)`
-//		pars = append(pars, newchartIds)
-//		chartDateList, e := models.GetChartListCollectionNew(condition, pars, uid, 0, len(newchartIds))
-//		if e != nil {
-//			err = errors.New("GetResourceDataList, Err: " + e.Error())
-//			return
-//		}
-//		for _, v := range chartDateList {
-//			mapItems[fmt.Sprint("newchart", v.ChartId)].Newchart = v
-//		}
-//	}
-//
-//	//处理专项调研
-//	if len(activityspecialIds) > 0 {
-//		pars = make([]interface{}, 0)
-//		condition = ` AND art.activity_id IN (` + utils.GetOrmInReplace(len(activityspecialIds)) + `)`
-//		pars = append(pars, activityspecialIds)
-//		activitySpeciallist, e := models.GetCygxActivitySpecialDetailList(condition, pars, user.UserId, 0, len(activityspecialIds))
-//		if e != nil {
-//			err = errors.New("GetCygxActivitySpecialDetailList, Err: " + e.Error())
-//			return
-//		}
-//		UserMap, e := GetSpecialTripUserMap(activityIds, user.UserId)
-//		if e != nil {
-//			err = errors.New("GetSpecialTripUserMap, Err: " + e.Error())
-//			return
-//		}
-//		for _, v := range activitySpeciallist {
-//			if mapChart[v.ChartPermissionName] != "" {
-//				imgUrlResp = mapChart[v.ChartPermissionName]
-//			}
-//			if _, ok := UserMap[v.ActivityId]; ok {
-//				v.IsTrip = 1
-//			}
-//			if v.Days == 0 {
-//				v.TripStatus = 1
-//				v.TripImgLink = v.TripImgLink
-//			} else {
-//				v.TripStatus = 2
-//				v.TripImgLink = v.TripImgLinkFix
-//				v.ActivityTimeText = v.ActivityTimeTextByDay
-//			}
-//			resultTimeStart := utils.StrTimeToTime(v.ActivityTime)  //时间字符串格式转时间格式
-//			resultTimeEnd := utils.StrTimeToTime(v.ActivityTimeEnd) //时间字符串格式转时间格式
-//			if resultTimeStart.After(time.Now()) {
-//				v.ActiveState = 1
-//			} else if time.Now().After(resultTimeEnd) {
-//				v.ActiveState = 3
-//			} else {
-//				v.ActiveState = 2
-//			}
-//			v.ImgUrl = imgUrlResp
-//			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].Activityspecial = v
-//
-//		}
-//	}
-//
-//	if len(roadshowIds)+len(activityvideoIds)+len(activityvoiceIds) > 0 {
-//
-//		audioIdstr := strings.Join(activityvoiceIds, ",")
-//		ideoIdsStr := strings.Join(roadshowIds, ",")
-//		activityVideoIdsStr := strings.Join(activityvideoIds, ",")
-//
-//		list, _, e := GetMicroRoadShowMycollect(len(roadshowIds)+len(activityvideoIds)+len(activityvoiceIds), 0, audioIdstr, ideoIdsStr, activityVideoIdsStr)
-//		if e != nil {
-//			err = errors.New("GetMicroRoadShowMycollect, Err: " + e.Error())
-//			return
-//		}
-//
-//		for _, item := range list {
-//			if item.Type == 1 {
-//				//音频
-//				count, e := models.GetVoiceCollectCount(user.UserId, item.Id)
-//				if e != nil {
-//					err = errors.New("GetVoiceCollectCount, Err: " + e.Error())
-//					return
-//				}
-//				if count > 0 {
-//					item.IsCollect = true
-//				}
-//			} else if item.Type == 2 {
-//				//活动视频
-//				count, e := models.GetActivityVideoCollectCount(user.UserId, item.Id)
-//				if e != nil {
-//					err = errors.New("GetActivityVideoCollectCount, Err: " + e.Error())
-//					return
-//				}
-//				if count > 0 {
-//					item.IsCollect = true
-//				}
-//			} else if item.Type == 3 {
-//				//微路演视频
-//				count, e := models.GetVideoCollectCount(user.UserId, item.Id)
-//				if e != nil {
-//					err = errors.New("GetVideoCollectCount, Err: " + e.Error())
-//					return
-//				}
-//				if count > 0 {
-//					item.IsCollect = true
-//				}
-//			}
-//		}
-//		// 用户权限
-//		authInfo, permissionArr, e := GetUserRaiPermissionInfo(user.UserId, user.CompanyId)
-//		if e != nil {
-//			err = errors.New("GetUserRaiPermissionInfo, Err: " + e.Error())
-//			return
-//		}
-//
-//		// 获取默认图配置
-//		audioMap, videoMap, audioShareMap, videoShareMap, e := GetMicroRoadShowDefaultImgConfig()
-//		if e != nil {
-//			err = errors.New("GetMicroRoadShowDefaultImgConfig, Err: " + e.Error())
-//			return
-//		}
-//		//Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
-//		for i := range list {
-//			// 权限
-//			au := new(models.UserPermissionAuthInfo)
-//			au.SellerName = authInfo.SellerName
-//			au.SellerMobile = authInfo.SellerMobile
-//			au.HasPermission = authInfo.HasPermission
-//			au.OperationMode = authInfo.OperationMode
-//			if au.HasPermission == 1 {
-//				// 非宏观权限进一步判断是否有权限
-//				if list[i].ChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, list[i].ChartPermissionName) {
-//					au.HasPermission = 2
-//				}
-//			}
-//			// 无权限的弹框提示
-//			if au.HasPermission != 1 {
-//				if au.OperationMode == UserPermissionOperationModeCall {
-//					if list[i].Type == 1 {
-//						au.PopupMsg = UserPermissionPopupMsgCallActivity
-//					} else {
-//						au.PopupMsg = UserPermissionPopupMsgCallMicroVideo
-//					}
-//				} else {
-//					if list[i].Type == 1 {
-//						au.PopupMsg = UserPermissionPopupMsgApplyActivity
-//					} else {
-//						au.PopupMsg = UserPermissionPopupMsgApplyMicroVideo
-//					}
-//				}
-//			}
-//			list[i].AuthInfo = au
-//			list[i].PublishTime = utils.StrTimeToTime(list[i].PublishTime).Format(utils.FormatDate)
-//			// 默认图
-//			if list[i].BackgroundImg == "" {
-//				if list[i].Type == 1 {
-//					list[i].BackgroundImg = audioMap[list[i].ChartPermissionId]
-//				} else {
-//					list[i].BackgroundImg = videoMap[list[i].ChartPermissionId]
-//				}
-//			}
-//			// 分享图
-//			if list[i].ShareImg == "" {
-//				if list[i].Type == 1 {
-//					list[i].ShareImg = audioShareMap[list[i].ChartPermissionId]
-//				} else {
-//					list[i].ShareImg = videoShareMap[list[i].ChartPermissionId]
-//				}
-//			}
-//		}
-//		//Type                int    `description:"类型: 1-音频; 2-活动视频； 3-产业视频"`
-//		for _, item := range list {
-//			if item.Type == 1 {
-//				mapItems[fmt.Sprint("activityvoice", item.Id)].Activityvoice = item
-//			} else if item.Type == 2 {
-//				mapItems[fmt.Sprint("activityvideo", item.Id)].Activityvideo = item
-//			} else if item.Type == 3 {
-//				mapItems[fmt.Sprint("roadshow", item.Id)].Roadshow = item
-//			}
-//		}
-//	}
-//
-//	for _, vList := range list {
-//		for _, v := range mapItems {
-//			if v.SourceId == vList.SourceId {
-//				items = append(items, v)
-//			}
-//		}
-//	}
-//	return
-//}
-
 func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserItem) (items []*models.CygxResourceDataNewResp, err error) {
 	var condition string
 	var pars []interface{}
@@ -786,7 +331,7 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 		} else if v.Source == "industrialsourceHz" {
 			industrialResourceIdsHz = append(industrialResourceIdsHz, v.SourceId)
 		} else if v.Source == "industrialResourceIdsYx" {
-			industrialResourceIdsHz = append(industrialResourceIdsYx, v.SourceId)
+			industrialResourceIdsYx = append(industrialResourceIdsYx, v.SourceId)
 		}
 	}
 	detail, e := models.GetConfigByCode("city_img_url")
@@ -1116,7 +661,7 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 			err = errors.New("GetMicroRoadShowMycollect, Err: " + e.Error())
 			return
 		}
-
+		fmt.Println("list", list)
 		for _, item := range list {
 			if item.Type == 1 {
 				//音频