From db129b7f2c933c987153f0d720afdf1a56d42217 Mon Sep 17 00:00:00 2001 From: dongchangxi <458593490@qq.com> Date: Fri, 19 Dec 2025 16:03:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E5=AD=98=E5=9C=A8=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E5=88=87=E5=B1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main_download_batch_data_and_trans.py | 9 +++++++-- factory_sliceing/download_batch_data/utils/funcs.py | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/factory_sliceing/download_batch_data/main_download_batch_data_and_trans.py b/factory_sliceing/download_batch_data/main_download_batch_data_and_trans.py index e09aadc..9f3b00e 100644 --- a/factory_sliceing/download_batch_data/main_download_batch_data_and_trans.py +++ b/factory_sliceing/download_batch_data/main_download_batch_data_and_trans.py @@ -18,14 +18,19 @@ elif ENV == 'prod': def step1(versionId): # 下载json 文件 和 图片 - dirName,machineInfo = downloadJsonAndJpgFileAndMoveToCorrectDir(versionId,currentDir) + dirName,machineInfo,isAlreadyExist = downloadJsonAndJpgFileAndMoveToCorrectDir(versionId,currentDir) if not dirName: return False - + #判断是否是小机台 isSmallMachine = False if str(machineInfo["machine_type"]) == '1': isSmallMachine = True + if isAlreadyExist: + objFilePath = os.path.join(dirName, 'json') + keyValue = f'{versionId}_small_No{machineInfo["id"]}' + BeginSliceing(versionId,machineInfo["id"],objFilePath,keyValue) + return True #下载数据，转换数据 diff --git a/factory_sliceing/download_batch_data/utils/funcs.py b/factory_sliceing/download_batch_data/utils/funcs.py index dfc0140..15ba4bf 100644 --- a/factory_sliceing/download_batch_data/utils/funcs.py +++ b/factory_sliceing/download_batch_data/utils/funcs.py @@ -215,6 +215,7 @@ def downloadJsonAndJpgFileAndMoveToCorrectDir(versionId, currentDir): # 判断目录是否存在，存在就删除 if os.path.exists(dirNewName): + return dirNewName, machineInfo,True shutil.rmtree(dirNewName) # 创建目录 os.makedirs(dirNewName)