From 3bb1c89e65fca5043bcb294acc7b6db30f34bd65 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sat, 7 Dec 2024 00:30:21 +0800 Subject: [PATCH] v2.0.6 --- README.md | 2 + .../appevent/app_checkpoint_check_fail_event.hpp | 24 ++++++++- appsrc/appconfig/basic/project_constant.hpp | 6 +-- appsrc/appconfig/basic/zappversion.hpp | 2 +- appsrc/baseservice/db/bean/user_behavior_des.cpp | 4 ++ appsrc/baseservice/db/bean/user_behavior_des.hpp | 2 + appsrc/baseservice/port/project_port.hpp | 2 +- appsrc/service/app/add_liquid_service.cpp | 20 ++++--- .../disinfection_ctrl_service.cpp | 1 + appsrc/service/app/drain_liquid_service.cpp | 46 ++++++++++++++-- appsrc/service/app_core.cpp | 17 +++++- appsrc/service/debug_page_test_service.cpp | 7 ++- .../service/device_check_point_check_service.cpp | 17 +++++- .../service/device_check_point_check_service.hpp | 15 ------ appsrc/service/device_info_mgr_service.cpp | 61 +++++++++++++++++++--- appsrc/service/device_info_mgr_service.hpp | 6 +++ .../disinfectant_weight_update_service.cpp | 2 +- appsrc/service/setting/ext_setting_mgr_service.cpp | 10 ++-- 18 files changed, 193 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index bd37ff6..79384d3 100644 --- a/README.md +++ b/README.md @@ -117,6 +117,8 @@ VERSION 2.0.2 VERSION 2.0.3 1. 增加设备信息配置接口 +VERSION 2.0.4 + 1. 修复部分BUG TODO: 1. 设备使用时间维护(UI接口已经准备好，考虑是否使用文件袋放在设备中的方案) diff --git a/appsrc/appbase/appevent/app_checkpoint_check_fail_event.hpp b/appsrc/appbase/appevent/app_checkpoint_check_fail_event.hpp index c600b1f..fe83444 100644 --- a/appsrc/appbase/appevent/app_checkpoint_check_fail_event.hpp +++ b/appsrc/appbase/appevent/app_checkpoint_check_fail_event.hpp @@ -2,10 +2,30 @@ #include "iapp_event.hpp" namespace iflytop { +typedef enum { + kCheckPointCode_Unknown = 0, + kCheckPointCode_evaporationBinWSTrigger, + kCheckPointCode_deviceBottomWSTrigger, +} CheckPointCode_t; + +class CheckPoint { + public: + CheckPointCode_t index; + string name; + bool passed; + int ecode; + string ecodeInfo; + + CheckPoint(CheckPointCode_t index, const string& name, bool passed) : index(index), name(name), passed(passed) {} + NLOHMANN_DEFINE_TYPE_INTRUSIVE(CheckPoint, index, ecode, ecodeInfo, name, passed); +}; + class AppCheckPointCheckFailEvent : public IAppEvent { - private: public: - AppCheckPointCheckFailEvent() : IAppEvent(AppEventType::AppCheckPointCheckFailEvent) {} + vector errCheckPoints; + + public: + AppCheckPointCheckFailEvent(vector checkpoint) : IAppEvent(AppEventType::AppCheckPointCheckFailEvent) { errCheckPoints = checkpoint; } virtual ~AppCheckPointCheckFailEvent() {} NLOHMANN_DEFINE_TYPE_INTRUSIVE(AppCheckPointCheckFailEvent, uuid, type); diff --git a/appsrc/appconfig/basic/project_constant.hpp b/appsrc/appconfig/basic/project_constant.hpp index caf2e6f..ac87fc3 100644 --- a/appsrc/appconfig/basic/project_constant.hpp +++ b/appsrc/appconfig/basic/project_constant.hpp @@ -20,8 +20,8 @@ // GPM_TO_SPEED_RADIO #define LARGE_SPACE_DM__GPM_TO_SPEED_RADIO (11.1250) #define SMALL_SPACE_DM__GPM_TO_SPEED_RADIO (11.1250) -#define PIPE_DM_GPM_TO_SPEED_RADIO (11.1250) -#define DRAW_BAR_DM_GPM_TO_SPEED_RADIO (41.97) +#define PIPE_DM_GPM_TO_SPEED_RADIO (11.1250) +#define DRAW_BAR_DM_GPM_TO_SPEED_RADIO (41.97) // EXT_SENSOR_NUM #define LARGE_SPACE_DM_EXT_SENSOR_NUM (2) @@ -34,5 +34,5 @@ #define LARGE_SPACE_DM__DISINFECTANT_BUCKET_CAPACITY 4800 #define SMALL_SPACE_DM__DISINFECTANT_BUCKET_CAPACITY 2800 -#define PIPE_DM__DISINFECTANT_BUCKET_CAPACITY 2500 +#define PIPE_DM__DISINFECTANT_BUCKET_CAPACITY 2300 #define DRAW_BAR_DM__DISINFECTANT_BUCKET_CAPACITY 0 \ No newline at end of file diff --git a/appsrc/appconfig/basic/zappversion.hpp b/appsrc/appconfig/basic/zappversion.hpp index 01266aa..5e45177 100644 --- a/appsrc/appconfig/basic/zappversion.hpp +++ b/appsrc/appconfig/basic/zappversion.hpp @@ -1,3 +1,3 @@ #pragma once -#define VERSION "2.0.3" +#define VERSION "2.0.6" #define PROJECT_NAME "TRANSMIT_DM" \ No newline at end of file diff --git a/appsrc/baseservice/db/bean/user_behavior_des.cpp b/appsrc/baseservice/db/bean/user_behavior_des.cpp index eb171a3..d0fdd20 100644 --- a/appsrc/baseservice/db/bean/user_behavior_des.cpp +++ b/appsrc/baseservice/db/bean/user_behavior_des.cpp @@ -44,6 +44,10 @@ string user_behavior_to_str(user_behavior_t behavior) { return "导出消毒数据"; case kbehavior_export_user_action_data: return "导出用户操作数据"; + case kbehavior_warning_prompt: + return "警告信息"; + case kbehavior_warning_prompt_confirm: + return "警告信息确认"; default: break; } diff --git a/appsrc/baseservice/db/bean/user_behavior_des.hpp b/appsrc/baseservice/db/bean/user_behavior_des.hpp index e71c5db..51f7767 100644 --- a/appsrc/baseservice/db/bean/user_behavior_des.hpp +++ b/appsrc/baseservice/db/bean/user_behavior_des.hpp @@ -32,6 +32,8 @@ typedef enum { kbehavior_export_disinfection_data = 16, kbehavior_export_user_action_data = 17, kbehavior_update_formula_name = 18, + kbehavior_warning_prompt = 19, + kbehavior_warning_prompt_confirm = 20, } user_behavior_t; string user_behavior_to_str(user_behavior_t behavior); diff --git a/appsrc/baseservice/port/project_port.hpp b/appsrc/baseservice/port/project_port.hpp index a7bf3a9..8209d87 100644 --- a/appsrc/baseservice/port/project_port.hpp +++ b/appsrc/baseservice/port/project_port.hpp @@ -56,7 +56,7 @@ class ProjectPort { bool isDeviceTypeInited() { return deviceTypeInited; } bool isBuildInPC() { -#ifdef BUILD_IN_PC +#ifdef BUILD_ON_PC return true; #else return false; diff --git a/appsrc/service/app/add_liquid_service.cpp b/appsrc/service/app/add_liquid_service.cpp index 45518dc..225a8e4 100644 --- a/appsrc/service/app/add_liquid_service.cpp +++ b/appsrc/service/app/add_liquid_service.cpp @@ -30,9 +30,9 @@ void AddLiquidService::start(int stopatg) { THROW_APP_EXCEPTION(getDeviceBusyReason(nowstate), ""); } - if (zsteady_clock().gets() < SENSOR_PREHEART_TIME_S) { - THROW_APP_EXCEPTION(err::kappe_sensor_is_pre_hearting, ""); - } + // if (zsteady_clock().gets() < SENSOR_PREHEART_TIME_S) { + // THROW_APP_EXCEPTION(err::kappe_sensor_is_pre_hearting, ""); + // } if (m_thread && !m_thread->isWaitingForJoin()) { THROW_APP_EXCEPTION(err::kappe_disinfection_state_is_wrong, ""); @@ -50,7 +50,7 @@ void AddLiquidService::start(int stopatg) { int32_t nowvolume = m_dwus->getWeight(); int maxg = PORT.getDisinfectantBucketCapacity(); - if (nowvolume > stopatg) { + if (nowvolume >= stopatg) { logger->warn("start add liquid fail, nowvolume {} > stopatg {}", nowvolume, stopatg); THROW_APP_EXCEPTION(err::kappe_adding_liquid_is_already_in_place, ""); } @@ -96,8 +96,12 @@ void AddLiquidService::addLiquidWork(int stopatg, bool& errorflag) { * @brief 选择加液通道 */ m_dics->setAddFluidChannelSelectorValve(true); - m_dics->AddLiquidPump_addLiquid(); + + /** + * @brief 等待加液完成 + */ + while (!thisThread.getExitFlag()) { int32_t nowvolume = m_dwus->getWeight(); logger->info("replenishingFluids {}g", nowvolume); @@ -115,9 +119,13 @@ void AddLiquidService::addLiquidWork(int stopatg, bool& errorflag) { thisThread.sleepForMs(300); } + + /** + * @brief 停止加液 + */ m_dics->AddLiquidPump_stop(); + thisThread.sleepForMs(2500); - thisThread.sleepForMs(1500); // 等待泵停止 /** * @brief 选择排空管路通道 */ diff --git a/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp b/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp index fc01d7f..cc618fe 100644 --- a/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp +++ b/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp @@ -226,6 +226,7 @@ void DisinfectionCtrlService::startWorkThread() { if (!stopbyusrflag && ThisThread().getExitFlag()) { stopbyusrflag = true; sm.changeState(DisinfectionState::finished); + continue; } if (sm.getState() == DisinfectionState::finished) { diff --git a/appsrc/service/app/drain_liquid_service.cpp b/appsrc/service/app/drain_liquid_service.cpp index f6c1f2e..04564d9 100644 --- a/appsrc/service/app/drain_liquid_service.cpp +++ b/appsrc/service/app/drain_liquid_service.cpp @@ -1,6 +1,6 @@ #include "drain_liquid_service.hpp" using namespace iflytop; -#define DRAINLIQUID_EXT_TIME_S 50 +#define DRAINLIQUID_EXT_TIME_S 25 void DrainLiquidService::initialize() { logger->info("DrainLiquidService initialize"); @@ -29,9 +29,9 @@ void DrainLiquidService::start() { THROW_APP_EXCEPTION(err::kappe_state_is_busy, ""); } - if (zsteady_clock().gets() < SENSOR_PREHEART_TIME_S) { - THROW_APP_EXCEPTION(err::kappe_sensor_is_pre_hearting, ""); - } + // if (zsteady_clock().gets() < SENSOR_PREHEART_TIME_S) { + // THROW_APP_EXCEPTION(err::kappe_sensor_is_pre_hearting, ""); + // } if (m_thread && !m_thread->isWaitingForJoin()) { THROW_APP_EXCEPTION(err::kappe_disinfection_state_is_wrong, ""); @@ -91,7 +91,7 @@ void DrainLiquidService::getServiceConfig(shared_ptr cxt) { void DrainLiquidService::workThread() { ThisThread thisThread; - +#if 0 m_dics->setAddFluidChannelSelectorValve(true); m_dics->AddLiquidPump_drainLiquid(); m_dics->SprayPump_startInRPM(-PORT.getEmptyPipeSprayPumpRPM()); @@ -135,7 +135,43 @@ void DrainLiquidService::workThread() { m_dics->AddLiquidPump_stop(); m_dics->SprayPump_stop(); m_dics->setAddFluidChannelSelectorValve(false); +#endif + + m_dics->setAddFluidChannelSelectorValve(true); + m_dics->AddLiquidPump_drainLiquid(); + logger->info("startDraining "); + + auto startdrainingtime = zsteady_clock().now(); + + zsteady_tp volumeReachZeroTime; + bool volumeReachZeroFlag = false; + + while (!thisThread.getExitFlag()) { + int32_t nowvolume = m_dwus->getWeight(); + logger->info("draining remain {} g", nowvolume); + if (!volumeReachZeroFlag && nowvolume <= 0) { + volumeReachZeroTime = zsteady_clock().now(); + volumeReachZeroFlag = true; + } + + if (m_dics->WaterSensor_readDeviceBottom()) { + AppEventBus::ins()->push(make_shared(err::kappe_the_bottom_of_the_device_has_water)); + break; + } + + if (volumeReachZeroFlag) { + logger->info("stopDraining after {} s", DRAINLIQUID_EXT_TIME_S - zsteady_clock().elapsedTimeS(volumeReachZeroTime)); + if (zsteady_clock().elapsedTimeS(volumeReachZeroTime) > DRAINLIQUID_EXT_TIME_S) { + break; + } + } + thisThread.sleepForMs(500); + } + logger->info("stopDraining"); + m_dics->AddLiquidPump_stop(); + thisThread.sleepForMs(1000); + m_dics->setAddFluidChannelSelectorValve(false); } void DrainLiquidService::getState(shared_ptr cxt) { cxt->rely = getState(); } diff --git a/appsrc/service/app_core.cpp b/appsrc/service/app_core.cpp index fb4ac64..2bcfa0b 100644 --- a/appsrc/service/app_core.cpp +++ b/appsrc/service/app_core.cpp @@ -25,8 +25,8 @@ // #include "baseservice/db/device_ext_setting_dao.hpp" #include "calibration/h2o2_liquid_weight_sensor_calibration_service.hpp" -#include "setting/ext_setting_mgr_service.hpp" #include "equipment_usage_info_mgr_service.hpp" +#include "setting/ext_setting_mgr_service.hpp" // DeviceExtSettingDAO @@ -48,7 +48,6 @@ static void installEcodeInfo() { REG_ENUM_TYPE(AppEventType, AppEventType::getEnumStrList()); REG_ENUM_TYPE(ProjectTypeEnum, ProjectTypeEnum::getEnumStrList()); REG_ENUM_TYPE(DeviceType, DeviceType::getEnumStrList()); - AppEcodeInfoMgr::ins().regEcodeInfo(kerr_overtime, "通信超时"); AppEcodeInfoMgr::ins().regEcodeInfo(kerr_invalid_param, "非法参数"); @@ -217,6 +216,15 @@ void AppCore::appEventConfirm(shared_ptr cxt, string evenid) lock_guard lock(appEventListMutex); for (auto it = appEventList.begin(); it != appEventList.end(); it++) { if ((*it)->uuid == evenid) { + if (dynamic_pointer_cast(*it)) { + ADD_USER_BEHAVIOR(DS->getLoginName(), kbehavior_warning_prompt_confirm, dynamic_pointer_cast(*it)->getDescription()); + } + if (dynamic_pointer_cast(*it)) { + vector checkPoints = dynamic_pointer_cast(*it)->errCheckPoints; + for (auto& cp : checkPoints) { + ADD_USER_BEHAVIOR(DS->getLoginName(), kbehavior_warning_prompt_confirm, cp.ecodeInfo); + } + } appEventList.erase(it); break; } @@ -233,8 +241,13 @@ void AppCore::insertAppEvent(shared_ptr event) { if (dynamic_pointer_cast(event)) { GET_SERVICE(WarningLightControler)->setwarningFlag(true); + ADD_USER_BEHAVIOR(DS->getLoginName(), kbehavior_warning_prompt, dynamic_pointer_cast(event)->getDescription()); } else if (dynamic_pointer_cast(event)) { GET_SERVICE(WarningLightControler)->setwarningFlag(true); + vector checkPoints = dynamic_pointer_cast(event)->errCheckPoints; + for (auto& cp : checkPoints) { + ADD_USER_BEHAVIOR(DS->getLoginName(), kbehavior_warning_prompt, cp.ecodeInfo); + } } } diff --git a/appsrc/service/debug_page_test_service.cpp b/appsrc/service/debug_page_test_service.cpp index 8dc60eb..4087c01 100644 --- a/appsrc/service/debug_page_test_service.cpp +++ b/appsrc/service/debug_page_test_service.cpp @@ -127,5 +127,10 @@ void DebugPageTestService::triggerPromptEvent(shared_ptr cxt, AppEventBus::ins()->pushPromoptEvent(message); } void DebugPageTestService::triggerAppCheckPointFailEvent(shared_ptr cxt) { // - AppEventBus::ins()->push(make_shared()); + vector checkPoints; + CheckPoint checkPoint(kCheckPointCode_evaporationBinWSTrigger, "消毒蒸发仓位传感器触发", false); + checkPoint.ecode = err::kappe_the_evaporation_bin_has_water; + checkPoints.push_back(checkPoint); + + AppEventBus::ins()->push(make_shared(checkPoints)); } diff --git a/appsrc/service/device_check_point_check_service.cpp b/appsrc/service/device_check_point_check_service.cpp index e5db3f0..7173bc0 100644 --- a/appsrc/service/device_check_point_check_service.cpp +++ b/appsrc/service/device_check_point_check_service.cpp @@ -37,14 +37,20 @@ void DeviceCheckPointCheckService::initialize() { // if (checkPointIndex == kCheckPointCode_evaporationBinWSTrigger) { if (GET_SERVICE(DeviceIoControlService)->WaterSensor_readEvaporationBin()) { checkPoint.passed = false; + checkPoint.ecode = err::kappe_the_evaporation_bin_has_water; + checkPoint.ecodeInfo = ecode2str(checkPoint.ecode); } else { checkPoint.passed = true; + checkPoint.ecode = 0; } } else if (checkPointIndex == kCheckPointCode_deviceBottomWSTrigger) { if (GET_SERVICE(DeviceIoControlService)->WaterSensor_readDeviceBottom()) { - checkPoint.passed = false; + checkPoint.passed = false; + checkPoint.ecode = err::kappe_the_bottom_of_the_device_has_water; + checkPoint.ecodeInfo = ecode2str(checkPoint.ecode); } else { checkPoint.passed = true; + checkPoint.ecode = 0; } } } catch (const std::exception& e) { @@ -65,7 +71,14 @@ void DeviceCheckPointCheckService::initialize() { // } else if (DS->getDeviceState() == DeviceState::AirLeakDetectTesting) { GET_SERVICE(AirLeakDetectTest)->stop(); } - AppEventBus::ins()->push(make_shared()); + + vector errCheckPoints; + for (auto& checkPoint : checkPoints) { + if (!checkPoint.passed) { + errCheckPoints.push_back(checkPoint); + } + } + AppEventBus::ins()->push(make_shared(errCheckPoints)); } } } diff --git a/appsrc/service/device_check_point_check_service.hpp b/appsrc/service/device_check_point_check_service.hpp index c1d4eaa..6317623 100644 --- a/appsrc/service/device_check_point_check_service.hpp +++ b/appsrc/service/device_check_point_check_service.hpp @@ -17,21 +17,6 @@ namespace iflytop { * 设备空闲状态异常监听 */ -typedef enum { - kCheckPointCode_Unknown = 0, - kCheckPointCode_evaporationBinWSTrigger, - kCheckPointCode_deviceBottomWSTrigger, -} CheckPointCode_t; - -class CheckPoint { - public: - CheckPointCode_t index; - string name; - bool passed; - - CheckPoint(CheckPointCode_t index, const string& name, bool passed) : index(index), name(name), passed(passed) {} - NLOHMANN_DEFINE_TYPE_INTRUSIVE(CheckPoint, index, name, passed); -}; class DeviceCheckPointCheckService : public enable_shared_from_this { THISCLASS(DeviceCheckPointCheckService); diff --git a/appsrc/service/device_info_mgr_service.cpp b/appsrc/service/device_info_mgr_service.cpp index 3b7dd86..5584803 100644 --- a/appsrc/service/device_info_mgr_service.cpp +++ b/appsrc/service/device_info_mgr_service.cpp @@ -9,14 +9,61 @@ void DeviceInfoMgrService::initialize() { GET_TO_SERVICE(m_ds); REG_EXTFN_VOID(getDeviceInfo, void()); + REG_EXTFN_VOID(getSubDeviceInfo, void()); } +#define CAN_MASTER TransmitDisinfectionCanMaster::ins() + void DeviceInfoMgrService::getDeviceInfo(shared_ptr cxt) { // - auto& content = cxt->rely; - content["projectType"] = PORT.getProjTypeString(); - content["appVersion"] = VERSION; - content["deviceType"] = DeviceExtSettingDAO::ins()->getDeviceExtSetting().deviceType; - content["mircoVersion"] = "3.0.0"; // TODO:换成真实的版本信息 - content["ip"] = "192.168.73.10"; - content["deviceId"] = DeviceExtSettingDAO::ins()->getDeviceExtSetting().deviceId; + auto& content = cxt->rely; + content["projectType"] = PORT.getProjTypeString(); + content["appVersion"] = VERSION; + content["deviceType"] = DeviceExtSettingDAO::ins()->getDeviceExtSetting().deviceType; + // content["mircoVersion"] = "3.0.0"; // TODO:换成真实的版本信息 + content["ip"] = "192.168.73.10"; + content["deviceId"] = DeviceExtSettingDAO::ins()->getDeviceExtSetting().deviceId; + content["deviceTypeInited"] = PORT.isDeviceTypeInited(); +} +json DeviceInfoMgrService::tryConstructBoardInfo(int boardId) { + json boardInfo; + + if (boardId == kFixBoardId_LiquidCtrl) { + boardInfo["name"] = "液路板版本信息"; + } else if (boardId == kFixBoardId_PowerControl) { + boardInfo["name"] = "功率板版本信息"; + } else if (boardId == kFixBoardId_ExtChSelector) { + boardInfo["name"] = "外部通道选择器版本信息"; + } else if (boardId >= kFixBoardId_H2O2SensorStart) { + boardInfo["name"] = "H2O2传感器版本信息"; + } else { + boardInfo["name"] = "未知板卡"; + } + + if (PORT.isBuildInPC()) { + boardInfo["version"] = "IN_PC:FAKE_VERSION"; + } + + else if (!PORT.isDeviceTypeInited()) { + boardInfo["version"] = "主机-设备类型未初始化"; + } + + else { + try { + ack_read_board_info_data_t info = CAN_MASTER->readboardinfo(boardId); + boardInfo["version"] = fmt::format("BT{:0>2d}HV{:0>2d}-{}", info.boardType, info.hardware_version, info.software_version); + } catch (...) { + boardInfo["version"] = "离线"; + } + } + + return boardInfo; } + +void DeviceInfoMgrService::getSubDeviceInfo(shared_ptr cxt) { + json content; + content["versionInfo"].push_back(tryConstructBoardInfo(kFixBoardId_LiquidCtrl)); + content["versionInfo"].push_back(tryConstructBoardInfo(kFixBoardId_PowerControl)); + cxt->rely = content; +} + +void DeviceInfoMgrService::getSubDeviceOSRunState(shared_ptr cxt) {} diff --git a/appsrc/service/device_info_mgr_service.hpp b/appsrc/service/device_info_mgr_service.hpp index 612263a..66e8b48 100644 --- a/appsrc/service/device_info_mgr_service.hpp +++ b/appsrc/service/device_info_mgr_service.hpp @@ -22,6 +22,12 @@ class DeviceInfoMgrService : public enable_shared_from_this cxt); + void getSubDeviceInfo(shared_ptr cxt); + void getSubDeviceOSRunState(shared_ptr cxt); + + + private: + json tryConstructBoardInfo(int boardId); }; } // namespace iflytop diff --git a/appsrc/service/hardware/disinfectant_weight_update_service.cpp b/appsrc/service/hardware/disinfectant_weight_update_service.cpp index 2303a8e..ebeef65 100644 --- a/appsrc/service/hardware/disinfectant_weight_update_service.cpp +++ b/appsrc/service/hardware/disinfectant_weight_update_service.cpp @@ -41,7 +41,7 @@ float DisinfectantWeightUpdateService::getRoughWeight() { void DisinfectantWeightUpdateService::updateWeightThread() { while (true) { if (PORT.isLageSpaceDM() || PORT.isSmallSpaceDM() || PORT.isPipeDM()) { - if (!DS->isTestMode()) { + if (DS->isTestMode()) { setNetWeight(1000); } diff --git a/appsrc/service/setting/ext_setting_mgr_service.cpp b/appsrc/service/setting/ext_setting_mgr_service.cpp index 6536b9f..f877d87 100644 --- a/appsrc/service/setting/ext_setting_mgr_service.cpp +++ b/appsrc/service/setting/ext_setting_mgr_service.cpp @@ -88,19 +88,19 @@ void ExtSettingMgrService::setDeviceInfo(shared_ptr cxt, Devi string deviceIdPrefix; if (type == DeviceType::DT_600N) { DeviceExtSettingDAO::ins()->setProjectTypes(ProjectTypeEnum::LargeSpaceDM); - deviceIdPrefix = "DT-600N"; + deviceIdPrefix = "DT600N"; } else if (type == DeviceType::DT_300N) { DeviceExtSettingDAO::ins()->setProjectTypes(ProjectTypeEnum::SmallSpaceDM); - deviceIdPrefix = "DT-300N"; + deviceIdPrefix = "DT300N"; } else if (type == DeviceType::DT_300W) { DeviceExtSettingDAO::ins()->setProjectTypes(ProjectTypeEnum::PipeDM); - deviceIdPrefix = "DT-300W"; + deviceIdPrefix = "DT300W"; } else if (type == DeviceType::DT_100N) { DeviceExtSettingDAO::ins()->setProjectTypes(ProjectTypeEnum::DrawBarDM); - deviceIdPrefix = "DT-100N"; + deviceIdPrefix = "DT100N"; } DeviceExtSettingDAO::ins()->setDeviceType(type); - DeviceExtSettingDAO::ins()->setDeviceId(fmt::format("{}-{:0>2d}{:0>2d}{:0>2d}{:0>3d}", deviceIdPrefix, year, month, day, index)); + DeviceExtSettingDAO::ins()->setDeviceId(fmt::format("{}{:0>2d}{:0>2d}{:0>2d}{:0>3d}", deviceIdPrefix, year, month, day, index)); cxt->rely["extSettings"] = DeviceExtSettingDAO::ins()->getDeviceExtSettingAsJson(); }