diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go index 3531f9d1..8eda1c69 100644 --- a/server/websocket/internal/logic/ws_render_image.go +++ b/server/websocket/internal/logic/ws_render_image.go @@ -178,7 +178,7 @@ func (w *wsConnectItem) renderImage(data []byte) { return } //发送合图完毕阶段消息 - w.sendCombineImageStepResponseMessage(renderImageData.RenderId, combineImage, productSize.Id, res.DiffTimeLogoCombine, res.DiffTimeUploadFile) + w.sendCombineImageStepResponseMessage(renderImageData.RenderId, combineImage, productSize.Id, model3dInfo.Id, productTemplate.Id, res.DiffTimeLogoCombine, res.DiffTimeUploadFile) //如果指定指定只返回刀版图 if renderImageData.OnlyReturnCombineImage { logx.Info("云渲染传入size id则不走unity云渲染,只返回刀版图,render_id:", renderImageData.RenderId) @@ -382,7 +382,7 @@ func (w *wsConnectItem) assembleRenderDataToUnity(taskId string, combineImage st } // 发送合图完毕阶段通知消息 -func (w *wsConnectItem) sendCombineImageStepResponseMessage(renderId, combineImage string, sizeId, combineTime, uploadTime int64) { +func (w *wsConnectItem) sendCombineImageStepResponseMessage(renderId, combineImage string, sizeId, modelId, templateId, combineTime, uploadTime int64) { combineTakesTime := "cache" uploadCombineImageTakesTime := "cache" if combineTime > 0 { @@ -395,6 +395,8 @@ func (w *wsConnectItem) sendCombineImageStepResponseMessage(renderId, combineIma RenderId: renderId, CombineImage: combineImage, SizeId: sizeId, + ModelId: modelId, + TemplateId: templateId, CombineProcessTime: websocket_data.CombineProcessTime{ CombineTakesTime: combineTakesTime, UploadCombineImageTakesTime: uploadCombineImageTakesTime, diff --git a/utils/websocket_data/render_data.go b/utils/websocket_data/render_data.go index f2c70de7..124950d1 100644 --- a/utils/websocket_data/render_data.go +++ b/utils/websocket_data/render_data.go @@ -44,6 +44,8 @@ type CombineImageRspMsg struct { RenderId string `json:"render_id"` //渲染id CombineImage string `json:"combine_image"` //刀版图 SizeId int64 `json:"size_id"` //尺寸id + ModelId int64 `json:"model_id"` + TemplateId int64 `json:"template_id"` CombineProcessTime CombineProcessTime `json:"combine_process_time"` } type CombineProcessTime struct {