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> SettingDBDao::getAllSetting() { // return allSetting; } +// shared_ptr SettingDBDao::getSettingConfig(SettingId setting_id) { +// for (auto& setting : settingInitTable) { +// if (setting.setting_id.eq(setting_id.getId())) { +// return make_shared(setting); +// } +// } +// THROW_APP_EXCEPTION(err::kappe_code_error, fmt::format("代码错误,未找到{}配置", setting_id.toString())); +// return nullptr; +// } + shared_ptr SettingDBDao::getSetting(string name) { Setting settingConfig = getSettingConfig(name); shared_ptr setting = make_shared(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; + } } }