Merge branch 'feature/dashboard'

* feature/dashboard:
  优化比例显示

internal/logic/dashboard/get_charts_logic.go

@@ -209,23 +209,23 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 		if hourLen > 0 {
 			if usageStatisticHour[0].TotalFriend > 0 {
 				totalFriendRate := float32((float64(usageStatisticHour[hourLen-1].TotalFriend) - float64(usageStatisticHour[0].TotalFriend)) / float64(usageStatisticHour[0].TotalFriend))
-				totalFriendRateRound := float32(math.Round(float64(totalFriendRate)*100) / 100)
+				totalFriendRateRound := float32(math.Round(float64(totalFriendRate) * 100))
 				totalFriend.Rate = &totalFriendRateRound
 				//totalFriend.Rate = &totalFriendRate
 			}
 			if usageStatisticHour[0].TotalGroup > 0 {
 				totalGroupRate := float32((float64(usageStatisticHour[hourLen-1].TotalGroup) - float64(usageStatisticHour[0].TotalGroup)) / float64(usageStatisticHour[0].TotalGroup))
-				totalGroupRateRound := float32(math.Round(float64(totalGroupRate)*100) / 100)
+				totalGroupRateRound := float32(math.Round(float64(totalGroupRate) * 100))
 				totalGroup.Rate = &totalGroupRateRound
 			}
 			//if usageStatisticHour[0].ActiveUser > 0 {
 			//	activeUserRate := float32((float64(usageStatisticHour[hourLen-1].ActiveUser) - float64(usageStatisticHour[0].ActiveUser)) / float64(usageStatisticHour[0].ActiveUser))
-			//	activeUserRateRound := float32(math.Round(float64(activeUserRate)*100) / 100)
+			//	activeUserRateRound := float32(math.Round(float64(activeUserRate)*100))
 			//	activeUser.Rate = &activeUserRateRound
 			//}
 			if usageStatisticHour[0].NewUser > 0 {
 				newUserRate := float32((float64(usageStatisticHour[hourLen-1].NewUser) - float64(usageStatisticHour[0].NewUser)) / float64(usageStatisticHour[0].NewUser))
-				newUserRateRound := float32(math.Round(float64(newUserRate)*100) / 100)
+				newUserRateRound := float32(math.Round(float64(newUserRate) * 100))
 				newUser.Rate = &newUserRateRound
 			}
 			labelDists = usageStatisticHour[hourLen-1].LabelDist
@@ -303,22 +303,22 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 		if dayLen > 0 {
 			if usageStatisticDay[0].TotalFriend > 0 {
 				totalFriendRate := float32((float64(usageStatisticDay[dayLen-1].TotalFriend) - float64(usageStatisticDay[0].TotalFriend)) / float64(usageStatisticDay[0].TotalFriend))
-				totalFriendRateRound := float32(math.Round(float64(totalFriendRate)*100) / 100)
+				totalFriendRateRound := float32(math.Round(float64(totalFriendRate) * 100))
 				totalFriend.Rate = &totalFriendRateRound
 			}
 			if usageStatisticDay[0].TotalGroup > 0 {
 				totalGroupRate := float32((float64(usageStatisticDay[dayLen-1].TotalGroup) - float64(usageStatisticDay[0].TotalGroup)) / float64(usageStatisticDay[0].TotalGroup))
-				totalGroupRateRound := float32(math.Round(float64(totalGroupRate)*100) / 100)
+				totalGroupRateRound := float32(math.Round(float64(totalGroupRate) * 100))
 				totalGroup.Rate = &totalGroupRateRound
 			}
 			//if usageStatisticDay[0].ActiveUser > 0 {
 			//	activeUserRate := float32((float64(usageStatisticDay[dayLen-1].ActiveUser) - float64(usageStatisticDay[0].ActiveUser)) / float64(usageStatisticDay[0].ActiveUser))
-			//	activeUserRateRound := float32(math.Round(float64(activeUserRate)*100) / 100)
+			//	activeUserRateRound := float32(math.Round(float64(activeUserRate)*100))
 			//	activeUser.Rate = &activeUserRateRound
 			//}
 			if usageStatisticDay[0].NewUser > 0 {
 				newUserRate := float32((float64(usageStatisticDay[dayLen-1].NewUser) - float64(usageStatisticDay[0].NewUser)) / float64(usageStatisticDay[0].NewUser))
-				newUserRateRound := float32(math.Round(float64(newUserRate)*100) / 100)
+				newUserRateRound := float32(math.Round(float64(newUserRate) * 100))
 				newUser.Rate = &newUserRateRound
 			}
 			labelDists = usageStatisticDay[dayLen-1].LabelDist
@@ -385,7 +385,7 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 				tfLen := len(totalFriend.Val)
 				if tfLen > 0 && totalFriend.Val[0] > 0 {
 					totalFriendRate := float32((float64(totalFriend.Val[tfLen-1]) - float64(totalFriend.Val[0])) / float64(totalFriend.Val[0]))
-					totalFriendRateRound := float32(math.Round(float64(totalFriendRate)*100) / 100)
+					totalFriendRateRound := float32(math.Round(float64(totalFriendRate) * 100))
 					totalFriend.Rate = &totalFriendRateRound
 				}
 				totalFriend.LabelText = "个"
@@ -396,7 +396,7 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 				tgLen := len(totalGroup.Val)
 				if tgLen > 0 && totalGroup.Val[0] > 0 {
 					totalGroupRate := float32((float64(totalGroup.Val[tgLen-1]) - float64(totalGroup.Val[0])) / float64(totalGroup.Val[0]))
-					totalGroupRateRound := float32(math.Round(float64(totalGroupRate)*100) / 100)
+					totalGroupRateRound := float32(math.Round(float64(totalGroupRate) * 100))
 					totalGroup.Rate = &totalGroupRateRound
 				}
 				totalGroup.LabelText = "个"
@@ -412,7 +412,7 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 				//auLen := len(activeUser.Val)
 				//if auLen > 0 && activeUser.Val[0] > 0 {
 				//	activeUserRate := float32((float64(activeUser.Val[auLen-1]) - float64(activeUser.Val[0])) / float64(activeUser.Val[0]))
-				//	activeUserRateRound := float32(math.Round(float64(activeUserRate)*100) / 100)
+				//	activeUserRateRound := float32(math.Round(float64(activeUserRate)*100))
 				//	activeUser.Rate = &activeUserRateRound
 				//}
 				activeUser.LabelText = "个"
@@ -423,7 +423,7 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 				nuLen := len(newUser.Val)
 				if nuLen > 0 && newUser.Val[0] > 0 {
 					newUserRate := float32((float64(newUser.Val[nuLen-1]) - float64(newUser.Val[0])) / float64(newUser.Val[0]))
-					newUserRateRound := float32(math.Round(float64(newUserRate)*100) / 100)
+					newUserRateRound := float32(math.Round(float64(newUserRate) * 100))
 					newUser.Rate = &newUserRateRound
 				}
 				newUser.LabelText = "个"

internal/logic/dashboard/get_wxs_logic.go

@@ -138,7 +138,7 @@ func (l *GetWxsLogic) GetWxs(req *types.WxReq) (resp *types.WxResp, err error) {
 					rate := float32(0)
 					if hourData.TotalFriend != 0 {
 						rate = float32(float64(hourData.ActiveUser)) / float32(float64(hourData.TotalFriend))
-						rate = float32(math.Round(float64(rate)*100) / 100)
+						rate = float32(math.Round(float64(rate) * 100))
 					}
 					wxList = append(wxList, types.WxData{
 						Nickname:        wxSet[hourData.BotID].Nickname,
@@ -175,7 +175,7 @@ func (l *GetWxsLogic) GetWxs(req *types.WxReq) (resp *types.WxResp, err error) {
 					rate := float32(0)
 					if dayData.TotalFriend != 0 {
 						rate = float32(float64(dayData.ActiveUser)) / float32(float64(dayData.TotalFriend))
-						rate = float32(math.Round(float64(rate)*100) / 100)
+						rate = float32(math.Round(float64(rate) * 100))
 					}
 					wxList = append(wxList, types.WxData{
 						Nickname:        wxSet[dayData.BotID].Nickname,