recode

appsrc/appsetting/project_setting/component_id_mgr.cpp

@@ -1,68 +0,0 @@
-#include "component_id_mgr.hpp"
-#if 0
-using namespace std;
-using namespace iflytop;
-using namespace core;
-
-#define HC HardwareComponent
-
-#define INSERT(id, boardId, subId) m_componentIdMap.insert({id, {boardId, subId}})
-
-void ComponentIdMgr::initialize() {  //
-  auto projSet = PROJECT_SETTING;
-
-  if (projSet->isLageSpaceDM() || projSet->isSmallSpaceDM() || projSet->isPipeDM()) {
-    // 加液泵
-    INSERT(HardwareComponent::kAddLiquidPump, kFixBoardId_LiquidCtrl, kpumpid_add_liquid);
-    // 喷雾泵
-    INSERT(HardwareComponent::kSprayPump, kFixBoardId_LiquidCtrl, kpumpid_spray);
-    // 风机
-    INSERT(HardwareComponent::kBlower, kFixBoardId_PowerControl, 0);
-    // 空压机
-    INSERT(HardwareComponent::kAirCompressor, kFixBoardId_PowerControl, 0);
-    // 加热器
-    INSERT(HardwareComponent::kHeater, kFixBoardId_PowerControl, 0);
-    // 报警灯
-    INSERT(HardwareComponent::kWarningLight, kFixBoardId_LiquidCtrl, 0);
-    // 蒸发仓水浸
-    INSERT(HardwareComponent::kEvaporationBinWS, kFixBoardId_LiquidCtrl, 0);
-    // 底部水浸
-    INSERT(HardwareComponent::kDeviceBottomWS, kFixBoardId_LiquidCtrl, 0);
-    // 主H2O2传感器
-    INSERT(HardwareComponent::kMainH2O2Sensor, kFixBoardId_PowerControl, 0);
-    // 液体重量传感器
-    INSERT(HardwareComponent::kLiquidWeightPS, kFixBoardId_LiquidCtrl, 1);
-    // 空压机后压力传感器
-    INSERT(HardwareComponent::kACPostPS, kFixBoardId_LiquidCtrl, 0);
-    // 喷雾泵后压力传感器
-    INSERT(HardwareComponent::kSprayPumpPostPS, kFixBoardId_LiquidCtrl, 0);
-    // 加液泵后压力传感器
-    INSERT(HardwareComponent::kAddLiquidPumpPostPS, kFixBoardId_LiquidCtrl, 0);
-
-    if (projSet->isPipeDM()) {
-      // 正压比例阀
-      INSERT(HardwareComponent::kPositivePressureProportional, kFixBoardId_LiquidCtrl, POSITIVE_PRESSURE_PROPORTIONAL_ID);
-      // 负压比例阀
-      INSERT(HardwareComponent::kNegativePressureProportional, kFixBoardId_LiquidCtrl, NEGATIVE_PRESSURE_PROPORTIONAL_ID);
-      // 气密传感器
-      INSERT(HardwareComponent::kAirLeakDetectPS, kFixBoardId_LiquidCtrl, 0);
-      // 空气密度测试空压机
-      INSERT(HardwareComponent::kAirLeakDetectTestAC, kFixBoardId_LiquidCtrl, 0);
-      // 空气密度测试通道控制
-      INSERT(HardwareComponent::kAirLeakDetectTestChannelCtrl, kFixBoardId_LiquidCtrl, 0);
-    }
-  }
-  if (projSet->isDrawBarDM()) {
-  }
-  // 外部通道选择器
-  // INSERT(HardwareComponent::kExtChSelector, kFixBoardId_ExtChSelector, 0);
-}
-
-ComponentId ComponentIdMgr::getId(HardwareComponent component) {
-  auto it = m_componentIdMap.find(component);
-  if (it != m_componentIdMap.end()) {
-    return it->second;
-  }
-  THROW_APP_EXCEPTION(err::kappe_code_error, "ComponentIdMgr::getId: component not found");
-}
-#endif

appsrc/appsetting/project_setting/project_setting_mgr.cpp

@@ -1,7 +1,7 @@
 #include "project_setting_mgr.hpp"
 
-#include "components/zservice_container/zservice_container.hpp"
 #include "appbase/appbase.hpp"
+#include "components/zservice_container/zservice_container.hpp"
 using namespace std;
 using namespace iflytop;
 #define INSERT(id, boardId, subId) componentIdMap.insert({id, {boardId, subId}})
@@ -21,7 +21,7 @@ static string projectType2Str(int val) {
   }
 }
 
-void ProjectSettingMgr::initialize() {
+void ProjectSetting::initialize() {
   GET_TO_SERVICE(gConfig);
   if (gConfig->get_projectType() == PROJECT_LARGE_SPACE_DM) {
     initProjectSetting(klarge_space_disinfection_machine);
@@ -32,11 +32,11 @@ void ProjectSettingMgr::initialize() {
   } else if (gConfig->get_projectType() == PROJECT_DRAW_BAR_DM) {
     initProjectSetting(kdraw_bar_disinfection_box);
   } else {
-    THROW_APP_EXCEPTION(err::kappe_code_error, "ProjectSettingMgr::initialize: projectType not found");
+    THROW_APP_EXCEPTION(err::kappe_code_error, "ProjectSetting::initialize: projectType not found");
   }
 }
 
-void ProjectSettingMgr::initProjectSetting(int projectTypeInt) {
+void ProjectSetting::initProjectSetting(int projectTypeInt) {
   projectTypeInt = projectTypeInt;
   projectType    = projectType2Str(projectTypeInt);
 
@@ -56,6 +56,7 @@ void ProjectSettingMgr::initProjectSetting(int projectTypeInt) {
     ZCHECK(false, "projectTypeInt not support: " + to_string(projectTypeInt));
   }
 
+  // 设备ID初始化
   if (isLageSpaceDM() || isSmallSpaceDM() || isPipeDM()) {
     // 加液泵
     INSERT(HardwareComponent::kAddLiquidPump, kFixBoardId_LiquidCtrl, kpumpid_add_liquid);

appsrc/appsetting/project_setting/project_setting_mgr.hpp

@@ -23,8 +23,8 @@ namespace iflytop {
 using namespace std;
 using namespace transmit_disfection_protocol;
 
-class ProjectSettingMgr {
-  THISCLASS(ProjectSettingMgr);
+class ProjectSetting {
+  THISCLASS(ProjectSetting);
 
  public:
   /* data */

appsrc/baseservice/db/setting_db_dao.cpp

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

appsrc/service/disinfection_logs_service.hpp

@@ -48,7 +48,7 @@ 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<ProjectSettingMgr>  m_projectSettingMgr;
+  shared_ptr<ProjectSetting>  m_projectSettingMgr;
   shared_ptr<UDiskMgrService>    m_udiskMgrService;
 
   string                          m_sessionId;

appsrc/service/hardware/base/uint_convert_mgr.cpp

@@ -9,7 +9,7 @@ void UintConvertMgr::initialize() {
   }
   isInited = true;
 
-  m_projSet = GET_SERVICE(ProjectSettingMgr);
+  m_projSet = GET_SERVICE(ProjectSetting);
   ZASSERT(m_projSet);
 }
 double UintConvertMgr::gpm2speed(double gpm) { return gpm * m_projSet->gpmToSpeedRadio; }

appsrc/service/hardware/base/uint_convert_mgr.hpp

@@ -34,7 +34,7 @@ class UintConvertMgr : public enable_shared_from_this<UintConvertMgr> {
 
   recursive_mutex               lock_;
   bool                          isInited = false;
-  shared_ptr<ProjectSettingMgr> m_projSet;
+  shared_ptr<ProjectSetting> m_projSet;
 
  public:
   void initialize();

appsrc/service/main_control_service.cpp

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