Browse Source

update

master
zhaohe 1 year ago
parent
commit
cdd01c980a
  1. 1
      api/cmds/disinfection_cmd_impl.cpp
  2. 16
      api/cmds/setting_page_cmd_impl.cpp
  3. 16
      service/disinfection_ctl_service.cpp
  4. 1
      service/disinfection_logs_manager.hpp

1
api/cmds/disinfection_cmd_impl.cpp

@ -75,7 +75,6 @@ void DisinfectionCmdImpl::startDraining(json& cmd, json& receipt) {
m_dbService->getSettingVal("stoped_humi"), // m_dbService->getSettingVal("stoped_humi"), //
m_dbService->getSettingVal("continued_humi")); m_dbService->getSettingVal("continued_humi"));
// kbehavior_do_disinfection // kbehavior_do_disinfection
m_dbService->addUserBehaviorRecord(m_deviceStateService->getLoginUid(), kbehavior_do_disinfection, fmt::format("({})", jsonGet<int>(cmd["loglevel"])));
return; return;
} }
void DisinfectionCmdImpl::stopDraining(json& cmd, json& receipt) { void DisinfectionCmdImpl::stopDraining(json& cmd, json& receipt) {

16
api/cmds/setting_page_cmd_impl.cpp

@ -16,7 +16,7 @@ void SettingPageCmdImpl::setSettingVal(json& cmd, json& receipt) {
receipt["ackcodeInfo"] = err::zecode2str(err::kdb_operate_error); receipt["ackcodeInfo"] = err::zecode2str(err::kdb_operate_error);
return; return;
} }
m_dbService->addUserBehaviorRecord(m_deviceStateService->getLoginUid(), kbehavior_set_setting_val, fmt::format("({},{})", settingName, settingVal));
// m_dbService->addUserBehaviorRecord(m_deviceStateService->getLoginUid(), kbehavior_set_setting_val, fmt::format("({},{})", settingName, settingVal));
} }
void SettingPageCmdImpl::getAllFormula(json& cmd, json& receipt) { void SettingPageCmdImpl::getAllFormula(json& cmd, json& receipt) {
receipt["formula"] = m_dbService->getAllFormulaJson(); receipt["formula"] = m_dbService->getAllFormulaJson();
@ -34,13 +34,13 @@ void SettingPageCmdImpl::addFormula(json& cmd, json& receipt) {
jsonGet<int>(cmd["continued_humi"]), // jsonGet<int>(cmd["continued_humi"]), //
jsonGet<int>(cmd["injection_pump_speed"])); jsonGet<int>(cmd["injection_pump_speed"]));
// kbehavior_add_formula // kbehavior_add_formula
m_dbService->addUserBehaviorRecord(m_deviceStateService->getLoginUid(), kbehavior_add_formula, fmt::format("({})", formula_id));
// m_dbService->addUserBehaviorRecord(m_deviceStateService->getLoginUid(), kbehavior_add_formula, fmt::format("({})", formula_id));
return; return;
} }
void SettingPageCmdImpl::delFormula(json& cmd, json& receipt) { void SettingPageCmdImpl::delFormula(json& cmd, json& receipt) {
auto formula = m_dbService->delFormula(jsonGet<int>(cmd["id"])); auto formula = m_dbService->delFormula(jsonGet<int>(cmd["id"]));
if (formula) { if (formula) {
m_dbService->addUserBehaviorRecord(m_deviceStateService->getLoginUid(), kbehavior_del_formula, fmt::format("({})", formula->formula_id));
// m_dbService->addUserBehaviorRecord(m_deviceStateService->getLoginUid(), kbehavior_del_formula, fmt::format("({})", formula->formula_id));
} }
return; return;
} }
@ -53,8 +53,8 @@ void SettingPageCmdImpl::updateFormula(json& cmd, json& receipt) {
} }
auto formula = m_dbService->updateFormula(jsonGet<int>(cmd["id"]), cmd["column"], val_str); auto formula = m_dbService->updateFormula(jsonGet<int>(cmd["id"]), cmd["column"], val_str);
if (formula) { if (formula) {
m_dbService->addUserBehaviorRecord(m_deviceStateService->getLoginUid(), kbehavior_update_formula,
fmt::format("({},{},{})", formula->formula_id, cmd["column"], val_str));
// m_dbService->addUserBehaviorRecord(m_deviceStateService->getLoginUid(), kbehavior_update_formula,
// fmt::format("({},{},{})", formula->formula_id, cmd["column"], val_str));
} }
return; return;
} }
@ -91,10 +91,10 @@ void SettingPageCmdImpl::updateFormula2(json& cmd, json& receipt) {
} }
m_dbService->updateFormula(formula); m_dbService->updateFormula(formula);
if (oldname != formula_id) { if (oldname != formula_id) {
m_dbService->addUserBehaviorRecord(m_deviceStateService->getLoginUid(), kbehavior_update_formula_name,
fmt::format("({}->{})", oldname, formula->formula_id));
// m_dbService->addUserBehaviorRecord(m_deviceStateService->getLoginUid(), kbehavior_update_formula_name,
// fmt::format("({}->{})", oldname, formula->formula_id));
} }
m_dbService->addUserBehaviorRecord(m_deviceStateService->getLoginUid(), kbehavior_update_formula, fmt::format("({})", formula->formula_id));
// m_dbService->addUserBehaviorRecord(m_deviceStateService->getLoginUid(), kbehavior_update_formula, fmt::format("({})", formula->formula_id));
return; return;
} }

16
service/disinfection_ctl_service.cpp

@ -292,22 +292,6 @@ void DisinfectionCtrlService::dumpDisinfectionLogsToCSV(DisinfectionContext& con
void DisinfectionCtrlService::log(DisinfectionContext& context) { void DisinfectionCtrlService::log(DisinfectionContext& context) {
#if (defined PROJECT_TYPE_LARGE_SPACE_DISINFECTION) || (defined PROJECT_TYPE_SMALL_SPACE_DISINFECTION) #if (defined PROJECT_TYPE_LARGE_SPACE_DISINFECTION) || (defined PROJECT_TYPE_SMALL_SPACE_DISINFECTION)
// int h2o2_0 = m_deviceIoControlService->H2O2Sensor_readH2O2PPM(0);
// int h2o2_1 = m_deviceIoControlService->H2O2Sensor_readH2O2PPM(1);
// int h2o2_2 = m_deviceIoControlService->H2O2Sensor_readH2O2PPM(2);
// int humid0 = m_deviceIoControlService->H2O2Sensor_readHumid(0);
// int humid1 = m_deviceIoControlService->H2O2Sensor_readHumid(1);
// int humid2 = m_deviceIoControlService->H2O2Sensor_readHumid(2);
// int temp0 = m_deviceIoControlService->H2O2Sensor_readTemperature(0);
// int temp1 = m_deviceIoControlService->H2O2Sensor_readTemperature(1);
// int temp2 = m_deviceIoControlService->H2O2Sensor_readTemperature(2);
// int sat0 = m_deviceIoControlService->H2O2Sensor_readSaturation(0);
// int sat1 = m_deviceIoControlService->H2O2Sensor_readSaturation(1);
// int sat2 = m_deviceIoControlService->H2O2Sensor_readSaturation(2);
auto& cx = context; auto& cx = context;
auto ds = m_deviceIoControlService; auto ds = m_deviceIoControlService;
float dvalue = 0; float dvalue = 0;

1
service/disinfection_logs_manager.hpp

@ -41,6 +41,7 @@ class DisinfectionLogsManager {
nlohmann::json getlogger(string log_file_name); nlohmann::json getlogger(string log_file_name);
nlohmann::json getLoggerList(); nlohmann::json getLoggerList();
private: private:
void list_dir_csvfile(string path, vector<string>& sv); void list_dir_csvfile(string path, vector<string>& sv);
}; };

Loading…
Cancel
Save