Explorar o código

告警复原!!

liyi hai 10 meses
pai
achega
6bf7a00d1b
Modificáronse 1 ficheiros con 3 adicións e 5 borrados
  1. 3 5
      pro/src/app.c

+ 3 - 5
pro/src/app.c

@@ -2380,22 +2380,20 @@ static void* sensor_thread(void* arg)
                             alarmflag = true;
                         }
                     }
-
+                    _globalSensorMangerTemp->Cur_sensor_info=_globalSensorInfo;
+                    set_dry_val_modbus(_globalDeviceManager,_globalSensorMangerTemp->sensor_status,_globalSensorMangerTemp->sensor_addr);
                     if (alarmflag){
                         dev_sensor_Alarm_send_message(&__globalDeviceManage, _globalSensorMangerTemp, -1);
                         time_t now;
                         time(&now);
                         t = localtime(&now);
+                        _globalSensorMangerTemp->Cur_sensor_info.product_log_time = now;
                         ret = dev_insert_sensor_info(_globalDeviceManager->db, &_globalSensorMangerTemp->Cur_sensor_info, &nSaveIndex);
                         if (ret != 0)
                         {
                             log_e("sensor_temp_write database error.");
                         }
                     }
-                    
-
-                    _globalSensorMangerTemp->Cur_sensor_info=_globalSensorInfo;
-                    set_dry_val_modbus(_globalDeviceManager,_globalSensorMangerTemp->sensor_status,_globalSensorMangerTemp->sensor_addr);
                 }                
             }
             break;