update

appsrc/appsetting/appsetting.hpp

@@ -1,3 +1,3 @@
 #pragma once
-#include "project_setting/project_setting_mgr.hpp"
+#include "project_setting/project_setting.hpp"
 

appsrc/appsetting/project_setting/project_setting_mgr.cpp → appsrc/appsetting/project_setting/project_setting.cpp

@@ -1,4 +1,4 @@
-#include "project_setting_mgr.hpp"
+#include "project_setting.hpp"
 
 #include "appbase/appbase.hpp"
 #include "components/zservice_container/zservice_container.hpp"

appsrc/appsetting/project_setting/project_setting_mgr.hpp → appsrc/appsetting/project_setting/project_setting.hpp

@@ -26,6 +26,9 @@ using namespace transmit_disfection_protocol;
 class ProjectSetting {
   THISCLASS(ProjectSetting);
 
+ private:
+  ProjectSetting() {}
+
  public:
   /* data */
   shared_ptr<GConfig>   gConfig;
@@ -38,8 +41,17 @@ class ProjectSetting {
   //
   int    extSensorNum    = 0;
   double gpmToSpeedRadio = 0;
+  bool   isInited        = false;
 
  public:
+  static ProjectSetting &ins() {
+    static ProjectSetting instance;
+    if (!instance.isInited) {
+      instance.initialize();
+      instance.isInited = true;
+    }
+    return instance;
+  }
   void initialize();
 
  public:

appsrc/baseservice/db/setting_db_dao.cpp

@@ -106,11 +106,11 @@ void SettingDBDao::initialize() {  //
     if (version != DB_VERSION) {
       keyvaldb.clear();
       keyvaldb.set("version", DB_VERSION);
-      auto projSetting = GET_SERVICE(ProjectSetting);
+      auto projSetting = ProjectSetting::ins();
       for (auto& setting : settingInitTable) {
         // 部分设置项根据项目类型进行初始化
         if (setting.setting_id == SettingId::injection_pump_speed) {
-          if (projSetting->isProjectType(kdraw_bar_disinfection_box)) {
+          if (projSetting.isProjectType(kdraw_bar_disinfection_box)) {
             setting.default_val     = "4";
             setting.val             = "4";
             setting.val_lower_limit = "0";

appsrc/service/audit_mgr_service.cpp

@@ -10,8 +10,8 @@ using namespace iflytop;
 static string getTime() {
   struct tm tm = {0};
 
-  time_t     t   = ::time(nullptr);
-  struct tm* tmp = localtime_r(&t, &tm);
+  time_t t = ::time(nullptr);
+  localtime_r(&t, &tm);
   return fmt::format("{:0>4}{:0>2}{:0>2}{:0>2}{:0>2}{:0>2}", tm.tm_year + 1900,  //
                      tm.tm_mon + 1,                                              //
                      tm.tm_mday,                                                 //
@@ -89,7 +89,6 @@ void AuditMgrService::getRecords(shared_ptr<MsgProcessContext> cxt) {
   cxt->content = m_db->getUserBehaviorRecordDescJson(jsonGet<int>(params["page"]), jsonGet<int>(params["page_size"]));
 }
 void AuditMgrService::pushTestData(shared_ptr<MsgProcessContext> cxt) {
-
   ADD_USER_BEHAVIOR("123", kbehavior_login, "");
   ADD_USER_BEHAVIOR("123", kbehavior_logout, "");
   ADD_USER_BEHAVIOR("123", kbehavior_add_user, "");

appsrc/service/disinfection_logs_service.cpp

@@ -108,7 +108,6 @@ void DisinfectionLogsService::initialize() {
   GET_TO_SERVICE(m_db);
   GET_TO_SERVICE(m_ds);
   GET_TO_SERVICE(m_gConfig);
-  GET_TO_SERVICE(m_projectSettingMgr);
   GET_TO_SERVICE(m_udiskMgrService);
 
   REGFN(DisinfectionLogsService, getRecordList);
@@ -177,7 +176,6 @@ void DisinfectionLogsService::dumpDisinfectionRecord(string sessionId, list<shar
   //    保存到记录到csv文件中
   //
   ZCSV csv;
-  auto projSetting = m_projectSettingMgr;
 
   for (auto& s : snapshots) {
     csv.addValue(m_csvHeaderDict.getChName(CSVHeader::time), /******************/ tu_sys::fmt(s->time, "%Y-%m-%d %H:%M:%S"));
@@ -187,14 +185,14 @@ void DisinfectionLogsService::dumpDisinfectionRecord(string sessionId, list<shar
     csv.addValue(m_csvHeaderDict.getChName(CSVHeader::rh_0), /******************/ formatSensorVal(s->rh[0]));
     csv.addValue(m_csvHeaderDict.getChName(CSVHeader::rs_0), /******************/ formatSensorVal(s->rs[0]));
 
-    if (projSetting->extSensorNum >= 1) {
+    if (ProjectSetting::ins().extSensorNum >= 1) {
       csv.addValue(m_csvHeaderDict.getChName(CSVHeader::ho2o2_1), /***************/ formatSensorVal(s->h2o2[1]));
       csv.addValue(m_csvHeaderDict.getChName(CSVHeader::temp_1), /****************/ formatSensorVal(s->temp[1]));
       csv.addValue(m_csvHeaderDict.getChName(CSVHeader::rh_1), /******************/ formatSensorVal(s->rh[1]));
       csv.addValue(m_csvHeaderDict.getChName(CSVHeader::rs_1), /******************/ formatSensorVal(s->rs[1]));
     }
 
-    if (projSetting->extSensorNum >= 2) {
+    if (ProjectSetting::ins().extSensorNum >= 2) {
       csv.addValue(m_csvHeaderDict.getChName(CSVHeader::ho2o2_2), /***************/ formatSensorVal(s->h2o2[2]));
       csv.addValue(m_csvHeaderDict.getChName(CSVHeader::temp_2), /****************/ formatSensorVal(s->temp[2]));
       csv.addValue(m_csvHeaderDict.getChName(CSVHeader::rh_2), /******************/ formatSensorVal(s->rh[2]));
@@ -206,7 +204,7 @@ void DisinfectionLogsService::dumpDisinfectionRecord(string sessionId, list<shar
     csv.addValue(m_csvHeaderDict.getChName(CSVHeader::tlog), /******************/ fmt::format("{}", s->tlog));
 
     // 拉杆箱消毒机没有消毒剂剩余量
-    if (projSetting->projectTypeInt != kdraw_bar_disinfection_box) {
+    if (ProjectSetting::ins().projectTypeInt != kdraw_bar_disinfection_box) {
       csv.addValue(m_csvHeaderDict.getChName(CSVHeader::remaindisinfectant), /****/ fmt::format("{}", s->remainDisinfectant));
     }
     csv.addValue(m_csvHeaderDict.getChName(CSVHeader::pumpvel), /***************/ fmt::format("{}", s->pumpVel));

appsrc/service/disinfection_logs_service.hpp

@@ -48,7 +48,6 @@ class DisinfectionLogsService : public enable_shared_from_this<DisinfectionLogsS
   shared_ptr<DBService>          m_db;
   shared_ptr<DeviceStateService> m_ds;
   shared_ptr<GConfig>            m_gConfig;
-  shared_ptr<ProjectSetting>  m_projectSettingMgr;
   shared_ptr<UDiskMgrService>    m_udiskMgrService;
 
   string                          m_sessionId;

appsrc/service/hardware/base/uint_convert_mgr.cpp

@@ -8,9 +8,6 @@ void UintConvertMgr::initialize() {
     return;
   }
   isInited = true;
-
-  m_projSet = GET_SERVICE(ProjectSetting);
-  ZASSERT(m_projSet);
 }
-double UintConvertMgr::gpm2speed(double gpm) { return gpm * m_projSet->gpmToSpeedRadio; }
-double UintConvertMgr::speed2gpm(double speed) { return (speed / m_projSet->gpmToSpeedRadio) + 0.5; }
+double UintConvertMgr::gpm2speed(double gpm) { return gpm * ProjectSetting::ins().gpmToSpeedRadio; }
+double UintConvertMgr::speed2gpm(double speed) { return (speed / ProjectSetting::ins().gpmToSpeedRadio) + 0.5; }

appsrc/service/hardware/base/uint_convert_mgr.hpp

@@ -32,9 +32,8 @@ using namespace core;
 class UintConvertMgr : public enable_shared_from_this<UintConvertMgr> {
   THISCLASS(UintConvertMgr);
 
-  recursive_mutex               lock_;
-  bool                          isInited = false;
-  shared_ptr<ProjectSetting> m_projSet;
+  recursive_mutex lock_;
+  bool            isInited = false;
 
  public:
   void initialize();

appsrc/service/hardware/device_ctrl_service.cpp

@@ -1,5 +1,5 @@
 #include "device_ctrl_service.hpp"
-#if 0
+#if 1
 using namespace iflytop;
 using namespace std;
 using namespace core;
@@ -32,8 +32,8 @@ bool isInPc() {
 // kh2o2_ext_sensor                  = 5,  // 外部H2O2传感器
 
 #define CAN_MASTER    TransmitDisinfectionCanMaster::ins()
-#define GET_BOARDID() (m_boardIdMgr->getId(COMPONENT).boardId)
-#define GET_SUBID()   (m_boardIdMgr->getId(COMPONENT).subId)
+#define GET_BOARDID() (ProjectSetting::ins().getId(COMPONENT).boardId)
+#define GET_SUBID()   (ProjectSetting::ins().getId(COMPONENT).subId)
 
 void DeviceIoControlService::initialize() {
   GET_TO_SERVICE(m_config);
@@ -131,7 +131,7 @@ int  DeviceIoControlService::NegaPressureProp_readPos() { return CAN_MASTER->pro
 bool DeviceIoControlService::NegaPressureProp_isBusy() { return CAN_MASTER->proportionalIsBusy(GET_BOARDID(), GET_SUBID()); }
 #undef COMPONENT
 
-#define COMPONENT HardwareComponent::AirLeakDetectTest
+#define COMPONENT HardwareComponent::AirLeakDetectTestChannelCtrl
 void DeviceIoControlService::AirLeakDetectTest_cutoffCh() { CAN_MASTER->airLeakDetectTestCloseOffCh(GET_BOARDID()); }
 void DeviceIoControlService::AirLeakDetectTest_releaseCh() { CAN_MASTER->airLeakDetectTestReleaseCh(GET_BOARDID()); }
 #undef COMPONENT

appsrc/service/main_control_service.cpp

@@ -27,8 +27,6 @@ void MainControlService::dosystem(string order, bool dump) {
 }
 
 void MainControlService::initialize() {
-  BUILD_AND_REG_SERRVICE(ProjectSetting);
-
   // Base
   BUILD_AND_REG_SERRVICE(IflytopFrontEndService);
   BUILD_AND_REG_SERRVICE(FrontMsgProcesser);