|
|
@@ -106,10 +106,6 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
|
|
|
activeUser := types.ChartsUint{}
|
|
|
newUser := types.ChartsInt{}
|
|
|
var labelDists []custom_types.LabelDist
|
|
|
- l.Infof("----------------isCurrentDay--------------: %+v", isCurrentDay)
|
|
|
- l.Infof("----------------layoutsType--------------: %+v", layoutsType)
|
|
|
- l.Infof("----------------req.StartDate--------------: %+v", req.StartDate)
|
|
|
- l.Infof("----------------req.EndDate--------------: %+v", req.EndDate)
|
|
|
if isCurrentDay && layoutsType == 1 && *req.StartDate == *req.EndDate {
|
|
|
// 返回当日每小时的数据
|
|
|
startOfDay := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.UTC)
|
|
|
@@ -195,7 +191,6 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
|
|
|
predicatesDay = append(predicatesDay, usagestatisticday.AddtimeGTE(startAddTime))
|
|
|
predicatesDay = append(predicatesDay, usagestatisticday.AddtimeLTE(endAddTime))
|
|
|
usageStatisticDay, err := l.svcCtx.DB.UsageStatisticDay.Query().Where(predicatesDay...).All(l.ctx)
|
|
|
- l.Infof("----------------usageStatisticDay--------------: %+v", usageStatisticDay)
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
}
|
