fix

model/gmodel/fs_user_material_logic.go

@@ -70,3 +70,8 @@ func (m *FsUserMaterialModel) FindLatestOne(ctx context.Context, userId int64, g
 	err = db.Take(&resp).Error
 	return resp, err
 }
+
+func (m *FsUserMaterialModel) FindOneById(ctx context.Context, id int64) (resp *FsUserMaterial, err error) {
+	err = m.db.WithContext(ctx).Model(&FsUserMaterial{}).Where("id = ?", id).Take(&resp).Error
+	return resp, err
+}

server/render/consumer/assemble_render_data.go

@@ -1,12 +1,14 @@
 package consumer
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"fusenapi/constants"
 	"fusenapi/initalize"
+	"fusenapi/model/gmodel"
 	"fusenapi/server/render/internal/svc"
 	"fusenapi/utils/curl"
 	"fusenapi/utils/file"
@@ -16,7 +18,6 @@ import (
 	"gorm.io/gorm"
 	"io/ioutil"
 	"strconv"
-	"strings"
 )
 
 // 这里请求的py接口返回数据
@@ -47,7 +48,7 @@ func (m *MqConsumerRenderAssemble) Run(ctx context.Context, data []byte) error {
 	}
 	rabbitmq := initalize.RabbitMqHandle{}
 	//获取模板（产品第一个sku的模板）
-	templateInfo, err := svcCtx.AllModels.FsProductTemplateV2.FindOneByProductIdTagIdWithSizeTable(ctx, parseInfo.RenderData.ProductId, fmt.Sprintf("%d", parseInfo.RenderData.TemplateTagId))
+	productTemplate, err := svcCtx.AllModels.FsProductTemplateV2.FindOneByProductIdTagIdWithSizeTable(ctx, parseInfo.RenderData.ProductId, fmt.Sprintf("%d", parseInfo.RenderData.TemplateTagId))
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			logx.Error("template info is not found")
@@ -66,7 +67,7 @@ func (m *MqConsumerRenderAssemble) Run(ctx context.Context, data []byte) error {
 	}
 	//如果不存在,则请求生成刀版图
 	if errors.Is(err, gorm.ErrRecordNotFound) {
-		combineImage, err = getCombineImage(ctx, svcCtx, parseInfo, combineHash)
+		combineImage, err = getCombineImage(ctx, svcCtx, parseInfo, productTemplate, combineHash)
 		if err != nil {
 			return err
 		}
@@ -74,10 +75,10 @@ func (m *MqConsumerRenderAssemble) Run(ctx context.Context, data []byte) error {
 		combineImage = *resource.ResourceUrl
 	}
 	//获取渲染设置信息
-	element, err := svcCtx.AllModels.FsProductTemplateElement.FindOneByModelId(ctx, *templateInfo.ModelId)
+	element, err := svcCtx.AllModels.FsProductTemplateElement.FindOneByModelId(ctx, *productTemplate.ModelId)
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			logx.Error("element info is not found,model_id = ?", *templateInfo.ModelId)
+			logx.Error("element info is not found,model_id = ?", *productTemplate.ModelId)
 			return nil
 		}
 		logx.Error("failed to get element list,", err)
@@ -132,7 +133,7 @@ func (m *MqConsumerRenderAssemble) Run(ctx context.Context, data []byte) error {
 			"light":     *element.Light,
 			"refletion": refletion,
 			"scale":     *element.Scale,
-			"sku_id":    *templateInfo.ProductId,
+			"sku_id":    parseInfo.RenderData.ProductId,
 			"tid":       *element.Title,
 			"rotation":  *element.Rotation,
 			"filePath":  "", //todo 文件路径,针对千人千面
@@ -160,14 +161,67 @@ func (m *MqConsumerRenderAssemble) Run(ctx context.Context, data []byte) error {
 }
 
 // 获取刀版图
-func getCombineImage(ctx context.Context, svcCtx *svc.ServiceContext, parseInfo websocket_data.AssembleRenderData, combineHash string) (image string, err error) {
+func getCombineImage(ctx context.Context, svcCtx *svc.ServiceContext, parseInfo websocket_data.AssembleRenderData, productTemplate *gmodel.FsProductTemplateV2, combineHash string) (image string, err error) {
-	// todo 获取sku对应用来合成刀版图的json数据
+	if productTemplate.TemplateInfo == nil || *productTemplate.TemplateInfo == "" {
-
+		logx.Error("product template info`template_info is empty")
+		return "", errors.New("product template info`template_info is empty")
+	}
+	//反序列化替换其中一些参数
+	var combineInfo map[string]interface{}
+	if err = json.Unmarshal([]byte(*productTemplate.TemplateInfo), &combineInfo); err != nil {
+		logx.Error("failed to parse json:template_info:", err)
+		return "", err
+	}
+	//需要替换的参数
+	replaceData := map[string]interface{}{
+		"logo_url":       parseInfo.RenderData.Logo,
+		"website":        "",
+		"slogan":         "",
+		"address":        "",
+		"phone":          "",
+		"colors":         []string{},
+		"template_tagid": []string{},
+		"is_crop":        false,
+		"shape":          "",
+		"ratio":          0,
+		"line":           "",
+		"other":          "",
+		"other1":         "",
+	}
+	//获取用户素材信息
+	if parseInfo.RenderData.UserMaterialId > 0 {
+		userMaterial, err := svcCtx.AllModels.FsUserMaterial.FindOneById(ctx, parseInfo.RenderData.UserMaterialId)
+		if err != nil {
+			if errors.Is(err, gorm.ErrRecordNotFound) {
+				logx.Error("user material not exists:", parseInfo.RenderData.UserMaterialId)
+				return "", errors.New("user material not exists")
+			}
+			logx.Error("err failed to get user material info")
+		}
+		if userMaterial.Metadata != nil && *userMaterial.Metadata != "" {
+			//解析元数据
+			var materialMetaData map[string]interface{}
+			if err = json.Unmarshal([]byte(*userMaterial.Metadata), &materialMetaData); err != nil {
+				logx.Error("failed to parse user material`matadata: ", err)
+				return "", err
+			}
+			//赋值
+			replaceData["colors"] = materialMetaData["colors"]
+			replaceData["logo_url"] = materialMetaData["logo_url"]
+			replaceData["shape"] = materialMetaData["shape"]
+			replaceData["is_crop"] = materialMetaData["is_crop"]
+			replaceData["ratio"] = materialMetaData["ratio"]
+			replaceData["line"] = materialMetaData["line"]
+			replaceData["other"] = materialMetaData["other"]
+			replaceData["other1"] = materialMetaData["other1"]
+		}
+	}
+	combineInfo["param_data"] = replaceData
+	postData, _ := json.Marshal(combineInfo)
 	url := "http://192.168.1.7:45678/LogoCombine"
 	header := make(map[string]string)
 	header["content-type"] = "application/json"
-	postData := "" // todo 请求数据要查出来
+	httpRsp, err := curl.ApiCall(url, "POST", header, bytes.NewReader(postData), 20)
-	httpRsp, err := curl.ApiCall(url, "POST", header, strings.NewReader(postData), 20)
 	if err != nil {
 		logx.Error("failed to combine logo:", err)
 		return "", err

server/websocket/internal/logic/ws_render_image_logic.go

@@ -59,6 +59,7 @@ func (w *wsConnectItem) renderImage(data []byte) {
 		renderImageData.RenderData.Logo = "https://s3.us-west-1.amazonaws.com/storage.fusenpack.com/f5ccd11365099fa47a6316b1cd639f6dd6064dcd2d37c8d2fcd0a322160b33cc"
 	} else {
 		renderImageData.RenderData.Logo = *userMaterial.ResourceUrl
+		renderImageData.RenderData.UserMaterialId = userMaterial.Id
 	}
 	//用户id赋值
 	renderImageData.RenderData.UserId = w.userId

utils/websocket_data/render_data.go

@@ -12,11 +12,12 @@ type RenderImageReqMsg struct {
 	RenderData RenderData `json:"render_data"`
 }
 type RenderData struct {
-	TemplateTagId int64  `json:"template_tag_id"` //模板标签id
+	TemplateTagId  int64  `json:"template_tag_id"`  //模板标签id
-	ProductId     int64  `json:"product_id"`      //产品id
+	ProductId      int64  `json:"product_id"`       //产品id
-	Logo          string `json:"logo"`            //log资源地址(websocket连接建立再赋值)
+	UserMaterialId int64  `json:"user_material_id"` //用户素材id
-	UserId        int64  `json:"user_id"`         //用户id(websocket连接建立再赋值)
+	Logo           string `json:"logo"`             //log资源地址(websocket连接建立再赋值)
-	GuestId       int64  `json:"guest_id"`        //游客id(websocket连接建立再赋值)
+	UserId         int64  `json:"user_id"`          //用户id(websocket连接建立再赋值)
+	GuestId        int64  `json:"guest_id"`         //游客id(websocket连接建立再赋值)
 }
 
 // websocket发送渲染完的数据