Merge branch 'feature/dashboard'

* feature/dashboard:
  修复统计问题
  优化
  优化

crontask/compute_statistic.go

@@ -144,7 +144,7 @@ func (l *CronTask) computeStatistic() {
 				newUserInt = int(lastHourData.TotalFriend) - friendCountInt
 			}
 			orgNewUserInt += newUserInt
-
+			var lc []custom_types.LabelDist
 			_, err := l.svcCtx.DB.UsageStatisticHour.Create().
 				SetType(1).
 				SetBotID(wxinfo.Wxid).
@@ -158,6 +158,7 @@ func (l *CronTask) computeStatistic() {
 				SetActiveUser(uint64(activeUserInt)).
 				SetNewUser(int64(newUserInt)).
 				SetAddtime(uint64(currentHourInt)).
+				SetLabelDist(lc).
 				Save(l.ctx)
 			l.Errorf("save hour data error:%v \n", err)
 		}
@@ -255,6 +256,7 @@ func (l *CronTask) computeStatistic() {
 			orgActiveUserInt += activeUser
 			orgNewUserInt += newUser
 
+			var lc []custom_types.LabelDist
 			_, err := l.svcCtx.DB.UsageStatisticDay.Create().
 				SetAddtime(uint64(day)).
 				SetType(1).
@@ -268,6 +270,7 @@ func (l *CronTask) computeStatistic() {
 				SetConsumeToken(consumeToken).
 				SetActiveUser(activeUser).
 				SetNewUser(newUser).
+				SetLabelDist(lc).
 				Save(l.ctx)
 			if err != nil {
 				l.Errorf("create day data error:%v \n", err)
@@ -369,7 +372,7 @@ func (l *CronTask) computeStatistic() {
 			orgConsumeTokenInt += consumeToken
 			orgActiveUserInt += activeUser
 			orgNewUserInt += newUser
-
+			var lc []custom_types.LabelDist
 			_, err := l.svcCtx.DB.UsageStatisticMonth.Create().
 				SetAddtime(uint64(month)).
 				SetType(1).
@@ -383,6 +386,7 @@ func (l *CronTask) computeStatistic() {
 				SetConsumeToken(consumeToken).
 				SetActiveUser(activeUser).
 				SetNewUser(newUser).
+				SetLabelDist(lc).
 				Save(l.ctx)
 			if err != nil {
 				l.Errorf("create month data error:%v \n", err)

internal/logic/dashboard/get_charts_logic.go

@@ -106,8 +106,7 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 	activeUser := types.ChartsUint{}
 	newUser := types.ChartsInt{}
 	var labelDists []custom_types.LabelDist
-
-	if isCurrentDay && layoutsType == 1 && req.StartDate == 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)
 		startAddTimeString := startOfDay.Format("2006010200")
@@ -121,7 +120,7 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 		if organizationId != 0 {
 			predicates = append(predicates, usagestatistichour.OrganizationID(organizationId))
 		}
-		predicates = append(predicates, usagestatistichour.BotIDIsNil())
+		predicates = append(predicates, usagestatistichour.BotID(""))
 		predicates = append(predicates, usagestatistichour.AddtimeGTE(startAddTime))
 		usageStatisticHour, err := l.svcCtx.DB.UsageStatisticHour.Query().Where(predicates...).All(l.ctx)
 		if err != nil {
@@ -188,7 +187,7 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 		if organizationId != 0 {
 			predicatesDay = append(predicatesDay, usagestatisticday.OrganizationID(organizationId))
 		}
-		predicatesDay = append(predicatesDay, usagestatisticday.BotIDIsNil())
+		predicatesDay = append(predicatesDay, usagestatisticday.BotID(""))
 		predicatesDay = append(predicatesDay, usagestatisticday.AddtimeGTE(startAddTime))
 		predicatesDay = append(predicatesDay, usagestatisticday.AddtimeLTE(endAddTime))
 		usageStatisticDay, err := l.svcCtx.DB.UsageStatisticDay.Query().Where(predicatesDay...).All(l.ctx)
@@ -250,7 +249,7 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 			if organizationId != 0 {
 				predicates = append(predicates, usagestatistichour.OrganizationID(organizationId))
 			}
-			predicates = append(predicates, usagestatistichour.BotIDIsNil())
+			predicates = append(predicates, usagestatistichour.BotID(""))
 			predicates = append(predicates, usagestatistichour.AddtimeGTE(startOfDayAddTime))
 			usageStatisticHour, err := l.svcCtx.DB.UsageStatisticHour.Query().Where(predicates...).All(l.ctx)
 			if err != nil {