|
@@ -131,17 +131,18 @@ func (l *CronTask) analyze() {
|
|
|
predicates = append(predicates, usagedetail.AppIn(1, 3, 4, 5))
|
|
|
//yesterdayStart := time.Now().AddDate(0, 0, -1).Truncate(24 * time.Hour)
|
|
|
//yesterdayEnd := yesterdayStart.Add(24 * time.Hour)
|
|
|
- loc, _ := time.LoadLocation("Asia/Shanghai")
|
|
|
- now := time.Now().In(loc)
|
|
|
- yesterdayEnd := now.Truncate(24 * time.Hour)
|
|
|
- yesterdayStart := yesterdayEnd.AddDate(0, 0, -1)
|
|
|
- predicates = append(predicates, usagedetail.CreatedAtGTE(yesterdayStart))
|
|
|
- predicates = append(predicates, usagedetail.CreatedAtLT(yesterdayEnd))
|
|
|
|
|
|
- //todayStart := time.Now().AddDate(0, 0, 0).Truncate(24 * time.Hour)
|
|
|
- //todayEnd := todayStart.Add(24 * time.Hour)
|
|
|
- //predicates = append(predicates, usagedetail.CreatedAtGTE(todayStart))
|
|
|
- //predicates = append(predicates, usagedetail.CreatedAtLT(todayEnd))
|
|
|
+ //loc, _ := time.LoadLocation("Asia/Shanghai")
|
|
|
+ //now := time.Now().In(loc)
|
|
|
+ //yesterdayEnd := now.Truncate(24 * time.Hour)
|
|
|
+ //yesterdayStart := yesterdayEnd.AddDate(0, 0, -1)
|
|
|
+ //predicates = append(predicates, usagedetail.CreatedAtGTE(yesterdayStart))
|
|
|
+ //predicates = append(predicates, usagedetail.CreatedAtLT(yesterdayEnd))
|
|
|
+
|
|
|
+ todayStart := time.Now().AddDate(0, 0, 0).Truncate(24 * time.Hour)
|
|
|
+ todayEnd := todayStart.Add(24 * time.Hour)
|
|
|
+ predicates = append(predicates, usagedetail.CreatedAtGTE(todayStart))
|
|
|
+ predicates = append(predicates, usagedetail.CreatedAtLT(todayEnd))
|
|
|
|
|
|
data, err := l.svcCtx.DB.UsageDetail.Query().Where(predicates...).All(l.ctx)
|
|
|
logx.Info("usageDetails: ", data)
|