Merge branch 'main' into 预焊-Win1

BaseModules/Hd_LogicDll_module/Logic_processtask.cpp

@@ -125,14 +125,14 @@ bool Logic_processtask::check_cmeraCfg(QJsonObject obj, QString& allMessage)
     {
         //allMessage += "第 " + QString::number(allFailNum++) + "条 :保存图片总文件夹，为空\r\n";
         allMessage += "第 " + QString::number(allFailNum) + "条 :保存图片总文件夹为空但已创建\r\n";
-        fileManager::createDirectoryIfNotExists(myQString.toStdString());
+        fileManager::createDirectoryIfNotExists(myQString);
     }
 	QDir dir(myQString);
 	if (!dir.exists())
     {
         //allMessage += "第 " + QString::number(allFailNum) + "条 :保存图片总文件夹:" + myQString + " 不存在\r\n";
         allMessage += "第 " + QString::number(allFailNum) + "条 :保存图片总文件夹:" + myQString + " 不存在但已创建\r\n";
-        fileManager::createDirectoryIfNotExists(myQString.toStdString());
+        fileManager::createDirectoryIfNotExists(myQString);
     }
 	myQString = m_jsonObj.value("数据保存天数").toString();
 	if (myQString.toInt() <= 0)

BaseModules/Hd_LogicDll_module/rlib/fileManager.h

@@ -306,16 +306,11 @@ public:
         }
         return normalizedAddress;
     }
-    static void createDirectoryIfNotExists(const std::string& path) {
-        // 检查路径是否存在
-        if (!std::filesystem::exists(path)) {
-            // 创建路径
-
-            std::filesystem::create_directories(path);
-            //std::cout << "已创建文件夹: " << path << std::endl;
-        }
-        else {/*
-            std::cout << "文件夹已存在: " << path << std::endl;*/
+    static void createDirectoryIfNotExists(const QString& path) {
+        QDir dir(path);
+        if (dir.exists() == false)
+        {
+            dir.mkpath(path);
         }
     }
     static bool setFileReadOnly(const std::string& filePath, bool readOnly);