Browse Source

后端添加限制,不在配方中的配置,后端会自动忽略

try_support_dt100n
zhaohe 4 weeks ago
parent
commit
dafd65ce6b
  1. 2
      appsrc/appconfig/basic/zappversion.hpp
  2. 10
      appsrc/baseservice/db/setting_db_dao.cpp
  3. 22
      appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp

2
appsrc/appconfig/basic/zappversion.hpp

@ -1,3 +1,3 @@
#pragma once #pragma once
#define VERSION "3.1.9"
#define VERSION "3.2.0"
#define PROJECT_NAME "TRANSMIT_DM" #define PROJECT_NAME "TRANSMIT_DM"

10
appsrc/baseservice/db/setting_db_dao.cpp

@ -268,6 +268,16 @@ list<shared_ptr<Setting>> SettingDBDao::getAllSetting() { //
return allSetting; 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) { shared_ptr<Setting> SettingDBDao::getSetting(string name) {
Setting settingConfig = getSettingConfig(name); Setting settingConfig = getSettingConfig(name);
shared_ptr<Setting> setting = make_shared<Setting>(settingConfig); shared_ptr<Setting> setting = make_shared<Setting>(settingConfig);

22
appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp

@ -19,17 +19,25 @@ string DisinfectionCtrlService::getSetting(SettingId sid) {
// 1. 从 realtimeCfg 中进行查找 // 1. 从 realtimeCfg 中进行查找
// 2. 从 系统配置 中进行查找 // 2. 从 系统配置 中进行查找
// m_realtimeCfg.find // m_realtimeCfg.find
Setting settingConfig = SETTING_DB->getSettingConfig(sid);
if (sid == SettingId::loglevel) { if (sid == SettingId::loglevel) {
return fmt::format("{}", m_tlog); 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;
}
} }
} }

Loading…
Cancel
Save