From 70f861622f7f19af2a09ef8e53e45a7fceca1fea Mon Sep 17 00:00:00 2001 From: zhaohe Date: Fri, 6 Dec 2024 11:50:39 +0800 Subject: [PATCH] v2.0.2 --- appsrc/appconfig/basic/zappversion.hpp | 2 +- appsrc/baseservice/baseservice.hpp | 2 +- appsrc/baseservice/db/bean/user_behavior_des.cpp | 54 ++++++++++++++++++++++ appsrc/baseservice/db/bean/user_behavior_des.hpp | 41 ++++++++++++++++ appsrc/baseservice/db/calibrate_info_dao.cpp | 2 +- appsrc/baseservice/db/db_service.hpp | 2 +- appsrc/baseservice/db/device_ext_setting_dao.hpp | 1 - appsrc/baseservice/db/equipment_usage_info_dao.cpp | 2 +- appsrc/baseservice/db/equipment_usage_info_dao.hpp | 1 - appsrc/baseservice/db/formula_db_dao.hpp | 1 - appsrc/baseservice/db/setting_db_dao.hpp | 1 - appsrc/baseservice/db/user_behavior_des.cpp | 54 ---------------------- appsrc/baseservice/db/user_behavior_des.hpp | 41 ---------------- appsrc/baseservice/db/user_behavior_record_dao.hpp | 2 +- appsrc/baseservice/db/user_dao.hpp | 1 - 代码测试说明.md | 20 ++++++++ 16 files changed, 121 insertions(+), 106 deletions(-) create mode 100644 appsrc/baseservice/db/bean/user_behavior_des.cpp create mode 100644 appsrc/baseservice/db/bean/user_behavior_des.hpp delete mode 100644 appsrc/baseservice/db/user_behavior_des.cpp delete mode 100644 appsrc/baseservice/db/user_behavior_des.hpp create mode 100644 代码测试说明.md diff --git a/appsrc/appconfig/basic/zappversion.hpp b/appsrc/appconfig/basic/zappversion.hpp index f6bd8cb..1d09d6c 100644 --- a/appsrc/appconfig/basic/zappversion.hpp +++ b/appsrc/appconfig/basic/zappversion.hpp @@ -1,3 +1,3 @@ #pragma once -#define VERSION "2.0.1" +#define VERSION "2.0.2" #define PROJECT_NAME "TRANSMIT_DM" \ No newline at end of file diff --git a/appsrc/baseservice/baseservice.hpp b/appsrc/baseservice/baseservice.hpp index 1c857ab..cc96b23 100644 --- a/appsrc/baseservice/baseservice.hpp +++ b/appsrc/baseservice/baseservice.hpp @@ -19,7 +19,7 @@ #include "db/equipment_usage_info_dao.hpp" #include "db/formula_db_dao.hpp" #include "db/setting_db_dao.hpp" -#include "db/user_behavior_des.hpp" +#include "db/bean/user_behavior_des.hpp" #include "db/user_behavior_record_dao.hpp" #include "db/user_dao.hpp" #include "db/device_ext_setting_dao.hpp" \ No newline at end of file diff --git a/appsrc/baseservice/db/bean/user_behavior_des.cpp b/appsrc/baseservice/db/bean/user_behavior_des.cpp new file mode 100644 index 0000000..eb171a3 --- /dev/null +++ b/appsrc/baseservice/db/bean/user_behavior_des.cpp @@ -0,0 +1,54 @@ +#include "user_behavior_des.hpp" + +using namespace iflytop; +using namespace iflytop::db; + +namespace iflytop { +namespace db { + +string user_behavior_to_str(user_behavior_t behavior) { + switch (behavior) { + case kbehavior_login: + return "登陆"; + case kbehavior_logout: + return "登出"; + case kbehavior_add_user: + return "添加用户"; + case kbehavior_del_user: + return "删除用户"; + case kbehavior_update_user_permission_level: + return "更新用户权限"; + case kbehavior_update_user_passwd: + return "更新用户密码"; + case kbehavior_update_user_uid: + return "更新用户ID"; + case kbehavior_set_setting_val: + return "设置参数"; + case kbehavior_add_formula: + return "添加配方"; + case kbehavior_del_formula: + return "删除配方"; + case kbehavior_update_formula: + return "更新配方"; + case kbehavior_update_formula_name: + return "更新配方名称"; + case kbehavior_do_disinfection: + return "开始消毒"; + case kbehavior_stop_disinfection: + return "停止消毒"; + case kbehavior_do_formula: + return "执行配方"; + case kbehavior_update_setting_val_on_disinfection: + return "消毒中更新参数"; + case kbehavior_export_disinfection_data: + return "导出消毒数据"; + case kbehavior_export_user_action_data: + return "导出用户操作数据"; + default: + break; + } + return "未知行为"; +} + +} // namespace db +} // namespace iflytop diff --git a/appsrc/baseservice/db/bean/user_behavior_des.hpp b/appsrc/baseservice/db/bean/user_behavior_des.hpp new file mode 100644 index 0000000..e71c5db --- /dev/null +++ b/appsrc/baseservice/db/bean/user_behavior_des.hpp @@ -0,0 +1,41 @@ +#pragma once +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +namespace iflytop { +using namespace std; + +namespace db { +typedef enum { + kbehavior_login = 0, + kbehavior_logout = 1, + kbehavior_add_user = 2, + kbehavior_del_user = 3, + kbehavior_update_user_uid = 5, + kbehavior_update_user_permission_level = 6, + kbehavior_update_user_passwd = 7, + kbehavior_set_setting_val = 8, + kbehavior_add_formula = 9, + kbehavior_del_formula = 10, + kbehavior_update_formula = 11, + kbehavior_do_disinfection = 12, + kbehavior_stop_disinfection = 13, + kbehavior_do_formula = 14, + kbehavior_update_setting_val_on_disinfection = 15, + kbehavior_export_disinfection_data = 16, + kbehavior_export_user_action_data = 17, + kbehavior_update_formula_name = 18, +} user_behavior_t; + +string user_behavior_to_str(user_behavior_t behavior); + +} // namespace db + +} // namespace iflytop \ No newline at end of file diff --git a/appsrc/baseservice/db/calibrate_info_dao.cpp b/appsrc/baseservice/db/calibrate_info_dao.cpp index 5847eaf..7bb3c33 100644 --- a/appsrc/baseservice/db/calibrate_info_dao.cpp +++ b/appsrc/baseservice/db/calibrate_info_dao.cpp @@ -14,7 +14,7 @@ using namespace iflytop::db; using namespace sqlite_orm; using namespace nlohmann; -CalibrationInfoDao::CalibrationInfoDao() : KeyValDBV2Dao("db/calibration_info", "calibration_info") {} +CalibrationInfoDao::CalibrationInfoDao() : KeyValDBV2Dao("db/calibration_info.db", "calibration_info") {} void CalibrationInfoDao::initialize() { mkdir("db", 0755); diff --git a/appsrc/baseservice/db/db_service.hpp b/appsrc/baseservice/db/db_service.hpp index 5e21309..b2aacec 100644 --- a/appsrc/baseservice/db/db_service.hpp +++ b/appsrc/baseservice/db/db_service.hpp @@ -19,7 +19,7 @@ #include "appbase/appbean/usr_role_type.hpp" #include "formula_db_dao.hpp" #include "setting_db_dao.hpp" -#include "user_behavior_des.hpp" +#include "bean/user_behavior_des.hpp" #include "user_behavior_record_dao.hpp" #include "user_dao.hpp" diff --git a/appsrc/baseservice/db/device_ext_setting_dao.hpp b/appsrc/baseservice/db/device_ext_setting_dao.hpp index 7085316..abe5391 100644 --- a/appsrc/baseservice/db/device_ext_setting_dao.hpp +++ b/appsrc/baseservice/db/device_ext_setting_dao.hpp @@ -17,7 +17,6 @@ #include "appbase/appbasedep.hpp" #include "base/keyvaldbv2.hpp" -#include "user_behavior_des.hpp" /** * @brief diff --git a/appsrc/baseservice/db/equipment_usage_info_dao.cpp b/appsrc/baseservice/db/equipment_usage_info_dao.cpp index 6099105..4b9edc3 100644 --- a/appsrc/baseservice/db/equipment_usage_info_dao.cpp +++ b/appsrc/baseservice/db/equipment_usage_info_dao.cpp @@ -14,7 +14,7 @@ using namespace iflytop::db; using namespace sqlite_orm; using namespace nlohmann; -EquipmentUsageInfoDao::EquipmentUsageInfoDao(/* args */) : KeyValDBV2Dao("db/equipment_usage_info", "equipment_usage_info") {} +EquipmentUsageInfoDao::EquipmentUsageInfoDao(/* args */) : KeyValDBV2Dao("db/equipment_usage_info.db", "equipment_usage_info") {} void EquipmentUsageInfoDao::initialize() { mkdir("db", 0755); diff --git a/appsrc/baseservice/db/equipment_usage_info_dao.hpp b/appsrc/baseservice/db/equipment_usage_info_dao.hpp index 124c512..610a85a 100644 --- a/appsrc/baseservice/db/equipment_usage_info_dao.hpp +++ b/appsrc/baseservice/db/equipment_usage_info_dao.hpp @@ -17,7 +17,6 @@ #include "appbase/appbasedep.hpp" #include "base/keyvaldbv2.hpp" -#include "user_behavior_des.hpp" /** * @brief diff --git a/appsrc/baseservice/db/formula_db_dao.hpp b/appsrc/baseservice/db/formula_db_dao.hpp index 949496f..5bf81df 100644 --- a/appsrc/baseservice/db/formula_db_dao.hpp +++ b/appsrc/baseservice/db/formula_db_dao.hpp @@ -19,7 +19,6 @@ #include "appconfig/appconfig.hpp" #include "base/dbbase.hpp" #include "base/keyvaldb.hpp" -#include "user_behavior_des.hpp" namespace iflytop { using namespace std; diff --git a/appsrc/baseservice/db/setting_db_dao.hpp b/appsrc/baseservice/db/setting_db_dao.hpp index 450d55b..5c411ce 100644 --- a/appsrc/baseservice/db/setting_db_dao.hpp +++ b/appsrc/baseservice/db/setting_db_dao.hpp @@ -21,7 +21,6 @@ #include "base/dbbase.hpp" #include "base/keyvaldb.hpp" -#include "user_behavior_des.hpp" namespace iflytop { using namespace std; using namespace std; diff --git a/appsrc/baseservice/db/user_behavior_des.cpp b/appsrc/baseservice/db/user_behavior_des.cpp deleted file mode 100644 index eb171a3..0000000 --- a/appsrc/baseservice/db/user_behavior_des.cpp +++ /dev/null @@ -1,54 +0,0 @@ -#include "user_behavior_des.hpp" - -using namespace iflytop; -using namespace iflytop::db; - -namespace iflytop { -namespace db { - -string user_behavior_to_str(user_behavior_t behavior) { - switch (behavior) { - case kbehavior_login: - return "登陆"; - case kbehavior_logout: - return "登出"; - case kbehavior_add_user: - return "添加用户"; - case kbehavior_del_user: - return "删除用户"; - case kbehavior_update_user_permission_level: - return "更新用户权限"; - case kbehavior_update_user_passwd: - return "更新用户密码"; - case kbehavior_update_user_uid: - return "更新用户ID"; - case kbehavior_set_setting_val: - return "设置参数"; - case kbehavior_add_formula: - return "添加配方"; - case kbehavior_del_formula: - return "删除配方"; - case kbehavior_update_formula: - return "更新配方"; - case kbehavior_update_formula_name: - return "更新配方名称"; - case kbehavior_do_disinfection: - return "开始消毒"; - case kbehavior_stop_disinfection: - return "停止消毒"; - case kbehavior_do_formula: - return "执行配方"; - case kbehavior_update_setting_val_on_disinfection: - return "消毒中更新参数"; - case kbehavior_export_disinfection_data: - return "导出消毒数据"; - case kbehavior_export_user_action_data: - return "导出用户操作数据"; - default: - break; - } - return "未知行为"; -} - -} // namespace db -} // namespace iflytop diff --git a/appsrc/baseservice/db/user_behavior_des.hpp b/appsrc/baseservice/db/user_behavior_des.hpp deleted file mode 100644 index e71c5db..0000000 --- a/appsrc/baseservice/db/user_behavior_des.hpp +++ /dev/null @@ -1,41 +0,0 @@ -#pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -namespace iflytop { -using namespace std; - -namespace db { -typedef enum { - kbehavior_login = 0, - kbehavior_logout = 1, - kbehavior_add_user = 2, - kbehavior_del_user = 3, - kbehavior_update_user_uid = 5, - kbehavior_update_user_permission_level = 6, - kbehavior_update_user_passwd = 7, - kbehavior_set_setting_val = 8, - kbehavior_add_formula = 9, - kbehavior_del_formula = 10, - kbehavior_update_formula = 11, - kbehavior_do_disinfection = 12, - kbehavior_stop_disinfection = 13, - kbehavior_do_formula = 14, - kbehavior_update_setting_val_on_disinfection = 15, - kbehavior_export_disinfection_data = 16, - kbehavior_export_user_action_data = 17, - kbehavior_update_formula_name = 18, -} user_behavior_t; - -string user_behavior_to_str(user_behavior_t behavior); - -} // namespace db - -} // namespace iflytop \ No newline at end of file diff --git a/appsrc/baseservice/db/user_behavior_record_dao.hpp b/appsrc/baseservice/db/user_behavior_record_dao.hpp index 6624aba..1bfb242 100644 --- a/appsrc/baseservice/db/user_behavior_record_dao.hpp +++ b/appsrc/baseservice/db/user_behavior_record_dao.hpp @@ -16,7 +16,7 @@ #include #include "appbase/appbasedep.hpp" -#include "user_behavior_des.hpp" +#include "bean/user_behavior_des.hpp" /** * @brief diff --git a/appsrc/baseservice/db/user_dao.hpp b/appsrc/baseservice/db/user_dao.hpp index be316c5..9cf0320 100644 --- a/appsrc/baseservice/db/user_dao.hpp +++ b/appsrc/baseservice/db/user_dao.hpp @@ -20,7 +20,6 @@ #include "appconfig/appconfig.hpp" #include "formula_db_dao.hpp" #include "setting_db_dao.hpp" -#include "user_behavior_des.hpp" namespace iflytop { using namespace std; diff --git a/代码测试说明.md b/代码测试说明.md new file mode 100644 index 0000000..41f9ba2 --- /dev/null +++ b/代码测试说明.md @@ -0,0 +1,20 @@ + +``` +1. 测试数据库损坏后是否能够重新自动创建 +1.1 启动程序后，去db目录下，查看是否所有的数据库都自动创建 + + +1.2 执行下面的执行破坏数据库 + +echo "adfa" >calibration_info.db +echo "adfa" >device_ext_setting.db +echo "adfa" >equipment_usage_info.db +echo "adfa" >formula.db +echo "adfa" >setting.db +echo "adfa" >user_behavior_record.db +echo "adfa" >user.db + +1.3 重启启动程序，观察程序是否正常启动。 + + +``` \ No newline at end of file