易董申万一级修改

models/activity.go

@@ -879,3 +879,11 @@ func UpdateCygxActivitySubmitMeetingByYidong(yidongActivityId string) (err error
 	_, err = o.Raw(sql, yidongActivityId).Exec()
 	return
 }
+
+//UpdateActivityshowSubject 根据易董推过来的匹配信息，判断临时标签是否展示
+func UpdateActivityshowSubject(activityId int) (err error) {
+	sql := ` UPDATE cygx_activity SET  is_show_subject_name= 1 , temporary_label = ''  WHERE activity_id = ?`
+	o := orm.NewOrm()
+	_, err = o.Raw(sql, activityId).Exec()
+	return
+}

services/yidong.go

@@ -12,25 +12,19 @@ import (
 	"time"
 )
 
-//
-//消费：家用电器，纺织服装，休闲服务，食品饮料
-//智造：汽车，机械设备，电气设备
-//科技：电子，计算机，通信
-//医药：医药生物
-//研选：非银金融、建筑装饰、化工、农林牧渔、传媒、公用事业、建筑材料、房地产、采掘、轻工制造，钢铁、交通运输、国防军工、银行、有色金属、综合、商业贸易
-
 //GetActivityTypeIdWithYiDong 根据易董同步过来的活动类型，自动匹配行业
 func GetActivityTypeIdWithYiDong(industrySwName string) (chartPermissionId int) {
 	mapIndustrySwName := map[string]int{
 		"家用电器": utils.XIAO_FEI_ID,
-		"纺织服装": utils.XIAO_FEI_ID,
+		"纺织服饰": utils.XIAO_FEI_ID,
 		"休闲服务": utils.XIAO_FEI_ID,
 		"食品饮料": utils.XIAO_FEI_ID,
+		"美容护理": utils.XIAO_FEI_ID,
 		//消费
 
 		"汽车":   utils.ZHI_ZAO_ID,
 		"机械设备": utils.ZHI_ZAO_ID,
-		"电气设备": utils.ZHI_ZAO_ID,
+		"电力设备": utils.ZHI_ZAO_ID,
 		//智造
 
 		"电子":  utils.KE_JI_ID,
@@ -41,9 +35,12 @@ func GetActivityTypeIdWithYiDong(industrySwName string) (chartPermissionId int)
 		"医药生物": utils.YI_YAO_ID,
 		//医药
 
+		"策略": utils.CE_LUE_ID,
+		//策略
+
 		"非银金融": utils.CHART_PERMISSION_ID_YANXUAN,
 		"建筑装饰": utils.CHART_PERMISSION_ID_YANXUAN,
-		"化工":   utils.CHART_PERMISSION_ID_YANXUAN,
+		"基础化工": utils.CHART_PERMISSION_ID_YANXUAN,
 		"农林牧渔": utils.CHART_PERMISSION_ID_YANXUAN,
 		"传媒":   utils.CHART_PERMISSION_ID_YANXUAN,
 		"公用事业": utils.CHART_PERMISSION_ID_YANXUAN,
@@ -58,6 +55,14 @@ func GetActivityTypeIdWithYiDong(industrySwName string) (chartPermissionId int)
 		"有色金属": utils.CHART_PERMISSION_ID_YANXUAN,
 		"综合":   utils.CHART_PERMISSION_ID_YANXUAN,
 		"商业贸易": utils.CHART_PERMISSION_ID_YANXUAN,
+
+		"宏观":   utils.CHART_PERMISSION_ID_YANXUAN,
+		"金融工程": utils.CHART_PERMISSION_ID_YANXUAN,
+		"商贸零售": utils.CHART_PERMISSION_ID_YANXUAN,
+		"社会服务": utils.CHART_PERMISSION_ID_YANXUAN,
+		"煤炭":   utils.CHART_PERMISSION_ID_YANXUAN,
+		"石油石化": utils.CHART_PERMISSION_ID_YANXUAN,
+		"环保":   utils.CHART_PERMISSION_ID_YANXUAN,
 		//研选
 	}
 	chartPermissionId = mapIndustrySwName[industrySwName]
@@ -68,14 +73,15 @@ func GetActivityTypeIdWithYiDong(industrySwName string) (chartPermissionId int)
 func GetActivityTypeNameWithYiDong(industrySwName string) (chartPermissionName string) {
 	mapIndustrySwName := map[string]string{
 		"家用电器": utils.XIAO_FEI_NAME,
-		"纺织服装": utils.XIAO_FEI_NAME,
+		"纺织服饰": utils.XIAO_FEI_NAME,
 		"休闲服务": utils.XIAO_FEI_NAME,
 		"食品饮料": utils.XIAO_FEI_NAME,
+		"美容护理": utils.XIAO_FEI_NAME,
 		//消费
 
 		"汽车":   utils.ZHI_ZAO_NAME,
 		"机械设备": utils.ZHI_ZAO_NAME,
-		"电气设备": utils.ZHI_ZAO_NAME,
+		"电力设备": utils.ZHI_ZAO_NAME,
 		//智造
 
 		"电子":  utils.KE_JI_NAME,
@@ -88,7 +94,7 @@ func GetActivityTypeNameWithYiDong(industrySwName string) (chartPermissionName s
 
 		"非银金融": utils.CHART_PERMISSION_NAME_MF_YANXUAN,
 		"建筑装饰": utils.CHART_PERMISSION_NAME_MF_YANXUAN,
-		"化工":   utils.CHART_PERMISSION_NAME_MF_YANXUAN,
+		"基础化工": utils.CHART_PERMISSION_NAME_MF_YANXUAN,
 		"农林牧渔": utils.CHART_PERMISSION_NAME_MF_YANXUAN,
 		"传媒":   utils.CHART_PERMISSION_NAME_MF_YANXUAN,
 		"公用事业": utils.CHART_PERMISSION_NAME_MF_YANXUAN,
@@ -103,6 +109,14 @@ func GetActivityTypeNameWithYiDong(industrySwName string) (chartPermissionName s
 		"有色金属": utils.CHART_PERMISSION_NAME_MF_YANXUAN,
 		"综合":   utils.CHART_PERMISSION_NAME_MF_YANXUAN,
 		"商业贸易": utils.CHART_PERMISSION_NAME_MF_YANXUAN,
+
+		"宏观":   utils.CHART_PERMISSION_NAME_MF_YANXUAN,
+		"金融工程": utils.CHART_PERMISSION_NAME_MF_YANXUAN,
+		"商贸零售": utils.CHART_PERMISSION_NAME_MF_YANXUAN,
+		"社会服务": utils.CHART_PERMISSION_NAME_MF_YANXUAN,
+		"煤炭":   utils.CHART_PERMISSION_NAME_MF_YANXUAN,
+		"石油石化": utils.CHART_PERMISSION_NAME_MF_YANXUAN,
+		"环保":   utils.CHART_PERMISSION_NAME_MF_YANXUAN,
 		//研选
 	}
 	chartPermissionName = mapIndustrySwName[industrySwName]
@@ -173,7 +187,7 @@ func GetYiDongActivity(cont context.Context) (err error) {
 	url := utils.YiDongZhengTongYunUrl + "interact/activityManageApi/getRoadshowList?access_token=" + token
 	method := "POST"
 	payload := strings.NewReader(`{
-    "meetingStatus": "0"
+    "meetingStatus": "0,1,2"
 }`)
 	client := &http.Client{}
 	req, err := http.NewRequest(method, url, payload)
@@ -235,7 +249,10 @@ func GetYiDongActivity(cont context.Context) (err error) {
 			item.YidongActivityEndTime = v.End
 			item.ActivityTimeText = GetActivityTextTime(v.Start)
 			item.YidongActivityUrl = v.URL
-			fmt.Println(item.ActivityTimeText)
+			if v.IndustrySwName == "电力设备" {
+				fmt.Println(item)
+			}
+			fmt.Println(v.IndustrySwName)
 			detailYidng, err := GetYiDongActivityDetail(v.ID)
 			if err != nil {
 				return err
@@ -253,6 +270,7 @@ func GetYiDongActivity(cont context.Context) (err error) {
 					fmt.Println(err)
 					utils.FileLog.Info(string(err.Error()))
 				}
+
 				//把公司名称当做标的 对活动进行产业标的的关联
 				YidongActivityGroup(v.CompanyInfo, int(newId))
 			} else {
@@ -531,9 +549,13 @@ func YidongActivityGroup(subjectName string, activityId int) (err error) {
 	if len(subjectList) == 0 {
 		return err
 	}
-
+	err = models.UpdateActivityshowSubject(activityId)
+	if err != nil {
+		go utils.SendAlarmMsg("UpdateActivityshowSubject ：根据易董推过来的匹配信息，判断临时标签是否展示失败"+err.Error(), 2)
+	}
 	var industrialActivityItems []*models.CygxIndustrialActivityGroupManagement
 	var subjectActivityItems []*models.CygxIndustrialActivityGroupSubject
+	mapSubjectName := make(map[string]string)
 	for _, v := range subjectList {
 		industrialActivityItem := new(models.CygxIndustrialActivityGroupManagement)
 		subjectActivityItem := new(models.CygxIndustrialActivityGroupSubject)
@@ -548,9 +570,16 @@ func YidongActivityGroup(subjectName string, activityId int) (err error) {
 		subjectActivityItem.IndustrialSubjectId = v.IndustrialSubjectId
 		subjectActivityItem.Source = 1
 		subjectActivityItem.CreateTime = time.Now()
-		subjectActivityItems = append(subjectActivityItems, subjectActivityItem)
+		mapSubjectName[v.SubjectName] = v.SubjectName
+
+		if mapSubjectName[v.SubjectName] == "" {
+			subjectActivityItems = append(subjectActivityItems, subjectActivityItem)
+		}
 		fmt.Println(v)
 	}
 	err = models.AddCygxActiuvityGroupMulti(industrialActivityItems, subjectActivityItems)
+	if err != nil {
+		go utils.SendAlarmMsg("AddCygxActiuvityGroupMulti ：批量添加易董活动关联的活动标签失败"+err.Error(), 2)
+	}
 	return
 }