From 416a4956542389b455c51eb3b1a44b5100581900 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Wed, 21 Aug 2024 18:04:15 +0800
Subject: [PATCH] update

---
 .../service/app/disinfection_ctrl/disinfection_ctrl_service.cpp  | 4 ++--
 .../service/app/disinfection_ctrl/disinfection_ctrl_service.hpp  | 2 +-
 appsrc/service/app/disinfection_ctrl_service_ext.cpp             | 9 +++++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp b/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp
index 754e9d7..0c5b608 100644
--- a/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp
+++ b/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp
@@ -154,7 +154,7 @@ void DisinfectionCtrlService::start(int loglevel) {
 
   startWorkThread();
 }
-void DisinfectionCtrlService::startWithFormula(string formulaid) {
+json DisinfectionCtrlService::startWithFormula(string formulaid) {
   logger->info("startWithFormula formulaid:{}", formulaid);
   checkBeforeStart();
 
@@ -176,6 +176,7 @@ void DisinfectionCtrlService::startWithFormula(string formulaid) {
   json cfg = m_realtimeCfg;
   logger->info("startWithFormula tlog:{} cfg: {}", m_tlog, cfg.dump(2));
   startWorkThread();
+  return formulacfg;
 }
 
 void DisinfectionCtrlService::checkBeforeStart() {
@@ -282,7 +283,6 @@ void DisinfectionCtrlService::traceState() {
   tracecontent += fmt::format("takebreak:{} ", s_isDisinfectionTakeBreak);
   tracecontent += fmt::format("remaintime:{} ", s_remaintime);
 
-
   logger->info(tracecontent);
 }
 
diff --git a/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.hpp b/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.hpp
index a7c09fa..a3eadef 100644
--- a/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.hpp
+++ b/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.hpp
@@ -79,7 +79,7 @@ class DisinfectionCtrlService : public enable_shared_from_this<DisinfectionCtrlS
   // impl
 
   void start(int loglevel);
-  void startWithFormula(string formulaid);
+  json startWithFormula(string formulaid);
   void startWorkThread();
   void checkBeforeStart();
   void stop();
diff --git a/appsrc/service/app/disinfection_ctrl_service_ext.cpp b/appsrc/service/app/disinfection_ctrl_service_ext.cpp
index 2e828ca..164d9de 100644
--- a/appsrc/service/app/disinfection_ctrl_service_ext.cpp
+++ b/appsrc/service/app/disinfection_ctrl_service_ext.cpp
@@ -55,12 +55,17 @@ void DisinfectionCtrlServiceExt::start(shared_ptr<MsgProcessContext> cxt, string
   // 从setting中获取实时参数
   int level = atoi(loglevel.c_str());
   dcs->start(level);
+  ADD_USER_BEHAVIOR(ds->getLoginUid(), kbehavior_do_disinfection, fmt::format("开始消毒,level:{}", level));
   // m_state = DisinfectionState::preheat;
 }
 void DisinfectionCtrlServiceExt::startWithFormula(shared_ptr<MsgProcessContext> cxt, string formulaid) {  //
-  dcs->startWithFormula(formulaid);
+  json formula = dcs->startWithFormula(formulaid);
+  ADD_USER_BEHAVIOR(ds->getLoginUid(), kbehavior_do_formula, fmt::format("启动配置方,{}", formula["name"]));
+}
+void DisinfectionCtrlServiceExt::stop(shared_ptr<MsgProcessContext> cxt) {
+  ADD_USER_BEHAVIOR(ds->getLoginUid(), kbehavior_stop_disinfection, "");
+  dcs->stop();
 }
-void DisinfectionCtrlServiceExt::stop(shared_ptr<MsgProcessContext> cxt) { dcs->stop(); }
 
 void DisinfectionCtrlServiceExt::getRealtimeConfig(shared_ptr<MsgProcessContext> cxt) {
   json& rely = cxt->rely;