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

server_api/inventory.api

@@ -0,0 +1,19 @@
+syntax = "v1"
+
+info (
+	title: "云仓服务"// TODO: add title
+	desc: // TODO: add description
+	author: "daming"
+	email: ""
+)
+import "basic.api"
+
+service canteen {
+	//提取云仓货物
+	@handler TakeHandler
+	post /inventory/take(TakeReq) returns (response);
+}
+//提取云仓货物
+type TakeReq{
+
+}

server_api/product-model.api

@@ -16,6 +16,9 @@ service product-model {
 	//获取产品模型其他信息
 	@handler GetModelOtherInfoHandler
 	get /product-model/other-info(GetModelOtherInfoReq) returns (response);
+	//更新产品模型
+	@handler UpdateProductModelHandler
+	post /product-model/update-model(UpdateProductModelReq) returns (response);
 }
 
 //获取产品模型详情
@@ -45,4 +48,40 @@ type PartListItem {
 	Name        string      `json:"name"`
 	MaterialImg string      `json:"material_img"`
 	ModelInfo   interface{} `json:"model_info"`
+}
+//更新产品模型
+type UpdateProductModelReq {
+	ModelData ModelData `json:"modelData"`
+	LightData LightData `json:"lightData"`
+}
+type LightData {
+	Id   int64     `json:"id"`
+	Name string    `json:"name"`
+	Info LightInfo `json:"info"`
+}
+type LightInfo {
+	Name      string                   `json:"name"`
+	Hdr       map[string]interface{}   `json:"hdr"`
+	LightData []map[string]interface{} `json:"lightData"`
+}
+
+type ModelData {
+	Id             int64                  `json:"id"`
+	Name           string                 `json:"name"`
+	KnifeTerritory string                 `json:"knifeTerritory"`
+	Cover          string                 `json:"cover"`
+	CameraData     map[string]interface{} `json:"cameraData"`
+	ControlsData   map[string]interface{} `json:"controlsData"`
+	Material       map[string]interface{} `json:"material"`
+	ModelData      map[string]interface{} `json:"modelData"`
+	LightList      []int64                `json:"lightList"`
+	Parts          int64                  `json:"parts"`
+	PartsList      []int64                `json:"partsList"`
+	Tag            int64                  `json:"tag"`
+	LightData      int64                  `json:"lightData"`
+}
+type UpdateProductModelRsp {
+	ModelId   int64   `json:"modelId"`
+	LightId   int64   `json:"lightId"`
+	LightList []int64 `json:"lightList"`
 }