v1.2.7

README.md

@@ -95,7 +95,10 @@ VERSION 1.2.5
 
 VERSION 1.2.6
     1. fix some bug
-    
+
+VERSION 1.2.7
+    1.fix formula some bug
+
 TODO:
     1.添加用户增加用户查重检查
     2.添加

appsrc/appsetting/project_port/basic/zappversion.hpp

@@ -1,3 +1,3 @@
 #pragma once
-#define VERSION      "1.2.6"
+#define VERSION      "1.2.7"
 #define PROJECT_NAME "TRANSMIT_DM"

appsrc/baseservice/db/formula_db_dao.cpp

@@ -31,12 +31,12 @@ void FormulaDBDao::updateFormula(string formulaid, json formula) {
   keyvaldb.set(formulaid, formula.dump());
 }
 void FormulaDBDao::updateFormula(string formulaid, string key, string val) {
-  json formula = keyvaldb.get(formulaid);
+  json formula = json::parse(keyvaldb.get(formulaid));
   formula[key] = val;
   keyvaldb.set(formulaid, formula);
 }
 string FormulaDBDao::getFormula(string formulaid, string key) {
-  json formula = keyvaldb.get(formulaid);
+  json formula = json::parse(keyvaldb.get(formulaid));
   if (formula.find(key) != formula.end()) {
     return formula[key];
   }
@@ -44,10 +44,11 @@ string FormulaDBDao::getFormula(string formulaid, string key) {
   // THROW_APP_EXCEPTION(err::kappe_code_error, "fomula key [%s] not found", key);
 }
 string FormulaDBDao::getFormulaWithExcep(string formulaid, string key) {
-  json formula = keyvaldb.get(formulaid);
+  json formula = json::parse(keyvaldb.get(formulaid));
   if (formula.find(key) != formula.end()) {
     return formula[key];
   }
+  logger->error("{}", formula.dump());
   THROW_APP_EXCEPTION(err::kappe_code_error, fmt::format("fomula key [{}] not found", key));
 }
 
@@ -70,7 +71,7 @@ json FormulaDBDao::newFormula() {
 json FormulaDBDao::getFormulaWithExcep(string formulaid) {
   string val = keyvaldb.get(formulaid);
   if (val.empty()) {
-    THROW_APP_EXCEPTION(err::kappe_code_error, fmt::format("fomula [{}] not found", formulaid));  
+    THROW_APP_EXCEPTION(err::kappe_code_error, fmt::format("fomula [{}] not found", formulaid));
   }
   return json::parse(val);
 }

appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp

@@ -163,6 +163,7 @@ void DisinfectionCtrlService::start(int loglevel) {
 json DisinfectionCtrlService::startWithFormula(string formulaid) {
   logger->info("startWithFormula formulaid:{}", formulaid);
   checkBeforeStart();
+  m_formulaid = formulaid;
 
   json formulacfg = FORMULA_DB->getFormulaWithExcep(m_formulaid);
   m_runType       = kFormulaMode;