From ae2c846c16e1f044a52612c8d04c7d83200fd4b1 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sun, 10 Sep 2023 15:19:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20changeDisinfectionParamete?= =?UTF-8?q?r=20=E6=8E=A5=E5=8F=A3=20=E6=94=AF=E6=8C=81=E5=8F=AA=E4=BC=A0?= =?UTF-8?q?=E9=80=92=E4=B8=80=E4=B8=AA=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main_control_service.cpp | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/src/main_control_service.cpp b/src/main_control_service.cpp index 4bfa456..e316df8 100644 --- a/src/main_control_service.cpp +++ b/src/main_control_service.cpp @@ -384,13 +384,38 @@ void MainControlService::processFrontEndMessage_Disinfection(weak_ptr return; } if (cmdstr == "changeDisinfectionParameter") { - m_disinfectionCtrlService->changeDisinfectionParameter(jsonGet(cmd["injection_pump_speed"]), // - jsonGet(cmd["stoped_gs"]), // - jsonGet(cmd["continued_gs"]), // - jsonGet(cmd["stoped_satur"]), // - jsonGet(cmd["continued_satur"]), // - jsonGet(cmd["stoped_humi"]), // - jsonGet(cmd["continued_humi"])); + int injection_pump_speed = m_disinfectionCtrlService->m_context.injection_pump_speed; + int stoped_gs = m_disinfectionCtrlService->m_context.stoped_gs; + int continued_gs = m_disinfectionCtrlService->m_context.continued_gs; + int stoped_satur = m_disinfectionCtrlService->m_context.stoped_satur; + int continued_satur = m_disinfectionCtrlService->m_context.continued_satur; + int stoped_humi = m_disinfectionCtrlService->m_context.stoped_humi; + int continued_humi = m_disinfectionCtrlService->m_context.continued_humi; + + if (cmd.find("injection_pump_speed") != cmd.end()) { + injection_pump_speed = jsonGet(cmd["injection_pump_speed"]); + } + if (cmd.find("stoped_gs") != cmd.end()) { + stoped_gs = jsonGet(cmd["stoped_gs"]); + } + if (cmd.find("continued_gs") != cmd.end()) { + continued_gs = jsonGet(cmd["continued_gs"]); + } + if (cmd.find("stoped_satur") != cmd.end()) { + stoped_satur = jsonGet(cmd["stoped_satur"]); + } + if (cmd.find("continued_satur") != cmd.end()) { + continued_satur = jsonGet(cmd["continued_satur"]); + } + if (cmd.find("stoped_humi") != cmd.end()) { + stoped_humi = jsonGet(cmd["stoped_humi"]); + } + if (cmd.find("continued_humi") != cmd.end()) { + continued_humi = jsonGet(cmd["continued_humi"]); + } + + m_disinfectionCtrlService->changeDisinfectionParameter(injection_pump_speed, stoped_gs, continued_gs, stoped_satur, continued_satur, stoped_humi, + continued_humi); return; }