Merge branch 'fix/split_db' into debug

cache/report_cache.go

@@ -19,6 +19,7 @@ type UserViewRedisData struct {
 	UserId          int    `json:"user_id" description:"用户id"`
 	ReportId        int    `json:"report_id" description:"报告ID"`
 	ReportChapterId int    `json:"report_chapter_id" description:"章节ID"`
+	Source          int8   `json:"source" description:"来源，1：rddp的报告；2：weekly_report的PHP报告；3：weekly_report商品的报告（应该是作废了）；4：察研观向的报告'"`
 	StopTime        int    `json:"stop_time" description:"停留时间"`
 	OutId           int    `json:"out_id" description:"章节ID"`
 }

services/task.go

@@ -5,8 +5,10 @@ import (
 	"fmt"
 	"hongze/hongze_api/cache"
 	"hongze/hongze_api/models"
+	"hongze/hongze_api/services/alarm_msg"
 	"hongze/hongze_api/services/go_redis"
 	"hongze/hongze_api/utils"
+	"time"
 )
 
 func Task() {
@@ -29,7 +31,7 @@ func AutoUpdateUserView() {
 		go_redis.BRPop2Func(utils.CACHE_KEY_USER_VIEW, func(b []byte) {
 			var userViewRedisData cache.UserViewRedisData
 			if err := json.Unmarshal(b, &userViewRedisData); err != nil {
-				go utils.SendEmail(utils.APPNAME+" "+utils.RunMode+" 失败提醒", fmt.Sprint("AutoUpdateUserView ERR:", err, ";response data:", string(b)), utils.EmailSendToUsers)
+				go alarm_msg.SendAlarmMsg(utils.APPNAME+" "+utils.RunMode+" 失败提醒："+fmt.Sprint("AutoUpdateUserView ERR:", err, ";response data:", string(b)), 2)
 				//}
 				//if _, err := models.AddLogs(&log); err != nil {
 				//	fmt.Println("AddLogs:", err.Error(), log)
@@ -37,33 +39,48 @@ func AutoUpdateUserView() {
 				// 客户的阅读时间
 				err = models.UpdateCompanyProductViewData(userViewRedisData.CompanyId, userViewRedisData.ProductId, userViewRedisData.ViewTime)
 				if err != nil {
-					go utils.SendEmail(utils.APPNAME+" "+utils.RunMode+" 失败提醒", fmt.Sprint("AutoUpdateUserView Update UpdateCompanyProductViewData ERR:", err, ";response data:", string(b)), utils.EmailSendToUsers)
+					go alarm_msg.SendAlarmMsg(utils.APPNAME+" "+utils.RunMode+" 失败提醒："+fmt.Sprint("AutoUpdateUserView Update UpdateCompanyProductViewData ERR:", err, ";response data:", string(b)), 2)
 				}
 
 				// 添加报告阅读汇总记录
-				item := &models.UserReportViewRecord{
-					Id:              1,
-					Source:          1,
-					UserId:          userViewRedisData.UserId,
-					ReportId:        userViewRedisData.ReportId,
-					ReportChapterId: userViewRedisData.ReportChapterId,
-					Mobile:          userViewRedisData.Mobile,
-					Email:           userViewRedisData.Email,
-					RealName:        userViewRedisData.RealName,
-					CompanyName:     userViewRedisData.CompanyName,
-					StopTime:        userViewRedisData.StopTime,
-					OutId:           fmt.Sprint(userViewRedisData.OutId),
-					CreateTime:      userViewRedisData.ViewTime,
-				}
-				err = item.Insert(2021, item)
-				if err != nil {
-					go utils.SendEmail(utils.APPNAME+" "+utils.RunMode+" 失败提醒", fmt.Sprint("AutoUpdateUserView ADD UserReportViewRecord ERR:", err, ";response data:", string(b)), utils.EmailSendToUsers)
+				{
+					source := userViewRedisData.Source
+					if source == 0 {
+						if userViewRedisData.ProductId == 2 {
+							source = 4
+						} else {
+							source = 1
+						}
+					}
+					item := &models.UserReportViewRecord{
+						Id:              1,
+						Source:          source,
+						UserId:          userViewRedisData.UserId,
+						ReportId:        userViewRedisData.ReportId,
+						ReportChapterId: userViewRedisData.ReportChapterId,
+						Mobile:          userViewRedisData.Mobile,
+						Email:           userViewRedisData.Email,
+						RealName:        userViewRedisData.RealName,
+						CompanyName:     userViewRedisData.CompanyName,
+						StopTime:        userViewRedisData.StopTime,
+						OutId:           fmt.Sprint(userViewRedisData.OutId),
+						CreateTime:      userViewRedisData.ViewTime,
+					}
+					viewTime, tmpErr := time.ParseInLocation(utils.FormatDateTime, userViewRedisData.ViewTime, time.Local)
+					if tmpErr != nil {
+						go utils.SendEmail(utils.APPNAME+" "+utils.RunMode+" 失败提醒", fmt.Sprint("AutoUpdateUserView ADD UserReportViewRecord ERR:", err, ";response data:", string(b)), utils.EmailSendToUsers)
+					} else {
+						err = item.Insert(viewTime.Year(), item)
+						if err != nil {
+							go utils.SendEmail(utils.APPNAME+" "+utils.RunMode+" 失败提醒", fmt.Sprint("AutoUpdateUserView ADD UserReportViewRecord ERR:", err, ";response data:", string(b)), utils.EmailSendToUsers)
+						}
+					}
 				}
 
 				// 联系人的阅读时间
 				err = models.UpdateWxUserViewData(userViewRedisData.UserId, userViewRedisData.ProductId, userViewRedisData.ViewTime)
 				if err != nil {
-					go utils.SendEmail(utils.APPNAME+" "+utils.RunMode+" 失败提醒", fmt.Sprint("AutoUpdateUserView Update UpdateWxUserViewData ERR:", err, ";response data:", string(b)), utils.EmailSendToUsers)
+					go alarm_msg.SendAlarmMsg(utils.APPNAME+" "+utils.RunMode+" 失败提醒："+fmt.Sprint("AutoUpdateUserView Update UpdateWxUserViewData ERR:", err, ";response data:", string(b)), 2)
 				}
 			}
 		})