|
|
|
@ -234,9 +234,10 @@ def step3(pid,task_distributed_id=""): |
|
|
|
#判断文件是否存在,存在则上传到oss, 更新数据库内容 |
|
|
|
#判断文件是否存在,存在则上传到oss, 更新数据库内容 |
|
|
|
if os.path.exists(f'D://{pid}/output/{pid}_pic.png'): |
|
|
|
if os.path.exists(f'D://{pid}/output/{pid}_pic.png'): |
|
|
|
#获取拍照订单的信息,从中得到拍照订单的信息 |
|
|
|
#获取拍照订单的信息,从中得到拍照订单的信息 |
|
|
|
uuid = get_p3d_info(pid)["data"]["uuid"] |
|
|
|
uuid = get_p3d_info(str(pid)) |
|
|
|
|
|
|
|
if uuid != 0: |
|
|
|
print("uuid",uuid) |
|
|
|
print("uuid",uuid) |
|
|
|
#config.oss_bucket.put_object_from_file(f'objs/auto/{pid}/{pid}_pic.png', f'D://{pid}/output/{pid}_pic.png') |
|
|
|
config.oss_bucket_3d_view.put_object_from_file(f'{uuid}/3d_view.png', f'D://{pid}/output/{pid}_pic.png') |
|
|
|
# #更新数据库 |
|
|
|
# #更新数据库 |
|
|
|
# main_service_db.update_task_distributed({"id":task_distributed_id,"pic_url":f'{pid}_pic.png'}) |
|
|
|
# main_service_db.update_task_distributed({"id":task_distributed_id,"pic_url":f'{pid}_pic.png'}) |
|
|
|
|
|
|
|
|
|
|
|
@ -252,9 +253,10 @@ def get_p3d_info(pid): |
|
|
|
url = "https://mp.api.suwa3d.com/api/customerP3dLog/info?id="+pid |
|
|
|
url = "https://mp.api.suwa3d.com/api/customerP3dLog/info?id="+pid |
|
|
|
res = requests.get(url) |
|
|
|
res = requests.get(url) |
|
|
|
res = res.json() |
|
|
|
res = res.json() |
|
|
|
print("获取拍照订单数据",res) |
|
|
|
if res["code"] == 1000: |
|
|
|
return res |
|
|
|
return res["data"]["guid"] |
|
|
|
|
|
|
|
else: |
|
|
|
|
|
|
|
return 0 |
|
|
|
|
|
|
|
|
|
|
|
def main(pid): |
|
|
|
def main(pid): |
|
|
|
if pid == '0': |
|
|
|
if pid == '0': |
|
|
|
|