Merge branch 'need/cygx_1054' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/chart.go

@@ -214,7 +214,8 @@ func (this *ChartController) Detail() {
 			detail.IsCollection = true
 		}
 	}
-	go services.ServerAddCygxChartRecord(user, chartId) //用户阅读图表，添加浏览记录
+	go services.ServerAddCygxChartRecord(user, chartId)                  //用户阅读图表，添加浏览记录
+	go services.KeyChartWxUserRaiLabelRedisAdd(chartId, user.UserId, "") //用户阅读图表，添加浏览记录
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

services/chart.go

@@ -607,6 +607,7 @@ func ServerAddCygxChartRecord(wxUser *models.WxUserItem, ctagId int) {
 			go utils.SendAlarmMsg(fmt.Sprint("用户阅读图表，添加浏览记录失败 ctagId", ctagId, "userId", wxUser.UserId, err.Error()), 2)
 		}
 	}()
+
 	item := new(models.CygxChartRecord)
 	item.ChartId = ctagId
 	item.UserId = wxUser.UserId

services/cygx_template_record_source.go

@@ -58,7 +58,7 @@ func SendCygxTemplateRecordSource(log models.WxUserRaiLabelRedis) (err error) {
 	for _, v := range listAdmin {
 		mobiles = append(mobiles, v.Mobile)
 	}
-	fmt.Println(mobiles)
+	//fmt.Println(mobiles)
 
 	var source string
 	switch sourceType {
@@ -90,7 +90,14 @@ func SendCygxTemplateRecordSource(log models.WxUserRaiLabelRedis) (err error) {
 		redirectUrl = utils.WX_MSG_PATH_ACTIVITY_DETAIL + strconv.Itoa(sourceId)
 		source = utils.CYGX_OBJ_ACTIVITYVIDEO
 	case 10:
-
+		chartDetail, e := models.GetChartDetailByChartId(sourceId)
+		if e != nil {
+			err = errors.New("GetChartDetailByChartId, Err: " + e.Error())
+			return
+		}
+		keyword2 = "阅读图表：" + chartDetail.Title
+		redirectUrl = utils.WX_MSG_PATH_CHART_DETAIL + strconv.Itoa(sourceId)
+		source = utils.CYGX_OBJ_NEWCHART
 	default:
 		return
 	}

services/wx_user_rai_label.go

@@ -106,6 +106,25 @@ func ActivityVivoWxUserRaiLabelRedisAdd(sourceId, uid int, createTime time.Time)
 	return
 }
 
+// 添加用户阅读图表标签到Redis
+func KeyChartWxUserRaiLabelRedisAdd(sourceId, uid int, label string) (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			msg := fmt.Sprint("sourceId:", sourceId, "userId:", uid)
+			go utils.SendAlarmMsg("用户关注产业更新相关标签，写入Redis队列消息失败："+err.Error()+msg, 2)
+		}
+	}()
+	log := &models.WxUserRaiLabelRedis{UserId: uid, SourceId: sourceId, SourceType: 10, Label: label, CreateTime: time.Now(), RegisterPlatform: utils.REGISTER_PLATFORM}
+	if utils.Re == nil {
+		err := utils.Rc.LPush(utils.WX_USER_RAI_LABEL_KEY, log)
+		if err != nil {
+			fmt.Println("WxUserRaiLabelRedis LPush Err:" + err.Error())
+		}
+	}
+	return
+}
+
 func UpdateWxUserRaiLabelRedis() (err error) {
 	for {
 		//	SourceType       int       `description:"来源1:搜索关键字标签、2:产业/个股标签(线下活动)、3:产业/个股标签(线下路演)、4:产业/个股标签(线上活动)、5:产业/个股标签(线上路演)、6:销售输入标签、7:产业/个股标签(报告)、8:报告类型标签"`

utils/constants.go

@@ -207,6 +207,7 @@ const (
 	WX_MSG_PATH_YX_SIGNUP_DETAIL           = "pages-message/activityTemplate/activityTemplate?id="          //研选报名详情
 	WX_MSG_PATH_YX_ARTICLE_DETAIL          = "pages-user/reportDetail/reportDetail?IsSendWx=1&id="          //研选纪要详情
 	WX_MSG_PATH_FICC_REPORT_DETAIL         = "pages-ficc/reportDetail/reportDetail?id="                     //FICC研报详情
+	WX_MSG_PATH_CHART_DETAIL               = "pageMy/chartPage/chartPage?id="                               //图表详情
 	WX_MSG_PATH_MORNING_MEETING_LOG_DETAIL = "pages-meeting/toExamine/toExamine?LogId="                     //晨会精华模板消息日志跳转详情
 )