From f1bd8d34c3a2ce141406262b3ba4b60e69d3a08b Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Mon, 7 Jul 2025 18:55:41 +0800
Subject: [PATCH] append

---
 appsrc/baseservice/db/setting_db_dao.cpp | 38 ++++++++++++++++----------------
 appsrc/service/os_mgr_service.cpp        |  4 +++-
 packet_release.sh                        |  2 +-
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/appsrc/baseservice/db/setting_db_dao.cpp b/appsrc/baseservice/db/setting_db_dao.cpp
index 364fa00..3d78b1d 100644
--- a/appsrc/baseservice/db/setting_db_dao.cpp
+++ b/appsrc/baseservice/db/setting_db_dao.cpp
@@ -55,25 +55,25 @@ using namespace iflytop;
 using namespace db;
 
 static Setting settingInitTable[] = {
-    {.setting_id = SettingId::kstoped_gs},
-    {.setting_id = SettingId::kcontinued_gs},
-    {.setting_id = SettingId::kstoped_satur},
-    {.setting_id = SettingId::kcontinued_satur},
-    {.setting_id = SettingId::kmax_humidity},
-    {.setting_id = SettingId::kdrainage_pump_speed},
-    {.setting_id = SettingId::kinjection_pump_speed},
-    {.setting_id = SettingId::kpre_heat_time_s},
-    {.setting_id = SettingId::kstoped_humi},
-    {.setting_id = SettingId::kcontinued_humi},
-    {.setting_id = SettingId::krecord_period_min},
-    {.setting_id = SettingId::krecord_printer_period_min},
-    {.setting_id = SettingId::kloglevel},
-    {.setting_id = SettingId::kenable_bd_dehumidify},
-    {.setting_id = SettingId::kbd_dehumidify_threshold},
-    {.setting_id = SettingId::kenable_ad_dehumidify},
-    {.setting_id = SettingId::kad_dehumidify_threshold},
-    {.setting_id = SettingId::kenable_ad_degrade},
-    {.setting_id = SettingId::kad_degrade_threshold},
+    {.setting_id = SettingId::stoped_gs},
+    {.setting_id = SettingId::continued_gs},
+    {.setting_id = SettingId::stoped_satur},
+    {.setting_id = SettingId::continued_satur},
+    {.setting_id = SettingId::stoped_humi},
+    {.setting_id = SettingId::continued_humi},
+    {.setting_id = SettingId::max_humidity},
+    {.setting_id = SettingId::drainage_pump_speed},
+    {.setting_id = SettingId::injection_pump_speed},
+    {.setting_id = SettingId::pre_heat_time_s},
+    {.setting_id = SettingId::record_period_min},
+    {.setting_id = SettingId::record_printer_period_min},
+    {.setting_id = SettingId::loglevel},
+    {.setting_id = SettingId::enable_bd_dehumidify},
+    {.setting_id = SettingId::bd_dehumidify_threshold},
+    {.setting_id = SettingId::enable_ad_dehumidify},
+    {.setting_id = SettingId::ad_dehumidify_threshold},
+    {.setting_id = SettingId::enable_ad_degrade},
+    {.setting_id = SettingId::ad_degrade_threshold},
     {.setting_id = SettingId::dvalue_correct_coefficient},
 };
 
diff --git a/appsrc/service/os_mgr_service.cpp b/appsrc/service/os_mgr_service.cpp
index d9ee08a..bae535c 100644
--- a/appsrc/service/os_mgr_service.cpp
+++ b/appsrc/service/os_mgr_service.cpp
@@ -41,6 +41,8 @@ void OsMgrService::getTime(shared_ptr<MsgProcessContext> cxt) {
   gettimeofday(&tv, NULL);
 
   // 计算毫秒级 Unix 时间戳
+  // TODO: 修改成时区来自系统
   long long timestamp_ms = (long long)tv.tv_sec * 1000 + tv.tv_usec / 1000;
-  cxt->rely["time"]      = timestamp_ms;
+  timestamp_ms += 8 * 3600 * 1000;  // 转换为北京时间（UTC+8）
+  cxt->rely["time"] = timestamp_ms;
 }
diff --git a/packet_release.sh b/packet_release.sh
index 7030709..f9cda88 100755
--- a/packet_release.sh
+++ b/packet_release.sh
@@ -18,7 +18,7 @@ rm -rf $packetpath
 mkdir -p $packetpath/
 
 cp ./build/app/* $packetpath/
-# cp -rf html $packetpath/
+cp -rf html $packetpath/
 
 tar -czvf $packetpath.tar.gz -C /tmp/ $packetname