修改线程名称

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());

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());

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);

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());

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());

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<Thread> 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<MsgProcessContext> cxt) { cxt->rely["val"] = readH2O2SensorData(); }

appsrc/service/front_end_realtime_display_content_mgr.hpp

@@ -15,12 +15,13 @@ class FrontEndRealtimeDisplayContentMgr : public enable_shared_from_this<FrontEn
   THISCLASS(FrontEndRealtimeDisplayContentMgr);
 
   shared_ptr<DeviceStateService> m_ds;
+  unique_ptr<Thread>             stateUpdateThread;
 
  public:
   void initialize();
 
  private:
- json readH2O2SensorData();
+  json readH2O2SensorData();
   void readH2O2SensorData(shared_ptr<MsgProcessContext> cxt);
   void readH2O2SensorRawData(shared_ptr<MsgProcessContext> cxt);
 };