add ws 链接确认

services/percutaneous/internal/logic/base.go

@@ -11,6 +11,11 @@ import (
 	jsoniter "github.com/json-iterator/go"
 )
 
+const (
+	WsTypeApp       = "app"
+	WsTypeOperation = "operation"
+)
+
 type BaseLogic struct {
 }
 

services/percutaneous/internal/logic/getWsCodeLogic.go

@@ -30,17 +30,21 @@ func NewGetWsCodeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetWsCo
 }
 
 func (l *GetWsCodeLogic) GetWsCode(in *percutaneous.GetWsCodeRequest) (*percutaneous.Response, error) {
-	adminInfo := utils.GetUserFromCtx(l.ctx)
-	if adminInfo.ID < utils.NumberOne {
-		return l.fail(utils.ErrorNoLoginInfo)
+	id := in.UserId
+	if id < utils.NumberOne {
+		adminInfo := utils.GetUserFromCtx(l.ctx)
+		if adminInfo.ID < utils.NumberOne {
+			return l.fail(utils.ErrorNoLoginInfo)
+		}
+		id = adminInfo.ID
 	}
 
-	Type := "app"
-	if in.Type == utils.NumberOne {
-		Type = "operation"
+	Type := WsTypeApp
+	if in.Type == utils.NumberTwo {
+		Type = WsTypeOperation
 	}
 
-	key := utils.MD5Encrypt(fmt.Sprintf("%d%s%s", adminInfo.ID, dao.WsCode, Type))
+	key := utils.MD5Encrypt(fmt.Sprintf("%d%s%s", id, dao.WsCode, Type))
 	redisKey := pkgws.RedisKeyQRSession + key
 
 	payload, err := jsoniter.MarshalToString(pkgws.Session{

services/percutaneous/internal/logic/setPositionLogic.go

@@ -40,8 +40,8 @@ func (l *SetPositionLogic) SetPosition(in *percutaneous.SetPositionRequest) (*pe
 
 	data := in.Position
 	if err := pkgws.Publish(l.ctx, in.SessionId, pkgws.Success(data)); err != nil {
-		l.Errorf("qrcode scan publish: %v", err)
+		l.Errorf("set position publish: %v", err)
 	}
 
-	return &percutaneous.Response{}, nil
+	return l.ok(utils.NumberOne)
 }

services/percutaneous/internal/logic/wsClientStatusLogic.go

@@ -0,0 +1,77 @@
+package logic
+
+import (
+	"context"
+	"fmt"
+	"lone-services/pkg/redis"
+	"lone-services/pkg/utils"
+	pkgws "lone-services/pkg/ws"
+	"lone-services/services/percutaneous/internal/dao"
+
+	"lone-services/rpc/percutaneous/pb"
+	"lone-services/services/percutaneous/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type WsClientStatusLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+	BaseLogic
+}
+
+func NewWsClientStatusLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WsClientStatusLogic {
+	return &WsClientStatusLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *WsClientStatusLogic) WsClientStatus(in *percutaneous.GetWsCodeRequest) (*percutaneous.Response, error) {
+	id := in.UserId
+	if id < utils.NumberOne {
+		adminInfo := utils.GetUserFromCtx(l.ctx)
+		if adminInfo.ID < utils.NumberOne {
+			return l.fail(utils.ErrorNoLoginInfo)
+		}
+		id = adminInfo.ID
+	}
+
+	Type := WsTypeApp
+	//1为web,2为设备
+	if in.Type == utils.NumberOne {
+		Type = WsTypeOperation
+	}
+
+	key := utils.MD5Encrypt(fmt.Sprintf("%d%s%s", id, dao.WsCode, Type))
+	redisKey := pkgws.RedisKeyQRSession + key
+
+	val, err := redis.Client.Get(l.ctx, redisKey).Result()
+	if err != nil && err.Error() != redis.Nil.Error() {
+		return l.fail(utils.Fail)
+	}
+
+	if len(val) > utils.NumberTen {
+		data := "ok"
+		keys := []string{WsTypeApp, WsTypeOperation}
+
+		for _, k := range keys {
+			key = utils.MD5Encrypt(fmt.Sprintf("%d%s%s", id, dao.WsCode, k))
+			redisKey = pkgws.RedisKeyQRSession + key
+			if err = pkgws.Publish(l.ctx, redisKey, pkgws.Success(data)); err != nil {
+				l.Errorf("ws client publish: %v", err)
+				return l.fail(utils.Fail)
+			}
+			redis.Client.Del(l.ctx, redisKey).Result()
+		}
+		return l.ok(utils.NumberOne)
+	}
+
+	if err := redis.Client.Set(l.ctx, redisKey, redisKey, pkgws.SessionTTL).Err(); err != nil {
+		return l.fail(utils.Fail)
+	}
+
+	return l.ok(utils.NumberOne)
+}

services/percutaneous/internal/server/percutaneousServer.go

@@ -64,6 +64,11 @@ func (s *PercutaneousServer) GetWsCode(ctx context.Context, in *percutaneous.Get
 	return l.GetWsCode(in)
 }
 
+func (s *PercutaneousServer) WsClientStatus(ctx context.Context, in *percutaneous.GetWsCodeRequest) (*percutaneous.Response, error) {
+	l := logic.NewWsClientStatusLogic(ctx, s.svcCtx)
+	return l.WsClientStatus(in)
+}
+
 // 添加用户
 func (s *PercutaneousServer) WsAddUserStream(stream percutaneous.Percutaneous_WsAddUserStreamServer) error {
 	l := logic.NewWsAddUserStreamLogic(stream.Context(), s.svcCtx)

services/percutaneous/percutaneousclient/percutaneous.go

@@ -38,6 +38,7 @@ type (
 		// 使用指南
 		SetPosition(ctx context.Context, in *SetPositionRequest, opts ...grpc.CallOption) (*Response, error)
 		GetWsCode(ctx context.Context, in *GetWsCodeRequest, opts ...grpc.CallOption) (*Response, error)
+		WsClientStatus(ctx context.Context, in *GetWsCodeRequest, opts ...grpc.CallOption) (*Response, error)
 		// 添加用户
 		WsAddUserStream(ctx context.Context, opts ...grpc.CallOption) (percutaneous.Percutaneous_WsAddUserStreamClient, error)
 	}
@@ -94,6 +95,11 @@ func (m *defaultPercutaneous) GetWsCode(ctx context.Context, in *GetWsCodeReques
 	return client.GetWsCode(ctx, in, opts...)
 }
 
+func (m *defaultPercutaneous) WsClientStatus(ctx context.Context, in *GetWsCodeRequest, opts ...grpc.CallOption) (*Response, error) {
+	client := percutaneous.NewPercutaneousClient(m.cli.Conn())
+	return client.WsClientStatus(ctx, in, opts...)
+}
+
 // 添加用户
 func (m *defaultPercutaneous) WsAddUserStream(ctx context.Context, opts ...grpc.CallOption) (percutaneous.Percutaneous_WsAddUserStreamClient, error) {
 	client := percutaneous.NewPercutaneousClient(m.cli.Conn())