v2.0.2

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"

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"

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);

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"
 

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

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);
 

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

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;

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;

appsrc/baseservice/db/user_behavior_record_dao.hpp

@@ -16,7 +16,7 @@
 #include <vector>
 
 #include "appbase/appbasedep.hpp"
-#include "user_behavior_des.hpp"
+#include "bean/user_behavior_des.hpp"
 
 /**
  * @brief

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;

代码测试说明.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 重启启动程序，观察程序是否正常启动。
+
+
+```