fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
momo 2023-08-29 18:00:42 +08:00
commit edfa22711e
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/websocket/internal/logic/ws_render_image.go
View File

@ -111,18 +111,18 @@ func (w *wsConnectItem) consumeRenderCache(data []byte) {
renderImageData.RenderData.GuestId = w.guestId renderImageData.RenderData.GuestId = w.guestId
var productSize *gmodel.FsProductSize var productSize *gmodel.FsProductSize
//指定尺寸 //指定尺寸
if renderImageData.RenderData.SizeId > 0 { if renderImageData.RenderData.ProductSizeId > 0 {
productSize, err = w.logic.svcCtx.AllModels.FsProductSize.FindOneByIdProductId(w.logic.ctx, renderImageData.RenderData.SizeId, renderImageData.RenderData.ProductId) productSize, err = w.logic.svcCtx.AllModels.FsProductSize.FindOneByIdProductId(w.logic.ctx, renderImageData.RenderData.ProductSizeId, renderImageData.RenderData.ProductId)
} else { //获取产品第一个尺寸 } else { //获取产品第一个尺寸
productSize, err = w.logic.svcCtx.AllModels.FsProductSize.GetProductFirstSize(w.logic.ctx, renderImageData.RenderData.ProductId) productSize, err = w.logic.svcCtx.AllModels.FsProductSize.GetProductFirstSize(w.logic.ctx, renderImageData.RenderData.ProductId)
} }
if err != nil { if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) { if errors.Is(err, gorm.ErrRecordNotFound) {
w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "product first size is not exists", w.userId, w.guestId, 0, 0, renderImageData.RenderData.SizeId, 0) w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "product first size is not exists", w.userId, w.guestId, 0, 0, renderImageData.RenderData.ProductSizeId, 0)
logx.Error("product size is not found") logx.Error("product size is not found")
return return
} }
w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "failed to get product first size", w.userId, w.guestId, 0, 0, renderImageData.RenderData.SizeId, 0) w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "failed to get product first size", w.userId, w.guestId, 0, 0, renderImageData.RenderData.ProductSizeId, 0)
logx.Error("failed to get product size:", err) logx.Error("failed to get product size:", err)
return return
} }
@ -198,8 +198,8 @@ func (w *wsConnectItem) consumeRenderCache(data []byte) {
UploadCombineImageTakesTime: fmt.Sprintf("%dms", res.DiffTimeUploadFile), UploadCombineImageTakesTime: fmt.Sprintf("%dms", res.DiffTimeUploadFile),
}, },
})) }))
//如果是传入了指定尺寸，则不走unity //如果指定指定只返回刀版图
if renderImageData.RenderData.SizeId > 0 { if renderImageData.OnlyReturnCombineImage {
logx.Info("云渲染传入size id则不走unity云渲染,只返回刀版图，render_id:", renderImageData.RenderId) logx.Info("云渲染传入size id则不走unity云渲染,只返回刀版图，render_id:", renderImageData.RenderId)
return return
} }

27
utils/websocket_data/render_data.go
View File

@ -10,21 +10,22 @@ type DataTransferData struct {
// websocket接受要云渲染处理的数据 // websocket接受要云渲染处理的数据
type RenderImageReqMsg struct { type RenderImageReqMsg struct {
RenderId string `json:"render_id"` //渲染id RenderId string `json:"render_id"` //渲染id
RenderData RenderData `json:"render_data"` OnlyReturnCombineImage bool `json:"only_return_combine_image"` //是否只返回刀版图
RenderData RenderData `json:"render_data"`
} }
type RenderData struct { type RenderData struct {
TemplateTag string `json:"template_tag"` //模板标签(必须) TemplateTag string `json:"template_tag"` //模板标签(必须)
ProductId int64 `json:"product_id"` //产品id(必须) ProductId int64 `json:"product_id"` //产品id(必须)
Website string `json:"website"` //网站(可选) Website string `json:"website"` //网站(可选)
Slogan string `json:"slogan"` //slogan(可选) Slogan string `json:"slogan"` //slogan(可选)
Address string `json:"address"` //地址(可选) Address string `json:"address"` //地址(可选)
Phone string `json:"phone"` //电话(可选) Phone string `json:"phone"` //电话(可选)
Qrcode string `json:"qrcode"` //二维码(可选) Qrcode string `json:"qrcode"` //二维码(可选)
SizeId int64 `json:"size_id"` //尺寸id(可选,传值大于0则值返回刀版图不参与unity云渲染) ProductSizeId int64 `json:"product_size_id"` //尺寸id(可选)
UserId int64 `json:"user_id"` //用户id(websocket连接建立再赋值) UserId int64 `json:"user_id"` //用户id(websocket连接建立再赋值)
GuestId int64 `json:"guest_id"` //游客id(websocket连接建立再赋值) GuestId int64 `json:"guest_id"` //游客id(websocket连接建立再赋值)
Logo string `json:"logo"` //log资源地址(websocket连接建立再赋值) Logo string `json:"logo"` //log资源地址(websocket连接建立再赋值)
} }
// websocket发送渲染完的数据 // websocket发送渲染完的数据