rambo 5 mesiacov pred
rodič
commit
6d7c2d4b16

+ 11 - 2
python/custom_plugins/plugins_mode/detail_generate_base.py

@@ -52,6 +52,9 @@ class DetailBase(object):
         self.out_put_dir = out_put_dir
         self.deal_pic_func_list = []
         self.goods_no_value = goods_no_value
+        self.goods_art_nos = [
+            item.get("货号", "") for item in self.goods_no_value.get("货号资料", [])
+        ]
         self.root = ""
         self.windows = windows
         self.template_name = None
@@ -180,7 +183,12 @@ class DetailBase(object):
             code=0,
             msg="详情页生成完成",
             msg_type="detail_progress",
-            data={"goods_no": self.goods_no, "temp_name": self.template_name,"status":"已完成"},
+            data={
+                "goods_no": self.goods_no,
+                "temp_name": self.template_name,
+                "status": "已完成",
+                "goods_art_nos": self.goods_art_nos,
+            },
         )
         return True
 
@@ -203,6 +211,7 @@ class DetailBase(object):
                 "goods_no": self.goods_no,
                 "temp_name": self.template_name,
                 "status": "进行中",
+                "goods_art_nos": self.goods_art_nos,
             },
         )
         for index, func in enumerate(self.deal_pic_func_list):
@@ -220,7 +229,6 @@ class DetailBase(object):
 
     # 生成拼接的图片
     def generate_spliced_picture(self):
-        print("详情页切片", "详情页切片")
         sendMessageAsync(
             code=0,
             msg="正在生成详情拼接图",
@@ -229,6 +237,7 @@ class DetailBase(object):
                 "goods_no": self.goods_no,
                 "temp_name": self.template_name,
                 "status": "进行中",
+                "goods_art_nos": self.goods_art_nos,
             },
         )
         detail_path = "{out_put_dir}/{goods_no}/详情页切片".format(

+ 104 - 0
python/docs/socket命令.md

@@ -907,4 +907,108 @@ _(该命令用于单独自定义配置中某一项的单独调整测试,不进
     "msg_type": "smart_shooter_get_camera_property"
 }
 ```
+
+##### 获取详情图处理接口中的<mark>[详情页模板]</mark>执行进度信息
+* data:{}
+    * goods_no:款号
+    * temp_name:模板名称
+    * status:状态
+    * goods_art_nos:货号-数组
+* msg_type:详情图处理固定为[detail_progress]
+<mark>以下为消息发送得示例</mark>
+
+```
+{
+    "code": 0,
+    "msg": "开始处理详情",
+    "status": 2,
+    "data": {
+        "goods_no": "B41135",
+        "temp_name": "huilima-1",
+        "status": "进行中",
+        "goods_art_nos": [
+            "B411351"
+        ]
+    },
+    "msg_type": "detail_progress"
+}
+```
+```
+{
+    "code": 0,
+    "msg": "正在生成详情页切片",
+    "status": 2,
+    "data": {
+        "goods_no": "B41135",
+        "temp_name": "huilima-1",
+        "status": "进行中"
+    },
+    "msg_type": "detail_progress"
+}
+```
+```
+{
+    "code": 0,
+    "msg": "正在生成详情拼接图",
+    "status": 2,
+    "data": {
+        "goods_no": "B41135",
+        "temp_name": "huilima-1",
+        "status": "进行中"
+    },
+    "msg_type": "detail_progress"
+}
+```
+```
+{
+    "code": 0,
+    "msg": "详情页生成完成",
+    "status": 2,
+    "data": {
+        "goods_no": "B41135",
+        "temp_name": "huilima-1",
+        "status": "已完成"
+    },
+    "msg_type": "detail_progress"
+}
+```
+
+
+##### 获取详情图处理接口中的<mark>[抠图]</mark>执行进度信息
+* data:{}
+    * status:状态
+    * goods_art_nos:货号-数组
+* msg_type:详情图处理固定为[segment_progress]
+<mark>以下为消息发送得示例</mark>
+
+```
+{
+    "code": 0,
+    "msg": "开始处理抠图",
+    "status": 2,
+    "data": {
+        "status": "进行中",
+        "goods_art_nos": [
+            "AQN1411322",
+            "B411351"
+        ]
+    },
+    "msg_type": "segment_progress"
+}
+```
+```
+{
+    "code": 0,
+    "msg": "抠图结束",
+    "status": 2,
+    "data": {
+        "status": "已完成",
+        "goods_art_nos": [
+            "AQN1411322",
+            "B411351"
+        ]
+    },
+    "msg_type": "detail_progress"
+}
+```
 ##### 未完待续.....

+ 28 - 4
python/service/run_main.py

@@ -300,6 +300,19 @@ class RunMain:
         logo_path,
         config_data,
     ):
+        goods_arts = [
+            goods_art_no_folder_data["folder_name"]
+            for goods_art_no_folder_data in all_goods_art_no_folder_data
+        ]
+        await sendSocketMessage(
+            code=0,
+            msg="开始处理抠图",
+            data={
+                "status": "进行中",
+                "goods_art_nos": goods_arts,
+            },
+            msg_type="segment_progress",
+        )
         print("BaseDealImage().run_main========>>>>")
         deal = BaseDealImage(token=self.token)
         await deal.run_main(
@@ -311,16 +324,22 @@ class RunMain:
             windows=windows,
             logo_path=logo_path,
         )
-        goods_arts = [
-            goods_art_no_folder_data["folder_name"]
-            for goods_art_no_folder_data in all_goods_art_no_folder_data
-        ]
+
         recordDataPoint(
             token=self.token,
             uuid=self.uuid,
             page="抠图结束",
             data=goods_arts,
         )
+        await sendSocketMessage(
+            code=0,
+            msg="抠图结束",
+            data={
+                "status": "已完成",
+                "goods_art_nos": goods_arts,
+            },
+            msg_type="segment_progress",
+        )
         callback_func("已结束抠图处理")
         return True
 
@@ -855,6 +874,10 @@ class RunMain:
                     out_put_dir_resp = "{}/详情模板{}/{}".format(
                         out_put_dir, _temp_name, goods_no
                     )
+                    goods_art_nos = [
+                        item.get("货号", "")
+                        for item in temp_info_data.get("货号资料", [])
+                    ]
                     await sendSocketMessage(
                         code=0,
                         msg="开始处理详情",
@@ -862,6 +885,7 @@ class RunMain:
                             "goods_no": goods_no,
                             "temp_name": _temp_name,
                             "status": "进行中",
+                            "goods_art_nos": goods_art_nos,
                         },
                         msg_type="detail_progress",
                     )