From 6a3220d74378e5ee682710be13a815b16f9647d3 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 21 May 2024 16:22:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=AF=92=E6=9C=BA?= =?UTF-8?q?=E6=8B=89=E6=9D=86=E7=AE=B1=E9=83=A8=E5=88=86=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/cmds/disinfection_cmd_impl.cpp | 10 +++++----- src/configs/project_setting.hpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/api/cmds/disinfection_cmd_impl.cpp b/src/api/cmds/disinfection_cmd_impl.cpp index c209568..6a509e2 100644 --- a/src/api/cmds/disinfection_cmd_impl.cpp +++ b/src/api/cmds/disinfection_cmd_impl.cpp @@ -4,7 +4,7 @@ using namespace iflytop; void DisinfectionCmdImpl::setDehumidifyBeforeDisinfectionEnable(json& cmd, json& receipt) { auto dfs = m_disinfectionCtrlService->getDisinfectionService(); - bool enable = cmd["enable"]; + bool enable = cmd["params"]["enable"]; logger->info("setDehumidifyBeforeDisinfectionEnable {}", enable); dfs->setEnableBfDinftDehumidification(enable); @@ -13,7 +13,7 @@ void DisinfectionCmdImpl::setDehumidifyBeforeDisinfectionEnable(json& cmd, json& void DisinfectionCmdImpl::setDehumidifyAfterDisinfectionEnable(json& cmd, json& receipt) { auto dfs = m_disinfectionCtrlService->getDisinfectionService(); - bool enable = cmd["enable"]; + bool enable = cmd["params"]["enable"]; logger->info("setDehumidifyAfterDisinfectionEnable {}", enable); dfs->setEnableAfDinftDehumidification(enable); @@ -22,7 +22,7 @@ void DisinfectionCmdImpl::setDehumidifyAfterDisinfectionEnable(json& cmd, json& void DisinfectionCmdImpl::setDegradeAfterDisinfectionEnable(json& cmd, json& receipt) { auto dfs = m_disinfectionCtrlService->getDisinfectionService(); - bool enable = cmd["enable"]; + bool enable = cmd["params"]["enable"]; logger->info("setDegradeAfterDisinfectionEnable {}", enable); dfs->setEnableDegradation(enable); return; @@ -30,7 +30,7 @@ void DisinfectionCmdImpl::setDegradeAfterDisinfectionEnable(json& cmd, json& rec void DisinfectionCmdImpl::setDehumidifyBeforeDisinfectionThreshold(json& cmd, json& receipt) { auto dfs = m_disinfectionCtrlService->getDisinfectionService(); - int32_t value = jsonGet(cmd["value"]); + int32_t value = jsonGet(cmd["params"]["value"]); logger->info("setDehumidifyBeforeDisinfectionThreshold {}", value); dfs->setBfDinftDehumidificationTargetVal(value); @@ -39,7 +39,7 @@ void DisinfectionCmdImpl::setDehumidifyBeforeDisinfectionThreshold(json& cmd, js void DisinfectionCmdImpl::setDehumidifyAfterDisinfectionThreshold(json& cmd, json& receipt) { auto dfs = m_disinfectionCtrlService->getDisinfectionService(); - int32_t value = jsonGet(cmd["value"]); + int32_t value = jsonGet(cmd["params"]["value"]); logger->info("setDehumidifyAfterDisinfectionThreshold {}", value); dfs->setAfDinftDehumidificationTargetVal(value); diff --git a/src/configs/project_setting.hpp b/src/configs/project_setting.hpp index 6211f41..4b9b97a 100644 --- a/src/configs/project_setting.hpp +++ b/src/configs/project_setting.hpp @@ -12,7 +12,7 @@ // #define PROJECT_TYPE_LARGE_SPACE_DISINFECTION 1 // 大空间 // #define PROJECT_TYPE_SMALL_SPACE_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)