diff --git a/services/percutaneous/internal/logic/useLogic.go b/services/percutaneous/internal/logic/useLogic.go index 6cb5656..5ac8412 100644 --- a/services/percutaneous/internal/logic/useLogic.go +++ b/services/percutaneous/internal/logic/useLogic.go @@ -2,13 +2,13 @@ package logic import ( "context" + "lone-services/pkg/modelbase" "lone-services/pkg/utils" + "lone-services/rpc/percutaneous/pb" "lone-services/services/percutaneous/internal/dao" "lone-services/services/percutaneous/internal/model" - "lone-services/services/percutaneous/validator" - - "lone-services/rpc/percutaneous/pb" "lone-services/services/percutaneous/internal/svc" + "lone-services/services/percutaneous/validator" "github.com/zeromicro/go-zero/core/logx" ) @@ -33,9 +33,16 @@ func (l *UseLogic) Use(in *percutaneous.UseRequest) (*percutaneous.Response, err if fail := l.checkParams(in, &v); fail != nil { return fail, nil } - adminInfo := utils.GetUserFromCtx(l.ctx) - if adminInfo.ID < utils.NumberOne { - return l.fail(utils.ErrorNoLoginInfo) + + w := modelbase.Params{ + Eq: map[string]string{ + "host_code": in.HostCode, + }, + } + var hostInfo dao.Group + err := model.GroupModel{}.Init().GetOne(w, &hostInfo) + if err != nil { + return l.fail(utils.Fail) } stamp, err := utils.ParseCustomTime(in.Stamp) @@ -43,7 +50,7 @@ func (l *UseLogic) Use(in *percutaneous.UseRequest) (*percutaneous.Response, err return l.fail(utils.Fail) } info := dao.UsedLog{ - HostUserId: adminInfo.ID, + HostUserId: hostInfo.HostUserId, HostCode: in.HostCode, UserId: in.UserId, Data: in.Data, diff --git a/services/percutaneous/internal/logic/wsClientStatusLogic.go b/services/percutaneous/internal/logic/wsClientStatusLogic.go index a0c1e4f..78336a9 100644 --- a/services/percutaneous/internal/logic/wsClientStatusLogic.go +++ b/services/percutaneous/internal/logic/wsClientStatusLogic.go @@ -31,7 +31,7 @@ func NewWsClientStatusLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Ws func (l *WsClientStatusLogic) WsClientStatus(in *percutaneous.GetWsCodeRequest) (*percutaneous.Response, error) { Type := WsTypeApp - + //1为web,2为设备 if in.Type == utils.NumberOne { Type = WsTypeOperation