From 7b19e55e74ec0b0ffa91246af6bcae4a23e45e16 Mon Sep 17 00:00:00 2001 From: dongchangxi <458593490@qq.com> Date: Tue, 16 Dec 2025 19:11:04 +0800 Subject: [PATCH] 8 --- .../auto_sliceing_operate/main_begin_sliceing.py | 14 +++++++------- .../auto_sliceing_operate/main_download_zip.py | 7 +++---- factory_sliceing/auto_sliceing_operate/test.py | 2 +- .../auto_sliceing_operate/utils/import_all_file.py | 2 +- .../auto_sliceing_operate/utils/miniIo.py | 2 +- .../auto_sliceing_operate/utils/oss_func.py | 4 ++-- .../auto_sliceing_operate/utils/request.py | 2 +- .../main_download_batch_data_and_trans.py | 6 +++--- .../download_batch_data/utils/changeFiles.py | 2 +- .../download_batch_data/utils/funcs.py | 10 +++++----- .../download_batch_data/utils/oss_func.py | 4 ++-- 11 files changed, 27 insertions(+), 28 deletions(-) diff --git a/factory_sliceing/auto_sliceing_operate/main_begin_sliceing.py b/factory_sliceing/auto_sliceing_operate/main_begin_sliceing.py index c743da0..8459ec8 100644 --- a/factory_sliceing/auto_sliceing_operate/main_begin_sliceing.py +++ b/factory_sliceing/auto_sliceing_operate/main_begin_sliceing.py @@ -1,12 +1,12 @@ -from .utils.import_all_file import modify_file_dialog_path_and_import_all -from .utils.click_soft_button import clickFileIMportShow, clickBegingSlice,checkIsSliceingText +from auto_sliceing_operate.utils.import_all_file import modify_file_dialog_path_and_import_all +from auto_sliceing_operate.utils.click_soft_button import clickFileIMportShow, clickBegingSlice,checkIsSliceingText import time -from .utils.oss_redis import redisClient -from .utils.exe_operate import start_exe, click_confirm, close -from .utils.logs import log +from auto_sliceing_operate.utils.oss_redis import redisClient +from auto_sliceing_operate.utils.exe_operate import start_exe, click_confirm, close +from auto_sliceing_operate.utils.logs import log import os -from .utils.miniIo import upload_file -from .utils.request import requestApiToUpdateSliceStatusComplate +from auto_sliceing_operate.utils.miniIo import upload_file +from auto_sliceing_operate.utils.request import requestApiToUpdateSliceStatusComplate from utils.config import cfg diff --git a/factory_sliceing/auto_sliceing_operate/main_download_zip.py b/factory_sliceing/auto_sliceing_operate/main_download_zip.py index 46f0d6e..769dbc9 100644 --- a/factory_sliceing/auto_sliceing_operate/main_download_zip.py +++ b/factory_sliceing/auto_sliceing_operate/main_download_zip.py @@ -1,8 +1,8 @@ -from .utils import miniIo as mio +from auto_sliceing_operate.utils import miniIo as mio import zipfile,time import os -from .utils.oss_redis import redisClient -from .utils.logs import log +from auto_sliceing_operate.utils.oss_redis import redisClient +from auto_sliceing_operate.utils.logs import log from utils.config import cfg # 打印机旁边的电脑下载切片文件到本地 # 解压压缩包，将数据移动到指定的目录 @@ -72,7 +72,6 @@ def main(work_dir=None): os.remove(os.path.join(downloadPath,data, f'data.snslc')) # 下载 zip 文件 downloadZip(ossZipPath, localPath) -th, localPath) # # 解压 zip 文件 # localUnzipPath = os.path.join(work_dir,batchId) # unzip(localZipPath, localUnzipPath) diff --git a/factory_sliceing/auto_sliceing_operate/test.py b/factory_sliceing/auto_sliceing_operate/test.py index 5312495..25a58ff 100644 --- a/factory_sliceing/auto_sliceing_operate/test.py +++ b/factory_sliceing/auto_sliceing_operate/test.py @@ -1,4 +1,4 @@ -from .utils.miniIo import upload_file +from auto_sliceing_operate.utils.miniIo import upload_file # 测试上传文件 diff --git a/factory_sliceing/auto_sliceing_operate/utils/import_all_file.py b/factory_sliceing/auto_sliceing_operate/utils/import_all_file.py index ae0c003..78d2653 100644 --- a/factory_sliceing/auto_sliceing_operate/utils/import_all_file.py +++ b/factory_sliceing/auto_sliceing_operate/utils/import_all_file.py @@ -1,7 +1,7 @@ import win32gui, win32con, time import win32api import ctypes -from .click_soft_button import checkImportFileIsSuccess +from auto_sliceing_operate.utils.click_soft_button import checkImportFileIsSuccess import os def find_window(title=None, class_name=None): diff --git a/factory_sliceing/auto_sliceing_operate/utils/miniIo.py b/factory_sliceing/auto_sliceing_operate/utils/miniIo.py index a00ca98..79939cc 100644 --- a/factory_sliceing/auto_sliceing_operate/utils/miniIo.py +++ b/factory_sliceing/auto_sliceing_operate/utils/miniIo.py @@ -1,7 +1,7 @@ import os from minio import Minio from minio.error import S3Error -from .logs import log +from auto_sliceing_operate.utils.logs import log from utils.config import cfg # 全局变量：存储桶名称（从配置文件读取） diff --git a/factory_sliceing/auto_sliceing_operate/utils/oss_func.py b/factory_sliceing/auto_sliceing_operate/utils/oss_func.py index 1e335f9..150d8d9 100644 --- a/factory_sliceing/auto_sliceing_operate/utils/oss_func.py +++ b/factory_sliceing/auto_sliceing_operate/utils/oss_func.py @@ -1,6 +1,6 @@ import os -from .oss_redis import ossClient -from .logs import log +from auto_sliceing_operate.utils.oss_redis import ossClient +from auto_sliceing_operate.utils.logs import log # 从 OSS 下载文件到本地，并做完整性校验（状态码 + 文件大小） def download_file_with_check(ossFilePath, localFilePath): diff --git a/factory_sliceing/auto_sliceing_operate/utils/request.py b/factory_sliceing/auto_sliceing_operate/utils/request.py index 96ab06b..e4fc4eb 100644 --- a/factory_sliceing/auto_sliceing_operate/utils/request.py +++ b/factory_sliceing/auto_sliceing_operate/utils/request.py @@ -1,5 +1,5 @@ import requests -from .logs import log +from auto_sliceing_operate.utils.logs import log url = 'https://mp.api.suwa3d.com' 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 f2c4a0f..012011e 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 @@ -1,7 +1,7 @@ import os,time,sys -from .utils.funcs import requestApiToUpdateSliceStatus -from .utils.oss_redis import redisClient -from .utils.funcs import downloadJsonAndJpgFileAndMoveToCorrectDir, downloadDataByOssAndTransformSave +from download_batch_data.utils.funcs import requestApiToUpdateSliceStatus +from download_batch_data.utils.oss_redis import redisClient +from download_batch_data.utils.funcs import downloadJsonAndJpgFileAndMoveToCorrectDir, downloadDataByOssAndTransformSave # 默认使用脚本所在目录 currentDir = os.path.dirname(os.path.abspath(__file__)) diff --git a/factory_sliceing/download_batch_data/utils/changeFiles.py b/factory_sliceing/download_batch_data/utils/changeFiles.py index 69df0b7..6a82c91 100644 --- a/factory_sliceing/download_batch_data/utils/changeFiles.py +++ b/factory_sliceing/download_batch_data/utils/changeFiles.py @@ -1,6 +1,6 @@ import os,time import re -from .logs import log +from download_batch_data.utils.logs import log def changeMtlFile(localMtlPath,newName): diff --git a/factory_sliceing/download_batch_data/utils/funcs.py b/factory_sliceing/download_batch_data/utils/funcs.py index 9dfc6d1..dfc0140 100644 --- a/factory_sliceing/download_batch_data/utils/funcs.py +++ b/factory_sliceing/download_batch_data/utils/funcs.py @@ -9,11 +9,11 @@ import subprocess import sys import signal from concurrent.futures import ThreadPoolExecutor, as_completed -from .oss_redis import ossClient -from .logs import log -from .oss_func import download_file_with_check, checkFileExists -from .changeFiles import changeObjFile, changeMtlFile -from .small_machine_transform import transform_save +from download_batch_data.utils.oss_redis import ossClient +from download_batch_data.utils.logs import log +from download_batch_data.utils.oss_func import download_file_with_check, checkFileExists +from download_batch_data.utils.changeFiles import changeObjFile, changeMtlFile +from download_batch_data.utils.small_machine_transform import transform_save ENV = 'prod' url = 'https://mp.api.suwa3d.com' diff --git a/factory_sliceing/download_batch_data/utils/oss_func.py b/factory_sliceing/download_batch_data/utils/oss_func.py index 1e335f9..52d3df0 100644 --- a/factory_sliceing/download_batch_data/utils/oss_func.py +++ b/factory_sliceing/download_batch_data/utils/oss_func.py @@ -1,6 +1,6 @@ import os -from .oss_redis import ossClient -from .logs import log +from download_batch_data.utils.oss_redis import ossClient +from download_batch_data.utils.logs import log # 从 OSS 下载文件到本地，并做完整性校验（状态码 + 文件大小） def download_file_with_check(ossFilePath, localFilePath):