feat: analysis user del
This commit is contained in:
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user