优化

internal/logic/dashboard/get_charts_logic.go

@@ -129,26 +129,31 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 
 			aiResponse.Count += hourData.AiResponse
 			aiResponse.Val = append(aiResponse.Val, hourData.AiResponse)
+			aiResponse.Label = append(aiResponse.Label, fmt.Sprintf("%02d点", addtimeLastTwoDigits))
 
 			sopRun.Count += hourData.SopRun
 			sopRun.Val = append(sopRun.Val, hourData.SopRun)
+			sopRun.Label = append(sopRun.Label, fmt.Sprintf("%02d点", addtimeLastTwoDigits))
 
 			totalFriend.Count = hourData.TotalFriend
 			totalFriend.Val = append(totalFriend.Val, hourData.TotalFriend)
+			totalFriend.Label = append(totalFriend.Label, fmt.Sprintf("%02d点", addtimeLastTwoDigits))
 
 			totalGroup.Count = hourData.TotalGroup
 			totalGroup.Val = append(totalGroup.Val, hourData.TotalGroup)
+			totalGroup.Label = append(totalGroup.Label, fmt.Sprintf("%02d点", addtimeLastTwoDigits))
 
 			consumeToken.Count += hourData.ConsumeToken
 			consumeToken.Val = append(consumeToken.Val, hourData.ConsumeToken)
-			consumeToken.Label = append(consumeToken.Label, fmt.Sprintf("%02d", addtimeLastTwoDigits))
+			consumeToken.Label = append(consumeToken.Label, fmt.Sprintf("%02d点", addtimeLastTwoDigits))
 
 			activeUser.Count = hourData.ActiveUser
 			activeUser.Val = append(activeUser.Val, hourData.ActiveUser)
+			activeUser.Label = append(activeUser.Label, fmt.Sprintf("%02d点", addtimeLastTwoDigits))
 
 			newUser.Count += hourData.NewUser
 			newUser.Val = append(newUser.Val, hourData.NewUser)
-			newUser.Label = append(newUser.Label, fmt.Sprintf("%02d", addtimeLastTwoDigits))
+			newUser.Label = append(newUser.Label, fmt.Sprintf("%02d点", addtimeLastTwoDigits))
 		}
 		hourLen := len(usageStatisticHour)
 		if hourLen > 0 {
@@ -193,15 +198,19 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 		for _, dayData := range usageStatisticDay {
 			aiResponse.Count = aiResponse.Count + dayData.AiResponse
 			aiResponse.Val = append(aiResponse.Val, dayData.AiResponse)
+			aiResponse.Label = append(aiResponse.Label, fmt.Sprintf("%d", dayData.Addtime))
 
 			sopRun.Count += dayData.SopRun
 			sopRun.Val = append(sopRun.Val, dayData.SopRun)
+			sopRun.Label = append(sopRun.Label, fmt.Sprintf("%d", dayData.Addtime))
 
 			totalFriend.Count = dayData.TotalFriend
 			totalFriend.Val = append(totalFriend.Val, dayData.TotalFriend)
+			totalFriend.Label = append(totalFriend.Label, fmt.Sprintf("%d", dayData.Addtime))
 
 			totalGroup.Count = dayData.TotalGroup
 			totalGroup.Val = append(totalGroup.Val, dayData.TotalGroup)
+			totalGroup.Label = append(totalGroup.Label, fmt.Sprintf("%d", dayData.Addtime))
 
 			consumeToken.Count += dayData.ConsumeToken
 			consumeToken.Val = append(consumeToken.Val, dayData.ConsumeToken)
@@ -209,6 +218,7 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 
 			activeUser.Count = dayData.ActiveUser
 			activeUser.Val = append(activeUser.Val, dayData.ActiveUser)
+			activeUser.Label = append(activeUser.Label, fmt.Sprintf("%d", dayData.Addtime))
 
 			newUser.Count += dayData.NewUser
 			newUser.Val = append(newUser.Val, dayData.NewUser)
@@ -271,12 +281,15 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 
 				aiResponse.Count = aiResponse.Count + aiResponseOfDay
 				aiResponse.Val = append(aiResponse.Val, aiResponseOfDay)
+				aiResponse.Label = append(aiResponse.Label, "今日")
 
 				sopRun.Count = sopRun.Count + sopRunOfDay
 				sopRun.Val = append(sopRun.Val, sopRunOfDay)
+				sopRun.Label = append(sopRun.Label, "今日")
 
 				totalFriend.Count = totalFriendOfDay
 				totalFriend.Val = append(totalFriend.Val, totalFriendOfDay)
+				totalFriend.Label = append(totalFriend.Label, "今日")
 				tfLen := len(totalFriend.Val)
 				if tfLen > 0 && totalFriend.Val[0] > 0 {
 					totalFriend.Rate = float32((totalFriend.Val[tfLen-1] - totalFriend.Val[0]) / totalFriend.Val[0])
@@ -284,6 +297,7 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 
 				totalGroup.Count = totalGroupOfDay
 				totalGroup.Val = append(totalGroup.Val, totalGroupOfDay)
+				totalGroup.Label = append(totalGroup.Label, "今日")
 				tgLen := len(totalGroup.Val)
 				if tgLen > 0 && totalGroup.Val[0] > 0 {
 					totalGroup.Rate = float32((totalGroup.Val[tgLen-1] - totalGroup.Val[0]) / totalGroup.Val[0])
@@ -295,6 +309,7 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 
 				activeUser.Count = activeUserOfDay
 				activeUser.Val = append(activeUser.Val, activeUserOfDay)
+				activeUser.Label = append(activeUser.Label, "今日")
 				auLen := len(activeUser.Val)
 				if auLen > 0 && activeUser.Val[0] > 0 {
 					activeUser.Rate = float32((activeUser.Val[auLen-1] - activeUser.Val[0]) / activeUser.Val[0])

internal/logic/dashboard/get_wxs_logic.go

@@ -74,7 +74,6 @@ func (l *GetWxsLogic) GetWxs(req *types.WxReq) (resp *types.WxResp, err error) {
 	} else {
 		isCurrentDay = endTime.Year() == now.Year() && endTime.Month() == now.Month() && endTime.Day() == now.Day()
 	}
-
 	var predicates []predicate.Wx
 	if organizationId != 0 {
 		predicates = append(predicates, wx.OrganizationID(organizationId))
@@ -128,12 +127,14 @@ func (l *GetWxsLogic) GetWxs(req *types.WxReq) (resp *types.WxResp, err error) {
 		if usageStatisticHour != nil && usageStatisticHour.List != nil {
 			resp.Data.Total = usageStatisticHour.PageDetails.Total
 			for _, hourData := range usageStatisticHour.List {
-				wxList = append(wxList, types.WxData{
-					Nickname:        wxSet[hourData.BotID].Nickname,
-					InteractionRate: float32(hourData.ActiveUser) / float32(hourData.TotalFriend),
-					TotalFriend:     hourData.TotalFriend,
-					TotalGroup:      hourData.TotalGroup,
-				})
+				if wxSet[hourData.BotID] != nil {
+					wxList = append(wxList, types.WxData{
+						Nickname:        wxSet[hourData.BotID].Nickname,
+						InteractionRate: float32(hourData.ActiveUser) / float32(hourData.TotalFriend),
+						TotalFriend:     hourData.TotalFriend,
+						TotalGroup:      hourData.TotalGroup,
+					})
+				}
 			}
 		}
 	} else {
@@ -161,12 +162,14 @@ func (l *GetWxsLogic) GetWxs(req *types.WxReq) (resp *types.WxResp, err error) {
 				if dayData.TotalFriend != 0 {
 					rate = float32(dayData.ActiveUser) / float32(dayData.TotalFriend)
 				}
-				wxList = append(wxList, types.WxData{
-					Nickname:        wxSet[dayData.BotID].Nickname,
-					InteractionRate: rate,
-					TotalFriend:     dayData.TotalFriend,
-					TotalGroup:      dayData.TotalGroup,
-				})
+				if wxSet[dayData.BotID] != nil {
+					wxList = append(wxList, types.WxData{
+						Nickname:        wxSet[dayData.BotID].Nickname,
+						InteractionRate: rate,
+						TotalFriend:     dayData.TotalFriend,
+						TotalGroup:      dayData.TotalGroup,
+					})
+				}
 			}
 		}
 	}