From 58827dcd6bec5dcfb70d4f14c4dd2238939a617c Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 9 May 2022 11:52:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 24 ++++++++++++------------ routers/repo/user_data_analysis.go | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index d2dbe4026..1b5846727 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -232,7 +232,7 @@ func getLastCountDate() int64 { return pageStartTime.Unix() } -func QueryMetricsPage(start int64, end int64, page int, pageSize int) ([]UserMetrics, int64) { +func QueryMetricsPage(start int64, end int64, page int, pageSize int) ([]*UserMetrics, int64) { statictisSess := xStatistic.NewSession() defer statictisSess.Close() @@ -242,7 +242,7 @@ func QueryMetricsPage(start int64, end int64, page int, pageSize int) ([]UserMet log.Info("query error." + err.Error()) return nil, 0 } - userMetricsList := make([]UserMetrics, 0) + userMetricsList := make([]*UserMetrics, 0) //.Limit(pageSize, page*pageSize) if err := statictisSess.Table(new(UserMetrics)).Where(cond).OrderBy("count_date desc"). Find(&userMetricsList); err != nil { @@ -252,10 +252,10 @@ func QueryMetricsPage(start int64, end int64, page int, pageSize int) ([]UserMet return userMetricsList, allCount } -func QueryMetrics(start int64, end int64) ([]UserMetrics, int) { +func QueryMetrics(start int64, end int64) ([]*UserMetrics, int) { statictisSess := xStatistic.NewSession() defer statictisSess.Close() - userMetricsList := make([]UserMetrics, 0) + userMetricsList := make([]*UserMetrics, 0) if err := statictisSess.Table(new(UserMetrics)).Where("count_date >" + fmt.Sprint(start) + " and count_date<" + fmt.Sprint(end)).OrderBy("count_date desc"). Find(&userMetricsList); err != nil { return nil, 0 @@ -264,7 +264,7 @@ func QueryMetrics(start int64, end int64) ([]UserMetrics, int) { return userMetricsList, len(userMetricsList) } -func postDeal(userMetricsList []UserMetrics) { +func postDeal(userMetricsList []*UserMetrics) { for _, userMetrics := range userMetricsList { dateTime := time.Unix(userMetrics.CountDate, 0) userMetrics.DisplayDate = dateTime.Format("2006-01-02") @@ -273,10 +273,10 @@ func postDeal(userMetricsList []UserMetrics) { } } -func QueryMetricsForAll() []UserMetrics { +func QueryMetricsForAll() []*UserMetrics { statictisSess := xStatistic.NewSession() defer statictisSess.Close() - userMetricsList := make([]UserMetrics, 0) + userMetricsList := make([]*UserMetrics, 0) if err := statictisSess.Table(new(UserMetrics)).OrderBy("count_date desc"). Find(&userMetricsList); err != nil { return nil @@ -284,7 +284,7 @@ func QueryMetricsForAll() []UserMetrics { return makeResultForMonth(userMetricsList, len(userMetricsList)) } -func QueryMetricsForYear() []UserMetrics { +func QueryMetricsForYear() []*UserMetrics { currentTimeNow := time.Now() currentYearEndTime := time.Date(currentTimeNow.Year(), currentTimeNow.Month(), currentTimeNow.Day(), 23, 59, 59, 0, currentTimeNow.Location()) currentYearStartTime := time.Date(currentTimeNow.Year(), 1, 1, 0, 0, 0, 0, currentTimeNow.Location()) @@ -293,7 +293,7 @@ func QueryMetricsForYear() []UserMetrics { return makeResultForMonth(allUserInfo, count) } -func makeResultForMonth(allUserInfo []UserMetrics, count int) []UserMetrics { +func makeResultForMonth(allUserInfo []*UserMetrics, count int) []*UserMetrics { monthMap := make(map[string]UserMetrics) if count > 0 { for _, userMetrics := range allUserInfo { @@ -322,9 +322,9 @@ func makeResultForMonth(allUserInfo []UserMetrics, count int) []UserMetrics { } } } - result := make([]UserMetrics, 0) + result := make([]*UserMetrics, 0) for _, value := range monthMap { - result = append(result, value) + result = append(result, &value) } sort.Slice(result, func(i, j int) bool { return strings.Compare(result[i].DisplayDate, result[j].DisplayDate) > 0 @@ -892,7 +892,7 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time, useMetrics.TotalActivateRegistUser = getMapKeyStringValue("TotalActivateRegistUser", userMetrics) useMetrics.TotalHasActivityUser = getMapKeyStringValue("TotalHasActivityUser", userMetrics) - count, err = sess.Count(new(User)) + count, err = sess.Where("type=0").Count(new(User)) if err != nil { log.Info("query user error. return.") } diff --git a/routers/repo/user_data_analysis.go b/routers/repo/user_data_analysis.go index 7fd6a3a8b..489a9c6cb 100755 --- a/routers/repo/user_data_analysis.go +++ b/routers/repo/user_data_analysis.go @@ -372,8 +372,8 @@ func QueryUserStaticLastMonth(ctx *context.Context) { } func QueryUserMetricsYesterday(ctx *context.Context) { currentTimeNow := time.Now() - pageStartTime := time.Date(currentTimeNow.Year(), currentTimeNow.Month(), currentTimeNow.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, -1) - pageEndTime := time.Date(currentTimeNow.Year(), currentTimeNow.Month(), currentTimeNow.Day(), 23, 59, 59, 0, currentTimeNow.Location()).AddDate(0, 0, -1) + pageStartTime := time.Date(currentTimeNow.Year(), currentTimeNow.Month(), currentTimeNow.Day(), 0, 0, 0, 0, time.Local) + pageEndTime := time.Date(currentTimeNow.Year(), currentTimeNow.Month(), currentTimeNow.Day(), 23, 59, 59, 0, currentTimeNow.Location()) queryMetrics(ctx, "public.user_business_analysis_yesterday", pageStartTime, pageEndTime) } func QueryUserStaticYesterday(ctx *context.Context) { From 1ab7599a438fa248c77edbaa8c87af97f4110543 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 9 May 2022 14:19:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/user_data_analysis.go b/routers/repo/user_data_analysis.go index 489a9c6cb..7e97b2207 100755 --- a/routers/repo/user_data_analysis.go +++ b/routers/repo/user_data_analysis.go @@ -264,7 +264,7 @@ func queryMetrics(ctx *context.Context, tableName string, startTime time.Time, e IsReturnFile := ctx.QueryBool("IsReturnFile") var count int64 - result := make([]models.UserMetrics, 0) + result := make([]*models.UserMetrics, 0) if tableName == "public.user_business_analysis_current_year" { result = models.QueryMetricsForYear() count = int64(len(result)) From 2755611741970593c922b0018da72cad11a6070c Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 9 May 2022 14:20:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/user_data_analysis.go b/routers/repo/user_data_analysis.go index 7e97b2207..2823f9c87 100755 --- a/routers/repo/user_data_analysis.go +++ b/routers/repo/user_data_analysis.go @@ -43,7 +43,7 @@ func getUserMetricsExcelHeader(ctx *context.Context) map[string]string { return excelHeaderMap } -func writeUserMetricsExcel(row int, xlsx *excelize.File, sheetName string, userMetrics models.UserMetrics) { +func writeUserMetricsExcel(row int, xlsx *excelize.File, sheetName string, userMetrics *models.UserMetrics) { rows := fmt.Sprint(row) var tmp byte tmp = 0 From d019278428586623e1b26aa2c2edc8cde5a8c7e9 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 9 May 2022 14:30:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index 1b5846727..fc5343f96 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -294,13 +294,13 @@ func QueryMetricsForYear() []*UserMetrics { } func makeResultForMonth(allUserInfo []*UserMetrics, count int) []*UserMetrics { - monthMap := make(map[string]UserMetrics) + monthMap := make(map[string]*UserMetrics) if count > 0 { for _, userMetrics := range allUserInfo { dateTime := time.Unix(userMetrics.CountDate, 0) month := fmt.Sprint(dateTime.Year()) + "-" + fmt.Sprint(int(dateTime.Month())) if _, ok := monthMap[month]; !ok { - var monthUserMetrics UserMetrics + var monthUserMetrics *UserMetrics monthUserMetrics.DisplayDate = month monthUserMetrics.ActivateRegistUser = userMetrics.ActivateRegistUser monthUserMetrics.NotActivateRegistUser = userMetrics.NotActivateRegistUser @@ -324,7 +324,7 @@ func makeResultForMonth(allUserInfo []*UserMetrics, count int) []*UserMetrics { } result := make([]*UserMetrics, 0) for _, value := range monthMap { - result = append(result, &value) + result = append(result, value) } sort.Slice(result, func(i, j int) bool { return strings.Compare(result[i].DisplayDate, result[j].DisplayDate) > 0