append

README.md

@@ -184,6 +184,11 @@ V 3.1.5
     2. 校准服务中修改单位为pa
     3. 修复导出csv表头数值错误
     4. 重构部分逻辑
+V 3.1.6
+    1. 修改预热时间单位为分钟
+    2. 修改预热时间最小值从0分钟到120分钟，默认值2分钟
+    3. 支持修改风机默认速度
+    4. 打开预热时，打开风机
 
 TODO:
     1.添加用户增加用户查重检查

appsrc/service/setting_mgr_service.cpp

@@ -12,7 +12,7 @@ void SettingMgrService::initialize() {
 
   REG_CLASS("基础设置");
   REG_EXTFN_VOID(getAllSetting, void());
-  REG_EXTFN(setSettingVal, void(string, string), settingName, settingVal);
+  REG_EXTFN(setSettingVal, void(SettingId, string), settingName, settingVal);
   REG_EXTFN_VOID(getAllFormula, json());
   REG_EXTFN_VOID(addNewFormula, json());
   REG_EXTFN(delFormula, void(string), formula_id);
@@ -25,12 +25,12 @@ void SettingMgrService::getAllSetting(shared_ptr<MsgProcessContext> cxt) {
   auto settings = SETTING_DB->getAllSetting();
   cxt->rely     = settings;
 }
-void SettingMgrService::setSettingVal(shared_ptr<MsgProcessContext> cxt, string settingName, string settingVal) {
-  bool suc = SETTING_DB->setSettingVal(settingName, settingVal);
+void SettingMgrService::setSettingVal(shared_ptr<MsgProcessContext> cxt, SettingId settingName, string settingVal) {
+  bool suc = SETTING_DB->setSettingVal(settingName.toString(), settingVal);
   APPCHECK(suc, err::kappe_db_operate_error, "setSettingVal failed");
 
-  auto setting = SETTING_DB->getSetting(settingName);
-  ADD_USER_BEHAVIOR(DS->getLoginName(), fmt::format("设置{}为{}", setting ? setting->name_ch : settingName, settingVal));
+  auto setting = SETTING_DB->getSetting(settingName.toString());
+  ADD_USER_BEHAVIOR(DS->getLoginName(), fmt::format("设置{}为{}", setting ? setting->name_ch : settingName.toString(), settingVal));
 }
 void SettingMgrService::getAllFormula(shared_ptr<MsgProcessContext> cxt) { cxt->rely = FORMULA_DB->getAllFormula(); }
 

appsrc/service/setting_mgr_service.hpp

@@ -22,7 +22,7 @@ class SettingMgrService : public enable_shared_from_this<SettingMgrService> {
 
  private:
   void getAllSetting(shared_ptr<MsgProcessContext> cxt);
-  void setSettingVal(shared_ptr<MsgProcessContext> cxt,string settingName, string settingVal);
+  void setSettingVal(shared_ptr<MsgProcessContext> cxt,SettingId settingName, string settingVal);
   void addNewFormula(shared_ptr<MsgProcessContext> cxt);
   void getAllFormula(shared_ptr<MsgProcessContext> cxt);
   void addFormula(shared_ptr<MsgProcessContext> cxt);