dongchangxi/make2
1
0 Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
dongchangxi committed 2025-07-01 10:01:35 +08:00
1 parent 6779b08fa8
commit 6117a5f49d
4 files changed
+19 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

apps/auto_convert3d_new.py
+10 -10
View File
@@ -36,13 +36,13 @@ def down_obj_fromoss(pid,order_id):
print("AAAAAAAAA",ossPath)
path = os.path.join(workdir, 'print', pid)
path = os.path.join(workdir, 'print', pid,order_id)
if not os.path.exists(path): os.makedirs(path)
# 根据前缀获取文件列表
prefix = f'objs/print/{pid}/'
if ossPath != "":
prefix = os.path.join("objs","print",pid,ossPath,order_id)
prefix = os.path.join("objs","print",pid,ossPath)
if "base/" in ossPath:
prefix = os.path.join("objs","print",pid,ossPath)
prefix = prefix.replace("\\","/")
@@ -122,34 +122,34 @@ def team_check(r):
pid = str(pid)
orderId = str(orderId)
print(time.strftime('%Y-%m-%d %H:%M:%S', time.localtime()), f'pid：{pid} repair_id:{repair_id} 生成团队审核模型 start model:IndependentRepairTeamcheckGLBQueue', )
#print(time.strftime('%Y-%m-%d %H:%M:%S', time.localtime()), f'pid：{pid} repair_id:{repair_id} 生成团队审核模型 start model:IndependentRepairTeamcheckGLBQueue', )
ossPath = down_obj_fromoss(pid,orderId)
obj_filename = f'{pid}.obj'
glb_filename = f'{orderId}.glb'
print('开始转换obj文件为glb文件...')
os.system(f'gltfpack -c -i {os.path.join(workdir, "print", pid, obj_filename)} -o {os.path.join(workdir, "print", pid, glb_filename)} -vt 16 -vc 16')
os.system(f'gltfpack -c -i {os.path.join(workdir, "print", pid,orderId, obj_filename)} -o {os.path.join(workdir, "print", pid,orderId, glb_filename)} -vt 16 -vc 16')
#处理封面图
#执行获取obj缩略图
print("执行获取obj全身缩略图脚本1111111111")
os.system(f'python d:\\make2\\tools\pic_for_obj\image_rander_small.py -pid {pid} -i D://print/{pid} -o D://print/{pid}')
os.system(f'python d:\\make2\\tools\pic_for_obj\image_rander_small.py -pid {pid} -i D://print/{pid}/{orderId} -o D://print/{pid}/{orderId}')
print("判断是否存在封面图")
#判断文件是否存在，存在则上传到oss， 更新数据库内容
if os.path.exists(f'D://print/{pid}/{pid}_pic.png'):
if os.path.exists(f'D://print/{pid}/{orderId}/{pid}_pic.png'):
#获取拍照订单的信息，从中得到拍照订单的信息
uuid = get_p3d_info(str(pid))
if uuid != 0 and uuid != None and uuid != "":
print("uuid",uuid)
config.oss_bucket_3d_view.put_object_from_file(f'{uuid}/3d_view.png', f'D://print/{pid}/{pid}_pic.png')
config.oss_bucket_3d_view.put_object_from_file(f'{uuid}/3d_view.png', f'D://print/{pid}/{orderId}/{pid}_pic.png')
oss_client.put_object_from_file(f'glbs/print/order_id/{glb_filename}', os.path.join(workdir, "print", pid, glb_filename))
oss_client.put_object_from_file(f'glbs/print/order_id/{glb_filename}', os.path.join(workdir, "print", pid,orderId, glb_filename))
#对文件进行白色提纯处理
imagePath = os.path.join(workdir, 'print', pid,pid+"Tex1.jpg")
imagePath = os.path.join(workdir, 'print', pid,orderId,pid+"Tex1.jpg")
print("开始处理白色提纯")
#white_purification.white_purification_utils(imagePath)
os.system(f'python D:\\make2\\apps\white_purification_v4.py -i {imagePath}')
@@ -165,7 +165,7 @@ def team_check(r):
print(f'{update_repair_status_url}?id={repair_id}')
res = requests.get(f'{update_repair_status_url}?id={repair_id}')
print('更新团队审核状态:', res.text)
shutil.rmtree(os.path.join(workdir, 'print', pid), ignore_errors=True)
#shutil.rmtree(os.path.join(workdir, 'print', pid,orderId), ignore_errors=True)
print(time.strftime('%Y-%m-%d %H:%M:%S', time.localtime()), f'pid：{pid} 生成团队审核模型 end')
def get_p3d_info(pid):