|
|
|
@@ -240,8 +240,8 @@ func QueryMetricsPage(start int64, end int64, page int, pageSize int) ([]*UserMe |
|
|
|
Find(&userMetricsList); err != nil { |
|
|
|
return nil, 0 |
|
|
|
} |
|
|
|
postDeal(userMetricsList) |
|
|
|
return userMetricsList, int64(len(userMetricsList)) |
|
|
|
postUserMetricsList := postDeal(userMetricsList) |
|
|
|
return postUserMetricsList, int64(len(postUserMetricsList)) |
|
|
|
} |
|
|
|
|
|
|
|
func QueryMetrics(start int64, end int64) ([]*UserMetrics, int) { |
|
|
|
@@ -252,8 +252,8 @@ func QueryMetrics(start int64, end int64) ([]*UserMetrics, int) { |
|
|
|
Find(&userMetricsList); err != nil { |
|
|
|
return nil, 0 |
|
|
|
} |
|
|
|
postDeal(userMetricsList) |
|
|
|
return userMetricsList, len(userMetricsList) |
|
|
|
postUserMetricsList := postDeal(userMetricsList) |
|
|
|
return postUserMetricsList, int(len(postUserMetricsList)) |
|
|
|
} |
|
|
|
|
|
|
|
func duplicateRemoval(userMetricsList []*UserMetrics) []*UserMetrics { |
|
|
|
@@ -269,13 +269,14 @@ func duplicateRemoval(userMetricsList []*UserMetrics) []*UserMetrics { |
|
|
|
return userMetricsResult |
|
|
|
} |
|
|
|
|
|
|
|
func postDeal(userMetricsList []*UserMetrics) { |
|
|
|
userMetricsList = duplicateRemoval(userMetricsList) |
|
|
|
for _, userMetrics := range userMetricsList { |
|
|
|
func postDeal(userMetricsList []*UserMetrics) []*UserMetrics { |
|
|
|
duplicateRemovalUserMetricsList := duplicateRemoval(userMetricsList) |
|
|
|
for _, userMetrics := range duplicateRemovalUserMetricsList { |
|
|
|
userMetrics.DisplayDate = userMetrics.DataDate |
|
|
|
userMetrics.TotalRegistUser = userMetrics.ActivateRegistUser + userMetrics.NotActivateRegistUser |
|
|
|
userMetrics.TotalNotActivateRegistUser = userMetrics.TotalUser - userMetrics.TotalActivateRegistUser |
|
|
|
} |
|
|
|
return duplicateRemovalUserMetricsList |
|
|
|
} |
|
|
|
|
|
|
|
func QueryMetricsForAll() []*UserMetrics { |
|
|
|
@@ -286,8 +287,8 @@ func QueryMetricsForAll() []*UserMetrics { |
|
|
|
Find(&userMetricsList); err != nil { |
|
|
|
return nil |
|
|
|
} |
|
|
|
userMetricsList = duplicateRemoval(userMetricsList) |
|
|
|
return makeResultForMonth(userMetricsList, len(userMetricsList)) |
|
|
|
duplicateRemovalUserMetricsList := duplicateRemoval(userMetricsList) |
|
|
|
return makeResultForMonth(duplicateRemovalUserMetricsList, len(duplicateRemovalUserMetricsList)) |
|
|
|
} |
|
|
|
|
|
|
|
func QueryMetricsForYear() []*UserMetrics { |
|
|
|
|