From b67c503e80c957f9951d91bdf98b23ed1cf52c4f Mon Sep 17 00:00:00 2001 From: Leufolium Date: Mon, 29 Apr 2024 15:31:54 +0800 Subject: [PATCH] by Robin at 20240429 --- app/mix/dao/mongo.go | 13 ++----------- app/mix/service/apiservice.go | 6 +++--- app/mix/service/video_moderation_result_handler.go | 10 +++++----- dbstruct/zonemoment.go | 6 ++---- 4 files changed, 12 insertions(+), 23 deletions(-) diff --git a/app/mix/dao/mongo.go b/app/mix/dao/mongo.go index 062243f3..9191bf9c 100644 --- a/app/mix/dao/mongo.go +++ b/app/mix/dao/mongo.go @@ -4258,17 +4258,8 @@ func (m *Mongo) TryToCompleteZoneMomentAudit(ctx *gin.Context, zonemomentId int6 filter := qmgo.M{ "_id": zonemomentId, "manually_review_status": consts.ZoneMomentManuallyReview_Waiting, - "$or": []qmgo.M{ - { - "image_audit_status": qmgo.M{ - "$ne": consts.ImageAudit_Created, - }, - }, - { - "video_moderation_status": qmgo.M{ - "$ne": consts.VideoModeration_Created, - }, - }, + "image_audit_status": qmgo.M{ + "$ne": consts.ImageAudit_Created, }, "text_audit_status": qmgo.M{ "$ne": consts.TextAudit_Created, diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go index 721a5a07..76944584 100644 --- a/app/mix/service/apiservice.go +++ b/app/mix/service/apiservice.go @@ -2477,7 +2477,7 @@ func (s *Service) ApiCreateZoneMoment(ctx *gin.Context, req *zonemomentproto.Api req.ZoneMoment.ImageAuditStatus = goproto.Int64(consts.ImageAudit_Created) // 创建 req.ZoneMoment.MediaAmount = goproto.Int64(int64(len(req.ZoneMoment.MediaComp.GetImageIds()))) } else { - req.ZoneMoment.VideoModerationStatus = goproto.Int64(consts.VideoModeration_Created) // 视频贴默认已通过 + req.ZoneMoment.ImageAuditStatus = goproto.Int64(consts.VideoModeration_Created) req.ZoneMoment.MediaAmount = goproto.Int64(int64(len(req.ZoneMoment.MediaComp.GetVideoIds()))) } req.ZoneMoment.TextAuditStatus = goproto.Int64(consts.TextAudit_Created) // 创建 @@ -2546,8 +2546,8 @@ func (s *Service) ApiUpdateZoneMoment(ctx *gin.Context, req *zonemomentproto.Api req.ZoneMoment.MediaAmount = goproto.Int64(int64(len(req.ZoneMoment.MediaComp.GetImageIds()))) } if req.ZoneMoment.MediaComp != nil && req.ZoneMoment.GetMType() == consts.MediaTypeVideo { - req.ZoneMoment.VideoModerationStatus = goproto.Int64(consts.VideoModeration_Created) // 创建 - req.ZoneMoment.VideoModerationOpinion = goproto.String("") // 信息抹除 + req.ZoneMoment.ImageAuditStatus = goproto.Int64(consts.VideoModeration_Created) // 创建 + req.ZoneMoment.ImageAuditOpinion = goproto.String("") // 信息抹除 req.ZoneMoment.MediaAmount = goproto.Int64(int64(len(req.ZoneMoment.MediaComp.GetVideoIds()))) } if req.ZoneMoment.Text != nil { diff --git a/app/mix/service/video_moderation_result_handler.go b/app/mix/service/video_moderation_result_handler.go index 4403f74f..2116dc55 100644 --- a/app/mix/service/video_moderation_result_handler.go +++ b/app/mix/service/video_moderation_result_handler.go @@ -56,8 +56,8 @@ func (handler *VideoModerationTaskResultHandler) generateZoneMomentMediaComponen if option == consts.VideoModerationTaskUpdate_Success { err := _DefaultZoneMoment.OpUpdate(ctx, &zonemomentproto.OpUpdateReq{ ZoneMoment: &dbstruct.ZoneMoment{ - Id: task.AssociativeTableId, - VideoModerationStatus: goproto.Int64(consts.VideoModeration_Passed), + Id: task.AssociativeTableId, + ImageAuditStatus: goproto.Int64(consts.VideoModeration_Passed), }, }) if err != nil { @@ -80,9 +80,9 @@ func (handler *VideoModerationTaskResultHandler) generateZoneMomentMediaComponen err := _DefaultZoneMoment.OpUpdate(ctx, &zonemomentproto.OpUpdateReq{ ZoneMoment: &dbstruct.ZoneMoment{ - Id: task.AssociativeTableId, - VideoModerationStatus: task.Status, - VideoModerationOpinion: goproto.String(videoModerationOpinion.String()), + Id: task.AssociativeTableId, + ImageAuditStatus: task.Status, + ImageAuditOpinion: goproto.String(videoModerationOpinion.String()), }, }) if err != nil { diff --git a/dbstruct/zonemoment.go b/dbstruct/zonemoment.go index 2e878598..ffd1e3bd 100644 --- a/dbstruct/zonemoment.go +++ b/dbstruct/zonemoment.go @@ -18,12 +18,10 @@ type ZoneMoment struct { ProductId *int64 `json:"product_id" bson:"product_id"` // 商品id(单帖商品或超粉商品id) ThumbsUpNum *int64 `json:"thumbs_up_num" bson:"thumbs_up_num"` // 点赞次数 Status *int64 `json:"status" bson:"status"` // 审批状态 - ImageAuditStatus *int64 `json:"image_audit_status" bson:"image_audit_status"` // 图像审核状态 - VideoModerationStatus *int64 `json:"video_moderation_status" bson:"video_moderation_status"` // 视频审核状态 + ImageAuditStatus *int64 `json:"image_audit_status" bson:"image_audit_status"` // 媒体审核状态 TextAuditStatus *int64 `json:"text_audit_status" bson:"text_audit_status"` // 文字审核状态 ManuallyReviewStatus *int64 `json:"manually_review_status" bson:"manually_review_status"` // 人工复审状态 - ImageAuditOpinion *string `json:"image_audit_opinion" bson:"image_audit_opinion"` // 图像审核意见 - VideoModerationOpinion *string `json:"video_moderation_opinion" bson:"video_moderation_opinion"` // 视频审核意见 + ImageAuditOpinion *string `json:"image_audit_opinion" bson:"image_audit_opinion"` // 媒体审核意见 TextAuditOpinion *string `json:"text_audit_opinion" bson:"text_audit_opinion"` // 文字审核意见 ManuallyReviewOpinion *string `json:"manually_review_opinion" bson:"manually_review_opinion"` // 人工复审意见 ManuallyReviewOperator *int64 `json:"manually_review_operator" bson:"manually_review_operator"` // 人工复审操作人