调整数据

View/die-bonder-ui/Login.h

@@ -3,7 +3,7 @@
 #define LOGIN_H
 
 #include <QMainWindow>
-#include "gen_interface.h"
+#include "Src/Sql/GetUiConfigFormDB.h"
 namespace Ui {
 class Login;
 }
@@ -38,7 +38,7 @@ signals:
 
 private:
     Ui::Login *ui;
-    Gen_Interface gen_if;
+    GetMainUiConfigFormDB gen_if;
 
     static Login* m_instance;
     int m_privilege;

View/die-bonder-ui/MainWnd.h

@@ -10,7 +10,7 @@
 #include <QSqlQuery>
 #include <QSqlError>
 #include <QPointer>
-#include "gen_interface.h"
+#include "Src/Sql/GetUiConfigFormDB.h"
 #include "Src/Sql/SqlOperation.h"
 #include "Src/CameraBind.h"
 #include <QTranslator>
@@ -99,7 +99,7 @@ private slots:
 private:
     Ui::MainWnd* ui;
 
-    Gen_Interface gen_if;
+    GetMainUiConfigFormDB gen_if;
 
 
     /**相机绑定接口

View/die-bonder-ui/OriginalWnd/DbTreeViewManager.h

@@ -219,46 +219,46 @@ private:
     /**
      * @brief  用于存储第三层界面生成的控件列表，方便统一管理和销毁
      */
-    QList<QWidget*> m_fieldWidgets;
+    QList<QWidget*>                 m_fieldWidgets;
 
 
     /**
      * @brief  当前正在使用的配置名字  ????
      */
-    QString m_currentConfigName = "";
+    QString                         m_currentConfigName = "";
 
    // int m_currentConfigId = -1;
     /**
      * @brief  特定分隔线，Home 界面时隐藏，其他界面时显示
      */
-    QPointer<QFrame>     m_pLineFrame1;
+    QPointer<QFrame>                m_pLineFrame1;
 
     /**数据库存储
      */
-    SqlOperation* m_sqlOper = nullptr;
+    SqlOperation*                   m_sqlOper = nullptr;
     
     /**组合控件
      */
-    std::vector<ST_COMBINED_CONT> m_veCombinedCont;
-    std::vector<ST_INPUT_CONT> m_veInputCont;
-    std::vector<ST_RADIO_CONT> m_veRadioCont;
-    std::vector<ST_CHECKBOX_CONT> m_veCheckBoxCont;
-    std::vector<ST_COMBOBOX_CONT> m_veComboBoxCont;
-    std::vector<ST_TIME_CONT> m_veTimeCont;
-    std::vector<ST_SWITCH_CONT> m_veSwitchCont;
-    ns_module::CViewInterface* m_pTreeCViewInterface;
+    std::vector<ST_COMBINED_CONT>   m_veCombinedCont;
+    std::vector<ST_INPUT_CONT>      m_veInputCont;
+    std::vector<ST_RADIO_CONT>      m_veRadioCont;
+    std::vector<ST_CHECKBOX_CONT>   m_veCheckBoxCont;
+    std::vector<ST_COMBOBOX_CONT>   m_veComboBoxCont;
+    std::vector<ST_TIME_CONT>       m_veTimeCont;
+    std::vector<ST_SWITCH_CONT>     m_veSwitchCont;
+    ns_module::CViewInterface*      m_pTreeCViewInterface = nullptr;
 
     /**二级表目录的名称
      */
-    QString m_str2DirModuleType;
+    QString                         m_str2DirModuleType;
 
-    QSet<QLabel*> modifiedLabels;
+    QSet<QLabel*>                   modifiedLabels;
 
     //字段展示 m_clear 替换
-    const QString m_strShowName = "DisplayName";
+    const QString                   m_strShowName = "DisplayName";
 
-    Gen_Interface gen_if;
-    int languageValue;
+    GetMainUiConfigFormDB                   gen_if;
+    int                             languageValue;
 private:
 
     //  每次切换控制屏幕时，清空历史

View/die-bonder-ui/OriginalWnd/OriginalWnd.h

@@ -10,7 +10,7 @@
 #include <QRadioButton>
 #include <QButtonGroup>
 #include <QLabel>
-#include "gen_interface.h"
+#include "Src/Sql/GetUiConfigFormDB.h"
 #include "Src/CameraBind.h"
 #include "JOriginalMainWnd.h"
 #include "CameraDistribute.h"
@@ -166,7 +166,7 @@ private:
 
     /**数据库
      */
-    Gen_Interface gen_if;
+    GetMainUiConfigFormDB gen_if;
 
     /**相机分配，观察页面以及相机变化
      */

View/die-bonder-ui/OriginalWnd/TreeViewManager/TreeViewManagerHead.h

@@ -52,7 +52,7 @@
 #include <array>
 #include "CViewInterface.h"
 #include "Src/Sql/SqlOperation.h"
-#include "gen_interface.h"
+#include "Src/Sql/GetUiConfigFormDB.h"
 
 // 组合控件
 struct ST_COMBINED_CONT

View/die-bonder-ui/SBTdie-bonder-ui.vcxproj

@@ -236,7 +236,6 @@
     <ClCompile Include="CameraMaterialGroupWnd\MaterialWindow\Waffle.cpp" />
     <ClCompile Include="CameraMaterialGroupWnd\MaterialWindow\WaffleGraphicsView.cpp" />
     <ClCompile Include="OriginalWnd\chartline.cpp" />
-    <ClCompile Include="gen_interface.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="OriginalWnd\TreeViewManager\JIoMapPage.cpp" />
     <ClCompile Include="Src\CameraBind.cpp" />
@@ -258,6 +257,7 @@
     <ClCompile Include="Src\RewriteControl\Sidebar\LogStatePage.cpp" />
     <ClCompile Include="Src\RewriteControl\SpeedAdjPage.cpp" />
     <ClCompile Include="Src\RewriteControl\SpeedAdjWnd.cpp" />
+    <ClCompile Include="Src\Sql\GetUiConfigFormDB.cpp" />
     <ClCompile Include="Src\Sql\SqlOperation.cpp" />
     <ClCompile Include="Src\SystemInfoPage\PageWnd\AccountMaintenanceWnd.cpp" />
     <ClCompile Include="Src\SystemInfoPage\PageWnd\AddUserAccountWnd.cpp" />
@@ -293,6 +293,7 @@
     <QtMoc Include="Src\RewriteControl\SpeedAdjWnd.h" />
     <QtMoc Include="Src\RewriteControl\SpeedAdjPage.h" />
     <QtMoc Include="Src\RewriteControl\Controls\JReLineEdit.h" />
+    <ClInclude Include="Src\Sql\GetUiConfigFormDB.h" />
     <ClInclude Include="Src\Sql\SqlOperation.h" />
     <QtMoc Include="Src\CameraBind.h" />
     <QtMoc Include="OriginalWnd\CameraDataHandleAndShow.h">
@@ -331,7 +332,6 @@
     </QtMoc>
     <QtMoc Include="OriginalWnd\chartline.h">
     </QtMoc>
-    <ClInclude Include="gen_interface.h" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="debug\moc_predefs.h.cbt">

View/die-bonder-ui/SBTdie-bonder-ui.vcxproj.filters

@@ -162,9 +162,6 @@
     <ClCompile Include="OriginalWnd\OriginalWnd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="gen_interface.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -291,6 +288,9 @@
     <ClCompile Include="OriginalWnd\TreeViewManager\JIoMapPage.cpp">
       <Filter>Header Files\OriginalWnd\TreeViewManager</Filter>
     </ClCompile>
+    <ClCompile Include="Src\Sql\GetUiConfigFormDB.cpp">
+      <Filter>Source Files\Src\Sql</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <QtMoc Include="ImageWidget.h">
@@ -308,9 +308,6 @@
     <QtMoc Include="OriginalWnd\OriginalWnd.h">
       <Filter>Header Files</Filter>
     </QtMoc>
-    <ClInclude Include="gen_interface.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <QtMoc Include="Src\common\JMessageTip.h">
       <Filter>Header Files\Src\common</Filter>
     </QtMoc>
@@ -777,7 +774,6 @@
     <None Include="dark.qss" />
     <None Include="dark.qss" />
     <None Include="dark.qss" />
-    <None Include="dark.qss" />
     <None Include="dark.qss">
       <Filter>Resource Files</Filter>
     </None>
@@ -830,6 +826,9 @@
     <ClInclude Include="OriginalWnd\TreeViewManager\TreeViewManagerHead.h">
       <Filter>Header Files\OriginalWnd\TreeViewManager</Filter>
     </ClInclude>
+    <ClInclude Include="Src\Sql\GetUiConfigFormDB.h">
+      <Filter>Header Files\Src\Sql</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <QtMoc Include="CameraMaterialGroupWnd\CameraImage\CameraImageHandler.h">

View/die-bonder-ui/Src/Sql/GetUiConfigFormDB.cpp

@@ -0,0 +1,107 @@
+#include "GetUiConfigFormDB.h"
+#include "Src/common/JLogAllOutput.h"
+
+bool GetMainUiConfigFormDB::checkDatabase()
+{
+    QSqlDatabase db = QSqlDatabase::database();
+    if (!db.isOpen())
+    {
+        JLogAllOutput::cmd_Warning("数据库未打开");
+        return false;
+    }
+    return true;
+}
+
+QJsonObject GetMainUiConfigFormDB::getInfofromDb()
+{
+    QJsonObject data;
+    if (!checkDatabase())
+    {
+        return data;
+    }
+
+    QSqlQuery query;
+    query.prepare("SELECT Function, Description, setValue FROM systemConfig");
+
+    if (query.exec())
+    {
+        QJsonArray fieldsArray;
+        while (query.next())
+        {
+            QJsonObject field;
+            field["Function"]       = query.value("Function").toString();
+            field["Description"]    = query.value("Description").toString();
+            field["setValue"]       = query.value("setValue").toInt();
+            fieldsArray.append(field);
+        }
+        data["systemConfig"] = fieldsArray;
+    }
+    else
+    {
+        JLogAllOutput::cmd_Warning("查询 systemConfig 失败:" + query.lastError().text().toStdString());
+    }
+    return data;
+}
+
+int GetMainUiConfigFormDB::getConfigValue(const QString& function)
+{
+    if (!checkDatabase())
+    {
+        return -1;
+    }
+
+    QSqlQuery query;
+    query.prepare("SELECT setValue FROM systemConfig WHERE Function = :function");
+    query.bindValue(":function", function);
+
+    if (query.exec() && query.next())
+    {
+        return query.value("setValue").toInt();
+    }
+
+    JLogAllOutput::cmd_Warning("查询 systemConfig 失败:" + query.lastError().text().toStdString());
+    return -1;
+}
+
+bool GetMainUiConfigFormDB::setConfigValue(const QString& function, int value)
+{
+    if (!checkDatabase()) 
+    {
+        return false;
+    }
+
+    QSqlQuery query;
+    query.prepare("UPDATE systemConfig SET setValue = :value WHERE Function = :function");
+    query.bindValue(":value", value);
+    query.bindValue(":function", function);
+
+
+    if (query.exec())
+    {
+        JLogAllOutput::cmd_debug("Update successful");
+        return true;
+    }
+
+    JLogAllOutput::cmd_debug("Update failed:" + query.lastError().text().toStdString());
+    return false;
+}
+
+int GetMainUiConfigFormDB::getLanguageValue()
+{
+    return getConfigValue("language");
+}
+
+int GetMainUiConfigFormDB::getThemeValue()
+{
+    return getConfigValue("theme");
+}
+
+void GetMainUiConfigFormDB::setLanguageValue(int data)
+{
+    setConfigValue("language", data);
+}
+
+void GetMainUiConfigFormDB::setThemeValue(int data)
+{
+    setConfigValue("theme", data);
+}

View/die-bonder-ui/Src/Sql/GetUiConfigFormDB.h

@@ -0,0 +1,41 @@
+// *****************************************************************************
+// 版权所有（C）2023~2099 上海骄成超声波技术有限公司
+// 保留所有权利
+// *****************************************************************************
+// 作者 : 杨坚
+// 版本 : 1.0
+// 功能说明:
+//              获取设置样式主题
+// *****************************************************************************
+#ifndef __GEN_INTERFACE_H__
+#define __GEN_INTERFACE_H__ 1
+#include <QJsonObject>
+#include <QtSql>
+#include <QSqlDatabase>
+#include <QSqlQuery>
+#include <QSqlError>
+
+class GetMainUiConfigFormDB
+{
+
+public:
+    //从数据库中获取systemconfig表中的信息
+    QJsonObject getInfofromDb();
+
+    int getLanguageValue();
+
+    int getThemeValue();
+
+    void setLanguageValue(int data);
+
+    void setThemeValue(int data);
+
+private:
+    /**执行sql 通用语句
+     */
+    bool checkDatabase();
+    int  getConfigValue(const QString& function);
+    bool setConfigValue(const QString& function, int value);
+
+};
+#endif  //__GEN_INTERFACE_H__

View/die-bonder-ui/Src/SystemInfoPage/PageWnd/LanguageSwitchWnd.h

@@ -3,7 +3,7 @@
 
 #include <QDialog>
 #include <QTranslator>
-#include "gen_interface.h"
+#include "Src/Sql/GetUiConfigFormDB.h"
 
 namespace Ui {
 class LanguageSwitchWnd;
@@ -26,7 +26,7 @@ signals:
 private:
     Ui::LanguageSwitchWnd *ui;
 
-    Gen_Interface gen_if;
+    GetMainUiConfigFormDB gen_if;
 };
 
 #endif // LANGUAGESWITCHWND_H

View/die-bonder-ui/gen_interface.cpp

@@ -1,137 +0,0 @@
-#include "gen_interface.h"
-QJsonObject Gen_Interface::getInfofromDb(){
-    QJsonObject data;
-    QJsonArray fieldsArray;
-    QSqlDatabase db = QSqlDatabase::database();
-    if (!db.isOpen()) {
-        qWarning() << "数据库未打开";
-        return data;
-    }
-
-    // 查询 systemConfig 表
-    QSqlQuery queryBond(db);
-    queryBond.prepare(R"(
-        SELECT Function, Description,setValue
-        FROM systemConfig
-    )");
-    if (queryBond.exec()) {
-        while (queryBond.next()) {
-            QJsonObject field;
-            field["Function"] = queryBond.value("Function").toString();
-            field["Description"] = queryBond.value("Description").toString();
-            field["setValue"] = queryBond.value("setValue").toInt();
-            fieldsArray.append(field);
-        }
-
-
-        // qDebug() << "Fetched fields:" << fieldsArray;
-    } else {
-        qWarning() << "查询 systemConfig 失败:" << queryBond.lastError().text();
-    }
-    data["systemConfig"]=fieldsArray;
-    // qDebug() << "Fetched data:" << data;
-    return data;
-
-}
-int Gen_Interface::getLanguageValue(){
-    int data;
-    QJsonArray fieldsArray;
-    QSqlDatabase db = QSqlDatabase::database();
-    if (!db.isOpen()) {
-        qWarning() << "数据库未打开";
-        return -1;
-    }
-
-    // 查询 systemConfig 表
-    QSqlQuery queryBond(db);
-    queryBond.prepare(R"(
-        SELECT Function, Description,setValue
-        FROM systemConfig
-    )");
-    if (queryBond.exec()) 
-    {
-        while (queryBond.next())
-        {
-            QJsonObject field;
-
-            field["Function"] = queryBond.value("Function").toString();
-            if(field["Function"] == "language")
-            {
-                data = queryBond.value("setValue").toInt();
-                return data;
-            }
-        }
-        // qDebug() << "Fetched fields:" << fieldsArray;
-    } 
-    else
-    {
-        qWarning() << "查询 systemConfig 失败:" << queryBond.lastError().text();
-    }
-
-    return -1;
-}
-int Gen_Interface::getThemeValue(){
-    int data;
-    QJsonArray fieldsArray;
-    QSqlDatabase db = QSqlDatabase::database();
-    if (!db.isOpen()) 
-    {
-        qWarning() << "数据库未打开";
-        return -1;
-    }
-
-    // 查询 systemConfig 表
-    QSqlQuery queryBond(db);
-    queryBond.prepare(R"(
-        SELECT Function, Description,setValue
-        FROM systemConfig
-    )");
-    if (queryBond.exec()) 
-    {
-        while (queryBond.next()) 
-        {
-            QJsonObject field;
-
-            field["Function"] = queryBond.value("Function").toString();
-            if(field["Function"] == "theme")
-            {
-                data = queryBond.value("setValue").toInt();
-                return data;
-            }
-        }
-
-
-        // qDebug() << "Fetched fields:" << fieldsArray;
-    } 
-    else
-    {
-        qWarning() << "查询 systemConfig 失败:" << queryBond.lastError().text();
-    }
-    return -1;
-}
-void Gen_Interface::setLanguageValue(int data){
-    QSqlDatabase db = QSqlDatabase::database();
-    if (!db.isOpen()) {
-        qWarning() << "数据库未打开";
-    }
-    QString sql = QString("UPDATE systemConfig SET setValue = '%1' WHERE Function = 'language'").arg(data);
-    QSqlQuery query;
-    if (query.exec(sql)) {
-        qDebug() << "Update successful";
-    } else {
-        qDebug() << "Update failed:" << query.lastError().text();
-    }
-}
-void Gen_Interface::setThemeValue(int data){
-    QSqlDatabase db = QSqlDatabase::database();
-    if (!db.isOpen()) {
-        qWarning() << "数据库未打开";
-    }
-    QString sql = QString("UPDATE systemConfig SET setValue = '%1' WHERE Function = 'theme'").arg(data);
-    QSqlQuery query;
-    if (query.exec(sql)) {
-        qDebug() << "Update successful";
-    } else {
-        qDebug() << "Update failed:" << query.lastError().text();
-    }
-}

View/die-bonder-ui/gen_interface.h

@@ -1,24 +0,0 @@
-#pragma once
-#ifndef GEN_INTERFACE_H
-#define GEN_INTERFACE_H
-#include <QJsonObject>
-#include <QtSql>
-#include <QSqlDatabase>
-#include <QSqlQuery>
-#include <QSqlError>
-#endif // GEN_INTERFACE_H
-class Gen_Interface{
-
-public:
-    //从数据库中获取systemconfig表中的信息
-    QJsonObject getInfofromDb();
-
-    int getLanguageValue();
-
-    int getThemeValue();
-
-    void setLanguageValue(int data);
-
-    void setThemeValue(int data);
-
-};