diff --git a/src/db/db_service.cpp b/src/db/db_service.cpp index c3f3a46..da475e9 100644 --- a/src/db/db_service.cpp +++ b/src/db/db_service.cpp @@ -81,7 +81,7 @@ void DBService::init_usr_db() { storage.sync_schema(); auto admin = storage.get_all(where(c(&User::uid) == "admin")); if (admin.size() == 0) { - storage.insert({-1, "admin", "9973", 0, true}); // 管理员 + storage.insert({-1, "admin", "9973", 1, true}); // 管理员 } auto user = storage.get_all(where(c(&User::uid) == "user")); if (user.size() == 0) { @@ -502,7 +502,7 @@ json DBService::getUserBehaviorRecordDescJson(int page, int page_size) { j_user_behavior_records["total"] = all.size(); j_user_behavior_records["page"] = page; - j_user_behavior_records["totalpage"] = all.size() / page_size + all.size() % page_size == 0 ? 0 : 1; + j_user_behavior_records["totalpage"] = all.size() / page_size + (all.size() % page_size == 0 ? 0 : 1); return j_user_behavior_records; } @@ -540,9 +540,4 @@ void DBService::addUserBehaviorRecord(string uid, int behavior, string behaviori } return; } -void DBService::cleanUserBehaviorRecord() { - auto user_behavior_record_table = make_storage(USER_BEHAVIOR_RECORD_DB, USER_BEHAVIOR_RECORD_STRUCT); - user_behavior_record_table.sync_schema(); - user_behavior_record_table.remove_all(where(c(&UserBehaviorRecord::id) > 0)); - user_behavior_record_table.sync_schema(); -} \ No newline at end of file +void DBService::cleanUserBehaviorRecord() { system(fmt::format("rm -rf {}", USER_BEHAVIOR_RECORD_DB).c_str()); } \ No newline at end of file diff --git a/src/db/db_service.hpp b/src/db/db_service.hpp index c65a43a..f7bef52 100644 --- a/src/db/db_service.hpp +++ b/src/db/db_service.hpp @@ -24,7 +24,7 @@ #define FORMULA_DB "formula.db" #define USER_BEHAVIOR_RECORD_DB "user_behavior_record.db" -#define USER_BEHAVIOR_RECORD_DB_MAX_RECORDS 5000 +#define USER_BEHAVIOR_RECORD_DB_MAX_RECORDS 1000 /** * @brief * diff --git a/src/main_control_service.cpp b/src/main_control_service.cpp index c1ac7f6..d008238 100644 --- a/src/main_control_service.cpp +++ b/src/main_control_service.cpp @@ -500,7 +500,9 @@ void MainControlService::processFrontEndMessage_processFormulaCmd(weak_ptrupdateFormula(jsonGet(cmd["id"]), cmd["column"], val_str); return; } - +} +void MainControlService::processFrontEndMessage_processBehaviorRecordCmd(weak_ptr webSocket, json& cmd, json& receipt) { + string cmdstr = cmd["command"]; if (cmdstr == "getUserBehaviorRecordDescJson") { receipt["records"] = m_dbService->getUserBehaviorRecordDescJson(jsonGet(cmd["page"]), jsonGet(cmd["page_size"])); return; @@ -513,12 +515,13 @@ void MainControlService::processFrontEndMessage_processFormulaCmd(weak_ptraddUserBehaviorRecord("admin", kbehavior_login, "(....)"); - m_dbService->addUserBehaviorRecord("admin", kbehavior_logout, "(....)"); - m_dbService->addUserBehaviorRecord("admin", kbehavior_add_user, "(....)"); - m_dbService->addUserBehaviorRecord("admin", kbehavior_del_user, "(....)"); - m_dbService->addUserBehaviorRecord("admin", kbehavior_update_user_permission_level, "(....)"); - m_dbService->addUserBehaviorRecord("admin", kbehavior_update_user_passwd, "(....)"); + logger->info("addUserBehaviorRecord {}", i); + m_dbService->addUserBehaviorRecord("admin", kbehavior_login, "(admin)"); + m_dbService->addUserBehaviorRecord("admin", kbehavior_logout, "(admin)"); + m_dbService->addUserBehaviorRecord("admin", kbehavior_add_user, "(zhaohe)"); + m_dbService->addUserBehaviorRecord("admin", kbehavior_del_user, "(zhaohe)"); + m_dbService->addUserBehaviorRecord("admin", kbehavior_update_user_permission_level, "(zhaohe,3)"); + m_dbService->addUserBehaviorRecord("admin", kbehavior_update_user_passwd, "()"); m_dbService->addUserBehaviorRecord("admin", kbehavior_set_setting_val, "(....)"); m_dbService->addUserBehaviorRecord("admin", kbehavior_add_formula, "(....)"); m_dbService->addUserBehaviorRecord("admin", kbehavior_del_formula, "(....)"); @@ -541,6 +544,7 @@ void MainControlService::processFrontEndMessage(weak_ptr webSocket, j processFrontEndMessage_test(webSocket, cmd, receipt); processFrontEndMessage_setting(webSocket, cmd, receipt); processFrontEndMessage_processFormulaCmd(webSocket, cmd, receipt); + processFrontEndMessage_processBehaviorRecordCmd(webSocket, cmd, receipt); /******************************************************************************* * getState * *******************************************************************************/ diff --git a/src/main_control_service.hpp b/src/main_control_service.hpp index 73c8510..d60f353 100644 --- a/src/main_control_service.hpp +++ b/src/main_control_service.hpp @@ -95,8 +95,9 @@ class MainControlService : public enable_shared_from_this { void processFrontEndMessage_test(weak_ptr webSocket, json& cmd, json& receipt); void processFrontEndMessage_setting(weak_ptr webSocket, json& cmd, json& receipt); void processFrontEndMessage_processFormulaCmd(weak_ptr webSocket, json& cmd, json& receipt); + void processFrontEndMessage_processBehaviorRecordCmd(weak_ptr webSocket, json& cmd, json& receipt); - json createSensorDataJson(); + json createSensorDataJson(); void dosystem(string order); };