boweniac 3 months ago
parent
commit
76f45dbcb3
2 changed files with 8 additions and 8 deletions
  1. 1 1
      crontask/compute_statistic.go
  2. 7 7
      internal/logic/dashboard/get_charts_logic.go

+ 1 - 1
crontask/compute_statistic.go

@@ -129,7 +129,7 @@ func (l *CronTask) computeStatistic() {
 				usagedetail.BotID(wxinfo.Wxid),
 				usagedetail.CreatedAtGTE(lastHour),
 				usagedetail.CreatedAtLT(currentHour),
-			).GroupBy(usagedetail.FieldBotID).Int(l.ctx)
+			).GroupBy(usagedetail.FieldReceiverID).Int(l.ctx)
 			orgActiveUserInt += activeUserInt
 
 			lastHourData, _ := l.svcCtx.DB.UsageStatisticHour.Query().Where(

+ 7 - 7
internal/logic/dashboard/get_charts_logic.go

@@ -124,10 +124,10 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 		for _, hourData := range usageStatisticHour {
 			addtimeLastTwoDigits := hourData.Addtime % 100
 
-			aiResponse.Count = aiResponse.Count + hourData.AiResponse
+			aiResponse.Count += hourData.AiResponse
 			aiResponse.Val = append(aiResponse.Val, hourData.AiResponse)
 
-			sopRun.Count = sopRun.Count + hourData.SopRun
+			sopRun.Count += hourData.SopRun
 			sopRun.Val = append(sopRun.Val, hourData.SopRun)
 
 			totalFriend.Count = hourData.TotalFriend
@@ -136,14 +136,14 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 			totalGroup.Count = hourData.TotalGroup
 			totalGroup.Val = append(totalGroup.Val, hourData.TotalGroup)
 
-			consumeToken.Count = consumeToken.Count + hourData.ConsumeToken
+			consumeToken.Count += hourData.ConsumeToken
 			consumeToken.Val = append(consumeToken.Val, hourData.ConsumeToken)
 			consumeToken.Label = append(consumeToken.Label, fmt.Sprintf("%02d", addtimeLastTwoDigits))
 
 			activeUser.Count = hourData.ActiveUser
 			activeUser.Val = append(activeUser.Val, hourData.ActiveUser)
 
-			newUser.Count = hourData.NewUser
+			newUser.Count += hourData.NewUser
 			newUser.Val = append(newUser.Val, hourData.NewUser)
 			newUser.Label = append(newUser.Label, fmt.Sprintf("%02d", addtimeLastTwoDigits))
 		}
@@ -191,7 +191,7 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 			aiResponse.Count = aiResponse.Count + dayData.AiResponse
 			aiResponse.Val = append(aiResponse.Val, dayData.AiResponse)
 
-			sopRun.Count = sopRun.Count + dayData.SopRun
+			sopRun.Count += dayData.SopRun
 			sopRun.Val = append(sopRun.Val, dayData.SopRun)
 
 			totalFriend.Count = dayData.TotalFriend
@@ -200,14 +200,14 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 			totalGroup.Count = dayData.TotalGroup
 			totalGroup.Val = append(totalGroup.Val, dayData.TotalGroup)
 
-			consumeToken.Count = consumeToken.Count + dayData.ConsumeToken
+			consumeToken.Count += dayData.ConsumeToken
 			consumeToken.Val = append(consumeToken.Val, dayData.ConsumeToken)
 			consumeToken.Label = append(consumeToken.Label, fmt.Sprintf("%d", dayData.Addtime))
 
 			activeUser.Count = dayData.ActiveUser
 			activeUser.Val = append(activeUser.Val, dayData.ActiveUser)
 
-			newUser.Count = dayData.NewUser
+			newUser.Count += dayData.NewUser
 			newUser.Val = append(newUser.Val, dayData.NewUser)
 			newUser.Label = append(newUser.Label, fmt.Sprintf("%d", dayData.Addtime))
 		}