feat:获取资源详情

2023-08-09 14:58:20 +08:00
parent d5e5cdc8f0
commit 7b32eb9154
2 changed files with 83 additions and 136 deletions
--- a/utils/file/upload.go
+++ b/utils/file/upload.go
@@ -65,63 +65,71 @@ func (upload *Upload) UploadFileByBase64(req *UploadBaseReq) (*UploadBaseRes, er

 	var uploadBaseRes = UploadBaseRes{}
 	resourceModel := gmodel.NewFsResourceModel(upload.MysqlConn)
-	resourceInfo, err := resourceModel.FindOneById(upload.Ctx, resourceId)
-	if err == nil && resourceInfo.ResourceId != "" {
-		uploadBaseRes.Status = 1
-		uploadBaseRes.ResourceId = resourceId
-		uploadBaseRes.ResourceUrl = *resourceInfo.ResourceUrl
-	} else {
-		dist, contentType, err := FileBase64ToByte(req.FileData)
-
-		if err != nil {
-			logx.Errorf("err:%+v，desc:%+v", err, "fail.upload.resourceInfoGet.mysql")
-			return nil, err
-		}
-
-		// 创建S3对象存储请求
-		s3req, _ = svc.PutObjectRequest(
-			&s3.PutObjectInput{
-				Bucket: bucketName,
-				Key:    &resourceId,
-			},
-		)
-
-		// 设置请求体为文件数据
-		s3req.SetBufferBody(dist)
-
-		// 发送请求
-		err = s3req.Send()
-
-		// 检查是否有错误
-		if err != nil {
-			logx.Errorf("err:%+v，desc:%+v", err, "fail.upload.s3req")
-			return nil, err
-		} else {
-			var url = s3req.HTTPRequest.URL.String()
-			// 打印请求URL
-			logx.Info(url)
+	err := resourceModel.Trans(upload.Ctx, func(ctx context.Context, connGorm *gorm.DB) error {
+		resourceModelTS := gmodel.NewFsResourceModel(connGorm)
+		resourceInfo, err := resourceModelTS.FindOneById(ctx, resourceId)
+		if err == nil && resourceInfo.ResourceId != "" {
 			uploadBaseRes.Status = 1
 			uploadBaseRes.ResourceId = resourceId
-			uploadBaseRes.ResourceUrl = url
-			var version string = "0.0.1"
-			var nowTime = time.Now()
-			_, err = resourceModel.Create(upload.Ctx, &gmodel.FsResource{
-				ResourceId:   resourceId,
-				UserId:       &req.UserId,
-				GuestId:      &req.GuestId,
-				ResourceType: &contentType,
-				ResourceUrl:  &url,
-				Version:      &version,
-				UploadedAt:   &nowTime,
-				Metadata:     &req.Metadata,
-				ApiType:      &apiType,
-				BucketName:   bucketName,
-			})
+			uploadBaseRes.ResourceUrl = *resourceInfo.ResourceUrl
+		} else {
+			dist, contentType, err := FileBase64ToByte(req.FileData)
+
 			if err != nil {
-				logx.Errorf("err:%+v，desc:%+v", err, "fail.upload.resourceInfoAdd.mysql")
-				return nil, err
+				logx.Errorf("err:%+v，desc:%+v", err, "fail.upload.resourceInfoGet.mysql")
+				return err
+			}
+
+			// 创建S3对象存储请求
+			s3req, _ = svc.PutObjectRequest(
+				&s3.PutObjectInput{
+					Bucket: bucketName,
+					Key:    &resourceId,
+				},
+			)
+
+			// 设置请求体为文件数据
+			s3req.SetBufferBody(dist)
+
+			// 发送请求
+			err = s3req.Send()
+
+			// 检查是否有错误
+			if err != nil {
+				logx.Errorf("err:%+v，desc:%+v", err, "fail.upload.s3req")
+				return err
+			} else {
+				var url = s3req.HTTPRequest.URL.String()
+				// 打印请求URL
+				logx.Info(url)
+				uploadBaseRes.Status = 1
+				uploadBaseRes.ResourceId = resourceId
+				uploadBaseRes.ResourceUrl = url
+				var version string = "0.0.1"
+				var nowTime = time.Now()
+				_, err = resourceModelTS.Create(upload.Ctx, &gmodel.FsResource{
+					ResourceId:   resourceId,
+					UserId:       &req.UserId,
+					GuestId:      &req.GuestId,
+					ResourceType: &contentType,
+					ResourceUrl:  &url,
+					Version:      &version,
+					UploadedAt:   &nowTime,
+					Metadata:     &req.Metadata,
+					ApiType:      &apiType,
+					BucketName:   bucketName,
+				})
+				if err != nil {
+					logx.Errorf("err:%+v，desc:%+v", err, "fail.upload.resourceInfoAdd.mysql")
+					return err
+				}
 			}
 		}
+		return nil
+	})
+	if err != nil {
+		return nil, err
 	}
+
 	return &uploadBaseRes, err
 }