Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into need_Clei_kejian

controllers/activity.go

@@ -345,7 +345,7 @@ func (this *ActivityCoAntroller) ActivityList() {
 		}
 		if strings.Contains(v.ChartPermissionName, "研选") && v.ActivityTypeId == 1 {
 			list[k].ActivityTypeName = "买方研选电话会"
-			list[k].ImgUrlText = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202112/20211221/bIdfv8t86xrFRpDOeGGHXOmKEuKl.png"
+			list[k].ImgUrlText = utils.YAN_XUAN_IMG
 		}
 		if v.ActivityType == 0 {
 			if mapAddress[v.City] != "" {
@@ -562,7 +562,8 @@ func (this *ActivityCoAntroller) ScheduleList() {
 		}
 		if strings.Contains(v.ChartPermissionName, "研选") && v.ActivityTypeId == 1 {
 			list[k].ActivityTypeName = "买方研选电话会"
-			list[k].ImgUrlText = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202112/20211221/bIdfv8t86xrFRpDOeGGHXOmKEuKl.png"
+			//list[k].ImgUrlText = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202112/20211221/bIdfv8t86xrFRpDOeGGHXOmKEuKl.png"
+			list[k].ImgUrlText = utils.YAN_XUAN_IMG
 		}
 		if v.ActivityType == 0 {
 			if mapAddress[v.City] != "" {
@@ -605,15 +606,28 @@ func (this *ActivityCoAntroller) ScheduleList() {
 		br.ErrMsg = "GetActivityVoiceResp，Err:" + err.Error()
 		return
 	}
+
+	//处理视频回放
+	mapActivityVideo, err := services.GetActivityVideoResp(mapActivityId)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "GetActivityVideoResp，Err:" + err.Error()
+		return
+	}
 	for k, v := range list {
 		if mapActivityVoice[v.ActivityId] != nil {
+			list[k].FileType = 1
 			list[k].AudioLink = true
 			list[k].VoiceList = mapActivityVoice[v.ActivityId]
 		}
+		if mapActivityVideo[v.ActivityId] != nil {
+			list[k].FileType = 2
+			list[k].AudioLink = true
+			list[k].VideoDetail = mapActivityVideo[v.ActivityId]
+		}
 		//处理列表的标签是否展示逻辑
 		resp.List = append(resp.List, services.ActivityButtonShow(v))
 	}
-
 	resp.Paging = page
 	br.Ret = 200
 	br.Success = true
@@ -998,7 +1012,8 @@ func (this *ActivityCoAntroller) Detail() {
 				return
 			}
 			//yidongKwy := activityInfo.YidongActivityUrl
-			activityInfo.YidongActivityUrl = yidongLongLink + "?source=11&fromHz=true&tgc=" + ydTgc
+			//activityInfo.YidongActivityUrl = yidongLongLink + "?source=11&fromHz=true&tgc=" + ydTgc
+			activityInfo.YidongActivityUrl = yidongLongLink + "%26source=11%26fromHz=true%26tgc=" + ydTgc
 		}
 		//处理音频回放
 		var mapActivityId []int
@@ -1010,13 +1025,25 @@ func (this *ActivityCoAntroller) Detail() {
 			return
 		}
 		if mapActivityVoice[activityId] != nil {
+			activityInfo.FileType = 1
 			activityInfo.AudioLink = true
 			activityInfo.VoiceList = mapActivityVoice[activityId]
 		}
 
+		//处理视频回放
+		mapActivityVideo, err := services.GetActivityVideoResp(mapActivityId)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "GetActivityVideoResp，Err:" + err.Error()
+			return
+		}
+		if mapActivityVideo[activityId] != nil {
+			activityInfo.FileType = 2
+			activityInfo.AudioLink = true
+			activityInfo.VideoDetail = mapActivityVideo[activityId]
+		}
 		//处理按钮是否展示问题
 		resp.Detail = services.ActivityButtonShow(activityInfo)
-
 	}
 	resp.HasPermission = hasPermission
 	br.Ret = 200
@@ -2079,202 +2106,6 @@ func (this *ActivityABaseController) FastSearch() {
 	br.Data = resp
 }
 
-// @Title 主题列表
-// @Description 获取活动主题列表接口
-// @Param   ChartPermissionIds   query   string  false     "行业id 多个用 , 隔开"
-// @Param   ActivityTypeIds   query   string  false     "活动类型id 多个用 , 隔开"
-// @Param   ActiveState   query   string  false       "活动进行状态 未开始：1、进行中2、已结束3"
-// @Param   WhichDay   query   string  false       "哪一天 今天：1、明天:2，多个用 , 隔开"
-// @Param   Label   query   string  false       "搜索主题 多个用 , 隔开 （空为活动主题，非空为更多主题）"
-// @Success 200 {object} models.GetCygxActivityLabelListRep
-// @router /labelList_deltest [get]
-func (this *ActivityCoAntroller) LabelList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	user := this.User
-	if user == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		return
-	}
-	pageSize, _ := this.GetInt("PageSize")
-	chartPermissionIds := this.GetString("ChartPermissionIds")
-	activityTypeIds := this.GetString("ActivityTypeIds")
-	whichDay := this.GetString("WhichDay")
-	isShowJurisdiction, _ := this.GetInt("IsShowJurisdiction")
-	activeState := this.GetString("ActiveState")
-	label := this.GetString("Label")
-	//入参为 undefined 时的处理
-	if chartPermissionIds == "undefined" {
-		chartPermissionIds = ""
-	}
-	// 查研观向7.4-始终查询宏观的活动
-	if chartPermissionIds != "" {
-		chartPermissionIds += ",1"
-	}
-	if activityTypeIds == "undefined" {
-		activityTypeIds = ""
-	}
-	if whichDay == "undefined" {
-		whichDay = ""
-	}
-	if activeState == "undefined" {
-		activeState = ""
-	}
-	if label == "undefined" {
-		label = ""
-	}
-	userType, permissionStr, err := services.GetUserType(user.CompanyId)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败，Err:" + err.Error()
-		return
-	}
-	if isShowJurisdiction == 1 && chartPermissionIds == "" && userType == 4 {
-		activityTypeIds = "1,3"
-	}
-	var startSize int
-	pageSize = 15
-	var condition string
-	var sortTime string
-	var pars []interface{}
-	//活动可见限制
-	var sqlExport string
-	slicePer := strings.Split(permissionStr, ",")
-	var permissionSqlStr string
-	for _, v := range slicePer {
-		if userType == 1 {
-			//if v != "研选" {
-			if !strings.Contains(v, "研选") {
-				permissionSqlStr += "'" + v + "',"
-			}
-		} else {
-			permissionSqlStr += "'" + v + "',"
-		}
-	}
-	permissionSqlStr = strings.TrimRight(permissionSqlStr, ",")
-	permissionSqlStr = strings.Replace(permissionSqlStr, "(主观)", "", -1)
-	permissionSqlStr = strings.Replace(permissionSqlStr, "(客观)", "", -1)
-	permissionSqlStr = ` AND art.chart_permission_name  IN (` + permissionSqlStr + `)`
-	sqlExport = ` AND (art.customer_type_ids LIKE '%` + strconv.Itoa(userType) + `%' `
-	if userType == 2 {
-		sqlExport += ` OR  art.customer_type_ids LIKE '%3%' `
-	}
-	if (userType == 2 || userType == 3) && strings.Contains(permissionStr, "专家") {
-		sqlExport += ` OR  art.customer_type_ids LIKE '%4%' `
-	}
-	sqlExport += `) `
-	condition += ` AND art.publish_status = 1  AND art.label != '' `
-	var conditionOr string
-	if (userType == 2 || userType == 3 || userType == 4) && strings.Contains(permissionStr, "专家") {
-		conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%4%'	 ` + condition + `) `
-	}
-	if (userType == 5) && strings.Contains(permissionStr, "专家") {
-		conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%5%'	 ` + condition + `) `
-	}
-	if userType == 1 {
-		conditionOr += `	OR ( art.is_limit_people = 0 	  ` + condition + permissionSqlStr + `) `
-	} else {
-		conditionOr += `	OR ( art.is_limit_people = 0 	  ` + condition + `) `
-	}
-	condition += `AND art.is_limit_people = 1 ` + permissionSqlStr + sqlExport + conditionOr
-	resp := new(models.GetCygxActivityLabelListRep)
-	//主题
-	if label != "" {
-		sortTime = ` timesort DESC `
-		listAll, errList := models.GetActivityLabelListAll(condition, sortTime, pars, startSize, 32)
-		if errList != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取失败，Err:" + errList.Error()
-			return
-		}
-		sortTime = ` mintimesort ASC `
-		condition += ` AND art.active_state = 1 `
-		list1, errList := models.GetActivityLabelListAll(condition, sortTime, pars, startSize, 16)
-		if errList != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取失败，Err:" + errList.Error()
-			return
-		}
-		for _, v := range listAll {
-			var isHAve bool
-			for _, v2 := range list1 {
-				if v2.KeyWord == v.KeyWord {
-					isHAve = true
-				}
-			}
-			if !isHAve {
-				resp.List = append(resp.List, v)
-			}
-		}
-		resp.Label = label
-		resp.ImgUrl = ""
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		br.Data = resp
-		return
-	} else {
-		//行业名称
-		condition = ` AND art.publish_status = 1  AND art.label != '' `
-		if len(chartPermissionIds) > 0 {
-			condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
-		}
-		if activityTypeIds != "" {
-			condition += ` AND art.activity_type_id  IN (` + activityTypeIds + `)`
-		}
-		var conditionOr string
-		if whichDay != "" {
-			var startDate string
-			var endDate string
-			if whichDay == "1" {
-				startDate = time.Now().Format(utils.FormatDate)
-				endDate = startDate
-			} else if whichDay == "2" {
-				startDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
-				endDate = startDate
-			} else {
-				startDate = time.Now().Format(utils.FormatDate)
-				endDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
-			}
-			condition += ` AND art.activity_time >= ` + "'" + startDate + " 00:00:00'"
-			condition += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
-		}
-		if activeState != "" {
-			condition += ` AND art.active_state  IN (` + activeState + `)`
-		} else {
-			condition += ` AND art.active_state  IN (1)`
-		}
-		if (userType == 2 || userType == 3 || userType == 4) && strings.Contains(permissionStr, "专家") {
-			conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%4%'	 ` + condition + `) `
-		}
-		if (userType == 5) && strings.Contains(permissionStr, "专家") {
-			conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%5%'	 ` + condition + `) `
-		}
-		if userType == 1 {
-			conditionOr += `	OR ( art.is_limit_people = 0 	  ` + condition + permissionSqlStr + `) `
-		} else {
-			conditionOr += `	OR ( art.is_limit_people = 0 	  ` + condition + `) `
-		}
-		condition += `AND art.is_limit_people = 1 ` + permissionSqlStr + sqlExport + conditionOr
-	}
-	sortTime = ` mintimesort ASC `
-	list, errList := models.GetActivityLabelListAll(condition, sortTime, pars, startSize, pageSize)
-	if errList != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败，Err:" + errList.Error()
-		return
-	}
-	resp.List = list
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}
-
 // @Title 活动带问
 // @Description 新增活动带问接口
 // @Param	request	body models.AddCygxActivityHelpAsk true "type json string"
@@ -2421,243 +2252,19 @@ func (this *ActivityCoAntroller) AskAdd() {
 					services.SendActivityAskApplyTemplateMsgV2(user.RealName+"——"+user.CompanyName, "所属销售："+sellerItem.RealName, time.Now().Format(utils.FormatDateTime), req.Content, activityInfo.ActivityName, openIpItem, activityInfo)
 				}
 			}
-		}
-		// 给所属销售发送消息
-		if sellerItem != nil {
-			openIpItem, _ := models.GetUserRecordByMobile(4, sellerItem.Mobile)
-			if openIpItem != nil && openIpItem.OpenId != "" {
-				services.SendActivityAskApplyTemplateMsgV2(user.RealName+"——"+user.CompanyName, "所属销售："+sellerItem.RealName, time.Now().Format(utils.FormatDateTime), req.Content, activityInfo.ActivityName, openIpItem, activityInfo)
-			}
-		}
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "提交成功"
-}
-
-// @Title 活动类型下的主题列表（4.3版本）
-// @Description 获取活动类型下的主题列表接口（4.3版本）
-// @Param   ChartPermissionIds   query   string  false     "行业id 多个用 , 隔开"
-// @Param   ActivityTypeIds   query   string  false     "活动类型id 多个用 , 隔开"
-// @Param   ActiveState   query   string  false       "活动进行状态 未开始：1、进行中2、已结束3"
-// @Param   WhichDay   query   string  false       "哪一天 今天：1、明天:2，多个用 , 隔开"
-// @Param   IsPower   query   int  false       "是否选择有权限行业 ，1是 0 否 默认0"
-// @Success 200 {object} models.ActivityTypeListHomeResp
-// @router /labelTypeList_deltest [get]
-func (this *ActivityCoAntroller) LabelTypeList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	user := this.User
-	if user == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		return
-	}
-	pageSize, _ := this.GetInt("PageSize")
-	isPower, _ := this.GetInt("IsPower")
-	//currentIndex, _ := this.GetInt("CurrentIndex")
-	chartPermissionIds := this.GetString("ChartPermissionIds")
-	//activityTypeIds := this.GetString("ActivityTypeIds")
-	whichDay := this.GetString("WhichDay")
-	activeState := this.GetString("ActiveState")
-	//入参为 undefined 时的处理
-	if chartPermissionIds == "undefined" {
-		chartPermissionIds = ""
-	}
-	// 查研观向7.4-始终查询宏观的活动
-	if chartPermissionIds != "" {
-		chartPermissionIds += ",1"
-	}
-	if whichDay == "undefined" {
-		whichDay = ""
-	}
-	if activeState == "undefined" || activeState == "" {
-		activeState = "1"
-	}
-	userType, permissionStr, err := services.GetUserType(user.CompanyId)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败，Err:" + err.Error()
-		return
-	}
-
-	var startSize int
-	pageSize = 40
-	var sortTime string
-	var pars []interface{}
-	//活动可见限制
-	slicePer := strings.Split(permissionStr, ",")
-	var permissionSqlStr string
-	var permissionNameStr string
-	for _, v := range slicePer {
-		if userType == 1 {
-			//if v != "研选" {
-			if !strings.Contains(v, "研选") {
-				permissionNameStr += "'" + v + "',"
-			}
-		} else {
-			permissionNameStr += "'" + v + "',"
-		}
-	}
-	permissionNameStr = strings.Replace(permissionNameStr, "(主观)", "", -1)
-	permissionNameStr = strings.Replace(permissionNameStr, "(客观)", "", -1)
-	permissionNameStr = strings.TrimRight(permissionNameStr, ",")
-	list, err := models.GetActivityTypeHomeList()
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取数据失败，Err:" + err.Error()
-		return
-	}
-	resp := new(models.ActivityTypeListHomeResp)
-	for k, v := range list {
-		var sqlExport string
-		var condition string
-		permissionSqlStr = ` AND art.chart_permission_name  IN (` + permissionNameStr + `)`
-		sqlExport = ` AND (art.customer_type_ids LIKE '%` + strconv.Itoa(userType) + `%' `
-		if userType == 2 {
-			sqlExport += ` OR  art.customer_type_ids LIKE '%3%' `
-		}
-		if (userType == 2 || userType == 3) && strings.Contains(permissionStr, "专家") {
-			sqlExport += ` OR  art.customer_type_ids LIKE '%4%' `
-		}
-		sqlExport += `) `
-		condition = ` AND art.publish_status = 1  AND art.label != ''  AND art.activity_type_id = ` + strconv.Itoa(v.ActivityTypeId)
-		if isPower == 1 {
-			condition += permissionSqlStr
-		}
-		//行业名称
-		if len(chartPermissionIds) > 0 {
-			condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
-		}
-		var conditionOr string
-		if whichDay != "" {
-			var startDate string
-			var endDate string
-			if whichDay == "1" {
-				startDate = time.Now().Format(utils.FormatDate)
-				endDate = startDate
-			} else if whichDay == "2" {
-				startDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
-				endDate = startDate
-			} else {
-				startDate = time.Now().Format(utils.FormatDate)
-				endDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
-			}
-			condition += ` AND art.activity_time >= ` + "'" + startDate + " 00:00:00'"
-			condition += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
-		}
-		if activeState != "" {
-			condition += ` AND art.active_state  IN (` + activeState + `)`
-		} else {
-			condition += ` AND art.active_state  IN (1)`
-		}
-		if (userType == 2 || userType == 3 || userType == 4) && strings.Contains(permissionStr, "专家") {
-			conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%4%'	 ` + condition + `) `
-		}
-		if (userType == 5) && strings.Contains(permissionStr, "专家") {
-			conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%5%'	 ` + condition + `) `
-		}
-		if userType == 1 {
-			conditionOr += ` OR ( art.is_limit_people = 0 ` + condition + permissionSqlStr + `) `
-		} else {
-			conditionOr += ` OR ( art.is_limit_people = 0 ` + condition + `) `
-		}
-		//判断客户规模是否属于可见范围的活动
-		companyProduct, err := models.GetCompanyProductDetail(user.CompanyId, 2)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
-			return
-		}
-
-		if companyProduct != nil {
-			if companyProduct.Scale != "" {
-				conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
-			}
-		}
-
-		condition += `AND art.is_limit_people = 1 ` + permissionSqlStr + sqlExport + conditionOr
-
-		sortTime = ` mintimesort ASC `
-		labelList, err := models.GetActivityLabelListAll(condition, sortTime, pars, startSize, pageSize)
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取失败，Err:" + err.Error()
-			return
-		}
-		//标签字段关联的产业与标签处理
-		for k2, v2 := range labelList {
-			labelList[k2].KeyWord = services.LabelStr(v2.KeyWord)
-			labelList[k2].ImgUrlBg = v.ImgUrlBgs
-		}
-		list[k].List = labelList
-	}
-	//获取对应活动的数量并排序
-	intArr := make([]int, 0)
-	var items []*models.ActivityTypeHome
-	for _, v := range list {
-		item := new(models.ActivityTypeHome)
-		if len(v.List) > 0 {
-			item.List = v.List
-			item.ActivityTypeName = v.ActivityTypeName
-			item.ActivityTypeId = v.ActivityTypeId
-			item.ImgUrlBg = v.ImgUrlBg
-			item.ImgUrl = v.ImgUrl
-			items = append(items, item)
-			intArr = append(intArr, len(v.List))
-		}
-	}
-	sort.Sort(sort.Reverse(sort.IntSlice(intArr)))
-	var itemsNew []*models.ActivityTypeHome
-	activityMap := make(map[int]int)
-	for _, v := range intArr {
-		for _, v2 := range items {
-			item := new(models.ActivityTypeHome)
-			if len(v2.List) > 0 && v == len(v2.List) && activityMap[v2.ActivityTypeId] == 0 {
-				item.List = v2.List
-				item.ActivityTypeName = v2.ActivityTypeName
-				item.ActivityTypeId = v2.ActivityTypeId
-				item.ImgUrlBg = v2.ImgUrlBg
-				item.ImgUrl = v2.ImgUrl
-				itemsNew = append(itemsNew, item)
-				activityMap[v2.ActivityTypeId] = len(v2.List)
-			}
-		}
-	}
-	//如果第三个活动数量比第四个多，则两者调换
-	if len(itemsNew) > 3 {
-		if len(itemsNew[2].List) > len(itemsNew[3].List) {
-			var itemsNewCopy []*models.ActivityTypeHome
-			for _, v := range itemsNew {
-				itemsNewCopy = append(itemsNewCopy, v)
-			}
-			itemsNew[2] = itemsNewCopy[3]
-			itemsNew[3] = itemsNewCopy[2]
-		}
-	}
-
-	//记录用户搜索的筛选条件
-
-	item := new(models.CygxActivitySearchHistory)
-	item.UserId = user.UserId
-	item.Mobile = user.Mobile
-	item.CompanyId = user.CompanyId
-	item.CompanyName = user.CompanyName
-	item.CreateTime = time.Now()
-	item.ChartPermissionIds = chartPermissionIds
-	item.IsPower = isPower
-	item.WhichDay = whichDay
-	go models.AddCygxActivitySearchHistory(item)
+		}
+		// 给所属销售发送消息
+		if sellerItem != nil {
+			openIpItem, _ := models.GetUserRecordByMobile(4, sellerItem.Mobile)
+			if openIpItem != nil && openIpItem.OpenId != "" {
+				services.SendActivityAskApplyTemplateMsgV2(user.RealName+"——"+user.CompanyName, "所属销售："+sellerItem.RealName, time.Now().Format(utils.FormatDateTime), req.Content, activityInfo.ActivityName, openIpItem, activityInfo)
+			}
+		}
+	}
 
-	resp.List = itemsNew
 	br.Ret = 200
 	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
+	br.Msg = "提交成功"
 }
 
 // @Title 更多主题列表（4.3版本）
@@ -3006,7 +2613,8 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 		}
 		if strings.Contains(v.ChartPermissionName, "研选") && v.ActivityTypeId == 1 {
 			list[k].ActivityTypeName = "买方研选电话会"
-			list[k].ImgUrlText = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202112/20211221/bIdfv8t86xrFRpDOeGGHXOmKEuKl.png"
+			//list[k].ImgUrlText = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202112/20211221/bIdfv8t86xrFRpDOeGGHXOmKEuKl.png"
+			list[k].ImgUrlText = utils.YAN_XUAN_IMG
 		}
 		if v.ActivityType == 0 {
 			if mapAddress[v.City] != "" {
@@ -3052,17 +2660,31 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 		br.ErrMsg = "GetActivityVoiceResp，Err:" + err.Error()
 		return
 	}
+
+	//处理视频回放
+	mapActivityVideo, err := services.GetActivityVideoResp(mapActivityId)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "GetActivityVideoResp，Err:" + err.Error()
+		return
+	}
+
 	for _, v := range list {
 		if mapDingActivityId[v.ActivityId] == 0 {
 			activityList = append(activityList, v)
 		}
 	}
-
 	for k, v := range activityList {
 		if mapActivityVoice[v.ActivityId] != nil {
+			list[k].FileType = 1
 			list[k].AudioLink = true
 			list[k].VoiceList = mapActivityVoice[v.ActivityId]
 		}
+		if mapActivityVideo[v.ActivityId] != nil {
+			list[k].FileType = 2
+			list[k].AudioLink = true
+			list[k].VideoDetail = mapActivityVideo[v.ActivityId]
+		}
 		resp.List = append(resp.List, services.ActivityButtonShow(v))
 	}
 
@@ -3115,187 +2737,6 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	br.Data = resp
 }
 
-// @Title 活动类型下的主题列表Pc端
-// @Description 获取活动类型下的主题列表接口Pc端
-// @Param   ChartPermissionIds   query   string  false     "行业id 多个用 , 隔开"
-// @Param   ActivityTypeIds   query   string  false     "活动类型id 多个用 , 隔开"
-// @Param   ActiveState   query   string  false       "活动进行状态 未开始：1、进行中2、已结束3"
-// @Param   WhichDay   query   string  false       "哪一天 今天：1、明天:2，多个用 , 隔开"
-// @Param   IsPower   query   int  false       "是否选择有权限行业 ，1是 0 否 默认0"
-// @Success 200 {object} models.ActivityTypeListHomeRespPc
-// @router /labelTypeListPc_deltest [get]
-func (this *ActivityCoAntroller) LabelTypeListPc() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	user := this.User
-	if user == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		return
-	}
-	pageSize, _ := this.GetInt("PageSize")
-	isPower, _ := this.GetInt("IsPower")
-	//currentIndex, _ := this.GetInt("CurrentIndex")
-	chartPermissionIds := this.GetString("ChartPermissionIds")
-	//activityTypeIds := this.GetString("ActivityTypeIds")
-	whichDay := this.GetString("WhichDay")
-	activeState := this.GetString("ActiveState")
-	//入参为 undefined 时的处理
-	if chartPermissionIds == "undefined" {
-		chartPermissionIds = ""
-	}
-	// 查研观向7.4-始终查询宏观的活动
-	if chartPermissionIds != "" {
-		chartPermissionIds += ",1"
-	}
-	if whichDay == "undefined" {
-		whichDay = ""
-	}
-	if activeState == "undefined" || activeState == "" {
-		activeState = "1"
-	}
-	userType, permissionStr, err := services.GetUserType(user.CompanyId)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败，Err:" + err.Error()
-		return
-	}
-
-	var startSize int
-	pageSize = 8
-	var sortTime string
-	var pars []interface{}
-	//活动可见限制
-	slicePer := strings.Split(permissionStr, ",")
-	var permissionSqlStr string
-	var permissionNameStr string
-	for _, v := range slicePer {
-		if userType == 1 {
-			//if v != "研选" {
-			if !strings.Contains(v, "研选") {
-				permissionNameStr += "'" + v + "',"
-			}
-		} else {
-			permissionNameStr += "'" + v + "',"
-		}
-	}
-	permissionNameStr = strings.Replace(permissionNameStr, "(主观)", "", -1)
-	permissionNameStr = strings.Replace(permissionNameStr, "(客观)", "", -1)
-	permissionNameStr = strings.TrimRight(permissionNameStr, ",")
-	list, err := models.GetActivityTypeHomeListPc()
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取数据失败，Err:" + err.Error()
-		return
-	}
-	resp := new(models.ActivityTypeListHomeRespPc)
-	for k, v := range list {
-		var sqlExport string
-		var condition string
-		permissionSqlStr = ` AND art.chart_permission_name  IN (` + permissionNameStr + `)`
-		sqlExport = ` AND (art.customer_type_ids LIKE '%` + strconv.Itoa(userType) + `%' `
-		if userType == 2 {
-			sqlExport += ` OR  art.customer_type_ids LIKE '%3%' `
-		}
-		if (userType == 2 || userType == 3) && strings.Contains(permissionStr, "专家") {
-			sqlExport += ` OR  art.customer_type_ids LIKE '%4%' `
-		}
-		sqlExport += `) `
-		condition = ` AND art.publish_status = 1  AND art.label != ''  AND art.activity_type_id = ` + strconv.Itoa(v.ActivityTypeId)
-		if isPower == 1 {
-			condition += permissionSqlStr
-		}
-		//行业名称
-		if len(chartPermissionIds) > 0 {
-			condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
-		}
-		var conditionOr string
-		if whichDay != "" {
-			var startDate string
-			var endDate string
-			if whichDay == "1" {
-				startDate = time.Now().Format(utils.FormatDate)
-				endDate = startDate
-			} else if whichDay == "2" {
-				startDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
-				endDate = startDate
-			} else {
-				startDate = time.Now().Format(utils.FormatDate)
-				endDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
-			}
-			condition += ` AND art.activity_time >= ` + "'" + startDate + " 00:00:00'"
-			condition += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
-		}
-		if activeState != "" {
-			// 默认查看未开始跟进行中
-			if activeState == "1" {
-				condition += ` AND art.active_state  IN (1,2)`
-			} else {
-				condition += ` AND art.active_state  IN (` + activeState + `)`
-			}
-		} else {
-			condition += ` AND art.active_state  IN (1)`
-		}
-		if (userType == 2 || userType == 3 || userType == 4) && strings.Contains(permissionStr, "专家") {
-			conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%4%'	 ` + condition + `) `
-		}
-		if (userType == 5) && strings.Contains(permissionStr, "专家") {
-			conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%5%'	 ` + condition + `) `
-		}
-		if userType == 1 {
-			conditionOr += ` OR ( art.is_limit_people = 0 ` + condition + permissionSqlStr + `) `
-		} else {
-			conditionOr += ` OR ( art.is_limit_people = 0 ` + condition + `) `
-		}
-		//判断客户规模是否属于可见范围的活动
-		companyProduct, err := models.GetCompanyProductDetail(user.CompanyId, 2)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
-			return
-		}
-		if companyProduct != nil {
-			if companyProduct.Scale != "" {
-				conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
-			}
-		}
-		condition += `AND art.is_limit_people = 1 ` + permissionSqlStr + sqlExport + conditionOr
-		sortTime = ` mintimesort ASC `
-		labelList, err := models.GetActivityLabelListAll(condition, sortTime, pars, startSize, pageSize)
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取失败，Err:" + err.Error()
-			return
-		}
-		//标签字段关联的产业与标签处理
-		for k2, v2 := range labelList {
-			labelList[k2].KeyWord = services.LabelStr(v2.KeyWord)
-
-		}
-		list[k].List = labelList
-	}
-	//记录用户搜索的筛选条件
-	item := new(models.CygxActivitySearchHistory)
-	item.UserId = user.UserId
-	item.Mobile = user.Mobile
-	item.CompanyId = user.CompanyId
-	item.CompanyName = user.CompanyName
-	item.CreateTime = time.Now()
-	item.ChartPermissionIds = chartPermissionIds
-	item.IsPower = isPower
-	item.WhichDay = whichDay
-	go models.AddCygxActivitySearchHistory(item)
-
-	resp.List = list
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}
-
 // @Title 校验活动带问是否有权限
 // @Description 校验活动带问是否有权限接口
 // @Param	request	body models.ActivityIdRep true "type json string"
@@ -3555,18 +2996,10 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 	if activeState == "undefined" || activeState == "" {
 		activeState = "1"
 	}
-
 	// 查研观向7.4-始终查询宏观的活动
 	if chartPermissionIds != "" {
 		chartPermissionIds += ",1"
 	}
-
-	//adminIds, err := models.GetSelleridWhichGroup(user.CompanyId, 2)
-	//if err != nil {
-	//	br.Msg = "获取失败"
-	//	br.ErrMsg = "获取本组下的销售失败，Err:" + err.Error()
-	//	return
-	//}
 	userType, permissionStr, err := services.GetUserType(user.CompanyId)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -3579,7 +3012,7 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 	var pars []interface{}
 	//活动可见限制
 	slicePer := strings.Split(permissionStr, ",")
-	var permissionSqlStr string
+	//var permissionSqlStr string
 	var permissionNameStr string
 	for _, v := range slicePer {
 		if userType == 1 {
@@ -3617,7 +3050,7 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 	}
 	//isMaker := user.IsMaker
 
-	var sqlExport string
+	//var sqlExport string
 	resp := new(models.ActivityTypeListHomeResp)
 	for k, v := range list {
 		// 如果是C类电话会就不展示内容，且合并到分析师电话会
@@ -3648,59 +3081,21 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 		list[k].Resource = 1
 	}
 
-	//userType = 1
-	//查询专项产业调研展示权限
+	//查询专项产业调研展示权限 仅对大套餐客户跟永续客户展示
 	if whichDay == "" {
-		var condition string
-		condition = ` AND art.publish_status = 1  AND art.label != '' `
-		if isPower == 1 {
-			condition += permissionSqlStr
-		}
-		//行业名称
-		if len(chartPermissionIds) > 0 {
-			condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
-		}
-		var conditionOr string
-
-		if (userType == 2 || userType == 3 || userType == 4) && strings.Contains(permissionStr, "专家") {
-			conditionOr += ` OR (1=1 AND   art.customer_type_ids LIKE '%4%'	 ` + condition + `) `
-		}
-		if (userType == 5) && strings.Contains(permissionStr, "专家") {
-			conditionOr += ` OR (1=1 AND art.customer_type_ids LIKE '%5%'	 ` + condition + `) `
-		}
-		if userType == 1 {
-			conditionOr += ` OR (1=1 ` + condition + permissionSqlStr + `) `
-		}
-
+		var scale string
 		if companyProduct != nil {
-			if companyProduct.Scale != "" {
-				conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
-			}
+			scale = companyProduct.Scale
 		}
-
-		condition += sqlExport + conditionOr
-		specialList, err := models.GetActivityLabelSpecialListAll(condition, pars, startSize, 8)
+		speciaItem, err := services.GetActivityLabelSpecialList(userType, isPower, chartPermissionIds, scale, permissionNameStr)
 		if err != nil {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取失败，Err:" + err.Error()
 			return
 		}
-		for k2, v2 := range specialList {
-			specialList[k2].KeyWord = services.LabelStrV5(v2.KeyWord, v2.IsShowSubjectName, v2.TemporaryLabel)
-			specialList[k2].ImgUrlBg = "https://hzstatic.hzinsights.com/static/temp/20220426202204/20220426/XDLLsjC9XAAy8LIzQr7GsjrBbtX6.png"
-			specialList[k2].ImgUrlBg = utils.ACTIVITY_ZXDY_ImgUrl3
+		if len(speciaItem.List) > 0 {
+			list = append(list, speciaItem)
 		}
-
-		itemList := new(models.ActivityTypeHome)
-		itemList.ActivityTypeName = "专项产业调研"
-		itemList.Resource = 2
-		itemList.List = specialList
-		itemList.ActivityTypeId = 7
-		//itemList.ImgUrl = "https://hzstatic.hzinsights.com/static/temp/20220427202204/20220427/b2Bj3fGakP16iJRFKisQohCWnCNl.png"
-		itemList.ImgUrl = utils.ACTIVITY_ZXDY_ImgUrl1
-		//itemList.ImgUrlBg = "https://hzstatic.hzinsights.com/static/temp/20220427202204/20220427/OkunjfKEgo5KRLifzwwLX8cDZnnN.png"
-		itemList.ImgUrlBg = utils.ACTIVITY_ZXDY_ImgUrl2
-		list = append(list, itemList)
 	}
 
 	//获取对应活动的数量并排序
@@ -4593,7 +3988,6 @@ func (this *ActivityCoAntroller) LabelTypeListV6Pc() {
 	var pars []interface{}
 	//活动可见限制
 	slicePer := strings.Split(permissionStr, ",")
-	var permissionSqlStr string
 	var permissionNameStr string
 	for _, v := range slicePer {
 		if userType == 1 {
@@ -4673,55 +4067,27 @@ func (this *ActivityCoAntroller) LabelTypeListV6Pc() {
 
 	if whichDay == "" {
 		//查询专项产业调研展示权限
-		var condition string
-		condition = ` AND art.publish_status = 1  AND art.label != '' `
-		if isPower == 1 {
-			condition += permissionSqlStr
-		}
-		//行业名称
-		if len(chartPermissionIds) > 0 {
-			condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
-		}
-		var conditionOr string
-
-		if (userType == 2 || userType == 3 || userType == 4) && strings.Contains(permissionStr, "专家") {
-			conditionOr += ` OR (1=1 AND   art.customer_type_ids LIKE '%4%'	 ` + condition + `) `
-		}
-		if (userType == 5) && strings.Contains(permissionStr, "专家") {
-			conditionOr += ` OR (1=1 AND art.customer_type_ids LIKE '%5%'	 ` + condition + `) `
-		}
-		if userType == 1 {
-			conditionOr += ` OR (1=1 ` + condition + permissionSqlStr + `) `
-		}
-
+		var scale string
 		if companyProduct != nil {
-			if companyProduct.Scale != "" {
-				conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
-			}
+			scale = companyProduct.Scale
 		}
-
-		condition += sqlExport + conditionOr
-		specialList, err := models.GetActivityLabelSpecialListAll(condition, pars, startSize, 8)
+		speciaItem, err := services.GetActivityLabelSpecialList(userType, isPower, chartPermissionIds, scale, permissionNameStr)
 		if err != nil {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取失败，Err:" + err.Error()
 			return
 		}
-		for k2, v2 := range specialList {
-			specialList[k2].KeyWord = services.LabelStrV5(v2.KeyWord, v2.IsShowSubjectName, v2.TemporaryLabel)
-			specialList[k2].Resource = 2
+		if len(speciaItem.List) > 0 {
+			itemList := new(models.ActivityTypeHomePc)
+			itemList.ActivityTypeName = "专项产业调研"
+			itemList.Resource = 2
+			itemList.List = speciaItem.List
+			itemList.ActivityTypeId = 7
+			itemList.OnlineIco = "https://hzstatic.hzinsights.com/static/temp/20220707202207/20220707/0H4md6VgZMuIttggMUnJxgrlayxC.png"
+			itemList.ImgUrlBgPc = "https://hzstatic.hzinsights.com/static/temp/20220707202207/20220707/rFwAM1c4fIMJM0EGoUkUYl25XH9L.png"
+			list = append(list, itemList)
 		}
-
-		itemList := new(models.ActivityTypeHomePc)
-		itemList.ActivityTypeName = "专项产业调研"
-		itemList.Resource = 2
-		itemList.List = specialList
-		itemList.ActivityTypeId = 7
-		itemList.OnlineIco = "https://hzstatic.hzinsights.com/static/temp/20220707202207/20220707/0H4md6VgZMuIttggMUnJxgrlayxC.png"
-		itemList.ImgUrlBgPc = "https://hzstatic.hzinsights.com/static/temp/20220707202207/20220707/rFwAM1c4fIMJM0EGoUkUYl25XH9L.png"
-		list = append(list, itemList)
 	}
-
 	// 查研观向7.4-活动【新】标签
 	activityIds := make([]int, 0)
 	for _, v := range list {
@@ -5218,3 +4584,81 @@ func (this *ActivityCoAntroller) ActivityVoiceHistoryAdd() {
 	br.Msg = "操作成功"
 	return
 }
+
+// @Title 记录用户浏览视频回放接口
+// @Description 记录用户浏览音频回放接口
+// @Param	request	body models.ActivityIdRep true "type json string"
+// @Success Ret=200 {object} models.AppointmentResp
+// @router /videoHistory/add [post]
+func (this *ActivityCoAntroller) ActivityVideoHistoryAdd() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	user := this.User
+	if user == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，用户信息为空"
+		br.Ret = 408
+		return
+	}
+	uid := user.UserId
+	var req models.ActivityIdRep
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+
+	activityId := req.ActivityId
+	activityInfo, errInfo := models.GetCygxActivityVideoByActivityId(activityId)
+	if activityInfo == nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "活动ID错误,不存在activityId：" + strconv.Itoa(activityId)
+		return
+	}
+	if errInfo != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "操作失败,Err:" + errInfo.Error()
+		return
+	}
+	var sellerName string
+	sellerName, err = models.GetCompanySellerName(user.CompanyId)
+	if err != nil {
+		br.Msg = "报名失败！"
+		br.ErrMsg = "获取对应销售失败，Err:" + err.Error()
+		return
+	}
+	item := models.CygxActivityVideoHistory{
+		ActivityId:  activityId,
+		VideoId:     activityInfo.VideoId,
+		UserId:      uid,
+		CreateTime:  time.Now(),
+		Mobile:      user.Mobile,
+		Email:       user.Email,
+		CompanyId:   user.CompanyId,
+		CompanyName: user.CompanyName,
+		RealName:    user.RealName,
+		SellerName:  sellerName,
+		ModifyTime:  time.Now(),
+	}
+
+	err = models.AddCygxActivityVideoHistory(&item)
+	if err != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "操作失败,Err:" + err.Error()
+		return
+	}
+	err = models.UpdateActivityVideoCounts(activityId)
+	if err != nil {
+		br.Msg = "更新失败"
+		br.ErrMsg = "更新失败,Err:" + err.Error()
+		return
+	}
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "操作成功"
+	return
+}

controllers/micro_roadshow.go

@@ -22,6 +22,7 @@ type MicroRoadShowController struct {
 // @Param   KeyWord			query	string	false	"搜索关键词"
 // @Param   AudioId			query	int		false	"音频ID"
 // @Param   VideoId			query	int		false	"视频ID"
+// @Param   ActivityVideoId			query	int		false	"活动视频ID"
 // @Success 200 {object} models.HomeListResp
 // @router /list [get]
 func (this *MicroRoadShowController) List() {
@@ -42,6 +43,7 @@ func (this *MicroRoadShowController) List() {
 	keywords := this.GetString("KeyWord")
 	audioId, _ := this.GetInt("AudioId")
 	videoId, _ := this.GetInt("VideoId")
+	activityVideoId, _ := this.GetInt("ActivityVideoId")
 
 	if pageSize <= 0 {
 		pageSize = utils.PageSize20
@@ -51,7 +53,7 @@ func (this *MicroRoadShowController) List() {
 	}
 
 	// 微路演列表
-	list, total, e := services.GetMicroRoadShowPageList(pageSize, currentIndex, audioId, videoId, keywords)
+	list, total, e := services.GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activityVideoId, keywords)
 	if e != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取微路演列表失败, Err: " + e.Error()
@@ -161,7 +163,11 @@ func (this *MicroRoadShowController) VideoHistoryAdd() {
 
 	videoId := req.VideoId
 	playSeconds := req.PlaySeconds
+	sourceType := req.SourceType
 
+	if sourceType == 0 {
+		sourceType = 1
+	}
 	var sellerName string
 	sellerName, err = models.GetCompanySellerName(user.CompanyId)
 	if err != nil {
@@ -169,44 +175,52 @@ func (this *MicroRoadShowController) VideoHistoryAdd() {
 		br.ErrMsg = "获取对应销售失败，Err:" + err.Error()
 		return
 	}
-	item := models.CygxMicroRoadshowVideoHistory{
-		VideoId:     videoId,
-		UserId:      uid,
-		Mobile:      user.Mobile,
-		Email:       user.Email,
-		CompanyId:   user.CompanyId,
-		CompanyName: user.CompanyName,
-		RealName:    user.RealName,
-		SellerName:  sellerName,
-		PlaySeconds: strconv.Itoa(playSeconds),
-		CreateTime:  time.Now(),
-		ModifyTime:  time.Now(),
-	}
-
-	if playSeconds != 0 {
-		lastItem, err := models.GetLastCygxMicroRoadshowVideoHistory(videoId, user.UserId)
-		if err != nil {
-			br.Msg = "操作失败"
-			br.ErrMsg = "操作失败,GetLastCygxMicroRoadshowVideoHistory Err:" + err.Error()
-			return
-		}
-		err = models.UpdateLastCygxActivityVideoHistory(strconv.Itoa(playSeconds), lastItem.Id)
-		if err != nil {
-			br.Msg = "更新失败"
-			br.ErrMsg = "更新失败,UpdateLastCygxActivityVideoHistory Err:" + err.Error()
-			return
+	if sourceType == 1 {
+		item := models.CygxMicroRoadshowVideoHistory{
+			VideoId:     videoId,
+			UserId:      uid,
+			Mobile:      user.Mobile,
+			Email:       user.Email,
+			CompanyId:   user.CompanyId,
+			CompanyName: user.CompanyName,
+			RealName:    user.RealName,
+			SellerName:  sellerName,
+			PlaySeconds: strconv.Itoa(playSeconds),
+			CreateTime:  time.Now(),
+			ModifyTime:  time.Now(),
 		}
-	} else {
-		err = models.AddCygxMicroRoadshowVideoHistory(&item)
-		if err != nil {
-			br.Msg = "操作失败"
-			br.ErrMsg = "操作失败,Err:" + err.Error()
-			return
+		if playSeconds != 0 {
+			lastItem, err := models.GetLastCygxMicroRoadshowVideoHistory(videoId, user.UserId)
+			if err != nil {
+				br.Msg = "操作失败"
+				br.ErrMsg = "操作失败,GetLastCygxMicroRoadshowVideoHistory Err:" + err.Error()
+				return
+			}
+			err = models.UpdateLastCygxActivityVideoHistory(strconv.Itoa(playSeconds), lastItem.Id)
+			if err != nil {
+				br.Msg = "更新失败"
+				br.ErrMsg = "更新失败,UpdateLastCygxActivityVideoHistory Err:" + err.Error()
+				return
+			}
+		} else {
+			err = models.AddCygxMicroRoadshowVideoHistory(&item)
+			if err != nil {
+				br.Msg = "操作失败"
+				br.ErrMsg = "操作失败,Err:" + err.Error()
+				return
+			}
+			err = models.UpdateCygxActivityVideoCounts(videoId)
+			if err != nil {
+				br.Msg = "更新失败"
+				br.ErrMsg = "更新失败,Err:" + err.Error()
+				return
+			}
 		}
-		err = models.UpdateCygxActivityVideoCounts(videoId)
+	} else if sourceType == 2 {
+		err = services.AddActivityVideoHistory(user, videoId)
 		if err != nil {
 			br.Msg = "更新失败"
-			br.ErrMsg = "更新失败,Err:" + err.Error()
+			br.ErrMsg = "更新失败,AddActivityVideoHistory Err:" + err.Error()
 			return
 		}
 	}

controllers/report.go

@@ -195,7 +195,7 @@ func (this *ReportController) IndustryList() {
 	}
 	// 推荐关注
 	if recommendFocus == 1 {
-		condition += ` AND man.recommended_index >= 50`
+		condition += ` AND man.recommended_index >= 80`
 	}
 
 	// 列表总数据量
@@ -525,6 +525,7 @@ func (this *ReportController) List() {
 	}
 
 	resp.CategoryImgUrlPc = mapChartPermission[detail.ChartPermissionName]
+	resp.ChartPermissionId = detail.ChartPermissionId
 	resp.List = list
 	resp.Paging = page
 	br.Ret = 200
@@ -1217,9 +1218,9 @@ func (this *ReportController) IsShow() {
 		return
 	}
 	resp.IsShowChart = true
-	resp.IsShowResearch = true
+	//resp.IsShowResearch = true
 	resp.LinkWxExplain = utils.LINK_WX_EXPLAIN
-	resp.YanXuan_Explain = true
+	//resp.YanXuan_Explain = true
 	resp.IsShowFreeButton = IsShowFreeButton
 	mobile := user.Mobile
 	if mobile == "" {

controllers/tactics.go

@@ -118,7 +118,18 @@ func (this *TacticsController) List() {
 		listTacticsSrt = strings.TrimRight(listTacticsSrt, ",")
 		condition = ` AND category_id IN(` + listTacticsSrt + `)`
 	} else {
-		condition = ` AND category_id IN(` + strconv.Itoa(categoryId) + `)`
+		categoryIdSet, errCategory := models.GetdetailByCategoryIdSet(categoryId)
+		if errCategory != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取信息失败,Err:" + errCategory.Error() + "categoryID 不存在：" + strconv.Itoa(categoryId)
+			return
+		}
+		if categoryIdSet != "" {
+			condition = ` AND category_id IN(` + categoryIdSet + `)`
+		} else {
+			condition = ` AND category_id IN(` + strconv.Itoa(categoryId) + `)`
+		}
+
 	}
 	total, err = models.GetHomeCount(condition, pars)
 	if err != nil {

models/activity.go

@@ -74,7 +74,7 @@ type Activity struct {
 	ShowType         string `description:"人数限制类型，1不展示限制，2可选限制，3强制限制"`
 }
 type ActivityIdRep struct {
-	ActivityId int `description:"活动id"`
+	ActivityId  int `description:"活动id"`
 	PlaySeconds int `description:"播放时长"`
 }
 
@@ -189,6 +189,8 @@ type ActivityDetail struct {
 	AdminId                 int                        `description:"管理员、销售ID "`
 	IsMakerShow             int                        `description:"是否仅决策人可见 0，否 、1，是"`
 	VisibleRange            int                        `description:"可见范围 1，仅本组可见 、2，全部客户可见"`
+	VideoDetail             *CygxActivityVideoListResp `description:"视频数据"`
+	FileType                int                        `description:"类型: 1-音频; 2-视频"`
 }
 
 type CygxActivityResp struct {
@@ -280,7 +282,7 @@ type GetCygxActivityListRep struct {
 func GetActivityListAll(condition string, pars []interface{}, uid, startSize, pageSize, playBack int) (items []*ActivityDetail, err error) {
 	var sqlJiontable string
 	if playBack == 1 {
-		sqlJiontable = ` INNER JOIN cygx_activity_voice AS ac ON ac.activity_id = art.activity_id `
+		//sqlJiontable = ` INNER JOIN cygx_activity_voice AS ac ON ac.activity_id = art.activity_id `
 	}
 	o := orm.NewOrm()
 	sql := `SELECT art.* ,t.activity_type,t.img_url_text,c.image_url as  img_url,
@@ -316,7 +318,7 @@ func GetActivityListByDateTime(startDate, endDate, activityIds, activityIdsLongT
 func GetActivityCount(condition string, playBack int, pars []interface{}) (count int, err error) {
 	var sqlJiontable string
 	if playBack == 1 {
-		sqlJiontable = ` INNER JOIN cygx_activity_voice AS ac ON ac.activity_id = art.activity_id `
+		//sqlJiontable = ` INNER JOIN cygx_activity_voice AS ac ON ac.activity_id = art.activity_id `
 	}
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_activity as art ` + sqlJiontable + ` WHERE 1= 1  `
 	if condition != "" {

models/activity_video.go

@@ -0,0 +1,71 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"github.com/rdlucklib/rdluck_tools/paging"
+)
+
+type CygxActivityVideo struct {
+	VideoId       int    `orm:"column(video_id);pk"description:"视频id"`
+	VideoName     string `description:"视频名称"`
+	ActivityId    int    ` description:"活动ID"`
+	ModifyDate    string `description:"更新时间"`
+	VideoDuration string `description:"视频时长"`
+	VideoCounts   int    `description:"播放量"`
+	VideoUrl      string `description:"视频地址"`
+	CreateTime    string `description:"创建时间"`
+}
+
+type CygxActivityVideoReq struct {
+	VideoName     string `description:"视频名称"`
+	VideoDuration string `description:"视频时长"`
+	VideoUrl      string `description:"视频地址"`
+}
+
+//string `orm:"column(label)";description:"主题"`
+//活动详情
+type CygxActivityVideoListResp struct {
+	ActivityId    int    `description:"活动ID 等于0新增活动，大于0修改活动"`
+	Id            int    `orm:"column(video_id)";description:"视频id"`
+	Title         string `orm:"column(video_name)";description:"视频名称"`
+	ResourceUrl   string `orm:"column(video_url)";description:"视频地址"`
+	VideoDuration string `description:"视频时长"`
+}
+
+type CygxActivityVideoListRep struct {
+	Paging *paging.PagingItem `description:"分页数据"`
+	List   []*CygxActivityVideoListResp
+}
+
+//列表
+func GetActivityVideoListAll(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityVideoListResp, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT art.*,v.video_id,v.video_name,v.video_url,video_duration FROM cygx_activity as art  INNER JOIN cygx_activity_video AS v ON v.activity_id = art.activity_id   WHERE 1= 1  `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` LIMIT ?,?`
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	return
+}
+
+func UpdateActivityVideoCounts(activityId int) (err error) {
+	sql := `UPDATE cygx_activity_video SET video_counts = video_counts+1 WHERE activity_id = ?  `
+	o := orm.NewOrm()
+	_, err = o.Raw(sql, activityId).Exec()
+	return
+}
+
+// GetCygxActivityVideoByActivityId 获取活动视频
+func GetCygxActivityVideoByActivityId(activityId int) (item *CygxActivityVideo, err error) {
+	sql := `SELECT * FROM cygx_activity_video WHERE activity_id = ? LIMIT 1 `
+	err = orm.NewOrm().Raw(sql, activityId).QueryRow(&item)
+	return
+}
+
+// GetCygxActivityVideoById 获取活动视频
+func GetCygxActivityVideoById(activityId int) (item *CygxActivityVideo, err error) {
+	sql := `SELECT * FROM cygx_activity_video WHERE video_id = ? LIMIT 1 `
+	err = orm.NewOrm().Raw(sql, activityId).QueryRow(&item)
+	return
+}

models/activity_video_history.go

@@ -0,0 +1,29 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+type CygxActivityVideoHistory struct {
+	Id          int       `orm:"column(id);pk"description:"音频id"`
+	VideoId     int       `description:"微路演音频id"`
+	ActivityId  int       `description:"活动id"`
+	UserId      int       `description:"用户id"`
+	Mobile      string    `description:"手机号"`
+	Email       string    `description:"邮箱"`
+	CompanyId   int       `description:"公司Id"`
+	CompanyName string    `description:"公司名称"`
+	RealName    string    `description:"用户实际名称"`
+	SellerName  string    `description:"所属销售"`
+	PlaySeconds string    `description:"播放时间 单位s"`
+	CreateTime  time.Time `description:"视频创建时间"`
+	ModifyTime  time.Time `description:"视频修改时间"`
+}
+
+//添加
+func AddCygxActivityVideoHistory(item *CygxActivityVideoHistory) (err error) {
+	o := orm.NewOrm()
+	_, err = o.Insert(item)
+	return
+}

models/activity_voice.go

@@ -13,8 +13,8 @@ type CygxActivityVoice struct {
 	VoiceUrl         string    `description:"音频地址"`
 	VoiceName        string    `description:"音频名称"`
 	VoicePlaySeconds string    `description:"音频时长"`
-	VoiceCounts         int    `description:"播放量"`
-	ModifyTime          string `description:"更新时间"`
+	VoiceCounts      int       `description:"播放量"`
+	ModifyTime       string    `description:"更新时间"`
 	CreateTime       time.Time `description:"创建时间"`
 }
 
@@ -33,7 +33,7 @@ func GetCygxActivityVoiceReqList(activityIds []int) (items []*CygxActivityVoiceR
 		return
 	}
 	//活动音频，设置有效时间为30天，失效后该活动就不再支持音频回放。有效期起始时间为活动的开始时间
-	endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
+	//endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
 	sql := `SELECT
 			v.activity_id,
 			v.voice_url AS url,
@@ -43,9 +43,9 @@ func GetCygxActivityVoiceReqList(activityIds []int) (items []*CygxActivityVoiceR
 			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 > ? AND  v.activity_id IN (` + utils.GetOrmInReplace(lenactivityIds) + `)  `
+			1 = 1 	 AND  v.activity_id IN (` + utils.GetOrmInReplace(lenactivityIds) + `)  `
 	o := orm.NewOrm()
-	_, err = o.Raw(sql, endTime, activityIds).QueryRows(&items)
+	_, err = o.Raw(sql, activityIds).QueryRows(&items)
 	return
 }
 
@@ -61,4 +61,16 @@ func GetCygxActivityVoiceById(videoId int) (item *CygxActivityVoice, err error)
 	sql := `SELECT * FROM cygx_activity_voice WHERE activity_voice_id = ? LIMIT 1`
 	err = orm.NewOrm().Raw(sql, videoId).QueryRow(&item)
 	return
-}
+}
+
+//列表
+func GetActivityVoiceListAll(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityVideoListResp, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT art.*  FROM cygx_activity as art  INNER JOIN cygx_activity_voice AS v ON v.activity_id = art.activity_id   WHERE 1= 1  `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` LIMIT ?,?`
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	return
+}

models/article.go

@@ -263,9 +263,8 @@ func GetArticleAll() (item []*ArticleDetail, err error) {
 }
 func GetArticleAllDate(endDate string) (item []*ArticleDetail, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_article WHERE is_summary=1 AND publish_date >= ? AND  article_id = 7297  `
-	sql = `SELECT * FROM cygx_article WHERE article_id = ?  `
-	_, err = o.Raw(sql, 7297).QueryRows(&item)
+	sql := `SELECT * FROM cygx_article WHERE is_summary=1 AND publish_date >= ?   `
+	_, err = o.Raw(sql, endDate).QueryRows(&item)
 	return
 }
 

models/db.go

@@ -124,6 +124,7 @@ func init() {
 		new(CygxActivitySignupDetailCopy),
 		new(CygxMicroRoadshowVideoHistory),
 		new(MicroRoadshowVideo),
+		new(CygxActivityVideoHistory),
 	)
 	// 记录ORM查询日志
 	orm.Debug = true

models/industrial_management.go

@@ -325,6 +325,14 @@ func UpdateIndustrialManagementArtReadNum(num, industrialManagementId int) (err
 	return
 }
 
+//更新产业布局时间
+func UpdateIndustrialManagementLayoutTime(layoutTime string, industrialManagementId int) (err error) {
+	o := orm.NewOrm()
+	sql := `UPDATE cygx_industrial_management SET layout_time = ? WHERE industrial_management_id = ?`
+	_, err = o.Raw(sql, layoutTime, industrialManagementId).Exec()
+	return
+}
+
 //获取产业下阅读数量第三的产业详情
 func GetIndustrialManagementHot3(chartPermissionId int) (item *IndustrialManagementRep, err error) {
 	o := orm.NewOrm()
@@ -405,7 +413,7 @@ func GetIndustrialManagementNewList(condition string) (items []*IndustrialManage
 //获取产业关联标的列表
 func GetIndustrialManagementForSubjecName(subjectName string, chartPermissionId int) (items []*IndustrialSubject, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT s.subject_name,s.industrial_subject_id,m.industrial_management_id,m.industry_name
+	sql := `SELECT s.subject_name,s.industrial_subject_id,m.industrial_management_id,m.industry_name,layout_time
 			FROM cygx_industrial_subject as s 
 			INNER JOIN cygx_industrial_management as m ON m.industrial_management_id = s.industrial_management_id
 			WHERE subject_name IN (` + subjectName + `) AND m.chart_permission_id = ? `
@@ -614,10 +622,9 @@ func GetSourceIndustryByName(industryName string) (item *IndustrialManagement, e
 	return
 }
 
-
 // GetIndustryByName 通过名称获取产业
 func GetIndustryByName(industryName string) (item *IndustrialManagement, err error) {
 	sql := `SELECT * FROM cygx_industrial_management WHERE industry_name = ? LIMIT 1`
 	err = orm.NewOrm().Raw(sql, industryName).QueryRow(&item)
 	return
-}
+}

models/micro_roadshow.go

@@ -51,53 +51,220 @@ func GetMicroRoadShowAudioPageList(startSize, pageSize int, condition string, pa
 	}
 	sql += ` ORDER BY publish_time DESC`
 
+	//totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z `
+	//err = o.Raw(totalSql, pars).QueryRow(&total)
+	//if err != nil {
+	//	return
+	//}
+
+	sql += ` LIMIT ?,?`
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	return
+}
+
+// GetMicroRoadShowAudioTotal 获取微路演音频数量
+func GetMicroRoadShowAudioTotal(condition string, pars []interface{}) (total int, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+				a.activity_id
+			FROM
+				cygx_activity_voice AS a
+			JOIN cygx_activity AS b ON a.activity_id = b.activity_id
+			WHERE 1 = 1 `
+	if condition != `` {
+		sql += condition
+	}
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z `
 	err = o.Raw(totalSql, pars).QueryRow(&total)
 	if err != nil {
 		return
 	}
-
-	sql += ` LIMIT ?,?`
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
 	return
 }
 
 // GetMicroRoadShowVideoPageList 获取微路演视频列表-分页
-func GetMicroRoadShowVideoPageList(startSize, pageSize int, condition string, pars []interface{}) (total int, list []*MicroRoadShowPageList, err error) {
+func GetMicroRoadShowVideoPageList(startSize, pageSize int, condition string, pars []interface{}, conditionAct string, parsAct []interface{}) (total int, list []*MicroRoadShowPageList, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-				video_id AS id,
-				video_name AS title,
-				video_url AS resource_url,
-				2 AS type,
-				publish_date AS publish_time,
-				chart_permission_id,
-				chart_permission_name,
-				video_duration AS play_seconds,
-				img_url AS background_img
-			FROM
-				cygx_micro_roadshow_video
-			WHERE
-				publish_status = 1 `
+			video_id AS id,
+			video_name AS title,
+			video_url AS resource_url,
+			2 AS type,
+			publish_date AS publish_time,
+			chart_permission_id,
+			chart_permission_name,
+			video_duration AS play_seconds,
+			img_url AS background_img,
+			"" as  activity_id
+		FROM
+			cygx_micro_roadshow_video 
+		WHERE
+			publish_status = 1 `
 	if condition != `` {
 		sql += condition
 	}
+	sql += ` UNION ALL
+		SELECT
+			video_id AS id,
+			video_name AS title,
+			video_url AS resource_url,
+			2 AS type,
+		art.activity_time as publish_time,
+			art.chart_permission_id,
+			art.chart_permission_name,
+			"",
+			"",
+			v.activity_id
+		FROM
+			cygx_activity_video as v
+			INNER JOIN cygx_activity as art on art.activity_id = v.activity_id WHERE 1= 1  `
+	if conditionAct != `` {
+		sql += conditionAct
+	}
 	sql += ` ORDER BY publish_time DESC`
+	//totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z `
+	//err = o.Raw(totalSql, pars, parsAct).QueryRow(&total)
+	//if err != nil {
+	//	return
+	//}
+
+	sql += ` LIMIT ?,?`
+	_, err = o.Raw(sql, pars, parsAct, startSize, pageSize).QueryRows(&list)
+	return
+}
 
+// GetMicroRoadShowVideoPageList 获取微路演视频列表-分页
+func GetMicroRoadShowVideoPageListV8(startSize, pageSize int, condition string, pars []interface{}, conditionAct string, parsAct []interface{}, conditionAudio string, parsAudio []interface{}, audioId, videoId, activityVideoId int) (total int, list []*MicroRoadShowPageList, err error) {
+	o := orm.NewOrm()
+	var sql string
+	if audioId+activityVideoId == 0 {
+		sql += `SELECT
+			video_id AS id,
+			video_name AS title,
+			video_url AS resource_url,
+			2 AS type,
+			publish_date AS publish_time,
+			chart_permission_id,
+			chart_permission_name,
+			video_duration AS play_seconds,
+			img_url AS background_img,
+			"" as  activity_id
+		FROM
+			cygx_micro_roadshow_video 
+		WHERE
+			publish_status = 1 `
+		if condition != `` {
+			sql += condition
+		}
+	}
+	if audioId+videoId+activityVideoId == 0 {
+		sql += `  UNION ALL `
+	}
+
+	if audioId+videoId == 0 {
+		sql += `
+		SELECT
+			video_id AS id,
+			video_name AS title,
+			video_url AS resource_url,
+			2 AS type,
+		art.activity_time as publish_time,
+			art.chart_permission_id,
+			art.chart_permission_name,
+			"" AS play_seconds,
+			"" AS background_img,
+			v.activity_id
+		FROM
+			cygx_activity_video as v
+			INNER JOIN cygx_activity as art on art.activity_id = v.activity_id WHERE 1= 1  `
+		if conditionAct != `` {
+			sql += conditionAct
+		}
+	}
+	if audioId+videoId+activityVideoId == 0 {
+		sql += `  UNION ALL `
+	}
+
+	if videoId+activityVideoId == 0 {
+		sql += `
+			SELECT
+			a.activity_voice_id AS id,
+			a.voice_name AS title,
+			a.voice_url AS resource_url,
+			1 AS type,
+			b.activity_time AS publish_time,
+			b.chart_permission_id,
+			b.chart_permission_name,
+			a.voice_play_seconds AS play_seconds,
+			a.img_url AS background_img,
+			a.activity_id 
+		FROM
+			cygx_activity_voice AS a
+			JOIN cygx_activity AS b ON a.activity_id = b.activity_id  WHERE 1= 1  `
+		if conditionAudio != `` {
+			sql += conditionAudio
+		}
+	}
+	sql += ` ORDER BY publish_time DESC`
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z `
-	err = o.Raw(totalSql, pars).QueryRow(&total)
+	err = o.Raw(totalSql, pars, parsAct, parsAudio).QueryRow(&total)
 	if err != nil {
 		return
 	}
-
 	sql += ` LIMIT ?,?`
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	_, err = o.Raw(sql, pars, parsAct, parsAudio, startSize, pageSize).QueryRows(&list)
+	return
+}
+
+// GetMicroRoadShowVideoTotal 获取微路演视频总量
+func GetMicroRoadShowVideoTotal(condition string, pars []interface{}, conditionAct string, parsAct []interface{}) (total int, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+			video_id AS id,
+			video_name AS title,
+			video_url AS resource_url,
+			2 AS type,
+			publish_date AS publish_time,
+			chart_permission_id,
+			chart_permission_name,
+			video_duration AS play_seconds,
+			img_url AS background_img,
+			"" as  activity_id
+		FROM
+			cygx_micro_roadshow_video 
+		WHERE
+			publish_status = 1 `
+	if condition != `` {
+		sql += condition
+	}
+	sql += ` UNION ALL
+		SELECT
+			video_id AS id,
+			video_name AS title,
+			video_url AS resource_url,
+			2 AS type,
+		art.activity_time as publish_time,
+			art.chart_permission_id,
+			art.chart_permission_name,
+			"",
+			"",
+			v.activity_id
+		FROM
+			cygx_activity_video as v
+			INNER JOIN cygx_activity as art on art.activity_id = v.activity_id WHERE 1= 1  `
+	if conditionAct != `` {
+		sql += conditionAct
+	}
+	sql += ` ORDER BY publish_time DESC`
+	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z `
+	err = o.Raw(totalSql, pars, parsAct).QueryRow(&total)
 	return
 }
 
 type AddVideoHistoryReq struct {
 	VideoId     int `description:"视频ID"`
 	PlaySeconds int `description:"播放时长"`
+	SourceType  int `description:"视频来源: 1-微路演; 2-活动 (不传默认为1)"`
 }
 
 type CygxMicroRoadshowVideoHistory struct {

models/report.go

@@ -44,6 +44,7 @@ type IndustrialSubject struct {
 	IndustrialManagementId int    `description:"产业id"`
 	SubjectName            string `description:"标的名称"`
 	IndustryName           string `description:"产业名称"`
+	LayoutTime             string `description:"产业布局时间"`
 }
 
 //获取产业报告数量

models/report_mapping.go

@@ -6,6 +6,7 @@ import (
 
 type ReportMapping struct {
 	CategoryId          int    `description:"分类ID"`
+	CategoryIdSet       int    `description:"分类ID手动设置的分类"`
 	SubCategoryName     string `description:"主题"`
 	MatchTypeName       string `description:"分类名称"`
 	ChartPermissionName string `description:"行业名称"`
@@ -114,6 +115,19 @@ func GetdetailByCategoryId(categoryId int) (item *ReportMapping, err error) {
 	return
 }
 
+//通过分类ID获取详情
+func GetdetailByCategoryIdSet(categoryId int) (ids string, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+		GROUP_CONCAT( DISTINCT category_id SEPARATOR ',' ) AS ids 
+	FROM
+		cygx_report_mapping 
+	WHERE
+		category_id_set = ? `
+	err = o.Raw(sql, categoryId).QueryRow(&ids)
+	return
+}
+
 //通过分类ID获取详情
 func GetdetailByCategoryIdPush(categoryId int) (item *ReportMapping, err error) {
 	o := orm.NewOrm()
@@ -152,7 +166,7 @@ func CheckThisCategoryNewArticleIsRead(uid, categoryId int) (count int, err erro
 //获取策略下面的所有分类
 func GetMatchTypeNamenNotNull() (items []*ReportMapping, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT category_id,match_type_name FROM cygx_report_mapping WHERE match_type_name <> ''`
+	sql := `SELECT category_id,category_id_set,match_type_name FROM cygx_report_mapping WHERE match_type_name <> ''`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }

models/send_company_user.go

@@ -79,7 +79,7 @@ func GetSendCompanyList(condition string) (items []*CompanyJson, err error) {
 					WHERE  a.company_id=cid
 					AND c.enabled = 1 
 					AND b.cygx_auth=1
-					AND c.status IN('正式','试用','冻结','流失')) AS permission
+					AND a.STATUS IN ( '正式', '试用', '永续' )) AS permission 
 		FROM
 			company_report_permission AS a
 			INNER JOIN chart_permission AS b ON a.chart_permission_id = b.chart_permission_id
@@ -128,7 +128,7 @@ func GetSendCompanyFiccList(condition string) (items []*CompanyJson, err error)
 				a.company_id = cid 
 				AND c.enabled = 1 
 				AND b.cygx_auth = 1 
-				AND c.STATUS IN ( '正式', '试用' ,'冻结','流失')) AS permission 
+				AND a.STATUS IN ( '正式', '试用', '永续' )) AS permission 
 		FROM
 			company_report_permission AS a
 			INNER JOIN chart_permission AS b ON a.chart_permission_id = b.chart_permission_id

models/tactics.go

@@ -111,10 +111,11 @@ func GetTacticsListAll2() (list []*Tactics2, err error) {
 }
 
 type TacticsListResp struct {
-	Paging           *paging.PagingItem
-	MatchTypeName    string `description:"匹配类型"`
-	CategoryImgUrlPc string `description:"图片"`
-	List             []*ReportArticle
+	Paging            *paging.PagingItem
+	MatchTypeName     string `description:"匹配类型"`
+	ChartPermissionId int    `description:"行业ID"`
+	CategoryImgUrlPc  string `description:"图片"`
+	List              []*ReportArticle
 }
 
 func GetReportTacticsList(condition string, pars []interface{}, userId, startSize, pageSize int) (items []*ReportArticle, err error) {

routers/commentsRouter.go

@@ -79,15 +79,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "LabelList",
-            Router: `/labelList_deltest`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
         beego.ControllerComments{
             Method: "LabelMoreList",
@@ -97,15 +88,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "LabelTypeListPc",
-            Router: `/labelTypeListPc_deltest`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
         beego.ControllerComments{
             Method: "LabelTypeListV5",
@@ -124,15 +106,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "LabelTypeList",
-            Router: `/labelTypeList_deltest`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
         beego.ControllerComments{
             Method: "ActivityList",
@@ -232,6 +205,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
+        beego.ControllerComments{
+            Method: "ActivityVideoHistoryAdd",
+            Router: `/videoHistory/add`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
         beego.ControllerComments{
             Method: "ActivityVoiceHistoryAdd",

routers/commentsRouter_controllers.go

@@ -1,1072 +0,0 @@
-package routers
-
-import (
-	beego "github.com/beego/beego/v2/server/web"
-	"github.com/beego/beego/v2/server/web/context/param"
-)
-
-func init() {
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityABaseController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityABaseController"],
-        beego.ControllerComments{
-            Method: "FastSearch",
-            Router: "/fastSearchKeWord",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "List",
-            Router: "/activityTypelist",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "ActivityAppointmentAdd",
-            Router: "/appointment/add",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "ActivityAppointmentCancel",
-            Router: "/appointment/cancel",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "AskAdd",
-            Router: "/askAdd",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "CheckAsk",
-            Router: "/checkAsk",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "Detail",
-            Router: "/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "GetUserSearchContent",
-            Router: "/getUserSearchContent",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "LabelList",
-            Router: "/labelList",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "LabelMoreList",
-            Router: "/labelMoreList",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "LabelTypeList",
-            Router: "/labelTypeList",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "LabelTypeListPc",
-            Router: "/labelTypeListPc",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "LabelTypeListV5",
-            Router: "/labelTypeListV5",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "LabelTypeListV6Pc",
-            Router: "/labelTypeListV6Pc",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "ActivityList",
-            Router: "/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "ActivityListNew",
-            Router: "/listNew",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "MeetingReminderAdd",
-            Router: "/meetingReminder/add",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "MeetingReminderCancel",
-            Router: "/meetingReminder/cancel",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "ScheduleList",
-            Router: "/scheduleList",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "SignupAdd",
-            Router: "/signup/add",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "SignupCancel",
-            Router: "/signup/cancel",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "SpecialDetail",
-            Router: "/special/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "SpecialMsg",
-            Router: "/special/follow",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "SpecialList",
-            Router: "/special/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "SpecialSignupAdd",
-            Router: "/special/signup/add",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:AdviceController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:AdviceController"],
-        beego.ControllerComments{
-            Method: "ApplyApprove",
-            Router: "/add",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleCommonController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleCommonController"],
-        beego.ControllerComments{
-            Method: "AddStopTimePublic",
-            Router: "/addStopTimePublic",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleCommonController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleCommonController"],
-        beego.ControllerComments{
-            Method: "DetailPublic",
-            Router: "/detailPublic",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleCommonController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleCommonController"],
-        beego.ControllerComments{
-            Method: "PageHistoryPublic",
-            Router: "/pageHistoryPublic",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleController"],
-        beego.ControllerComments{
-            Method: "AddStopTime",
-            Router: "/addStopTime",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleController"],
-        beego.ControllerComments{
-            Method: "AskAdd",
-            Router: "/askAdd",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleController"],
-        beego.ControllerComments{
-            Method: "ArticleCollect",
-            Router: "/collect",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleController"],
-        beego.ControllerComments{
-            Method: "Detail",
-            Router: "/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleController"],
-        beego.ControllerComments{
-            Method: "InterviewApply",
-            Router: "/interview/apply",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleController"],
-        beego.ControllerComments{
-            Method: "Pdfwatermark",
-            Router: "/pdfwatermark",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleControllerMobile"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleControllerMobile"],
-        beego.ControllerComments{
-            Method: "DetailMd5",
-            Router: "/look/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:BaseChartController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:BaseChartController"],
-        beego.ControllerComments{
-            Method: "Patg",
-            Router: "/patg",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:BaseConfigController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:BaseConfigController"],
-        beego.ControllerComments{
-            Method: "HotDetail",
-            Router: "/detailPublic",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:BaseHomeController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:BaseHomeController"],
-        beego.ControllerComments{
-            Method: "ListHomePublic",
-            Router: "/listPublic",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:BaseSearchController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:BaseSearchController"],
-        beego.ControllerComments{
-            Method: "SearchListPublic",
-            Router: "/listPublic",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ChartController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ChartController"],
-        beego.ControllerComments{
-            Method: "ChartCollect",
-            Router: "/collect",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ChartController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ChartController"],
-        beego.ControllerComments{
-            Method: "Detail",
-            Router: "/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ChartController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ChartController"],
-        beego.ControllerComments{
-            Method: "Collection",
-            Router: "/my/collection",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ChartController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ChartController"],
-        beego.ControllerComments{
-            Method: "ChartTop",
-            Router: "/top",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ChartPermissionAuthController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ChartPermissionAuthController"],
-        beego.ControllerComments{
-            Method: "Detail",
-            Router: "/all",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ChartPermissionAuthController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ChartPermissionAuthController"],
-        beego.ControllerComments{
-            Method: "ReportDetail",
-            Router: "/reportall",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ChartPermissionAuthController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ChartPermissionAuthController"],
-        beego.ControllerComments{
-            Method: "StrategyDetail",
-            Router: "/strategyAll",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ChartPermissionController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ChartPermissionController"],
-        beego.ControllerComments{
-            Method: "DetailPublic",
-            Router: "/allPublic",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ConfigController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ConfigController"],
-        beego.ControllerComments{
-            Method: "DescriptionOfResearch",
-            Router: "/descriptionOfResearch",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ConfigController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ConfigController"],
-        beego.ControllerComments{
-            Method: "BrowseHistoryList",
-            Router: "/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ConfigController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ConfigController"],
-        beego.ControllerComments{
-            Method: "PageHistory",
-            Router: "/pageHistory",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:HomeController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:HomeController"],
-        beego.ControllerComments{
-            Method: "ListHomeArtAndChart",
-            Router: "/artAndChart/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:HomeController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:HomeController"],
-        beego.ControllerComments{
-            Method: "ListHome",
-            Router: "/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportBillboardController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportBillboardController"],
-        beego.ControllerComments{
-            Method: "FllowList",
-            Router: "/industry/fllowList",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportBillboardController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportBillboardController"],
-        beego.ControllerComments{
-            Method: "ReadList",
-            Router: "/industry/readList",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportBillboardController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportBillboardController"],
-        beego.ControllerComments{
-            Method: "CompanyTableList",
-            Router: "/table/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "Fllow",
-            Router: "/fllow",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "FllowDepartment",
-            Router: "/fllowDepartment",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "IndustryList",
-            Router: "/home/industryList",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "TradeList",
-            Router: "/home/tradeList",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "List",
-            Router: "/industry/ArticleList",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "ReportList",
-            Router: "/industry/reportList",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "ReportListNew",
-            Router: "/industry/reportListNew",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "IndustryAndArticleList",
-            Router: "/industryAndArticle/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "IndustryAndArticleListPc",
-            Router: "/industryAndArticle/listPc",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "IndustryListByDepartment",
-            Router: "/industryListByDepartment",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "IndustryListByDepartmentPc",
-            Router: "/industryListByDepartmentPc",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "IsShow",
-            Router: "/isShow",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "MinutesDetail",
-            Router: "/minutesSummary/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "MinutesDetailV4",
-            Router: "/minutesSummary/detailv4",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "ReportListByType",
-            Router: "/reportList/byType",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "Detail",
-            Router: "/reportSelection/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "ResearchDetail",
-            Router: "/researchSummary/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "RoadshowDetail",
-            Router: "/roadshowEssence/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "SearchReport",
-            Router: "/searchReport",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "SearchResource",
-            Router: "/searchResource",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "ArticleCategoryList",
-            Router: "/toArticleCategoryList",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
-        beego.ControllerComments{
-            Method: "ArticleCollect",
-            Router: "/top",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"],
-        beego.ControllerComments{
-            Method: "ArticleHotList",
-            Router: "/article/hotList",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"],
-        beego.ControllerComments{
-            Method: "CollectionList",
-            Router: "/collectionList",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"],
-        beego.ControllerComments{
-            Method: "DepartmentIdDetail",
-            Router: "/departmentId/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"],
-        beego.ControllerComments{
-            Method: "HotKeyWord",
-            Router: "/hotKeyWord",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"],
-        beego.ControllerComments{
-            Method: "HotList",
-            Router: "/hotList",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"],
-        beego.ControllerComments{
-            Method: "KolList",
-            Router: "/kolList",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"],
-        beego.ControllerComments{
-            Method: "ThemeDetail",
-            Router: "/theme/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"],
-        beego.ControllerComments{
-            Method: "NewList",
-            Router: "/theme/newList",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResourceController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResourceController"],
-        beego.ControllerComments{
-            Method: "Upload",
-            Router: "/image/upload",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:SearchController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:SearchController"],
-        beego.ControllerComments{
-            Method: "ListHomeArtAndChart",
-            Router: "/artAndChart/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:SearchController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:SearchController"],
-        beego.ControllerComments{
-            Method: "SearchList",
-            Router: "/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:SearchController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:SearchController"],
-        beego.ControllerComments{
-            Method: "SearchReport",
-            Router: "/report/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:TacticsController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:TacticsController"],
-        beego.ControllerComments{
-            Method: "Detail",
-            Router: "/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:TacticsController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:TacticsController"],
-        beego.ControllerComments{
-            Method: "List",
-            Router: "/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserCommonController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserCommonController"],
-        beego.ControllerComments{
-            Method: "LoginPublic",
-            Router: "/loginPublic",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"],
-        beego.ControllerComments{
-            Method: "ApplyTryOut",
-            Router: "/apply/try",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"],
-        beego.ControllerComments{
-            Method: "AskList",
-            Router: "/ask/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"],
-        beego.ControllerComments{
-            Method: "BrowseHistoryList",
-            Router: "/browse/history/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"],
-        beego.ControllerComments{
-            Method: "CheckLogin",
-            Router: "/check/status",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"],
-        beego.ControllerComments{
-            Method: "CollectList",
-            Router: "/collect/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"],
-        beego.ControllerComments{
-            Method: "AddCountryCcode",
-            Router: "/countryCcode/Add",
-            AllowHTTPMethods: []string{"POST"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"],
-        beego.ControllerComments{
-            Method: "AddOutboundMobile",
-            Router: "/countryCcode/addOutboundMobile",
-            AllowHTTPMethods: []string{"POST"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"],
-        beego.ControllerComments{
-            Method: "CountryCcode",
-            Router: "/countryCcode/isNeedAdd",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"],
-        beego.ControllerComments{
-            Method: "Detail",
-            Router: "/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"],
-        beego.ControllerComments{
-            Method: "FreeButtonUpdate",
-            Router: "/freeButton/update",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"],
-        beego.ControllerComments{
-            Method: "HeadimgurlUpdate",
-            Router: "/headimgurl/update",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"],
-        beego.ControllerComments{
-            Method: "InterviewApplyList",
-            Router: "/interview/apply/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"],
-        beego.ControllerComments{
-            Method: "AlertIsShow",
-            Router: "/isShow/alert",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"],
-        beego.ControllerComments{
-            Method: "IsShow",
-            Router: "/isShow/freeButton",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"],
-        beego.ControllerComments{
-            Method: "ShareIsShow",
-            Router: "/isShow/share",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"],
-        beego.ControllerComments{
-            Method: "Login",
-            Router: "/login",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:WechatCommonController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:WechatCommonController"],
-        beego.ControllerComments{
-            Method: "GetSmsCode",
-            Router: "/getSmsCodePublic",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:WechatCommonController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:WechatCommonController"],
-        beego.ControllerComments{
-            Method: "WechatLogin",
-            Router: "/login",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:WechatCommonController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:WechatCommonController"],
-        beego.ControllerComments{
-            Method: "WechatLoginByxzs",
-            Router: "/loginByxzs",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:WechatController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:WechatController"],
-        beego.ControllerComments{
-            Method: "GetEmailCode",
-            Router: "/getEmailCode",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:WechatController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:WechatController"],
-        beego.ControllerComments{
-            Method: "GetPhoneNumber",
-            Router: "/getPhoneNumber",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:WechatController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:WechatController"],
-        beego.ControllerComments{
-            Method: "GetSmsCode",
-            Router: "/getSmsCode",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:WechatController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:WechatController"],
-        beego.ControllerComments{
-            Method: "GetUserInfo",
-            Router: "/getUserInfo",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:WechatController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:WechatController"],
-        beego.ControllerComments{
-            Method: "ShareImage",
-            Router: "/shareImage",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:WechatController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:WechatController"],
-        beego.ControllerComments{
-            Method: "UpdateWxAccesstoken",
-            Router: "/updateWxAccesstoken",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-}

services/activity.go

@@ -613,9 +613,34 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 	}
 
 	if playBack == 1 {
+		var pars []interface{}
+		ativityVIdArry := make([]string, 0)
+		voiceList, e := models.GetActivityVoiceListAll("", pars, 0, 1000)
+		if e != nil && e.Error() != utils.ErrNoRow() {
+			err = e
+			return
+		}
+		for _, v := range voiceList {
+			ativityVIdArry = append(ativityVIdArry, strconv.Itoa(v.ActivityId))
+		}
+
+		videoList, e := models.GetActivityVideoListAll("", pars, 0, 1000)
+		if e != nil && e.Error() != utils.ErrNoRow() {
+			err = e
+			return
+		}
+		for _, v := range videoList {
+			ativityVIdArry = append(ativityVIdArry, strconv.Itoa(v.ActivityId))
+		}
+
 		//活动音频，设置有效时间为30天，失效后该活动就不再支持音频回放。有效期起始时间为活动的开始时间
-		endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
-		condition += ` AND art.activity_time > '` + endTime + `'  `
+		//endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
+		//condition += ` AND art.activity_time > '` + endTime + `'  `
+		if len(ativityVIdArry) > 0 {
+			ativityVIdstr := strings.Join(ativityVIdArry, ",")
+			fmt.Println(ativityVIdstr)
+			condition += ` AND art.activity_id IN  (` + ativityVIdstr + `) `
+		}
 	}
 
 	//查询全部可见的数据（是否全部客户可见）
@@ -1497,7 +1522,10 @@ func ActivityButtonShow(item *models.ActivityDetail) (articleDetail *models.Acti
 	if articleDetail.ActivityTypeId == 7 {
 		articleDetail.IsShowSignup = true
 	}
-
+	activityTimeText := articleDetail.ActivityTimeText
+	activityTimeText = strings.Replace(activityTimeText, "（", "(", -1)
+	activityTimeText = strings.Replace(activityTimeText, "）", ")", -1)
+	articleDetail.ActivityTimeText = activityTimeText
 	return
 }
 
@@ -1587,3 +1615,35 @@ func AddActivitykeyWordSearch(keyWordSearch string, user *models.WxUserItem) {
 		}
 	}
 }
+
+//GetActivityVideoResp 处理活动视频频回放
+func GetActivityVideoResp(mapActivityId []int) (mapItem map[int]*models.CygxActivityVideoListResp, err error) {
+	var condition string
+	var ativityVIdstr string
+	for _, v := range mapActivityId {
+		ativityVIdstr += strconv.Itoa(v) + ","
+	}
+	if ativityVIdstr == "" {
+		return
+	}
+
+	ativityVIdstr = strings.TrimRight(ativityVIdstr, ",")
+	condition += ` AND art.activity_id IN  (` + ativityVIdstr + `) `
+	var pars []interface{}
+	endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
+	condition += ` AND art.activity_time > ? `
+	pars = append(pars, endTime)
+	videoList, e := models.GetActivityVideoListAll(condition, pars, 0, 1000)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = e
+		return
+	}
+	mapActivityVideo := make(map[int]*models.CygxActivityVideoListResp)
+	if len(videoList) > 0 {
+		for _, v := range videoList {
+			mapActivityVideo[v.ActivityId] = v
+		}
+	}
+	mapItem = mapActivityVideo
+	return
+}

services/activity_special.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
+	"strconv"
 	"time"
 )
 
@@ -67,3 +68,41 @@ func UpdateCygxActivitySpecialSignupNum(cont context.Context) (err error) {
 	fmt.Println("UpdateCygxActivitySpecialSignupNum end")
 	return
 }
+
+//处理专项调研的展示
+func GetActivityLabelSpecialList(userType, isPower int, chartPermissionIds, scale, permissionNameStr string) (item *models.ActivityTypeHome, err error) {
+	var condition string
+	var pars []interface{}
+	condition = ` AND art.publish_status = 1  AND art.label != '' `
+
+	//行业名称
+	if isPower == 1 {
+		condition += ` AND art.chart_permission_name  IN (` + permissionNameStr + `) `
+	}
+	if chartPermissionIds != "" {
+		condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `) `
+	}
+	var conditionOr string
+	if scale != "" {
+		conditionOr += ` OR (  art.scale LIKE '%` + scale + `%'	 ` + condition + `) `
+	}
+	condition += ` AND  art.customer_type_ids LIKE '%` + strconv.Itoa(userType) + `%'` + conditionOr
+	specialList, err := models.GetActivityLabelSpecialListAll(condition, pars, 0, 8)
+	if err != nil {
+		return
+	}
+	for k2, v2 := range specialList {
+		specialList[k2].KeyWord = LabelStrV5(v2.KeyWord, v2.IsShowSubjectName, v2.TemporaryLabel)
+		specialList[k2].ImgUrlBg = "https://hzstatic.hzinsights.com/static/temp/20220426202204/20220426/XDLLsjC9XAAy8LIzQr7GsjrBbtX6.png"
+		specialList[k2].ImgUrlBg = utils.ACTIVITY_ZXDY_ImgUrl3
+	}
+	itemList := new(models.ActivityTypeHome)
+	itemList.ActivityTypeName = "专项产业调研"
+	itemList.Resource = 2
+	itemList.List = specialList
+	itemList.ActivityTypeId = 7
+	itemList.ImgUrl = utils.ACTIVITY_ZXDY_ImgUrl1
+	itemList.ImgUrlBg = utils.ACTIVITY_ZXDY_ImgUrl2
+	item = itemList
+	return
+}

services/article.go

@@ -672,7 +672,7 @@ func GetArticleListByApi(cont context.Context) (err error) {
 }
 
 //func init() {
-//	HandleArticleListByApi(7370)
+//	HandleArticleListByApi(7507)
 //}
 
 //处理同步过来的文章
@@ -822,6 +822,10 @@ func HandleArticleListByApi(artcleId int) (err error) {
 		fmt.Println("GetTacticsList Err:", errMatch.Error())
 		return err
 	}
+	//mapCategoryIdSet := make(map[int]int)
+	//for _, vMatch := range listGetMatchTypeName {
+	//	mapCategoryIdSet[vMatch.CategoryId] = vMatch.CategoryIdSet
+	//}
 	fmt.Println("list len:", len(list))
 	noSummaryArticleIds := "3454,3456,3457,3459,2449,2450,2453,2454,2459,2530,2583,2663,2670,2699,2715,2732,2748,2759,2399,2356,2870,3173,2978,2826,3470" //非纪要库类型的文章ID
 	listNoSummaryArticleIds := strings.Split(noSummaryArticleIds, ",")
@@ -1020,6 +1024,9 @@ func HandleArticleListByApi(artcleId int) (err error) {
 								mapIndustrialId[vIndustrial.IndustrialManagementId] = vIndustrial.IndustrialManagementId
 								industrialSubjectIdStr += strconv.Itoa(vIndustrial.IndustrialSubjectId) + ","
 								mapManagementForSubject[vIndustrial.IndustryName] += vIndustrial.SubjectName + "/"
+								if vIndustrial.LayoutTime == "0000-00-00 00:00:00" {
+									go models.UpdateIndustrialManagementLayoutTime(v.PublishDate.Format(utils.FormatDateTime), vIndustrial.IndustrialManagementId)
+								}
 							}
 
 							industrialManagementIdStr = strings.TrimRight(industrialManagementIdStr, ",")

services/cygx_activity_video_history.go

@@ -0,0 +1,45 @@
+package services
+
+import (
+	"hongze/hongze_cygx/models"
+	"time"
+)
+
+//添加活动的视频播放记录
+func AddActivityVideoHistory(user *models.WxUserItem, activityId int) (err error) {
+	activityInfo, errInfo := models.GetCygxActivityVideoByActivityId(activityId)
+	if activityInfo == nil {
+		return
+	}
+	if errInfo != nil {
+		return
+	}
+	var sellerName string
+	sellerName, err = models.GetCompanySellerName(user.CompanyId)
+	if err != nil {
+		return
+	}
+	item := models.CygxActivityVideoHistory{
+		ActivityId:  activityInfo.ActivityId,
+		VideoId:     activityInfo.VideoId,
+		UserId:      user.UserId,
+		CreateTime:  time.Now(),
+		Mobile:      user.Mobile,
+		Email:       user.Email,
+		CompanyId:   user.CompanyId,
+		CompanyName: user.CompanyName,
+		RealName:    user.RealName,
+		SellerName:  sellerName,
+		ModifyTime:  time.Now(),
+	}
+	err = models.AddCygxActivityVideoHistory(&item)
+	if err != nil {
+		return
+	}
+	err = models.UpdateActivityVideoCounts(activityInfo.ActivityId)
+	if err != nil {
+		return
+	}
+
+	return
+}

services/micro_roadshow.go

@@ -13,7 +13,7 @@ import (
 )
 
 // GetMicroRoadShowPageList 获取微路演列表
-func GetMicroRoadShowPageList(pageSize, currentIndex, audioId, videoId int, keywords string) (respList []*models.MicroRoadShowPageList, total int, err error) {
+func GetMicroRoadShowPageList(pageSize, currentIndex, audioId, videoId, activityVideoId int, keywords string) (respList []*models.MicroRoadShowPageList, total int, err error) {
 	var e error
 	// 根据每页数据量获取音视频配比
 	audioRatio, videoRatio, audioPageNum, videoPageNum, sliceNum, e := getMicroRoadShowDataRatio(pageSize)
@@ -30,7 +30,7 @@ func GetMicroRoadShowPageList(pageSize, currentIndex, audioId, videoId int, keyw
 		keywords = "%" + keywords + "%"
 	}
 	// 查询指定音频/视频时, 调整比例为1方便后面组合数据
-	if audioId > 0 || videoId > 0 {
+	if audioId > 0 || videoId > 0 || activityVideoId > 0 {
 		audioRatio = 1
 		videoRatio = 1
 	}
@@ -43,7 +43,7 @@ func GetMicroRoadShowPageList(pageSize, currentIndex, audioId, videoId int, keyw
 	go func() {
 		defer wg.Done()
 		// 如果筛选条件为指定视频ID则不做音频查询
-		if videoId > 0 {
+		if videoId > 0 || activityVideoId > 0 {
 			return
 		}
 		var audioCond string
@@ -76,22 +76,46 @@ func GetMicroRoadShowPageList(pageSize, currentIndex, audioId, videoId int, keyw
 		if audioId > 0 {
 			return
 		}
+
 		var videoCond string
+		var videoCondAct string
 		var videoPars []interface{}
+		var videoParsAct []interface{}
 		if keywords != "" {
 			videoCond += ` AND video_name LIKE ?`
 			videoPars = append(videoPars, keywords)
+
+			videoCondAct += ` AND video_name LIKE ?`
+			videoParsAct = append(videoParsAct, keywords)
 		}
 		if videoId > 0 {
 			videoCond += ` AND video_id = ?`
 			videoPars = append(videoPars, videoId)
 		}
+
+		if activityVideoId > 0 {
+			videoCondAct += ` AND video_id = ?`
+			videoParsAct = append(videoParsAct, activityVideoId)
+		}
+
+		//如果传了路演的或者活动的视频ID只查询一个
+		if videoId > 0 {
+			videoCondAct += ` AND video_id = 0 `
+		}
+		if activityVideoId > 0 {
+			videoCond += ` AND video_id = 0 `
+		}
+
+		endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
+		videoCondAct += ` AND art.activity_time > ? `
+		videoParsAct = append(videoParsAct, endTime)
+
 		videoCond += ` AND publish_status = 1`
 		videoStartSize := 0
 		if currentIndex > 1 {
 			videoStartSize = (currentIndex - 1) * videoPageNum
 		}
-		videoTotal, videoList, e = models.GetMicroRoadShowVideoPageList(videoStartSize, videoPageNum, videoCond, videoPars)
+		videoTotal, videoList, e = models.GetMicroRoadShowVideoPageList(videoStartSize, videoPageNum, videoCond, videoPars, videoCondAct, videoParsAct)
 	}()
 
 	wg.Wait()
@@ -327,3 +351,81 @@ func GetHomeNewestList(userId, companyId, startSize, pageSize int, condition str
 	}
 	return
 }
+
+// GetMicroRoadShowPageList 获取微路演列表添加活动视频 更新与8.1版本
+func GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activityVideoId int, keywords string) (respList []*models.MicroRoadShowPageList, total int, err error) {
+	var e error
+	// 根据每页数据量获取音视频配比
+	startSize := utils.StartIndex(currentIndex, pageSize)
+	videoList := make([]*models.MicroRoadShowPageList, 0)
+	if keywords != "" {
+		keywords = "%" + keywords + "%"
+	}
+
+	//音频的查询
+	var audioCond string
+	var audioPars []interface{}
+	// 如果筛选条件为指定视频ID则不做音频查询
+	if videoId > 0 || activityVideoId > 0 {
+		audioCond = ""
+	} else {
+		// 活动已发布且已结束
+		audioCond += ` AND b.publish_status = 1 AND b.active_state = 3`
+		//活动音频，设置有效时间为30天，失效后该活动就不再支持音频回放。有效期起始时间为活动的开始时间
+		//endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
+		//audioCond += ` AND b.activity_time > ? `
+		//audioPars = append(audioPars, endTime)
+		if keywords != "" {
+			audioCond += ` AND a.voice_name LIKE ? OR b.label LIKE ?`
+			audioPars = append(audioPars, keywords, keywords)
+		}
+		if audioId > 0 {
+			audioCond += ` AND a.activity_voice_id = ?`
+			audioPars = append(audioPars, audioId)
+		}
+	}
+	//视频的处理
+	var videoCond string
+	var videoCondAct string
+	var videoPars []interface{}
+	var videoParsAct []interface{}
+	if audioId > 0 {
+		videoCond = ""
+	} else {
+		if keywords != "" {
+			videoCond += ` AND video_name LIKE ?`
+			videoPars = append(videoPars, keywords)
+			videoCondAct += ` AND video_name LIKE ?`
+			videoParsAct = append(videoParsAct, keywords)
+		}
+		if videoId > 0 {
+			videoCond += ` AND video_id = ?`
+			videoPars = append(videoPars, videoId)
+		}
+		if activityVideoId > 0 {
+			videoCondAct += ` AND video_id = ?`
+			videoParsAct = append(videoParsAct, activityVideoId)
+		}
+
+		//如果传了路演的或者活动的视频ID只查询一个
+		if videoId > 0 {
+			videoCondAct += ` AND video_id = 0 `
+		}
+		if activityVideoId > 0 {
+			videoCond += ` AND video_id = 0 `
+		}
+		//if videoId == 0 {
+		//	endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
+		//	videoCondAct += ` AND art.activity_time > ? `
+		//	videoParsAct = append(videoParsAct, endTime)
+		//}
+		videoCond += ` AND publish_status = 1`
+	}
+	total, videoList, e = models.GetMicroRoadShowVideoPageListV8(startSize, pageSize, videoCond, videoPars, videoCondAct, videoParsAct, audioCond, audioPars, audioId, videoId, activityVideoId)
+	if e != nil {
+		err = errors.New("获取微路演音视频列表失败, Err: " + e.Error())
+		return
+	}
+	respList = videoList
+	return
+}

services/send_company_user.go

@@ -146,7 +146,7 @@ func DotongbuShangHai(cont context.Context) (err error) {
 		}
 	}
 
-	condition = ` AND p.modify_time > ` + "'" + updateTime + "'"
+	condition = ` AND p.is_suspend = 0  AND p.modify_time > ` + "'" + updateTime + "'"
 	companyIds = strings.TrimRight(companyIds, ",")
 
 	fmt.Println("获取冻结跟流失的用户", len(listFreezeAndLoss))
@@ -165,7 +165,7 @@ func DotongbuShangHai(cont context.Context) (err error) {
 	//原有的公司如果新增了也同步
 	companyIds = strings.TrimRight(companyIds, ",")
 	if companyIds != "" {
-		condition = ` AND c.company_id  IN (` + companyIds + ")"
+		condition = ` AND p.is_suspend = 0  AND c.company_id  IN (` + companyIds + ")"
 		DotongbuShangHaApi(condition)
 	}
 

services/sms.go

@@ -11,7 +11,7 @@ import (
 
 func SendSmsCode(mobile, vcode string) bool {
 	flag := false
-	tplId := "65692"
+	tplId := "250078"
 	result, err := sendSms(mobile, tplId, vcode)
 	if err != nil {
 		fmt.Println("发送短信失败")
@@ -96,7 +96,7 @@ func sendSmsGj(mobile, code, areaNum string) (rs []byte, err error) {
 	param := url.Values{}
 	//配置请求参数,方法内部已处理urlencode问题,中文参数可以直接传参
 	param.Set("mobile", mobile)           //接受短信的用户手机号码
-	param.Set("tplId", "10054")           //您申请的短信模板ID，根据实际情况修改
+	param.Set("tplId", "12335")           //您申请的短信模板ID，根据实际情况修改
 	param.Set("tplValue", "#code#="+code) //您设置的模板变量，根据实际情况
 	param.Set("key", utils.JhGjAppKey)    //应用APPKEY(应用详细页查询)
 	param.Set("areaNum", areaNum)         //应用APPKEY(应用详细页查询)

services/yidong.go

@@ -493,12 +493,13 @@ func GetYiDongOriginalLink(item *models.ActivityDetail) (yidongLongLink string,
 		return
 	}
 	lingLink := ApifoxModal.Result
-
-	slicelingLink := strings.Split(lingLink, "redirect_uri=")
-	//var shortLink string
-	if len(slicelingLink) > 1 {
-		lingLink = slicelingLink[len(slicelingLink)-1]
-	}
+	//fmt.Println(lingLink)
+	//
+	//slicelingLink := strings.Split(lingLink, "redirect_uri=")
+	////var shortLink string
+	//if len(slicelingLink) > 1 {
+	//	lingLink = slicelingLink[len(slicelingLink)-1]
+	//}
 	yidongLongLink = lingLink
 	return
 }

utils/constants.go

@@ -38,8 +38,8 @@ const (
 
 //聚合短信
 var (
-	JhGnTplId = "65692" //聚合国内模板编码
-	JhGjTplId = "10054" //聚合国内模板编码
+	JhGnTplId = "250078" //聚合国内模板编码
+	JhGjTplId = "10054"  //聚合国内模板编码
 
 	JhGnAppKey = "4c8504c49dd335e99cfd7b6a3a9e2415" //聚合国内AppKey
 	JhGjAppKey = "3326ad2c1047a4cd92ace153e6044ca3"
@@ -123,6 +123,7 @@ const (
 
 const (
 	YI_YAO_QI_TA = "https://hzstatic.hzinsights.com/static/temp/20220922202209/20220922/2OQMBFplQE1R3bX1y3obX7JSwSuA.png"
+	YAN_XUAN_IMG = "https://hzstatic.hzinsights.com/static/temp/20221027202210/20221027/Dd8TrsMh8tNx2tGd5VeaQDyJVQfV.png"
 )
 
 const (