Merge branch 'feature/dashboard'

* feature/dashboard:
  修复bug
  修复bug
  优化
  优化
  优化

crontask/compute_statistic.go

@@ -132,12 +132,13 @@ func (l *CronTask) computeStatistic() {
 			allHourAccountBalanceInt = 0
 
 			// 活跃好友：usage_detail 表 type = 1
-			activeUserInt, _ = l.svcCtx.DB.UsageDetail.Query().Where(
+			activeUsers, _ := l.svcCtx.DB.UsageDetail.Query().Where(
 				usagedetail.Type(1),
 				usagedetail.BotID(wxinfo.Wxid),
 				usagedetail.CreatedAtGTE(lastHour),
 				usagedetail.CreatedAtLT(currentHour),
-			).GroupBy(usagedetail.FieldReceiverID).Int(l.ctx)
+			).GroupBy(usagedetail.FieldReceiverID).Strings(l.ctx)
+			activeUserInt = len(activeUsers)
 			orgActiveUserInt += activeUserInt
 			allHourActiveUserInt += activeUserInt
 
@@ -148,9 +149,9 @@ func (l *CronTask) computeStatistic() {
 			).First(l.ctx)
 
 			if lastHourData == nil {
-				newUserInt = friendCountInt
+				newUserInt = 0
 			} else {
-				newUserInt = int(lastHourData.TotalFriend) - friendCountInt
+				newUserInt = friendCountInt - int(lastHourData.TotalFriend)
 			}
 			orgNewUserInt += newUserInt
 			allHourNewUserInt += newUserInt

internal/logic/dashboard/get_charts_logic.go

@@ -44,14 +44,13 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 	// 获取组织id
 	var organizationId uint64 = 0
 	isAdmin := l.ctx.Value("isAdmin").(bool)
-	if isAdmin && req.OrganizationId != nil && *req.OrganizationId != 0 {
+	if isAdmin {
 		if req.OrganizationId != nil && *req.OrganizationId != 0 {
 			organizationId = *req.OrganizationId
 		}
 	} else {
 		organizationId = l.ctx.Value("organizationId").(uint64)
 	}
-
 	// 解析起始和截止时间
 	layouts := []string{
 		"2006-01",    // 对应 "2024-01"
@@ -106,49 +105,60 @@ 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 {
-		// 返回当日每小时的数据
-		startOfDay := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.UTC)
-		startAddTimeString := startOfDay.Format("2006010200")
+	if layoutsType == 1 && *req.StartDate == *req.EndDate {
+		startAddTimeString := startTime.Format("2006010200")
 		startAddTime, err := strconv.ParseUint(startAddTimeString, 10, 64)
 		if err != nil {
 			fmt.Println("转换开始时间失败:", err)
 			return nil, err
 		}
 
+		nextDayMidnight := time.Date(startTime.Year(), startTime.Month(), startTime.Day()+1, 0, 0, 0, 0, startTime.Location())
+		nextDayMidnightString := nextDayMidnight.Format("2006010200")
+		nextDayAddTime, err := strconv.ParseUint(nextDayMidnightString, 10, 64)
+		if err != nil {
+			fmt.Println("转换次日0点时间失败:", err)
+			return nil, err
+		}
+
 		var predicates []predicate.UsageStatisticHour
 		predicates = append(predicates, usagestatistichour.OrganizationID(organizationId))
 		predicates = append(predicates, usagestatistichour.BotID(""))
 		predicates = append(predicates, usagestatistichour.AddtimeGTE(startAddTime))
+		predicates = append(predicates, usagestatistichour.AddtimeLTE(nextDayAddTime))
 		usageStatisticHour, err := l.svcCtx.DB.UsageStatisticHour.Query().Where(predicates...).All(l.ctx)
 		if err != nil {
 			return nil, err
 		}
 		for _, hourData := range usageStatisticHour {
 			addtimeLastTwoDigits := hourData.Addtime % 100
-
 			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 +203,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 +223,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 +286,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 +302,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 +314,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))
@@ -96,7 +95,6 @@ func (l *GetWxsLogic) GetWxs(req *types.WxReq) (resp *types.WxResp, err error) {
 	}
 
 	var wxList []types.WxData
-
 	if isCurrentDay {
 		// 返回当日每小时的数据
 		var predicatesH []predicate.UsageStatisticHour
@@ -118,8 +116,8 @@ func (l *GetWxsLogic) GetWxs(req *types.WxReq) (resp *types.WxResp, err error) {
 		var predicatesHour []predicate.UsageStatisticHour
 		if organizationId != 0 {
 			predicatesHour = append(predicatesHour, usagestatistichour.OrganizationID(organizationId))
-			predicatesHour = append(predicatesHour, usagestatistichour.BotIDIn(wxIds...))
 		}
+		predicatesHour = append(predicatesHour, usagestatistichour.BotIDIn(wxIds...))
 		predicatesHour = append(predicatesHour, usagestatistichour.Addtime(lastHourData.Addtime))
 		usageStatisticHour, err := l.svcCtx.DB.UsageStatisticHour.Query().Where(predicatesHour...).Page(l.ctx, req.Page, req.PageSize)
 		if err != nil {
@@ -128,12 +126,18 @@ 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 {
+					rate := float32(0)
+					if hourData.TotalFriend != 0 {
+						rate = float32(hourData.ActiveUser) / float32(hourData.TotalFriend)
+					}
+					wxList = append(wxList, types.WxData{
+						Nickname:        wxSet[hourData.BotID].Nickname,
+						InteractionRate: rate,
+						TotalFriend:     hourData.TotalFriend,
+						TotalGroup:      hourData.TotalGroup,
+					})
+				}
 			}
 		}
 	} else {
@@ -146,8 +150,8 @@ func (l *GetWxsLogic) GetWxs(req *types.WxReq) (resp *types.WxResp, err error) {
 		var predicatesDay []predicate.UsageStatisticDay
 		if organizationId != 0 {
 			predicatesDay = append(predicatesDay, usagestatisticday.OrganizationID(organizationId))
-			predicatesDay = append(predicatesDay, usagestatisticday.BotIDIn(wxIds...))
 		}
+		predicatesDay = append(predicatesDay, usagestatisticday.BotIDIn(wxIds...))
 		predicatesDay = append(predicatesDay, usagestatisticday.Addtime(endAddTime))
 		usageStatisticDay, err := l.svcCtx.DB.UsageStatisticDay.Query().
 			Where(predicatesDay...).Page(l.ctx, req.Page, req.PageSize)
@@ -157,19 +161,22 @@ func (l *GetWxsLogic) GetWxs(req *types.WxReq) (resp *types.WxResp, err error) {
 		if usageStatisticDay != nil && usageStatisticDay.List != nil {
 			resp.Data.Total = usageStatisticDay.PageDetails.Total
 			for _, dayData := range usageStatisticDay.List {
-				rate := float32(0)
-				if dayData.TotalFriend != 0 {
-					rate = float32(dayData.ActiveUser) / float32(dayData.TotalFriend)
+				if wxSet[dayData.BotID] != nil {
+					rate := float32(0)
+					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,
+					})
 				}
-				wxList = append(wxList, types.WxData{
-					Nickname:        wxSet[dayData.BotID].Nickname,
-					InteractionRate: rate,
-					TotalFriend:     dayData.TotalFriend,
-					TotalGroup:      dayData.TotalGroup,
-				})
 			}
 		}
 	}
+
 	resp.Data.Data = wxList
 
 	return resp, nil