From 5741edfeb1c9d22e0cc1171c545da68b6eb16815 Mon Sep 17 00:00:00 2001 From: zouap Date: Sun, 15 Jan 2023 10:44:36 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E8=B0=83=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index 2a379095a..50d48eda4 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -2602,6 +2602,11 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s break } } + resultItemMapJson, _ := json.Marshal(resultItemMap) + log.Info("resultItemMapJson=" + string(resultItemMapJson)) + + resultMapJson, _ := json.Marshal(resultMap) + log.Info("resultMap=" + string(resultMapJson)) return resultMap, resultItemMap } From 5707e6969aa7091e7410cab43f84de532026499e Mon Sep 17 00:00:00 2001 From: zouap Date: Sun, 15 Jan 2023 10:49:06 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E8=B0=83=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/repo/user_data_analysis.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/routers/repo/user_data_analysis.go b/routers/repo/user_data_analysis.go index 8121f167c..b7b76fd71 100755 --- a/routers/repo/user_data_analysis.go +++ b/routers/repo/user_data_analysis.go @@ -719,7 +719,7 @@ func TimingCountDataByDateAndReCount(date string, isReCount bool) { endTime = endTime.UTC() log.Info("startTime time:" + startTime.Format("2006-01-02 15:04:05")) log.Info("endTime time:" + endTime.Format("2006-01-02 15:04:05")) - warnEmailMessage := "用户统计信息入库失败，请尽快定位。" + //warnEmailMessage := "用户统计信息入库失败，请尽快定位。" startYear := time.Date(USER_YEAR, 1, 1, 0, 0, 0, 1, t.Location()) endYear := startYear.AddDate(1, 0, 0) @@ -727,14 +727,14 @@ func TimingCountDataByDateAndReCount(date string, isReCount bool) { models.RefreshUserYearTable(startYear, endYear) //query wiki data - log.Info("start to time count data") - wikiMap, err := queryWikiCountMap(startTime, endTime) - //other user info data - err = models.CounDataByDateAndReCount(wikiMap, startTime, endTime, isReCount) - if err != nil { - log.Error("count user info error." + err.Error()) - mailer.SendWarnNotifyMail(setting.Warn_Notify_Mails, warnEmailMessage) - } + // log.Info("start to time count data") + // wikiMap, err := queryWikiCountMap(startTime, endTime) + // //other user info data + // err = models.CounDataByDateAndReCount(wikiMap, startTime, endTime, isReCount) + // if err != nil { + // log.Error("count user info error." + err.Error()) + // mailer.SendWarnNotifyMail(setting.Warn_Notify_Mails, warnEmailMessage) + // } log.Info("end to count all user info data") } From 52d3ab8b541d8e1d284115e2e99cc309b968ac48 Mon Sep 17 00:00:00 2001 From: zouap Date: Sun, 15 Jan 2023 11:02:17 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=95=85=E9=9A=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index 50d48eda4..42b55e04f 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -2537,11 +2537,12 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s resultItemMap := make(map[string]int) cond := " created_unix>=" + fmt.Sprint(start_unix) + " and created_unix<=" + fmt.Sprint(end_unix) - count, err := sess.Where(cond).Count(new(Cloudbrain)) + count, err := sess.Where(cond).Unscoped().Count(new(Cloudbrain)) if err != nil { log.Info("query cloudbrain error. return.") return resultMap, resultItemMap } + log.Info("count=" + fmt.Sprint(count)) var indexTotal int64 indexTotal = 0 for { From 51d08b6d0f6bf82a07700ef871cdb0660c840040 Mon Sep 17 00:00:00 2001 From: zouap Date: Sun, 15 Jan 2023 11:09:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=91=E8=84=91?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=95=B0=E4=B8=8D=E5=87=86=E7=A1=AE=E7=9A=84?= =?UTF-8?q?Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index 42b55e04f..11f6d9d01 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -2542,7 +2542,7 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s log.Info("query cloudbrain error. return.") return resultMap, resultItemMap } - log.Info("count=" + fmt.Sprint(count)) + log.Info("cloudbrain count=" + fmt.Sprint(count)) var indexTotal int64 indexTotal = 0 for { @@ -2603,12 +2603,6 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s break } } - resultItemMapJson, _ := json.Marshal(resultItemMap) - log.Info("resultItemMapJson=" + string(resultItemMapJson)) - - resultMapJson, _ := json.Marshal(resultMap) - log.Info("resultMap=" + string(resultMapJson)) - return resultMap, resultItemMap } From 8a3700c827b9213bd2cc3f74db99f0a9f082c14a Mon Sep 17 00:00:00 2001 From: zouap Date: Sun, 15 Jan 2023 11:10:50 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E4=BA=91=E8=84=91=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=B8=8D=E5=87=86=E7=A1=AE=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/repo/user_data_analysis.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/routers/repo/user_data_analysis.go b/routers/repo/user_data_analysis.go index b7b76fd71..8121f167c 100755 --- a/routers/repo/user_data_analysis.go +++ b/routers/repo/user_data_analysis.go @@ -719,7 +719,7 @@ func TimingCountDataByDateAndReCount(date string, isReCount bool) { endTime = endTime.UTC() log.Info("startTime time:" + startTime.Format("2006-01-02 15:04:05")) log.Info("endTime time:" + endTime.Format("2006-01-02 15:04:05")) - //warnEmailMessage := "用户统计信息入库失败，请尽快定位。" + warnEmailMessage := "用户统计信息入库失败，请尽快定位。" startYear := time.Date(USER_YEAR, 1, 1, 0, 0, 0, 1, t.Location()) endYear := startYear.AddDate(1, 0, 0) @@ -727,14 +727,14 @@ func TimingCountDataByDateAndReCount(date string, isReCount bool) { models.RefreshUserYearTable(startYear, endYear) //query wiki data - // log.Info("start to time count data") - // wikiMap, err := queryWikiCountMap(startTime, endTime) - // //other user info data - // err = models.CounDataByDateAndReCount(wikiMap, startTime, endTime, isReCount) - // if err != nil { - // log.Error("count user info error." + err.Error()) - // mailer.SendWarnNotifyMail(setting.Warn_Notify_Mails, warnEmailMessage) - // } + log.Info("start to time count data") + wikiMap, err := queryWikiCountMap(startTime, endTime) + //other user info data + err = models.CounDataByDateAndReCount(wikiMap, startTime, endTime, isReCount) + if err != nil { + log.Error("count user info error." + err.Error()) + mailer.SendWarnNotifyMail(setting.Warn_Notify_Mails, warnEmailMessage) + } log.Info("end to count all user info data") }