新增获取终端数量统计，任务统计

internal/controller/statistic/statistic_v1_get_online_device.go

@@ -2,19 +2,33 @@ package statistic
 
 import (
 	"context"
-	"fmt"
-	"github.com/gogf/gf/v2/frame/g"
-	"server/internal/consts"
+	_ "fmt"
+	_ "github.com/gogf/gf/v2/frame/g"
+	"server/internal/model"
+	"server/internal/service"
 
 	"server/api/statistic/v1"
 )
 
 func (c *ControllerV1) GetOnlineDevice(ctx context.Context, req *v1.GetOnlineDeviceReq) (res *v1.GetOnlineDeviceRes, err error) {
-	get, err := g.Redis().Get(ctx, fmt.Sprintf(consts.NetbarOnlineNumberKey, req.NetbarAccount))
+	//get, err := g.Redis().Get(ctx, fmt.Sprintf(consts.NetbarOnlineNumberKey, req.NetbarAccount))
+	//if err != nil {
+	//	return nil, err
+	//}
+	out, err := service.Statistic().GetOnlineDevice(ctx, &model.GetOnlineDeviceIn{
+		NetbarAccount: req.NetbarAccount,
+		StoreId:       req.StoreId,
+	})
+
 	if err != nil {
 		return nil, err
 	}
+
 	return &v1.GetOnlineDeviceRes{
-		Total: get.Int64(),
+		OnlineTerminalTotal: out.OnlineTerminalTotal,
+		StartTimes:          out.StartTimes,
+		TaskCompletedTotal:  out.TaskCompletedTotal,
+		TaskTimes:           out.TaskTimes,
+		TerminalTotal:       out.TerminalTotal,
 	}, nil
 }