目录结构调整

python/api.py

@@ -362,10 +362,10 @@ async def process_handle_detail(request: Request, params: HandlerDetail):
 
 async def _process_non_excel_mode(params, goods_art_no_arrays):
     """处理非Excel模式的准备工作"""
-    limit_path = "output/{}".format(time.strftime("%Y-%m-%d", time.localtime(time.time())))
+    limit_path = "{}/{}".format(settings.OUTPUT_DIR,time.strftime("%Y-%m-%d", time.localtime(time.time())))
     check_path(limit_path)
     
-    move_folder_array = check_move_goods_art_no_folder("output", goods_art_no_arrays, limit_path)
+    move_folder_array = check_move_goods_art_no_folder(settings.OUTPUT_DIR, goods_art_no_arrays, limit_path)
     
     for goods_art_no in goods_art_no_arrays:
         if not goods_art_no:
@@ -393,10 +393,10 @@ async def _process_non_excel_mode(params, goods_art_no_arrays):
 
 async def _process_excel_mode(goods_art_no_arrays,excel_df):
     """处理非Excel模式的准备工作"""
-    limit_path = "output/{}".format(time.strftime("%Y-%m-%d", time.localtime(time.time())))
+    limit_path = "{}/{}".format(settings.OUTPUT_DIR,time.strftime("%Y-%m-%d", time.localtime(time.time())))
     check_path(limit_path)
     
-    move_folder_array = check_move_goods_art_no_folder("output", goods_art_no_arrays, limit_path)
+    move_folder_array = check_move_goods_art_no_folder(settings.OUTPUT_DIR, goods_art_no_arrays, limit_path)
     for index, row in excel_df.iterrows():
             goods_art_no_image_dir = str(row["文件夹名称"])
             goods_art_no = str(row["商品货号"])
@@ -455,7 +455,7 @@ async def _build_config_data(params, goods_art_no_arrays):
         else "2"
     )
     
-    limit_path = "output/{}".format(time.strftime("%Y-%m-%d", time.localtime(time.time())))
+    limit_path = "{}/{}".format(settings.OUTPUT_DIR,time.strftime("%Y-%m-%d", time.localtime(time.time())))
     
     config_data = {
         "image_dir": limit_path,

python/config.ini

@@ -10,7 +10,7 @@ app_run=api:app
 # 端口号
 port=7074
 debug=false
-env=prod
+env=dev
 # 线程数
 works=1
 project=惠利玛
@@ -45,4 +45,6 @@ stop = 9
 
 ; [camera_config]
 ; low_iso = 100
-; high_iso = 6400
+; high_iso = 6400
+[output_config]
+output_dir = ..\..\..\output\

python/service/base.py

@@ -8,7 +8,7 @@ import shutil
 from hashlib import sha256, md5
 import requests
 from datetime import datetime
-
+from settings import OUTPUT_DIR
 
 # 获取digicam的路径
 def check_install_path(other):
@@ -240,9 +240,9 @@ def check_move_goods_art_no_folder(path, goods_art_nos,limit_folder):
         for folder_data in temp_folder_list:
             # folder_path = folder_data["folder_path"]
             folder_name = folder_data["folder_name"]
-            _p = "output/{}/{}/原始图".format(folder_name, goods_art_no)
+            _p = "{}/{}/{}/原始图".format(OUTPUT_DIR,folder_name, goods_art_no)
             if os.path.exists(_p):
-                folder_data["folder_path"] = f"output/{folder_name}/{goods_art_no}"
+                folder_data["folder_path"] = f"{OUTPUT_DIR}/{folder_name}/{goods_art_no}"
                 # 整个目录移动到目标目录
                 folder_list[goods_art_no] = folder_data
                 if not os.path.exists(f"{limit_folder}/{goods_art_no}"):

python/service/deal_image.py

@@ -231,7 +231,7 @@ class DealImage(BaseDealImage):
         total_num = len(original_photo_list)
         # 当天日期作为文件夹
         seconds = time.time()
-        output_path = "output/{f_name}".format(f_name=time.strftime("%Y-%m-%d", time.localtime(seconds)))
+        output_path = "{}/{f_name}".format(settings.OUTPUT_DIR,f_name=time.strftime("%Y-%m-%d", time.localtime(seconds)))
 
         # 遍历每个匹配好的数据进行处理
         print(f"original_photo_list:",original_photo_list)

python/service/run_main.py

@@ -441,12 +441,9 @@ class RunMain:
         _result = {"code": 99, "message": "无法解析到数据，请检查登录企业"}
         print("is_use_excel", is_use_excel)
         if not is_use_excel:
-            if settings.PROJECT == "惠利玛":
-                if settings.Company:
-                    if "惠利玛" in settings.Company:
-                        _result = self.data_mode_generate_detail.get_basic_goods_art_data_by_hqt_and_hlm(
+            _result = self.data_mode_generate_detail.get_basic_goods_art_data_by_hqt_and_hlm(
                             folder_name_list
-                        )
+                        )            
         else:
             keys = settings.keys
             _result = (
@@ -456,7 +453,7 @@ class RunMain:
                     keys,
                 )
             )
-            print("打印=======>>>>>>>_result=============>", _result)
+        print("打印=======>>>>>>>_result=============>", _result)
         if _result["code"] == 0:
             remote_data = _result["data"]
         else:

python/settings.py

@@ -2,11 +2,11 @@ from wsgiref import headers
 from dotenv import load_dotenv, find_dotenv
 from pathlib import Path  # Python 3.6+ only
 import configparser, json, pytz
-import requests
+import requests,os
 import pillow_avif
 from utils.common import message_queue
 import hashlib
-
+from pathlib import Path
 TIME_ZONE = pytz.timezone("Asia/Shanghai")
 from numpy import true_divide
 from databases import (
@@ -247,30 +247,6 @@ CUTOUT_MODE = (
 )
 import importlib
 
-# plugins = [
-#     # "custom_plugins.plugins.detail_template.huilima.detail_huilima1.DetailPicGet",
-#     ".custom_plugins.plugins.detail_template.huilima.detail_huilima1.DetailPicGet",
-#     # "custom_plugins.plugins.detail_template.huilima.detail_huilima2.DetailPicGet",
-#     # "custom_plugins.plugins.detail_template.huilima.detail_huilima3.DetailPicGet",
-#     # "custom_plugins.plugins.detail_template.huilima.detail_huilima4.DetailPicGet",
-#     # "custom_plugins.plugins.detail_template.xiaosushuoxie.detail_xiaosushuoxie1",
-#     # "custom_plugins.plugins.detail_template.xiaosushuoxie.detail_xiaosushuoxie2",
-#     # "custom_plugins.plugins.detail_template.xiaosushuoxie.detail_xiaosushuoxie3",
-#     # "custom_plugins.plugins.detail_template.xiaosushuoxie.detail_xiaosushuoxie4",
-#     # "custom_plugins.plugins.detail_template.xiaosushuoxie.detail_xiaosushuoxie5",
-#     # "custom_plugins.plugins.detail_template.xiaosushuoxie.detail_xiaosushuoxie6",
-#     # "custom_plugins.plugins.detail_template.hongqingting.detail_hongqingting1.DetailPicGet",
-#     # "custom_plugins.plugins_mode.detail_generate_base.DetailBase",
-#     # "custom_plugins.plugins_mode.pic_deal.PictureProcessing",
-# ]
-# def load_plugin(plugin_path):
-#     module_name, class_name = plugin_path.rsplit(".", 1)
-#     module = importlib.import_module(module_name)
-#     return getattr(module, class_name)
-
-
-# loaded_plugins = [load_plugin(p.lstrip(".")) for p in plugins]
-
 OUT_PIC_QUALITY = "普通"
 GRENERATE_MAIN_PIC_BRIGHTNESS = int(
     getSysConfigs("other_configs", "grenerate_main_pic_brightness", 254)
@@ -342,3 +318,7 @@ def calculate_md5(filepath):
             md5hash.update(chunk)
         # 返回MD5哈希的十六进制表示
         return md5hash.hexdigest()
+__output_dir = config.get("output_config", "output_dir")
+path_obj = Path(os.path.abspath(__output_dir))
+OUTPUT_DIR = path_obj.absolute()
+print("OUTPUT_DIR",__output_dir,OUTPUT_DIR)

python/sockets/message_handler.py

@@ -376,7 +376,7 @@ async def handlerSend(
                 return
             reset_data = {"image_path": None}
             photoRecord.update(session, id, **reset_data)
-            device_ctrl = DeviceControl(websocket_manager=manager)
+            device_ctrl = DeviceControl(websocket_manager=manager)#
             loop.create_task(
                 device_ctrl.only_take_photo(
                     goods_art_no=goods_art_no,
@@ -393,13 +393,13 @@ async def handlerSend(
             uuid = data.get("uuid", "")
             run_main = RunMain(obj, token, uuid)
             goods_art_no_arrays = data.get("goods_art_no", [])
-            limit_path = "output/{}".format(
+            limit_path = "{}/{}".format(settings.OUTPUT_DIR,
                 time.strftime("%Y-%m-%d", time.localtime(time.time()))
             )
             check_path(limit_path)
             # 该数组表示是否需要后面的移动文件夹操作，减少重复抠图，提升抠图时间和速度
             move_folder_array = check_move_goods_art_no_folder(
-                "output", goods_art_no_arrays, limit_path
+                settings.OUTPUT_DIR, goods_art_no_arrays, limit_path
             )
             for goods_art_revice in goods_art_no_arrays:
                 cutout_goods = f"{limit_path}/{goods_art_revice}"