From 2e5f491aae11b2c9904d8c19cb074c39cf1b8dff Mon Sep 17 00:00:00 2001 From: zhaohe Date: Fri, 8 Sep 2023 09:36:58 +0800 Subject: [PATCH] update --- README.md | 2 +- src/main_control_service.cpp | 30 +++++++++++++++++++++++------- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 1c8c49c..5f0837f 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ ``` ``` -修改点: +修改点: (OK) 1. 用户等级分为3级别（后台不限制用户等级，前台限制用户操作）OK 2. iflytop9973属于admin的超级密码 3. 修改用户密码 OK diff --git a/src/main_control_service.cpp b/src/main_control_service.cpp index 8927788..c919450 100644 --- a/src/main_control_service.cpp +++ b/src/main_control_service.cpp @@ -470,20 +470,36 @@ void MainControlService::processFrontEndMessage(weak_ptr webSocket, j receipt["state"]["permissionLevel"] = m_deviceStateService->getLoginPermissionLevel(); // receipt["state"]["workState"] = m_disinfectionCtrlService->isDisinfectionRunning(); - receipt["state"]["disinfectionWorkState"] = m_disinfectionCtrlService->getDisinfectionWorkState(); + /******************************************************************************* + * disinfectionState * + *******************************************************************************/ + receipt["state"]["replenishingFluidsWorkState"] = m_disinfectionCtrlService->getReplenishingFluidsWorkState(); receipt["state"]["drainingWorkState"] = m_disinfectionCtrlService->getDrainingWorkState(); + /** + * @brief 历史接口 + */ + receipt["state"]["preHeat"] = m_disinfectionCtrlService->isPreheatState(); + receipt["state"]["preHeatRaminTimeS"] = m_disinfectionCtrlService->getPreHeatRaminTimeS(); // 预热剩余时间 receipt["state"]["estimatedRemainingTimeS"] = m_disinfectionCtrlService->getEstimatedRemainingTimeS(); receipt["state"]["disinfection_id"] = m_disinfectionCtrlService->getDisinfectionID(); - // receipt["state"]["preHeat"] = m_disinfectionCtrlService->processPreheatState - // getPreHeatRaminTimeS - // isPreheatState - receipt["state"]["preHeat"] = m_disinfectionCtrlService->isPreheatState(); - receipt["state"]["preHeatRaminTimeS"] = m_disinfectionCtrlService->getPreHeatRaminTimeS(); // 预热剩余时间 + // 消毒状态 + receipt["state"]["disinfectionWorkState"] = m_disinfectionCtrlService->getDisinfectionWorkState(); + receipt["state"]["disinfectionState"]["id"] = m_disinfectionCtrlService->getDisinfectionID(); + receipt["state"]["disinfectionState"]["estimatedRemainingTimeS"] = m_disinfectionCtrlService->getEstimatedRemainingTimeS(); + receipt["state"]["disinfectionState"]["workState"] = m_disinfectionCtrlService->getDisinfectionWorkState(); + receipt["state"]["disinfectionState"]["preHeat"] = m_disinfectionCtrlService->isPreheatState(); + receipt["state"]["disinfectionState"]["preHeatRaminTimeS"] = m_disinfectionCtrlService->getPreHeatRaminTimeS(); // 预热剩余时间 + + /******************************************************************************* + * sensor * + *******************************************************************************/ receipt["state"]["sensor_data"] = createSensorDataJson(); - + /******************************************************************************* + * disinfectionConfig * + *******************************************************************************/ receipt["disinfectionConfig"]["loglevel"] = m_disinfectionCtrlService->m_context.m_targetLoglevel; receipt["disinfectionConfig"]["injection_pump_speed"] = m_disinfectionCtrlService->m_context.injection_pump_speed; receipt["disinfectionConfig"]["stoped_gs"] = m_disinfectionCtrlService->m_context.stoped_gs;