zzw/lone-services
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: analysis user del

Browse Source
This commit is contained in:
zzw
2026-11-03 10:25:14 +08:00
parent fe3ca6f2c9
commit 8cbd2a7d8b
19 changed files with 567 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/analysis/client/analysisuser/analysisUser.go
+2
View File
@@ -30,6 +30,7 @@ type (
AnalysisUser interface {
FaceBind(ctx context.Context, in *FaceBindReq, opts ...grpc.CallOption) (*Response, error)
UserImprove(ctx context.Context, in *UserImproveReq, opts ...grpc.CallOption) (*Response, error)
// UserDelete 按平台 users.id 级联删除：analysis.users、人脸向量、以及 user 侧关联表。
UserDelete(ctx context.Context, in *UserDeleteReq, opts ...grpc.CallOption) (*Response, error)
UserAuth(ctx context.Context, in *UserAuthReq, opts ...grpc.CallOption) (*Response, error)
UserAuthList(ctx context.Context, in *UserAuthListReq, opts ...grpc.CallOption) (*Response, error)
@@ -62,6 +63,7 @@ func (m *defaultAnalysisUser) UserImprove(ctx context.Context, in *UserImproveRe
return client.UserImprove(ctx, in, opts...)
}
// UserDelete 按平台 users.id 级联删除：analysis.users、人脸向量、以及 user 侧关联表。
func (m *defaultAnalysisUser) UserDelete(ctx context.Context, in *UserDeleteReq, opts ...grpc.CallOption) (*Response, error) {
client := analysis.NewAnalysisUserClient(m.cli.Conn())
return client.UserDelete(ctx, in, opts...)
services/analysis/internal/face/image.go
-2
View File
@@ -14,8 +14,6 @@ import (
"github.com/google/uuid"
)
// PrepareImagePath 将上传字节或已有路径解析为 insightface 可读的本地路径。
// 返回 cleanup 用于删除临时文件（共享路径不删）。
func PrepareImagePath(file []byte, filePath string) (string, func(), error) {
noop := func() {}
if len(file) > utils.NumberZero {
services/analysis/internal/face/milvus.go
+12
View File
@@ -144,6 +144,18 @@ func UpsertFace(userID int64, vector []float32) error {
return err
}
func DeleteFace(userID int64) error {
c := getMilvus()
if c == nil {
return errors.New("milvus client is nil")
}
if userID < utils.NumberOne {
return errors.New("invalid face delete args")
}
ctx := context.Background()
return c.Delete(ctx, collectionName, "", fmt.Sprintf("%s == %d", faceUserIDField, userID))
}
func SearchUser(vector []float32) (int64, float32, error) {
c := getMilvus()
if c == nil {
services/analysis/internal/logic/analysisuser/userDeleteLogic.go
+40 -5
View File
@@ -8,12 +8,17 @@ import (
"lone-services/pkg/utils"
"lone-services/pkg/validate"
analysis "lone-services/rpc/analysis/pb"
userpb "lone-services/rpc/user/pb"
"lone-services/services/analysis/internal/dao"
"lone-services/services/analysis/internal/face"
"lone-services/services/analysis/internal/logic/common"
"lone-services/services/analysis/internal/model"
"lone-services/services/analysis/internal/svc"
"lone-services/services/analysis/validator"
"github.com/zeromicro/go-zero/core/logx"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
type UserDeleteLogic struct {
@@ -36,13 +41,43 @@ func (l *UserDeleteLogic) UserDelete(in *analysis.UserDeleteReq) (*analysis.Resp
return common.OutResponse(utils.ErrorParams, msg), nil
}
_, err := model.UserModel{}.Init().Del(modelbase.Params{
Eq: map[string]string{"id": strconv.FormatInt(req.Id, utils.NumberTen)},
}, map[string]string{})
if err != nil {
l.Errorf("user delete: %v", err)
if err := face.DeleteFace(req.Id); err != nil {
l.Errorf("user delete milvus: %v", err)
return common.FailResponse(utils.Fail), nil
}
if l.svcCtx.UserSvcName == utils.StringEmpty {
return common.FailResponse(utils.Fail), nil
}
cli, err := svc.GetRpcClient(l.svcCtx.UserSvcName)
if err != nil {
l.Errorf("user delete get user rpc: %v", err)
return common.FailResponse(utils.Fail), nil
}
deleted, err := userpb.NewUserClient(cli.Conn()).InternalDeleteUser(l.ctx, &userpb.InternalDeleteUserReq{
UserId: req.Id,
})
if err != nil {
if st, ok := status.FromError(err); ok && st.Code() == codes.NotFound {
return common.FailResponse(utils.ErrorNotFund), nil
}
l.Errorf("user delete internal: %v", err)
return common.FailResponse(utils.Fail), nil
}
for _, c := range deleted.GetClients() {
if c.GetClientCode() != dao.ClientCodeUserSkin || c.GetBizId() < utils.NumberOne {
continue
}
_, delErr := model.UserModel{}.Init().Del(modelbase.Params{
Eq: map[string]string{"id": strconv.FormatInt(c.GetBizId(), utils.NumberTen)},
}, map[string]string{})
if delErr != nil {
l.Errorf("user delete analysis user biz_id=%d: %v", c.GetBizId(), delErr)
return common.FailResponse(utils.Fail), nil
}
}
return common.OkResponse(nil), nil
}
services/analysis/internal/logic/analysisuser/userImproveLogic.go
+1 -1
View File
@@ -132,7 +132,7 @@ func (l *UserImproveLogic) updatePlatformUser(loginUser utils.UserInfo, bizId in
if _, err = userClient.InternalUpdate(l.ctx, updateReq); err != nil {
l.Errorf("improve internal update: %v", err)
return utils.Fail
return utils.ErrorDataIsExist
}
return utils.Ok
}
services/analysis/internal/server/analysisuser/analysisUserServer.go
+1
View File
@@ -33,6 +33,7 @@ func (s *AnalysisUserServer) UserImprove(ctx context.Context, in *analysis.UserI
return l.UserImprove(in)
}
// UserDelete 按平台 users.id 级联删除：analysis.users、人脸向量、以及 user 侧关联表。
func (s *AnalysisUserServer) UserDelete(ctx context.Context, in *analysis.UserDeleteReq) (*analysis.Response, error) {
l := analysisuserlogic.NewUserDeleteLogic(ctx, s.svcCtx)
return l.UserDelete(in)
services/analysis/validator/user.go
+3 -3
View File
@@ -51,13 +51,13 @@ func (p AgreementInfoValidator) GetMessage() validate.ValidatorMessages {
}
type UserDeleteValidator struct {
Id int64 `validate:"required,gt=0"`
Id int64 `validate:"required,gt=0"` // 平台 users.id
}
func (p UserDeleteValidator) GetMessage() validate.ValidatorMessages {
return validate.ValidatorMessages{
"Id.required": "id 不能为空",
"Id.gt": "id 必须大于0",
"Id.required": "用户ID不能为空",
"Id.gt": "用户ID必须大于0",
}
}
services/user/internal/logic/internalDeleteUserLogic.go
+102
View File
@@ -0,0 +1,102 @@
package logic
import (
"context"
"strconv"
"lone-services/pkg/modelbase"
"lone-services/pkg/utils"
"lone-services/pkg/validate"
user "lone-services/rpc/user/pb"
"lone-services/services/user/internal/dao"
"lone-services/services/user/internal/model"
"lone-services/services/user/internal/svc"
"lone-services/services/user/validator"
"github.com/zeromicro/go-zero/core/logx"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"gorm.io/gorm"
)
type InternalDeleteUserLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
}
func NewInternalDeleteUserLogic(ctx context.Context, svcCtx *svc.ServiceContext) *InternalDeleteUserLogic {
return &InternalDeleteUserLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
}
}
func (l *InternalDeleteUserLogic) InternalDeleteUser(in *user.InternalDeleteUserReq) (*user.InternalDeleteUserData, error) {
var req validator.InternalDeleteUserValidator
if msg := validate.ValidateFromProto(in, &req); msg != utils.StringEmpty {
return nil, status.Error(codes.InvalidArgument, msg)
}
userModel := model.UserModel{}.Init()
var row dao.UserRow
if err := userModel.GetOne(modelbase.Params{
Eq: map[string]string{"id": strconv.FormatInt(req.UserId, utils.NumberTen)},
}, &row); err != nil {
l.Errorf("internal delete user get: %v", err)
return nil, status.Error(codes.Internal, utils.Fail.Msg)
}
if row.Id < utils.NumberOne {
return nil, status.Error(codes.NotFound, utils.ErrorNotFund.Msg)
}
clientModel := model.UserClientModel{}.Init()
var clients []dao.UserClient
if err := clientModel.Items(modelbase.Params{
Eq: map[string]string{"user_id": strconv.FormatInt(req.UserId, utils.NumberTen)},
}, &clients); err != nil {
l.Errorf("internal delete user clients: %v", err)
return nil, status.Error(codes.Internal, utils.Fail.Msg)
}
outClients := make([]*user.InternalDeleteUserClient, 0, len(clients))
for _, c := range clients {
outClients = append(outClients, &user.InternalDeleteUserClient{
ClientCode: c.ClientCode,
BizId: c.BizId,
})
}
txErr := l.svcCtx.DB.WithContext(l.ctx).Transaction(func(tx *gorm.DB) error {
credModel := model.UserCredentialModel{}.Init()
credModel.Base = credModel.Base.WithTX(tx)
if _, err := credModel.Del(modelbase.Params{
Eq: map[string]string{"user_id": strconv.FormatInt(req.UserId, utils.NumberTen)},
}, &dao.UserCredential{}); err != nil {
return err
}
ucModel := model.UserClientModel{}.Init()
ucModel.Base = ucModel.Base.WithTX(tx)
if _, err := ucModel.Del(modelbase.Params{
Eq: map[string]string{"user_id": strconv.FormatInt(req.UserId, utils.NumberTen)},
}, &dao.UserClient{}); err != nil {
return err
}
if err := deleteUserDetail(tx, req.UserId); err != nil {
return err
}
return deleteUser(tx, req.UserId)
})
if txErr != nil {
l.Errorf("internal delete user tx: %v", txErr)
return nil, status.Error(codes.Internal, utils.Fail.Msg)
}
return &user.InternalDeleteUserData{
Ok: true,
Clients: outClients,
}, nil
}
services/user/internal/server/userServer.go
+5
View File
@@ -123,6 +123,11 @@ func (s *UserServer) InternalRevokeBizClient(ctx context.Context, in *user.Inter
return l.InternalRevokeBizClient(in)
}
func (s *UserServer) InternalDeleteUser(ctx context.Context, in *user.InternalDeleteUserReq) (*user.InternalDeleteUserData, error) {
l := logic.NewInternalDeleteUserLogic(ctx, s.svcCtx)
return l.InternalDeleteUser(in)
}
func (s *UserServer) InternalGetUserInfo(ctx context.Context, in *user.InternalGetUserInfoReq) (*user.InternalGetUserInfoData, error) {
l := logic.NewInternalGetUserInfoLogic(ctx, s.svcCtx)
return l.InternalGetUserInfo(in)
services/user/userClient/user.go
+9
View File
@@ -26,6 +26,9 @@ type (
InternalCheckUpdateReq = user.InternalCheckUpdateReq
InternalCreateData = user.InternalCreateData
InternalCreateReq = user.InternalCreateReq
InternalDeleteUserClient = user.InternalDeleteUserClient
InternalDeleteUserData = user.InternalDeleteUserData
InternalDeleteUserReq = user.InternalDeleteUserReq
InternalGetUserInfoData = user.InternalGetUserInfoData
InternalGetUserInfoReq = user.InternalGetUserInfoReq
InternalLoginByUserIdData = user.InternalLoginByUserIdData
@@ -74,6 +77,7 @@ type (
InternalUsersByIds(ctx context.Context, in *InternalUsersByIdsReq, opts ...grpc.CallOption) (*InternalUsersByIdsData, error)
InternalUpdateMobile(ctx context.Context, in *InternalUpdateMobileReq, opts ...grpc.CallOption) (*InternalUpdateMobileData, error)
InternalRevokeBizClient(ctx context.Context, in *InternalRevokeBizClientReq, opts ...grpc.CallOption) (*InternalRevokeBizClientData, error)
InternalDeleteUser(ctx context.Context, in *InternalDeleteUserReq, opts ...grpc.CallOption) (*InternalDeleteUserData, error)
InternalGetUserInfo(ctx context.Context, in *InternalGetUserInfoReq, opts ...grpc.CallOption) (*InternalGetUserInfoData, error)
InternalVerifyPassword(ctx context.Context, in *InternalVerifyPasswordReq, opts ...grpc.CallOption) (*InternalVerifyPasswordData, error)
InternalUsersByBiz(ctx context.Context, in *InternalUsersByBizReq, opts ...grpc.CallOption) (*InternalUsersByBizData, error)
@@ -191,6 +195,11 @@ func (m *defaultUser) InternalRevokeBizClient(ctx context.Context, in *InternalR
return client.InternalRevokeBizClient(ctx, in, opts...)
}
func (m *defaultUser) InternalDeleteUser(ctx context.Context, in *InternalDeleteUserReq, opts ...grpc.CallOption) (*InternalDeleteUserData, error) {
client := user.NewUserClient(m.cli.Conn())
return client.InternalDeleteUser(ctx, in, opts...)
}
func (m *defaultUser) InternalGetUserInfo(ctx context.Context, in *InternalGetUserInfoReq, opts ...grpc.CallOption) (*InternalGetUserInfoData, error) {
client := user.NewUserClient(m.cli.Conn())
return client.InternalGetUserInfo(ctx, in, opts...)
services/user/validator/user.go
+11
View File
@@ -270,6 +270,17 @@ func (p InternalRevokeBizClientValidator) GetMessage() validate.ValidatorMessage
}
}
type InternalDeleteUserValidator struct {
UserId int64 `validate:"required,gt=0"`
}
func (p InternalDeleteUserValidator) GetMessage() validate.ValidatorMessages {
return validate.ValidatorMessages{
"UserId.required": "用户ID不能为空",
"UserId.gt": "用户ID必须大于0",
}
}
type InternalCheckCreateValidator struct {
Mobile string `validate:"required,max=20"`
}