|
|
@@ -1,9 +1,9 @@
|
|
|
import base64
|
|
|
import requests
|
|
|
import settings
|
|
|
-import json
|
|
|
+import json, asyncio
|
|
|
import numpy as np
|
|
|
-
|
|
|
+from utils.common import message_queue
|
|
|
|
|
|
class JsonEncoder(json.JSONEncoder):
|
|
|
"""Convert numpy classes to JSON serializable objects."""
|
|
|
@@ -331,8 +331,26 @@ class OnlineDataRequest(object):
|
|
|
print("上传商品api==>resultData", resultData)
|
|
|
return resultData
|
|
|
|
|
|
- def uploadGoods2ThirdParty(self, goods_no_dict=None,online_stores=[]):
|
|
|
+ def sendSocketMessage(self, code=0, msg="", data=None, device_status=2):
|
|
|
+ data = {
|
|
|
+ "code": code,
|
|
|
+ "msg": msg,
|
|
|
+ "status": device_status,
|
|
|
+ "data": data,
|
|
|
+ "msg_type": self.msg_type,
|
|
|
+ }
|
|
|
+ loop = asyncio.get_event_loop()
|
|
|
+ loop.create_task(message_queue.put(data))
|
|
|
+
|
|
|
+ def uploadGoods2ThirdParty(self, goods_no_dict=None, online_stores=[]):
|
|
|
params = []
|
|
|
+ message_type = "upload_goods_progress"
|
|
|
+ self.sendSocketMessage(
|
|
|
+ code=0,
|
|
|
+ msg="开始上传商品数据",
|
|
|
+ data={"online_stores": online_stores, "status": "进行中"},
|
|
|
+ message_type=message_type,
|
|
|
+ )
|
|
|
if goods_no_dict == None:
|
|
|
return
|
|
|
for goods_no in goods_no_dict.keys():
|
|
|
@@ -428,6 +446,13 @@ class OnlineDataRequest(object):
|
|
|
encoded = base64.b64encode(json_params.encode("utf-8")).decode("utf-8")
|
|
|
self.upload_goods_api({"bizcontent": encoded, "online_stores": online_stores})
|
|
|
print("商品上传第三方成功")
|
|
|
+ self.sendSocketMessage(
|
|
|
+ code=0,
|
|
|
+ msg="商品上传第三方成功",
|
|
|
+ data={"online_stores": online_stores, "status": "已完成"},
|
|
|
+ message_type=message_type,
|
|
|
+ )
|
|
|
+
|
|
|
|
|
|
class GetOnlineDataHLM(OnlineDataRequest):
|
|
|
|