dongchangxi 1 week ago
parent
commit
7b19e55e74
  1. 14
      factory_sliceing/auto_sliceing_operate/main_begin_sliceing.py
  2. 7
      factory_sliceing/auto_sliceing_operate/main_download_zip.py
  3. 2
      factory_sliceing/auto_sliceing_operate/test.py
  4. 2
      factory_sliceing/auto_sliceing_operate/utils/import_all_file.py
  5. 2
      factory_sliceing/auto_sliceing_operate/utils/miniIo.py
  6. 4
      factory_sliceing/auto_sliceing_operate/utils/oss_func.py
  7. 2
      factory_sliceing/auto_sliceing_operate/utils/request.py
  8. 6
      factory_sliceing/download_batch_data/main_download_batch_data_and_trans.py
  9. 2
      factory_sliceing/download_batch_data/utils/changeFiles.py
  10. 10
      factory_sliceing/download_batch_data/utils/funcs.py
  11. 4
      factory_sliceing/download_batch_data/utils/oss_func.py

14
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 auto_sliceing_operate.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.click_soft_button import clickFileIMportShow, clickBegingSlice,checkIsSliceingText
import time import time
from .utils.oss_redis import redisClient from auto_sliceing_operate.utils.oss_redis import redisClient
from .utils.exe_operate import start_exe, click_confirm, close from auto_sliceing_operate.utils.exe_operate import start_exe, click_confirm, close
from .utils.logs import log from auto_sliceing_operate.utils.logs import log
import os import os
from .utils.miniIo import upload_file from auto_sliceing_operate.utils.miniIo import upload_file
from .utils.request import requestApiToUpdateSliceStatusComplate from auto_sliceing_operate.utils.request import requestApiToUpdateSliceStatusComplate
from utils.config import cfg from utils.config import cfg

7
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 zipfile,time
import os import os
from .utils.oss_redis import redisClient from auto_sliceing_operate.utils.oss_redis import redisClient
from .utils.logs import log from auto_sliceing_operate.utils.logs import log
from utils.config import cfg from utils.config import cfg
# 打印机旁边的电脑下载切片文件到本地 # 打印机旁边的电脑下载切片文件到本地
# 解压压缩包,将数据移动到指定的目录 # 解压压缩包,将数据移动到指定的目录
@ -72,7 +72,6 @@ def main(work_dir=None):
os.remove(os.path.join(downloadPath,data, f'data.snslc')) os.remove(os.path.join(downloadPath,data, f'data.snslc'))
# 下载 zip 文件 # 下载 zip 文件
downloadZip(ossZipPath, localPath) downloadZip(ossZipPath, localPath)
th, localPath)
# # 解压 zip 文件 # # 解压 zip 文件
# localUnzipPath = os.path.join(work_dir,batchId) # localUnzipPath = os.path.join(work_dir,batchId)
# unzip(localZipPath, localUnzipPath) # unzip(localZipPath, localUnzipPath)

2
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
# 测试上传文件 # 测试上传文件

2
factory_sliceing/auto_sliceing_operate/utils/import_all_file.py

@ -1,7 +1,7 @@
import win32gui, win32con, time import win32gui, win32con, time
import win32api import win32api
import ctypes import ctypes
from .click_soft_button import checkImportFileIsSuccess from auto_sliceing_operate.utils.click_soft_button import checkImportFileIsSuccess
import os import os
def find_window(title=None, class_name=None): def find_window(title=None, class_name=None):

2
factory_sliceing/auto_sliceing_operate/utils/miniIo.py

@ -1,7 +1,7 @@
import os import os
from minio import Minio from minio import Minio
from minio.error import S3Error from minio.error import S3Error
from .logs import log from auto_sliceing_operate.utils.logs import log
from utils.config import cfg from utils.config import cfg
# 全局变量:存储桶名称(从配置文件读取) # 全局变量:存储桶名称(从配置文件读取)

4
factory_sliceing/auto_sliceing_operate/utils/oss_func.py

@ -1,6 +1,6 @@
import os import os
from .oss_redis import ossClient from auto_sliceing_operate.utils.oss_redis import ossClient
from .logs import log from auto_sliceing_operate.utils.logs import log
# 从 OSS 下载文件到本地,并做完整性校验(状态码 + 文件大小) # 从 OSS 下载文件到本地,并做完整性校验(状态码 + 文件大小)
def download_file_with_check(ossFilePath, localFilePath): def download_file_with_check(ossFilePath, localFilePath):

2
factory_sliceing/auto_sliceing_operate/utils/request.py

@ -1,5 +1,5 @@
import requests import requests
from .logs import log from auto_sliceing_operate.utils.logs import log
url = 'https://mp.api.suwa3d.com' url = 'https://mp.api.suwa3d.com'

6
factory_sliceing/download_batch_data/main_download_batch_data_and_trans.py

@ -1,7 +1,7 @@
import os,time,sys import os,time,sys
from .utils.funcs import requestApiToUpdateSliceStatus from download_batch_data.utils.funcs import requestApiToUpdateSliceStatus
from .utils.oss_redis import redisClient from download_batch_data.utils.oss_redis import redisClient
from .utils.funcs import downloadJsonAndJpgFileAndMoveToCorrectDir, downloadDataByOssAndTransformSave from download_batch_data.utils.funcs import downloadJsonAndJpgFileAndMoveToCorrectDir, downloadDataByOssAndTransformSave
# 默认使用脚本所在目录 # 默认使用脚本所在目录
currentDir = os.path.dirname(os.path.abspath(__file__)) currentDir = os.path.dirname(os.path.abspath(__file__))

2
factory_sliceing/download_batch_data/utils/changeFiles.py

@ -1,6 +1,6 @@
import os,time import os,time
import re import re
from .logs import log from download_batch_data.utils.logs import log
def changeMtlFile(localMtlPath,newName): def changeMtlFile(localMtlPath,newName):

10
factory_sliceing/download_batch_data/utils/funcs.py

@ -9,11 +9,11 @@ import subprocess
import sys import sys
import signal import signal
from concurrent.futures import ThreadPoolExecutor, as_completed from concurrent.futures import ThreadPoolExecutor, as_completed
from .oss_redis import ossClient from download_batch_data.utils.oss_redis import ossClient
from .logs import log from download_batch_data.utils.logs import log
from .oss_func import download_file_with_check, checkFileExists from download_batch_data.utils.oss_func import download_file_with_check, checkFileExists
from .changeFiles import changeObjFile, changeMtlFile from download_batch_data.utils.changeFiles import changeObjFile, changeMtlFile
from .small_machine_transform import transform_save from download_batch_data.utils.small_machine_transform import transform_save
ENV = 'prod' ENV = 'prod'
url = 'https://mp.api.suwa3d.com' url = 'https://mp.api.suwa3d.com'

4
factory_sliceing/download_batch_data/utils/oss_func.py

@ -1,6 +1,6 @@
import os import os
from .oss_redis import ossClient from download_batch_data.utils.oss_redis import ossClient
from .logs import log from download_batch_data.utils.logs import log
# 从 OSS 下载文件到本地,并做完整性校验(状态码 + 文件大小) # 从 OSS 下载文件到本地,并做完整性校验(状态码 + 文件大小)
def download_file_with_check(ossFilePath, localFilePath): def download_file_with_check(ossFilePath, localFilePath):

Loading…
Cancel
Save