diff --git a/appsrc/service/app/add_liquid_service.cpp b/appsrc/service/app/add_liquid_service.cpp index c402afe..2f6b39b 100644 --- a/appsrc/service/app/add_liquid_service.cpp +++ b/appsrc/service/app/add_liquid_service.cpp @@ -20,7 +20,7 @@ void AddLiquidService::initialize() { REG_EXTFN_VOID(startStateReport, void()); REG_EXTFN_VOID(stopStateReport, void()); - stateUpdateThread.reset(new Thread("stateUpdateThread", [this]() { + stateUpdateThread.reset(new Thread("AddLiquidService-stateUpdateThread", [this]() { while (!ThisThread().getExitFlag()) { try { SEND_CLASS_REPORT(thisClass.className, "stateUpdate", getState()); diff --git a/appsrc/service/app/air_leak_detect_test.cpp b/appsrc/service/app/air_leak_detect_test.cpp index 6fd1d40..0bafc4c 100644 --- a/appsrc/service/app/air_leak_detect_test.cpp +++ b/appsrc/service/app/air_leak_detect_test.cpp @@ -19,7 +19,7 @@ void AirLeakDetectTest::initialize() { REG_EXTFN_VOID(startStateReport, void()); REG_EXTFN_VOID(stopStateReport, void()); - stateUpdateThread.reset(new Thread("stateUpdateThread", [this]() { + stateUpdateThread.reset(new Thread("AirLeakDetectTest-stateUpdateThread", [this]() { while (!ThisThread().getExitFlag()) { try { SEND_CLASS_REPORT(thisClass.className, "stateUpdate", getState()); diff --git a/appsrc/service/app/disinfection_ctrl_service_ext.cpp b/appsrc/service/app/disinfection_ctrl_service_ext.cpp index 27962a5..e851462 100644 --- a/appsrc/service/app/disinfection_ctrl_service_ext.cpp +++ b/appsrc/service/app/disinfection_ctrl_service_ext.cpp @@ -51,7 +51,7 @@ void DisinfectionCtrlServiceExt::initialize() { REG_EXTFN_VOID(startStateReport, void()); REG_EXTFN_VOID(stopStateReport, void()); - stateUpdateThread.reset(new Thread("stateUpdateThread", [this]() { + stateUpdateThread.reset(new Thread("DisinfectionCtrlServiceExt-stateUpdateThread", [this]() { while (!ThisThread().getExitFlag()) { DisinfectionState state; json report = getState(state); diff --git a/appsrc/service/app/drain_liquid_service.cpp b/appsrc/service/app/drain_liquid_service.cpp index 387e0d8..addea4c 100644 --- a/appsrc/service/app/drain_liquid_service.cpp +++ b/appsrc/service/app/drain_liquid_service.cpp @@ -17,7 +17,7 @@ void DrainLiquidService::initialize() { REG_EXTFN_VOID(startStateReport, void()); REG_EXTFN_VOID(stopStateReport, void()); - stateUpdateThread.reset(new Thread("stateUpdateThread", [this]() { + stateUpdateThread.reset(new Thread("DrainLiquidService-stateUpdateThread", [this]() { while (!ThisThread().getExitFlag()) { try { SEND_CLASS_REPORT(thisClass.className, "stateUpdate", getState()); diff --git a/appsrc/service/app_core.cpp b/appsrc/service/app_core.cpp index 97a54d4..c8386d9 100644 --- a/appsrc/service/app_core.cpp +++ b/appsrc/service/app_core.cpp @@ -219,7 +219,7 @@ void AppCore::initialize() { // // // - stateUpdateThread.reset(new Thread("stateUpdateThread", [this]() { + stateUpdateThread.reset(new Thread("AppCore-stateUpdateThread", [this]() { while (!ThisThread().getExitFlag()) { try { SEND_CLASS_REPORT(thisClass.className, "stateUpdate", getState()); diff --git a/appsrc/service/front_end_realtime_display_content_mgr.cpp b/appsrc/service/front_end_realtime_display_content_mgr.cpp index c8f7a91..eb8df6f 100644 --- a/appsrc/service/front_end_realtime_display_content_mgr.cpp +++ b/appsrc/service/front_end_realtime_display_content_mgr.cpp @@ -6,9 +6,8 @@ using namespace iflytop; void FrontEndRealtimeDisplayContentMgr::initialize() { // REG_EXTFN_VOID(readH2O2SensorData, json()); REG_EXTFN_VOID(readH2O2SensorRawData, json()); - unique_ptr stateUpdateThread; // - stateUpdateThread.reset(new Thread("stateUpdateThread", [this]() { + stateUpdateThread.reset(new Thread("FERDC-stateUpdateThread", [this]() { while (!ThisThread().getExitFlag()) { try { SEND_CLASS_REPORT(thisClass.className, "stateUpdate", readH2O2SensorData()); @@ -26,27 +25,38 @@ json FrontEndRealtimeDisplayContentMgr::readH2O2SensorData() { // h2o2Mgr->getCacheData() json sensordata = json::array(); if (PORT.getExtH2O2SensorNum() >= 0) { - sensordata[0]["h2o2"] = !h2o2Mgr->isDataExpired(0) ? h2o2Mgr->getCacheData(0)->h2o2 : -1; - sensordata[0]["temp"] = !h2o2Mgr->isDataExpired(0) ? h2o2Mgr->getCacheData(0)->temp : -1; - sensordata[0]["rh"] = !h2o2Mgr->isDataExpired(0) ? h2o2Mgr->getCacheData(0)->rh : -1; - sensordata[0]["rs"] = !h2o2Mgr->isDataExpired(0) ? h2o2Mgr->getCacheData(0)->rs : -1; + sensordata[0]["h2o2"] = !h2o2Mgr->isDataExpired(0) ? h2o2Mgr->getCacheData(0)->h2o2 : -1; + sensordata[0]["temp"] = !h2o2Mgr->isDataExpired(0) ? h2o2Mgr->getCacheData(0)->temp : -1; + sensordata[0]["rh"] = !h2o2Mgr->isDataExpired(0) ? h2o2Mgr->getCacheData(0)->rh : -1; + sensordata[0]["rs"] = !h2o2Mgr->isDataExpired(0) ? h2o2Mgr->getCacheData(0)->rs : -1; + sensordata[0]["type"] = "Internal"; // Internal sensor + sensordata[0]["sensorId"] = 1; // Internal sensor } if (PORT.getExtH2O2SensorNum() >= 1) { - sensordata[1]["h2o2"] = !h2o2Mgr->isDataExpired(1) ? h2o2Mgr->getCacheData(1)->h2o2 : -1; - sensordata[1]["temp"] = !h2o2Mgr->isDataExpired(1) ? h2o2Mgr->getCacheData(1)->temp : -1; - sensordata[1]["rh"] = !h2o2Mgr->isDataExpired(1) ? h2o2Mgr->getCacheData(1)->rh : -1; - sensordata[1]["rs"] = !h2o2Mgr->isDataExpired(1) ? h2o2Mgr->getCacheData(1)->rs : -1; + sensordata[1]["h2o2"] = !h2o2Mgr->isDataExpired(1) ? h2o2Mgr->getCacheData(1)->h2o2 : -1; + sensordata[1]["temp"] = !h2o2Mgr->isDataExpired(1) ? h2o2Mgr->getCacheData(1)->temp : -1; + sensordata[1]["rh"] = !h2o2Mgr->isDataExpired(1) ? h2o2Mgr->getCacheData(1)->rh : -1; + sensordata[1]["rs"] = !h2o2Mgr->isDataExpired(1) ? h2o2Mgr->getCacheData(1)->rs : -1; + sensordata[1]["type"] = "WiredExSensor"; // WiredExSensor sensor + sensordata[1]["sensorId"] = 1; } if (PORT.getExtH2O2SensorNum() >= 2) { - sensordata[2]["h2o2"] = !h2o2Mgr->isDataExpired(2) ? h2o2Mgr->getCacheData(2)->h2o2 : -1; - sensordata[2]["temp"] = !h2o2Mgr->isDataExpired(2) ? h2o2Mgr->getCacheData(2)->temp : -1; - sensordata[2]["rh"] = !h2o2Mgr->isDataExpired(2) ? h2o2Mgr->getCacheData(2)->rh : -1; - sensordata[2]["rs"] = !h2o2Mgr->isDataExpired(2) ? h2o2Mgr->getCacheData(2)->rs : -1; + sensordata[2]["h2o2"] = !h2o2Mgr->isDataExpired(2) ? h2o2Mgr->getCacheData(2)->h2o2 : -1; + sensordata[2]["temp"] = !h2o2Mgr->isDataExpired(2) ? h2o2Mgr->getCacheData(2)->temp : -1; + sensordata[2]["rh"] = !h2o2Mgr->isDataExpired(2) ? h2o2Mgr->getCacheData(2)->rh : -1; + sensordata[2]["rs"] = !h2o2Mgr->isDataExpired(2) ? h2o2Mgr->getCacheData(2)->rs : -1; + sensordata[1]["type"] = "WiredExSensor"; // WiredExSensor sensor + sensordata[1]["sensorId"] = 2; } - return sensordata; + json rely; + rely["sensordata"] = sensordata; + rely["internalSensorNum"] = 1; + rely["wiredExSensorNum"] = PORT.getExtH2O2SensorNum(); + + return rely; } void FrontEndRealtimeDisplayContentMgr::readH2O2SensorData(shared_ptr cxt) { cxt->rely["val"] = readH2O2SensorData(); } diff --git a/appsrc/service/front_end_realtime_display_content_mgr.hpp b/appsrc/service/front_end_realtime_display_content_mgr.hpp index 29c2b21..d7ae554 100644 --- a/appsrc/service/front_end_realtime_display_content_mgr.hpp +++ b/appsrc/service/front_end_realtime_display_content_mgr.hpp @@ -15,12 +15,13 @@ class FrontEndRealtimeDisplayContentMgr : public enable_shared_from_this m_ds; + unique_ptr stateUpdateThread; public: void initialize(); private: - json readH2O2SensorData(); + json readH2O2SensorData(); void readH2O2SensorData(shared_ptr cxt); void readH2O2SensorRawData(shared_ptr cxt); };