Browse Source

修改消毒机拉杆箱部分指令格式

storage-in-realtime
zhaohe 1 year ago
parent
commit
6a3220d743
  1. 10
      src/api/cmds/disinfection_cmd_impl.cpp
  2. 2
      src/configs/project_setting.hpp

10
src/api/cmds/disinfection_cmd_impl.cpp

@ -4,7 +4,7 @@ using namespace iflytop;
void DisinfectionCmdImpl::setDehumidifyBeforeDisinfectionEnable(json& cmd, json& receipt) { void DisinfectionCmdImpl::setDehumidifyBeforeDisinfectionEnable(json& cmd, json& receipt) {
auto dfs = m_disinfectionCtrlService->getDisinfectionService(); auto dfs = m_disinfectionCtrlService->getDisinfectionService();
bool enable = cmd["enable"];
bool enable = cmd["params"]["enable"];
logger->info("setDehumidifyBeforeDisinfectionEnable {}", enable); logger->info("setDehumidifyBeforeDisinfectionEnable {}", enable);
dfs->setEnableBfDinftDehumidification(enable); dfs->setEnableBfDinftDehumidification(enable);
@ -13,7 +13,7 @@ void DisinfectionCmdImpl::setDehumidifyBeforeDisinfectionEnable(json& cmd, json&
void DisinfectionCmdImpl::setDehumidifyAfterDisinfectionEnable(json& cmd, json& receipt) { void DisinfectionCmdImpl::setDehumidifyAfterDisinfectionEnable(json& cmd, json& receipt) {
auto dfs = m_disinfectionCtrlService->getDisinfectionService(); auto dfs = m_disinfectionCtrlService->getDisinfectionService();
bool enable = cmd["enable"];
bool enable = cmd["params"]["enable"];
logger->info("setDehumidifyAfterDisinfectionEnable {}", enable); logger->info("setDehumidifyAfterDisinfectionEnable {}", enable);
dfs->setEnableAfDinftDehumidification(enable); dfs->setEnableAfDinftDehumidification(enable);
@ -22,7 +22,7 @@ void DisinfectionCmdImpl::setDehumidifyAfterDisinfectionEnable(json& cmd, json&
void DisinfectionCmdImpl::setDegradeAfterDisinfectionEnable(json& cmd, json& receipt) { void DisinfectionCmdImpl::setDegradeAfterDisinfectionEnable(json& cmd, json& receipt) {
auto dfs = m_disinfectionCtrlService->getDisinfectionService(); auto dfs = m_disinfectionCtrlService->getDisinfectionService();
bool enable = cmd["enable"];
bool enable = cmd["params"]["enable"];
logger->info("setDegradeAfterDisinfectionEnable {}", enable); logger->info("setDegradeAfterDisinfectionEnable {}", enable);
dfs->setEnableDegradation(enable); dfs->setEnableDegradation(enable);
return; return;
@ -30,7 +30,7 @@ void DisinfectionCmdImpl::setDegradeAfterDisinfectionEnable(json& cmd, json& rec
void DisinfectionCmdImpl::setDehumidifyBeforeDisinfectionThreshold(json& cmd, json& receipt) { void DisinfectionCmdImpl::setDehumidifyBeforeDisinfectionThreshold(json& cmd, json& receipt) {
auto dfs = m_disinfectionCtrlService->getDisinfectionService(); auto dfs = m_disinfectionCtrlService->getDisinfectionService();
int32_t value = jsonGet<int>(cmd["value"]);
int32_t value = jsonGet<int>(cmd["params"]["value"]);
logger->info("setDehumidifyBeforeDisinfectionThreshold {}", value); logger->info("setDehumidifyBeforeDisinfectionThreshold {}", value);
dfs->setBfDinftDehumidificationTargetVal(value); dfs->setBfDinftDehumidificationTargetVal(value);
@ -39,7 +39,7 @@ void DisinfectionCmdImpl::setDehumidifyBeforeDisinfectionThreshold(json& cmd, js
void DisinfectionCmdImpl::setDehumidifyAfterDisinfectionThreshold(json& cmd, json& receipt) { void DisinfectionCmdImpl::setDehumidifyAfterDisinfectionThreshold(json& cmd, json& receipt) {
auto dfs = m_disinfectionCtrlService->getDisinfectionService(); auto dfs = m_disinfectionCtrlService->getDisinfectionService();
int32_t value = jsonGet<int>(cmd["value"]);
int32_t value = jsonGet<int>(cmd["params"]["value"]);
logger->info("setDehumidifyAfterDisinfectionThreshold {}", value); logger->info("setDehumidifyAfterDisinfectionThreshold {}", value);
dfs->setAfDinftDehumidificationTargetVal(value); dfs->setAfDinftDehumidificationTargetVal(value);

2
src/configs/project_setting.hpp

@ -12,7 +12,7 @@
// #define PROJECT_TYPE_LARGE_SPACE_DISINFECTION 1 // 大空间 // #define PROJECT_TYPE_LARGE_SPACE_DISINFECTION 1 // 大空间
// #define PROJECT_TYPE_SMALL_SPACE_DISINFECTION 1 // 小空间 // #define PROJECT_TYPE_SMALL_SPACE_DISINFECTION 1 // 小空间
// #define PROJECT_TYPE_PIPE_DISINFECTION 1 // 管道消毒机 // #define PROJECT_TYPE_PIPE_DISINFECTION 1 // 管道消毒机
// #define PROJECT_TYPE_DRAW_BAR_BOX 1 // 拉感箱
#define PROJECT_TYPE_DRAW_BAR_BOX 1 // 拉感箱
// #if (defined PROJECT_TYPE_LARGE_SPACE_DISINFECTION) || (defined PROJECT_TYPE_SMALL_SPACE_DISINFECTION) || (defined PROJECT_TYPE_PIPE_DISINFECTION) // #if (defined PROJECT_TYPE_LARGE_SPACE_DISINFECTION) || (defined PROJECT_TYPE_SMALL_SPACE_DISINFECTION) || (defined PROJECT_TYPE_PIPE_DISINFECTION)

Loading…
Cancel
Save