From 802803d1e96922c916a5b30af61b5785c37893b8 Mon Sep 17 00:00:00 2001
From: laodaming <11058467+laudamine@user.noreply.gitee.com>
Date: Tue, 29 Aug 2023 18:22:15 +0800
Subject: [PATCH] fix

---
 .../internal/logic/ws_render_image.go         | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go
index 4b719410..d9a513f8 100644
--- a/server/websocket/internal/logic/ws_render_image.go
+++ b/server/websocket/internal/logic/ws_render_image.go
@@ -252,32 +252,6 @@ func (w *wsConnectItem) consumeRenderCache(data []byte) {
 	}
 }
 
-// 组装渲染任务id
-func (w *wsConnectItem) genRenderTaskId(renderImageData websocket_data.RenderImageReqMsg, model3dInfo *gmodel.FsProductModel3d, productTemplate *gmodel.FsProductTemplateV2, element *gmodel.FsProductTemplateElement) string {
-	//生成任务id(需要把user_id,guest_id设为0)
-	incomeHashParam := renderImageData.RenderData
-	incomeHashParam.UserId = 0  //设为0(渲染跟用户id无关)
-	incomeHashParam.GuestId = 0 //设为0(渲染跟用户id无关)
-	incomeHashBytes, _ := json.Marshal(incomeHashParam)
-	modelHashStr := ""
-	templateHashStr := ""
-	if model3dInfo.ModelInfo != nil {
-		modelHashStr = *model3dInfo.ModelInfo
-	}
-	if productTemplate.TemplateInfo != nil {
-		templateHashStr = *productTemplate.TemplateInfo
-	}
-	elementHashBytes, _ := json.Marshal(element)
-	hashMap := map[string]interface{}{
-		"income_param":   incomeHashBytes,
-		"model_info":     modelHashStr,
-		"template_info":  templateHashStr,
-		"material_image": *productTemplate.MaterialImg,
-		"render_element": elementHashBytes,
-	}
-	return hash.JsonHashKey(hashMap)
-}
-
 // 组装数据发送给unity
 func (w *wsConnectItem) assembleRenderData(taskId string, combineImage string, info websocket_data.RenderImageReqMsg, productTemplate *gmodel.FsProductTemplateV2, model3dInfo *gmodel.FsProductModel3d, element *gmodel.FsProductTemplateElement, productSize *gmodel.FsProductSize) (err error) {
 	//组装数据
@@ -430,6 +404,32 @@ func (w *wsConnectItem) modifyRenderTaskProperty(data renderImageControlChanItem
 	}
 }
 
+// 组装渲染任务id
+func (w *wsConnectItem) genRenderTaskId(renderImageData websocket_data.RenderImageReqMsg, model3dInfo *gmodel.FsProductModel3d, productTemplate *gmodel.FsProductTemplateV2, element *gmodel.FsProductTemplateElement) string {
+	//生成任务id(需要把user_id,guest_id设为0)
+	incomeHashParam := renderImageData.RenderData
+	incomeHashParam.UserId = 0  //设为0(渲染跟用户id无关)
+	incomeHashParam.GuestId = 0 //设为0(渲染跟用户id无关)
+	incomeHashBytes, _ := json.Marshal(incomeHashParam)
+	modelHashStr := ""
+	templateHashStr := ""
+	if model3dInfo.ModelInfo != nil {
+		modelHashStr = *model3dInfo.ModelInfo
+	}
+	if productTemplate.TemplateInfo != nil {
+		templateHashStr = *productTemplate.TemplateInfo
+	}
+	elementHashBytes, _ := json.Marshal(element)
+	hashMap := map[string]interface{}{
+		"income_param":   incomeHashBytes,
+		"model_info":     modelHashStr,
+		"template_info":  templateHashStr,
+		"material_image": *productTemplate.MaterialImg,
+		"render_element": elementHashBytes,
+	}
+	return hash.JsonHashKey(hashMap)
+}
+
 // 处理渲染任务的增加/删除/修改耗时属性（任务map不能读写并发，所以放在chan里面串行执行）
 func (w *wsConnectItem) operationRenderTask() {
 	defer func() {