From a63107ad9cc49f64f7a61a3fd3292c45a8312518 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Tue, 5 Sep 2023 15:36:45 +0800
Subject: [PATCH] update

---
 src/db/db_service.cpp | 14 ++++++++++++++
 src/db/db_service.hpp | 13 +++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/src/db/db_service.cpp b/src/db/db_service.cpp
index b165c9c..6e4313b 100644
--- a/src/db/db_service.cpp
+++ b/src/db/db_service.cpp
@@ -37,6 +37,19 @@ using namespace nlohmann;
              make_column("permission_level", &Setting::permission_level), /**/ \
              make_column("val", &Setting::val))
 
+// #define SETTING_DB_STRUCT                                                         \
+//   make_table("settings",                                                     /**/ \
+//              make_column("id", &PreSetting::id, primary_key()),              /**/ \
+//              make_column("name", &PreSetting::group_id),                     /**/ \
+//              make_column("name", &PreSetting::name),                         /**/ \
+//              make_column("name_ch", &PreSetting::name_ch),                   /**/ \
+//              make_column("val_lower_limit", &PreSetting::val_lower_limit),   /**/ \
+//              make_column("val_upper_limit", &PreSetting::val_upper_limit),   /**/ \
+//              make_column("permission_level", &PreSetting::permission_level), /**/ \
+//              make_column("val", &PreSetting::val))
+
+// // PreSetting
+
 #define DISINFECTION_RECORD_DB_STRUCT                                                            \
   DISINFECTION_RECORD_DB,                                                                        \
       make_table("disinfection_records",                                                    /**/ \
@@ -238,6 +251,7 @@ json DBService::getAllUserJson() {
   auto all = usertable.get_all<User>();
   for (auto& u : all) {
     json j_user;
+    j_user["id"]               = u.id;
     j_user["uid"]              = u.uid;
     j_user["passwd"]           = u.passwd;
     j_user["permission_level"] = u.permission_level;
diff --git a/src/db/db_service.hpp b/src/db/db_service.hpp
index 6c10fac..9abb503 100644
--- a/src/db/db_service.hpp
+++ b/src/db/db_service.hpp
@@ -70,6 +70,19 @@ struct Setting {
   int    val;
 };
 
+struct PreSetting {
+ public:
+  int id;
+  int group_id;
+  int stoped_gs;
+  int continued_gs;
+  int stoped_satur;
+  int continued_satur;
+  int stoped_humi;
+  int continued_humi;
+  int injection_pump_speed;
+};
+
 struct DisinfectionRecord {
  public:
   int    id;