From 37a84b1af426be83f1adb7c888201d3902030f79 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Mon, 7 Jul 2025 22:42:47 +0800
Subject: [PATCH] fix some bug

---
 appsrc/baseservice/db/base/keyvaldbv2.cpp          | 10 ++++++++-
 appsrc/baseservice/db/base/keyvaldbv2.hpp          |  3 +++
 .../baseservice/db/device_ext_setting_dao_v2.cpp   | 24 ++++++++++++++++++----
 html/debug/index.html                              | 22 +++++++++++---------
 4 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/appsrc/baseservice/db/base/keyvaldbv2.cpp b/appsrc/baseservice/db/base/keyvaldbv2.cpp
index 93174b9..394889f 100644
--- a/appsrc/baseservice/db/base/keyvaldbv2.cpp
+++ b/appsrc/baseservice/db/base/keyvaldbv2.cpp
@@ -33,7 +33,6 @@ bool KeyValDBV2Dao::set(string key, string val) {
 string KeyValDBV2Dao::get(string key, string defaultVal) {
   lock_guard<recursive_mutex> lock(lock_);
 
-
   try {
     auto all = storage.get_all<KeyValDBV2>(where(c(&KeyValDBV2::key) == key));
     if (all.size() == 0) {
@@ -52,3 +51,12 @@ bool   KeyValDBV2Dao::get(string key, bool defaultVal) { return get(key, default
 bool KeyValDBV2Dao::set(string key, int val) { return set(key, to_string(val)); }
 bool KeyValDBV2Dao::set(string key, double val) { return set(key, to_string(val)); }
 bool KeyValDBV2Dao::set(string key, bool val) { return set(key, val ? string("true") : string("false")); }
+
+void KeyValDBV2Dao::clear(string key) {
+  lock_guard<recursive_mutex> lock(lock_);
+  try {
+    storage.remove_all<KeyValDBV2>(where(c(&KeyValDBV2::key) == key));
+  } catch (const std::exception& e) {
+    // Ignore errors
+  }
+}
\ No newline at end of file
diff --git a/appsrc/baseservice/db/base/keyvaldbv2.hpp b/appsrc/baseservice/db/base/keyvaldbv2.hpp
index 3fb4048..a4d1a22 100644
--- a/appsrc/baseservice/db/base/keyvaldbv2.hpp
+++ b/appsrc/baseservice/db/base/keyvaldbv2.hpp
@@ -83,6 +83,9 @@ class KeyValDBV2Dao {
   bool   get(string key, bool defaultVal);
   double get(string key, double defaultVal);
   float  get(string key, float defaultVal) { return get(key, (double)defaultVal); }
+
+  void clear(string key);
+
 };
 
 };  // namespace iflytop
diff --git a/appsrc/baseservice/db/device_ext_setting_dao_v2.cpp b/appsrc/baseservice/db/device_ext_setting_dao_v2.cpp
index ae37d41..3b12463 100644
--- a/appsrc/baseservice/db/device_ext_setting_dao_v2.cpp
+++ b/appsrc/baseservice/db/device_ext_setting_dao_v2.cpp
@@ -269,7 +269,7 @@ void DeviceExtSettingV2Dao::initVal(ProjectTypeEnum projType, string deviceId) {
 
   // clearVal
   for (auto& id : DeviceExtSettingId::getEnumList()) {
-    setVal(id, "");
+    clear(id);
   }
 
   setVal(DeviceExtSettingId::deviceId, deviceId);
@@ -319,8 +319,24 @@ json DeviceExtSettingV2Dao::getSetting() {
 
 json DeviceExtSettingV2Dao::getSettingCH() {
   json settingCH;
-  for (auto& settingId : DeviceExtSettingId::getEnumList()) {
-    settingCH[idToChName(DeviceExtSettingId(settingId))] = get(settingId, "");
-  }
+
+  settingCH["设备ID"] = getDeviceId();
+  settingCH["项目类型"] = getProjectType().toString();
+  settingCH["can接口"] = getCanIF();
+  settingCH["can波特率"] = getCanBitrate();
+  settingCH["打印机串口路径"] = getPrinterUartPath();
+  settingCH["探头-过期时间(月)"] = getH2o2SensorExpireTimeMonth();
+  settingCH["探头-最小值(ppm)"] = getH2o2Sensorh2o2MinVal();
+  settingCH["探头-预热时间(秒)"] = getSensorPreheartTimeS();
+  settingCH["有线探头数量"] = getExtWiredSensorNum();
+  settingCH["清空加液管路时间(秒)"] = getEmptyThePipeLineTimeS();
+  settingCH["排空储液桶条件判定阈值(克)"] = getEmptyingLiquidStorageTankCondtionG();
+  settingCH["泄露检测-充气时间(毫秒)"] = getLeakTestInflationTimeMs();
+  settingCH["泄露检测-稳定时间(秒)"] = getLeakTestStabilizationTimeS();
+  settingCH["消毒液桶体积(毫升)"] = getDisinfectantBucketCapacity();
+  settingCH["用户行为最大记录数"] = getUserBehaviorRecordDbMaxRecords();
+  settingCH["喷液泵转速单位转换系数"] = getGpmToSpeedRadio();
+  settingCH["喷液管路清空时间(秒)"] = getSprayLineEmptyTimeS();
+  settingCH["喷液管路清空速度(RPM)"] = getSprayLineEmptyVelRPM();
   return settingCH;
 }
\ No newline at end of file
diff --git a/html/debug/index.html b/html/debug/index.html
index b241605..31fdc9c 100644
--- a/html/debug/index.html
+++ b/html/debug/index.html
@@ -39,14 +39,14 @@
               @click="actionActionExecute(item)">
               {{item.fnDispName}}</a-button>
 
-            <div v-for="param in item.params" class="param-input">
-              <a-select v-if="item.paramInfoMap[param].isEnum" v-model:value="item.values[param]"
+            <div v-for="param in item.params" >
+              <a-select v-if="item.paramInfoMap[param].isEnum" class="param-input" v-model:value="item.values[param]"
                 :placeholder="param" :dropdownMatchSelectWidth="false">
                 <a-select-option v-for="enumValue in item.paramInfoMap[param].enumValues" :key="enumValue"
                   :value="enumValue">{{enumValue}}</a-select-option>
               </a-select>
 
-              <a-input v-else v-model:value="item.values[param]" :placeholder="param"
+              <a-input v-else v-model:value="item.values[param]" :placeholder="param" class="param-input"
                 @click="showKeyboard(item.values, param)"></a-input>
             </div>
           </div>
@@ -77,6 +77,8 @@
             </a-collapse-panel>
           </a-collapse>
         </div>
+
+
       </a-col>
     </a-row>
   </div>
@@ -84,7 +86,7 @@
   <style>
     :root {
       --primary-color: #1890ff;       /* 主蓝色 */
-      --primary-hover: #40a9ff;      /* 悬停蓝色 */
+      --primary-hover: #40a9ff2a;      /* 悬停蓝色 */
       --success-color: #52c41a;      /* 成功绿色 */
       --warning-color: #faad14;      /* 警告黄色 */
       --error-color: #f5222d;        /* 错误红色 */
@@ -96,7 +98,7 @@
       --card-bg: #ffffff;            /* 卡片背景 */
       --action-btn-bg: #1890ff;      /* 操作按钮背景 */
       --action-btn-hover: #40a9ff;    /* 操作按钮悬停 */
-      --disinfect-color: #13c2c2;    /* 消毒主题色 - 青蓝色 */
+      --disinfect-color:  #1890ff;    /* 消毒主题色 -  */
     }
 
     body {
@@ -141,7 +143,7 @@
     /* 主内容区样式 */
     .main-content {
       padding: 15px;
-      background-color: white;
+      background-color:  #f0f2f5;
     }
 
     .action-container {
@@ -150,7 +152,7 @@
       overflow-y: auto;
       margin-bottom: 10px;
       padding: 10px;
-      background-color: white;
+      background-color:#f0f2f5;
       border-radius: 4px;
       box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.03);
     }
@@ -160,9 +162,9 @@
       flex-direction: row;
       margin-bottom: 10px;
       padding: 10px;
-      background-color: #f6ffed;
+      background-color: var(--primary-hover);
       border-radius: 4px;
-      border-left: 3px solid var(--success-color);
+      border-left: 3px solid var(--primary-color);
       transition: all 0.3s;
     }
 
@@ -210,7 +212,7 @@
     }
 
     .log-container, .report-container {
-      height: 0;
+      height: 600px;
       flex-grow: 1;
       overflow-y: auto;
       margin-bottom: 10px;