From 383cccf55fec27fce647a210eddbda45a6800677 Mon Sep 17 00:00:00 2001 From: qhd <1766646056@qq.com> Date: Mon, 12 Jan 2026 09:11:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6=E6=8F=92?= =?UTF-8?q?=E5=85=A5=E5=8F=82=E6=95=B0=E4=BC=A0=E9=80=92=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E7=A7=9F=E6=88=B7OSS=E6=80=BB?= =?UTF-8?q?=E9=87=8F=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/file_dao.go | 2 +- dao/tenant_oss_total.go | 16 +++++----------- service/tenant_oss_total_service.go | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dao/file_dao.go b/dao/file_dao.go index 72b2857..6b2c2e1 100644 --- a/dao/file_dao.go +++ b/dao/file_dao.go @@ -15,6 +15,6 @@ type file struct { // Insert 插入 func (d *file) Insert(ctx context.Context, entity *entity.File) (err error) { - _, err = mongo.DB().Insert(ctx, []interface{}{entity}, consts.FileCollection) + _, err = mongo.DB().Insert(ctx, []interface{}{&entity}, consts.FileCollection) return } diff --git a/dao/tenant_oss_total.go b/dao/tenant_oss_total.go index 9dbdedf..849163a 100644 --- a/dao/tenant_oss_total.go +++ b/dao/tenant_oss_total.go @@ -3,6 +3,7 @@ package dao import ( "context" "oss/consts" + "oss/model/dto" "oss/model/entity" "gitee.com/red-future---jilin-g/common/mongo" @@ -15,18 +16,12 @@ var TenantOssTotal = &tenantOssTotal{} type tenantOssTotal struct { } -// Insert 插入 -func (d *tenantOssTotal) Insert(ctx context.Context, entity []interface{}) (err error) { - _, err = mongo.DB().Insert(ctx, entity, consts.TenantOssTotalCollection) - return -} - // SaveOrUpdate 增加或更新 func (d *tenantOssTotal) SaveOrUpdate(ctx context.Context, updateData []*entity.TenantOssTotal) (err error) { if !g.IsEmpty(updateData) { var filter, update []bson.M for _, v := range updateData { - bsonm, err := mongo.EntityToBSONM(v) + bsonm, err := mongo.EntityToBsonWithFilter(v, true) if err != nil { return err } @@ -41,9 +36,8 @@ func (d *tenantOssTotal) SaveOrUpdate(ctx context.Context, updateData []*entity. return } -func (d *tenantOssTotal) GetOneByTenantId(ctx context.Context, tenantId string) (e *entity.TenantOssTotal, err error) { - filter := bson.M{"tenantId": tenantId} - e = &entity.TenantOssTotal{} - err = mongo.DB().FindOne(ctx, filter, e, consts.TenantOssTotalCollection) +func (d *tenantOssTotal) GetOneByTenantId(ctx context.Context, req *dto.GetByTenantIdReq) (res *entity.TenantOssTotal, err error) { + filter := bson.M{"tenantId": req.TenantId} + err = mongo.DB().FindOne(ctx, filter, &res, consts.TenantOssTotalCollection) return } diff --git a/service/tenant_oss_total_service.go b/service/tenant_oss_total_service.go index 00e0686..06e24b9 100644 --- a/service/tenant_oss_total_service.go +++ b/service/tenant_oss_total_service.go @@ -17,7 +17,7 @@ type tenantOssTotal struct{} var TenantOssTotal = new(tenantOssTotal) func (s *tenantOssTotal) GetOneByTenantId(ctx context.Context, req *dto.GetByTenantIdReq) (res *dto.GetByTenantIdRes, err error) { - e, err := dao.TenantOssTotal.GetOneByTenantId(ctx, req.TenantId) + e, err := dao.TenantOssTotal.GetOneByTenantId(ctx, req) if err != nil { return nil, err }