From dafd65ce6bd7a8d30b74558a0cae4166d69eb6c2 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Wed, 9 Jul 2025 20:57:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=B7=BB=E5=8A=A0=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=EF=BC=8C=E4=B8=8D=E5=9C=A8=E9=85=8D=E6=96=B9=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=90=8E=E7=AB=AF=E4=BC=9A?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=BF=BD=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appsrc/appconfig/basic/zappversion.hpp             |  2 +-
 appsrc/baseservice/db/setting_db_dao.cpp           | 10 ++++++++++
 .../disinfection_ctrl_service.cpp                  | 22 +++++++++++++++-------
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/appsrc/appconfig/basic/zappversion.hpp b/appsrc/appconfig/basic/zappversion.hpp
index 66ab898..f82f33e 100644
--- a/appsrc/appconfig/basic/zappversion.hpp
+++ b/appsrc/appconfig/basic/zappversion.hpp
@@ -1,3 +1,3 @@
 #pragma once
-#define VERSION      "3.1.9"
+#define VERSION      "3.2.0"
 #define PROJECT_NAME "TRANSMIT_DM"
\ No newline at end of file
diff --git a/appsrc/baseservice/db/setting_db_dao.cpp b/appsrc/baseservice/db/setting_db_dao.cpp
index d7a9c43..8d3c873 100644
--- a/appsrc/baseservice/db/setting_db_dao.cpp
+++ b/appsrc/baseservice/db/setting_db_dao.cpp
@@ -268,6 +268,16 @@ list<shared_ptr<Setting>> SettingDBDao::getAllSetting() {  //
   return allSetting;
 }
 
+// shared_ptr<Setting> SettingDBDao::getSettingConfig(SettingId setting_id) {
+//   for (auto& setting : settingInitTable) {
+//     if (setting.setting_id.eq(setting_id.getId())) {
+//       return make_shared<Setting>(setting);
+//     }
+//   }
+//   THROW_APP_EXCEPTION(err::kappe_code_error, fmt::format("代码错误,未找到{}配置", setting_id.toString()));
+//   return nullptr;
+// }
+
 shared_ptr<Setting> SettingDBDao::getSetting(string name) {
   Setting             settingConfig = getSettingConfig(name);
   shared_ptr<Setting> setting       = make_shared<Setting>(settingConfig);
diff --git a/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp b/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp
index 470caae..ceb92fc 100644
--- a/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp
+++ b/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp
@@ -19,17 +19,25 @@ string DisinfectionCtrlService::getSetting(SettingId sid) {
   // 1. 从 realtimeCfg 中进行查找
   // 2. 从 系统配置      中进行查找
   // m_realtimeCfg.find
+  Setting settingConfig = SETTING_DB->getSettingConfig(sid);
+
   if (sid == SettingId::loglevel) {
     return fmt::format("{}", m_tlog);
   }
-  auto value = m_realtimeCfg.find(sid);
-  if (value != m_realtimeCfg.end()) {
-    return value->second;
+
+  if (settingConfig.is_visible_in_rt_page) {
+    auto value = m_realtimeCfg.find(sid);
+    if (value != m_realtimeCfg.end()) {
+      return value->second;
+    }
   }
-  if (m_runType == RunType_t::kFormulaMode) {
-    string str = FORMULA_DB->getFormula(m_formulaid, sid);
-    if (!str.empty()) {
-      return str;
+
+  if (settingConfig.is_visible_in_formula_page) {
+    if (m_runType == RunType_t::kFormulaMode) {
+      string str = FORMULA_DB->getFormula(m_formulaid, sid);
+      if (!str.empty()) {
+        return str;
+      }
     }
   }