diff --git a/README.md b/README.md index ec7c2e1..bbd162e 100644 --- a/README.md +++ b/README.md @@ -15,61 +15,27 @@ 消毒前,如果湿度太大,不允许消毒。 -添加预设参数 -添加预设参数配置 +添加预设参数 OK +添加预设参数配置 OK -添加审计数据库接口 -添加审计 -添加U盘数据导出 -添加审计数据导出 +添加审计数据库接口 OK +添加审计 OK +添加U盘数据导出 OK +添加审计数据导出 OK + +记录用户操作 (TODO) 通过getState可以获得到log,小数 -排液自动停止 +数据库操作加锁 +排液自动停止 水禁传感器测试 ``` # 测试指令 -``` -修改密码 -{ - "command":"chpasswd", - "messageId":"123", - "userId":"admin", - "newpasswd":"1234" -} -读取用户数据 -{ - "command":"getAllUser", - "messageId":"123", - "userId":"admin", - "newpasswd":"1234" -} - - - -{ - "command":"addFormula", - "messageId":"123", - "formula_id":"1234abcd", - "stoped_gs":"100", - "continued_gs":"110", - "stoped_satur":"200", - "continued_satur":"300", - "stoped_humi":"100", - "continued_humi":"102", - "injection_pump_speed":"300" -} - -{ - "command":"getAllFormula", - "messageId":"123" -} - -``` ``` diff --git a/src/db/user_behavior_des.hpp b/src/db/user_behavior_des.hpp index bda1cb9..c91c01a 100644 --- a/src/db/user_behavior_des.hpp +++ b/src/db/user_behavior_des.hpp @@ -14,21 +14,21 @@ using namespace std; namespace db { typedef enum { - kbehavior_login = 0, - kbehavior_logout, - kbehavior_add_user, - kbehavior_del_user, - kbehavior_update_user_permission_level, - kbehavior_update_user_passwd, - kbehavior_set_setting_val, - kbehavior_add_formula, - kbehavior_del_formula, - kbehavior_update_formula, - kbehavior_do_disinfection, - kbehavior_stop_disinfection, - kbehavior_do_formula, - kbehavior_update_setting_val_on_disinfection, - kbehavior_export_data, + kbehavior_login = 0, + kbehavior_logout = 1, + kbehavior_add_user = 2, + kbehavior_del_user = 3, + kbehavior_update_user_permission_level = 4, + kbehavior_update_user_passwd = 5, + kbehavior_set_setting_val = 6, + kbehavior_add_formula = 7, + kbehavior_del_formula = 8, + kbehavior_update_formula = 9, + kbehavior_do_disinfection = 10, + kbehavior_stop_disinfection = 11, + kbehavior_do_formula = 12, + kbehavior_update_setting_val_on_disinfection = 13, + kbehavior_export_data = 14, } user_behavior_t; string user_behavior_to_str(user_behavior_t behavior); diff --git a/src/main_control_service.cpp b/src/main_control_service.cpp index d008238..8ab8185 100644 --- a/src/main_control_service.cpp +++ b/src/main_control_service.cpp @@ -576,7 +576,9 @@ void MainControlService::processFrontEndMessage(weak_ptr webSocket, j receipt["state"]["disinfectionState"]["workState"] = m_disinfectionCtrlService->getDisinfectionWorkState(); receipt["state"]["disinfectionState"]["preHeat"] = m_disinfectionCtrlService->isPreheatState(); receipt["state"]["disinfectionState"]["preHeatRaminTimeS"] = m_disinfectionCtrlService->getPreHeatRaminTimeS(); // 预热剩余时间 - receipt["state"]["disinfectionState"]["logval"] = m_disinfectionCtrlService->m_context.m_nowLoglevel; + receipt["state"]["disinfectionState"]["nowlog"] = m_disinfectionCtrlService->m_context.m_nowLoglevel; + receipt["state"]["disinfectionState"]["targetlog"] = m_disinfectionCtrlService->m_context.m_targetLoglevel; + receipt["state"]["disinfectionState"]["dvalue"] = m_disinfectionCtrlService->m_context.dvalue; /******************************************************************************* * sensor *