继续改指针为结构体

pro/src/app.c

@@ -1269,43 +1269,43 @@ void sensor_alarm(GlobalSensorManger *_globalSensorMangerTemp, int nAlarmType)
     char  *nCtrlType = NULL; //报警方式
     char  *nCtrlValue= NULL; //控制通道
     char strCtrlValue[512]={0};
-    if (!_globalSensorMangerTemp|| !_globalSensorMangerTemp->over_manager)
+    if (!_globalSensorMangerTemp)
     {
         return;
     }
     switch (nAlarmType)
     {
     case SENSOR_VAL1_UPPER:
-        penable = &_globalSensorMangerTemp->over_manager->sensor_val1_upper_enabled;
-        pValthreshold = &_globalSensorMangerTemp->over_manager->sensor_val1_upper_threshold;
+        penable = &_globalSensorMangerTemp->over_manager.sensor_val1_upper_enabled;
+        pValthreshold = &_globalSensorMangerTemp->over_manager.sensor_val1_upper_threshold;
         pSave = &_globalSensorMangerTemp->warning_status.sensor_val1_upper;
         pValData = &_globalSensorMangerTemp->Cur_sensor_info.val1;
-        nCtrlType = &_globalSensorMangerTemp->over_manager->sensor_val1_upper_threshold_ctrl;
-        nCtrlValue = _globalSensorMangerTemp->over_manager->sensor_val1_upper_threshold_ctrl_para;
+        nCtrlType = &_globalSensorMangerTemp->over_manager.sensor_val1_upper_threshold_ctrl;
+        nCtrlValue = _globalSensorMangerTemp->over_manager.sensor_val1_upper_threshold_ctrl_para;
         break;
     case SENSOR_VAL1_LOWER:
-        penable = &_globalSensorMangerTemp->over_manager->sensor_val1_lower_enabled;
-        pValthreshold = &_globalSensorMangerTemp->over_manager->sensor_val1_lower_threshold;
+        penable = &_globalSensorMangerTemp->over_manager.sensor_val1_lower_enabled;
+        pValthreshold = &_globalSensorMangerTemp->over_manager.sensor_val1_lower_threshold;
         pSave = &_globalSensorMangerTemp->warning_status.sensor_val1_lower;
         pValData = &_globalSensorMangerTemp->Cur_sensor_info.val1;
-        nCtrlType = &_globalSensorMangerTemp->over_manager->sensor_val1_lower_threshold_ctrl;
-        nCtrlValue = _globalSensorMangerTemp->over_manager->sensor_val1_lower_threshold_ctrl_para;
+        nCtrlType = &_globalSensorMangerTemp->over_manager.sensor_val1_lower_threshold_ctrl;
+        nCtrlValue = _globalSensorMangerTemp->over_manager.sensor_val1_lower_threshold_ctrl_para;
         break;
     case SENSOR_VAL2_UPPER:
-        penable = &_globalSensorMangerTemp->over_manager->sensor_val2_upper_enabled;
-        pValthreshold = &_globalSensorMangerTemp->over_manager->sensor_val2_upper_threshold;
+        penable = &_globalSensorMangerTemp->over_manager.sensor_val2_upper_enabled;
+        pValthreshold = &_globalSensorMangerTemp->over_manager.sensor_val2_upper_threshold;
         pSave = &_globalSensorMangerTemp->warning_status.sensor_val2_upper;
         pValData = &_globalSensorMangerTemp->Cur_sensor_info.val2;
-        nCtrlType = &_globalSensorMangerTemp->over_manager->sensor_val2_upper_threshold_ctrl;
-        nCtrlValue = _globalSensorMangerTemp->over_manager->sensor_val2_upper_threshold_ctrl_para;
+        nCtrlType = &_globalSensorMangerTemp->over_manager.sensor_val2_upper_threshold_ctrl;
+        nCtrlValue = _globalSensorMangerTemp->over_manager.sensor_val2_upper_threshold_ctrl_para;
         break;
     case SENSOR_VAL2_LOWER:
-        penable = &_globalSensorMangerTemp->over_manager->sensor_val2_lower_enabled;
-        pValthreshold = &_globalSensorMangerTemp->over_manager->sensor_val2_lower_threshold;
+        penable = &_globalSensorMangerTemp->over_manager.sensor_val2_lower_enabled;
+        pValthreshold = &_globalSensorMangerTemp->over_manager.sensor_val2_lower_threshold;
         pSave = &_globalSensorMangerTemp->warning_status.sensor_val2_lower;
         pValData = &_globalSensorMangerTemp->Cur_sensor_info.val2;
-        nCtrlType = &_globalSensorMangerTemp->over_manager->sensor_val2_lower_threshold_ctrl;
-        nCtrlValue = _globalSensorMangerTemp->over_manager->sensor_val2_lower_threshold_ctrl_para;
+        nCtrlType = &_globalSensorMangerTemp->over_manager.sensor_val2_lower_threshold_ctrl;
+        nCtrlValue = _globalSensorMangerTemp->over_manager.sensor_val2_lower_threshold_ctrl_para;
         break;
 
     default:

pro/src/appweb_handle.c

@@ -2472,12 +2472,6 @@ static void sensorStatusMonitoring(void* conn)
         {
             wrong_param = 1;
         }
-        _globalSensorMangerTemp->over_manager = (GlobalSensorOverManage*)malloc(sizeof(GlobalSensorOverManage));
-        if (! _globalSensorMangerTemp->over_manager)
-        {
-            wrong_param = 1;
-        }
-        
 
         if(wrong_param) {
             cJSON_Delete(cjson);
@@ -2485,7 +2479,6 @@ static void sensorStatusMonitoring(void* conn)
             return ;   
         }
         
-         memset(_globalSensorMangerTemp->over_manager, 0, sizeof(GlobalSensorOverManage));
         _globalSensorMangerTemp->sensor_status = 0;
         switch( _globalSensorMangerTemp->sensor_type)
         {
@@ -3325,68 +3318,68 @@ static void alarmProtect(void *conn)
             sprintf(strName2, "%s%d", language_temperature[__globalDeviceManage._globalDevInfo.product.language], 2);
             if (strcmp(_alarm_request_info._sensor_info.thresholdType, language_temperature[__globalDeviceManage._globalDevInfo.product.language]) == 0||strcmp(_alarm_request_info._sensor_info.thresholdType, strName1) == 0)
             {
-                _globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_threshold = atof(_alarm_request_info._sensor_info.thresholdUpperValue);
-                _globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_threshold = atof(_alarm_request_info._sensor_info.thresholdDownValue);
-                if (_globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_threshold<=0.05 &&_globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_threshold>=-0.05  )
+                _globalSensorMangerSaveTemp->over_manager.sensor_val1_upper_threshold = atof(_alarm_request_info._sensor_info.thresholdUpperValue);
+                _globalSensorMangerSaveTemp->over_manager.sensor_val1_lower_threshold = atof(_alarm_request_info._sensor_info.thresholdDownValue);
+                if (_globalSensorMangerSaveTemp->over_manager.sensor_val1_upper_threshold<=0.05 &&_globalSensorMangerSaveTemp->over_manager.sensor_val1_upper_threshold>=-0.05  )
                 {
-                    _globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_enabled = 0;
+                    _globalSensorMangerSaveTemp->over_manager.sensor_val1_upper_enabled = 0;
                 }
-                else  _globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_enabled = 1;
+                else  _globalSensorMangerSaveTemp->over_manager.sensor_val1_upper_enabled = 1;
              
-                 if (_globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_threshold<=0.05 &&_globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_threshold>=-0.05  )
+                 if (_globalSensorMangerSaveTemp->over_manager.sensor_val1_lower_threshold<=0.05 &&_globalSensorMangerSaveTemp->over_manager.sensor_val1_lower_threshold>=-0.05  )
                 {
-                     _globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_enabled = 0;
+                     _globalSensorMangerSaveTemp->over_manager.sensor_val1_lower_enabled = 0;
                 }
-                else _globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_enabled =1;
+                else _globalSensorMangerSaveTemp->over_manager.sensor_val1_lower_enabled =1;
                 
                 if (_alarm_request_info._sensor_info.thresholdUpperAction && strcmp(_alarm_request_info._sensor_info.thresholdUpperAction,Alarm_Ctrl_type) == 0)
                 {
-                    _globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_threshold_ctrl = ALARM_CTRL_CLOSE_CH;
-                    if(_alarm_request_info._sensor_info.thresholdUpperChanel)strcpy(_globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_threshold_ctrl_para,_alarm_request_info._sensor_info.thresholdUpperChanel);
+                    _globalSensorMangerSaveTemp->over_manager.sensor_val1_upper_threshold_ctrl = ALARM_CTRL_CLOSE_CH;
+                    if(_alarm_request_info._sensor_info.thresholdUpperChanel)strcpy(_globalSensorMangerSaveTemp->over_manager.sensor_val1_upper_threshold_ctrl_para,_alarm_request_info._sensor_info.thresholdUpperChanel);
                 }
                 else
-                    _globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_threshold_ctrl = ALARM_CTRL_ALARM_ONLY;
+                    _globalSensorMangerSaveTemp->over_manager.sensor_val1_upper_threshold_ctrl = ALARM_CTRL_ALARM_ONLY;
 
                 if (_alarm_request_info._sensor_info.thresholdDownAction && strcmp(_alarm_request_info._sensor_info.thresholdDownAction, Alarm_Ctrl_type) == 0)
                 {
-                    _globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_threshold_ctrl = ALARM_CTRL_CLOSE_CH;
-                    if(_alarm_request_info._sensor_info.thresholdDownChanel)strcpy(_globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_threshold_ctrl_para,_alarm_request_info._sensor_info.thresholdDownChanel);
+                    _globalSensorMangerSaveTemp->over_manager.sensor_val1_lower_threshold_ctrl = ALARM_CTRL_CLOSE_CH;
+                    if(_alarm_request_info._sensor_info.thresholdDownChanel)strcpy(_globalSensorMangerSaveTemp->over_manager.sensor_val1_lower_threshold_ctrl_para,_alarm_request_info._sensor_info.thresholdDownChanel);
                 }
                 else
-                    _globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_threshold_ctrl = ALARM_CTRL_ALARM_ONLY;
+                    _globalSensorMangerSaveTemp->over_manager.sensor_val1_lower_threshold_ctrl = ALARM_CTRL_ALARM_ONLY;
 
             }
             else if (strcmp(_alarm_request_info._sensor_info.thresholdType, language_humidity[__globalDeviceManage._globalDevInfo.product.language]) == 0||strcmp(_alarm_request_info._sensor_info.thresholdType, strName2) == 0)
             {
-                _globalSensorMangerSaveTemp->over_manager->sensor_val2_upper_threshold = atof(_alarm_request_info._sensor_info.thresholdUpperValue);
-                _globalSensorMangerSaveTemp->over_manager->sensor_val2_lower_threshold = atof(_alarm_request_info._sensor_info.thresholdDownValue);
-               if (_globalSensorMangerSaveTemp->over_manager->sensor_val2_upper_threshold<=0.05 &&_globalSensorMangerSaveTemp->over_manager->sensor_val2_upper_threshold>=-0.05  )
+                _globalSensorMangerSaveTemp->over_manager.sensor_val2_upper_threshold = atof(_alarm_request_info._sensor_info.thresholdUpperValue);
+                _globalSensorMangerSaveTemp->over_manager.sensor_val2_lower_threshold = atof(_alarm_request_info._sensor_info.thresholdDownValue);
+               if (_globalSensorMangerSaveTemp->over_manager.sensor_val2_upper_threshold<=0.05 &&_globalSensorMangerSaveTemp->over_manager.sensor_val2_upper_threshold>=-0.05  )
                 {
-                     _globalSensorMangerSaveTemp->over_manager->sensor_val2_upper_enabled = 0;
+                     _globalSensorMangerSaveTemp->over_manager.sensor_val2_upper_enabled = 0;
                 }
-                else  _globalSensorMangerSaveTemp->over_manager->sensor_val2_upper_enabled = 1;
+                else  _globalSensorMangerSaveTemp->over_manager.sensor_val2_upper_enabled = 1;
 
-               if (_globalSensorMangerSaveTemp->over_manager->sensor_val2_lower_threshold<=0.05 &&_globalSensorMangerSaveTemp->over_manager->sensor_val2_lower_threshold>=-0.05  )
+               if (_globalSensorMangerSaveTemp->over_manager.sensor_val2_lower_threshold<=0.05 &&_globalSensorMangerSaveTemp->over_manager.sensor_val2_lower_threshold>=-0.05  )
                 {
-                    _globalSensorMangerSaveTemp->over_manager->sensor_val2_lower_enabled = 0;
+                    _globalSensorMangerSaveTemp->over_manager.sensor_val2_lower_enabled = 0;
                 }
-                else _globalSensorMangerSaveTemp->over_manager->sensor_val2_lower_enabled = 1;
+                else _globalSensorMangerSaveTemp->over_manager.sensor_val2_lower_enabled = 1;
 
                 if (_alarm_request_info._sensor_info.thresholdUpperAction && strcmp(_alarm_request_info._sensor_info.thresholdUpperAction, Alarm_Ctrl_type) == 0)
                 {
-                    _globalSensorMangerSaveTemp->over_manager->sensor_val2_upper_threshold_ctrl = ALARM_CTRL_CLOSE_CH;
-                    if(_alarm_request_info._sensor_info.thresholdUpperChanel)strcpy(_globalSensorMangerSaveTemp->over_manager->sensor_val2_upper_threshold_ctrl_para,_alarm_request_info._sensor_info.thresholdUpperChanel);
+                    _globalSensorMangerSaveTemp->over_manager.sensor_val2_upper_threshold_ctrl = ALARM_CTRL_CLOSE_CH;
+                    if(_alarm_request_info._sensor_info.thresholdUpperChanel)strcpy(_globalSensorMangerSaveTemp->over_manager.sensor_val2_upper_threshold_ctrl_para,_alarm_request_info._sensor_info.thresholdUpperChanel);
                 }
                 else
-                    _globalSensorMangerSaveTemp->over_manager->sensor_val2_upper_threshold_ctrl = ALARM_CTRL_ALARM_ONLY;
+                    _globalSensorMangerSaveTemp->over_manager.sensor_val2_upper_threshold_ctrl = ALARM_CTRL_ALARM_ONLY;
 
                 if (_alarm_request_info._sensor_info.thresholdDownAction && strcmp(_alarm_request_info._sensor_info.thresholdDownAction, Alarm_Ctrl_type) == 0)
                 {
-                    _globalSensorMangerSaveTemp->over_manager->sensor_val2_lower_threshold_ctrl = ALARM_CTRL_CLOSE_CH;
-                    if(_alarm_request_info._sensor_info.thresholdDownChanel)strcpy(_globalSensorMangerSaveTemp->over_manager->sensor_val2_lower_threshold_ctrl_para,_alarm_request_info._sensor_info.thresholdDownChanel);
+                    _globalSensorMangerSaveTemp->over_manager.sensor_val2_lower_threshold_ctrl = ALARM_CTRL_CLOSE_CH;
+                    if(_alarm_request_info._sensor_info.thresholdDownChanel)strcpy(_globalSensorMangerSaveTemp->over_manager.sensor_val2_lower_threshold_ctrl_para,_alarm_request_info._sensor_info.thresholdDownChanel);
                 }
                 else
-                    _globalSensorMangerSaveTemp->over_manager->sensor_val2_lower_threshold_ctrl = ALARM_CTRL_ALARM_ONLY;
+                    _globalSensorMangerSaveTemp->over_manager.sensor_val2_lower_threshold_ctrl = ALARM_CTRL_ALARM_ONLY;
             }
         }
             break;
@@ -3402,39 +3395,39 @@ static void alarmProtect(void *conn)
                 sprintf(strName2, "%s%d", language_atmosphere_gas[__globalDeviceManage._globalDevInfo.product.language], 2);
                 if (strcmp(_alarm_request_info._sensor_info.thresholdType, language_atmosphere_gas[__globalDeviceManage._globalDevInfo.product.language]) == 0 || strcmp(_alarm_request_info._sensor_info.thresholdType, strName1) == 0)
                 {
-                    _globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_threshold = atof(_alarm_request_info._sensor_info.thresholdUpperValue);
-                    _globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_threshold = atof(_alarm_request_info._sensor_info.thresholdDownValue);
-                    if (_globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_threshold <= 0.05 && _globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_threshold >= -0.05)
+                    _globalSensorMangerSaveTemp->over_manager.sensor_val1_upper_threshold = atof(_alarm_request_info._sensor_info.thresholdUpperValue);
+                    _globalSensorMangerSaveTemp->over_manager.sensor_val1_lower_threshold = atof(_alarm_request_info._sensor_info.thresholdDownValue);
+                    if (_globalSensorMangerSaveTemp->over_manager.sensor_val1_upper_threshold <= 0.05 && _globalSensorMangerSaveTemp->over_manager.sensor_val1_upper_threshold >= -0.05)
                     {
-                        _globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_enabled = 0;
+                        _globalSensorMangerSaveTemp->over_manager.sensor_val1_upper_enabled = 0;
                     }
                     else
-                        _globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_enabled = 1;
+                        _globalSensorMangerSaveTemp->over_manager.sensor_val1_upper_enabled = 1;
 
-                    if (_globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_threshold <= 0.05 && _globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_threshold >= -0.05)
+                    if (_globalSensorMangerSaveTemp->over_manager.sensor_val1_lower_threshold <= 0.05 && _globalSensorMangerSaveTemp->over_manager.sensor_val1_lower_threshold >= -0.05)
                     {
-                        _globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_enabled = 0;
+                        _globalSensorMangerSaveTemp->over_manager.sensor_val1_lower_enabled = 0;
                     }
                     else
-                        _globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_enabled = 1;
+                        _globalSensorMangerSaveTemp->over_manager.sensor_val1_lower_enabled = 1;
 
                     if (_alarm_request_info._sensor_info.thresholdUpperAction && strcmp(_alarm_request_info._sensor_info.thresholdUpperAction, Alarm_Ctrl_type) == 0)
                     {
-                        _globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_threshold_ctrl = ALARM_CTRL_CLOSE_CH;
+                        _globalSensorMangerSaveTemp->over_manager.sensor_val1_upper_threshold_ctrl = ALARM_CTRL_CLOSE_CH;
                         if (_alarm_request_info._sensor_info.thresholdUpperChanel)
-                            strcpy(_globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_threshold_ctrl_para, _alarm_request_info._sensor_info.thresholdUpperChanel);
+                            strcpy(_globalSensorMangerSaveTemp->over_manager.sensor_val1_upper_threshold_ctrl_para, _alarm_request_info._sensor_info.thresholdUpperChanel);
                     }
                     else
-                        _globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_threshold_ctrl = ALARM_CTRL_ALARM_ONLY;
+                        _globalSensorMangerSaveTemp->over_manager.sensor_val1_upper_threshold_ctrl = ALARM_CTRL_ALARM_ONLY;
 
                     if (_alarm_request_info._sensor_info.thresholdDownAction && strcmp(_alarm_request_info._sensor_info.thresholdDownAction, Alarm_Ctrl_type) == 0)
                     {
-                        _globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_threshold_ctrl = ALARM_CTRL_CLOSE_CH;
+                        _globalSensorMangerSaveTemp->over_manager.sensor_val1_lower_threshold_ctrl = ALARM_CTRL_CLOSE_CH;
                         if (_alarm_request_info._sensor_info.thresholdDownChanel)
-                            strcpy(_globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_threshold_ctrl_para, _alarm_request_info._sensor_info.thresholdDownChanel);
+                            strcpy(_globalSensorMangerSaveTemp->over_manager.sensor_val1_lower_threshold_ctrl_para, _alarm_request_info._sensor_info.thresholdDownChanel);
                     }
                     else
-                        _globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_threshold_ctrl = ALARM_CTRL_ALARM_ONLY;
+                        _globalSensorMangerSaveTemp->over_manager.sensor_val1_lower_threshold_ctrl = ALARM_CTRL_ALARM_ONLY;
                 }
             }
             break;

pro/src/common.h

@@ -651,7 +651,7 @@ typedef struct
     char                sensor_val_count                           ;//传感器值个数
     int                 sensor_node_number                         ;//节点号
     GlobalSensorInfo Cur_sensor_info ;
-    GlobalSensorOverManage*  over_manager                          ;//超限管理   
+    GlobalSensorOverManage over_manager                            ;//超限管理   
     GlobalSensorOverInfo warning_status;//报警状态
     struct list_head    list;   
 }GlobalSensorManger;

pro/src/json_handle.c

@@ -3554,17 +3554,17 @@ char* alarm_sensor_threshold_to_json(GlobalSensorManger* _globalSensorManger)
             {
                 cJSON_AddStringToObject(data_filed, "thresholdType", language_temperature[__globalDeviceManage._globalDevInfo.product.language]);
             }
-            sprintf(temp, "%0.2f", _globalSensorMangerTemp->over_manager->sensor_val1_upper_threshold);
+            sprintf(temp, "%0.2f", _globalSensorMangerTemp->over_manager.sensor_val1_upper_threshold);
             cJSON_AddStringToObject(data_filed, "thresholdUpperValue", temp);
-            sprintf(temp, "%0.2f", _globalSensorMangerTemp->over_manager->sensor_val1_lower_threshold);
+            sprintf(temp, "%0.2f", _globalSensorMangerTemp->over_manager.sensor_val1_lower_threshold);
             cJSON_AddStringToObject(data_filed, "thresholdDownValue", temp);
-            if (_globalSensorMangerTemp->over_manager->sensor_val1_upper_threshold_ctrl == ALARM_CTRL_CLOSE_CH)
+            if (_globalSensorMangerTemp->over_manager.sensor_val1_upper_threshold_ctrl == ALARM_CTRL_CLOSE_CH)
             {
                 cJSON_AddStringToObject(data_filed, "thresholdUpperAction", Closetemp);
             }
             else
                 cJSON_AddStringToObject(data_filed, "thresholdUpperAction", Alarmtemp);
-            if (_globalSensorMangerTemp->over_manager->sensor_val1_lower_threshold_ctrl == ALARM_CTRL_CLOSE_CH)
+            if (_globalSensorMangerTemp->over_manager.sensor_val1_lower_threshold_ctrl == ALARM_CTRL_CLOSE_CH)
             {
                 cJSON_AddStringToObject(data_filed, "thresholdDownAction", Closetemp);
             }
@@ -3574,10 +3574,10 @@ char* alarm_sensor_threshold_to_json(GlobalSensorManger* _globalSensorManger)
             char *pCHlist;
             char *pCHListSave;
             char sensor_para[512];
-            if (strlen(_globalSensorMangerTemp->over_manager->sensor_val1_upper_threshold_ctrl_para) > 0)
+            if (strlen(_globalSensorMangerTemp->over_manager.sensor_val1_upper_threshold_ctrl_para) > 0)
             {
-                strcpy(sensor_para, _globalSensorMangerTemp->over_manager->sensor_val1_upper_threshold_ctrl_para);
-                cJSON_AddStringToObject(data_filed, "thresholdUpperChanel", _globalSensorMangerTemp->over_manager->sensor_val1_upper_threshold_ctrl_para);
+                strcpy(sensor_para, _globalSensorMangerTemp->over_manager.sensor_val1_upper_threshold_ctrl_para);
+                cJSON_AddStringToObject(data_filed, "thresholdUpperChanel", _globalSensorMangerTemp->over_manager.sensor_val1_upper_threshold_ctrl_para);
                  memset(subTemp, 0, sizeof(subTemp));
                 pCHlist = strtok_r(sensor_para, ",", &pCHListSave);
                 // 其他版本功能
@@ -3606,11 +3606,11 @@ char* alarm_sensor_threshold_to_json(GlobalSensorManger* _globalSensorManger)
                 }
                 cJSON_AddStringToObject(data_filed, "thresholdUpperChanelName", subTemp);
             }
-            if (strlen(_globalSensorMangerTemp->over_manager->sensor_val1_lower_threshold_ctrl_para) > 0)
+            if (strlen(_globalSensorMangerTemp->over_manager.sensor_val1_lower_threshold_ctrl_para) > 0)
             {
-                cJSON_AddStringToObject(data_filed, "thresholdDownChanel", _globalSensorMangerTemp->over_manager->sensor_val1_lower_threshold_ctrl_para);
+                cJSON_AddStringToObject(data_filed, "thresholdDownChanel", _globalSensorMangerTemp->over_manager.sensor_val1_lower_threshold_ctrl_para);
                 memset(subTemp, 0, sizeof(subTemp));
-                strcpy(sensor_para, _globalSensorMangerTemp->over_manager->sensor_val1_lower_threshold_ctrl_para);
+                strcpy(sensor_para, _globalSensorMangerTemp->over_manager.sensor_val1_lower_threshold_ctrl_para);
                 pCHlist = strtok_r(sensor_para, ",", &pCHListSave);
                 // 其他版本功能
                 while (pCHlist != NULL)
@@ -3658,17 +3658,17 @@ char* alarm_sensor_threshold_to_json(GlobalSensorManger* _globalSensorManger)
                 cJSON_AddStringToObject(data_filed, "thresholdType", language_humidity[__globalDeviceManage._globalDevInfo.product.language]);
             }
 
-            sprintf(temp, "%0.2f", _globalSensorMangerTemp->over_manager->sensor_val2_upper_threshold);
+            sprintf(temp, "%0.2f", _globalSensorMangerTemp->over_manager.sensor_val2_upper_threshold);
             cJSON_AddStringToObject(data_filed, "thresholdUpperValue", temp);
-            sprintf(temp, "%0.2f", _globalSensorMangerTemp->over_manager->sensor_val2_lower_threshold);
+            sprintf(temp, "%0.2f", _globalSensorMangerTemp->over_manager.sensor_val2_lower_threshold);
             cJSON_AddStringToObject(data_filed, "thresholdDownValue", temp);
-            if (_globalSensorMangerTemp->over_manager->sensor_val2_upper_threshold_ctrl == ALARM_CTRL_CLOSE_CH)
+            if (_globalSensorMangerTemp->over_manager.sensor_val2_upper_threshold_ctrl == ALARM_CTRL_CLOSE_CH)
             {
                 cJSON_AddStringToObject(data_filed, "thresholdUpperAction", Closetemp);
             }
             else
                 cJSON_AddStringToObject(data_filed, "thresholdUpperAction", Alarmtemp);
-            if (_globalSensorMangerTemp->over_manager->sensor_val2_lower_threshold_ctrl == ALARM_CTRL_CLOSE_CH)
+            if (_globalSensorMangerTemp->over_manager.sensor_val2_lower_threshold_ctrl == ALARM_CTRL_CLOSE_CH)
             {
                 cJSON_AddStringToObject(data_filed, "thresholdDownAction", Closetemp);
             }
@@ -3678,10 +3678,10 @@ char* alarm_sensor_threshold_to_json(GlobalSensorManger* _globalSensorManger)
             char *pCHlist1;
             char *pCHListSave1;
             char sensor_para1[512];
-            if (strlen(_globalSensorMangerTemp->over_manager->sensor_val2_upper_threshold_ctrl_para) > 0)
+            if (strlen(_globalSensorMangerTemp->over_manager.sensor_val2_upper_threshold_ctrl_para) > 0)
             {
-                strcpy(sensor_para1, _globalSensorMangerTemp->over_manager->sensor_val2_upper_threshold_ctrl_para);
-                cJSON_AddStringToObject(data_filed, "thresholdUpperChanel", _globalSensorMangerTemp->over_manager->sensor_val2_upper_threshold_ctrl_para);
+                strcpy(sensor_para1, _globalSensorMangerTemp->over_manager.sensor_val2_upper_threshold_ctrl_para);
+                cJSON_AddStringToObject(data_filed, "thresholdUpperChanel", _globalSensorMangerTemp->over_manager.sensor_val2_upper_threshold_ctrl_para);
                 memset(subTemp, 0, sizeof(subTemp));
                 pCHlist1 = strtok_r(sensor_para1, ",", &pCHListSave1);
                 // 其他版本功能
@@ -3710,11 +3710,11 @@ char* alarm_sensor_threshold_to_json(GlobalSensorManger* _globalSensorManger)
                 }
                 cJSON_AddStringToObject(data_filed, "thresholdUpperChanelName", subTemp);
             }
-            if (strlen(_globalSensorMangerTemp->over_manager->sensor_val2_lower_threshold_ctrl_para) > 0)
+            if (strlen(_globalSensorMangerTemp->over_manager.sensor_val2_lower_threshold_ctrl_para) > 0)
             {
-                cJSON_AddStringToObject(data_filed, "thresholdDownChanel", _globalSensorMangerTemp->over_manager->sensor_val2_lower_threshold_ctrl_para);
+                cJSON_AddStringToObject(data_filed, "thresholdDownChanel", _globalSensorMangerTemp->over_manager.sensor_val2_lower_threshold_ctrl_para);
                 memset(subTemp, 0, sizeof(subTemp));
-                strcpy(sensor_para1, _globalSensorMangerTemp->over_manager->sensor_val2_lower_threshold_ctrl_para);
+                strcpy(sensor_para1, _globalSensorMangerTemp->over_manager.sensor_val2_lower_threshold_ctrl_para);
                 pCHlist1 = strtok_r(sensor_para1, ",", &pCHListSave1);
                 // 其他版本功能
                 while (pCHlist1 != NULL)
@@ -3770,17 +3770,17 @@ char* alarm_sensor_threshold_to_json(GlobalSensorManger* _globalSensorManger)
             cJSON_AddStringToObject(data_filed, "sensorId", temp);
             cJSON_AddNumberToObject(data_filed, "sensorType", _globalSensorMangerTemp->sensor_type);
             cJSON_AddStringToObject(data_filed, "thresholdType", language_atmosphere_gas[__globalDeviceManage._globalDevInfo.product.language]);
-            sprintf(temp, "%0.2f", _globalSensorMangerTemp->over_manager->sensor_val1_upper_threshold);
+            sprintf(temp, "%0.2f", _globalSensorMangerTemp->over_manager.sensor_val1_upper_threshold);
             cJSON_AddStringToObject(data_filed, "thresholdUpperValue", temp);
-            sprintf(temp, "%0.2f", _globalSensorMangerTemp->over_manager->sensor_val1_lower_threshold);
+            sprintf(temp, "%0.2f", _globalSensorMangerTemp->over_manager.sensor_val1_lower_threshold);
             cJSON_AddStringToObject(data_filed, "thresholdDownValue", temp);
-            if (_globalSensorMangerTemp->over_manager->sensor_val1_upper_threshold_ctrl == ALARM_CTRL_CLOSE_CH)
+            if (_globalSensorMangerTemp->over_manager.sensor_val1_upper_threshold_ctrl == ALARM_CTRL_CLOSE_CH)
             {
                 cJSON_AddStringToObject(data_filed, "thresholdUpperAction", Closetemp);
             }
             else
                 cJSON_AddStringToObject(data_filed, "thresholdUpperAction", Alarmtemp);
-            if (_globalSensorMangerTemp->over_manager->sensor_val1_lower_threshold_ctrl == ALARM_CTRL_CLOSE_CH)
+            if (_globalSensorMangerTemp->over_manager.sensor_val1_lower_threshold_ctrl == ALARM_CTRL_CLOSE_CH)
             {
                 cJSON_AddStringToObject(data_filed, "thresholdDownAction", Closetemp);
             }
@@ -3790,10 +3790,10 @@ char* alarm_sensor_threshold_to_json(GlobalSensorManger* _globalSensorManger)
             char *pCHlist;
             char *pCHListSave;
             char sensor_para[512];
-            if (strlen(_globalSensorMangerTemp->over_manager->sensor_val1_upper_threshold_ctrl_para) > 0)
+            if (strlen(_globalSensorMangerTemp->over_manager.sensor_val1_upper_threshold_ctrl_para) > 0)
             {
-                strcpy(sensor_para, _globalSensorMangerTemp->over_manager->sensor_val1_upper_threshold_ctrl_para);
-                cJSON_AddStringToObject(data_filed, "thresholdUpperChanel", _globalSensorMangerTemp->over_manager->sensor_val1_upper_threshold_ctrl_para);
+                strcpy(sensor_para, _globalSensorMangerTemp->over_manager.sensor_val1_upper_threshold_ctrl_para);
+                cJSON_AddStringToObject(data_filed, "thresholdUpperChanel", _globalSensorMangerTemp->over_manager.sensor_val1_upper_threshold_ctrl_para);
                  memset(subTemp, 0, sizeof(subTemp));
                 pCHlist = strtok_r(sensor_para, ",", &pCHListSave);
                 // 其他版本功能
@@ -3822,11 +3822,11 @@ char* alarm_sensor_threshold_to_json(GlobalSensorManger* _globalSensorManger)
                 }
                 cJSON_AddStringToObject(data_filed, "thresholdUpperChanelName", subTemp);
             }
-            if (strlen(_globalSensorMangerTemp->over_manager->sensor_val1_lower_threshold_ctrl_para) > 0)
+            if (strlen(_globalSensorMangerTemp->over_manager.sensor_val1_lower_threshold_ctrl_para) > 0)
             {
-                cJSON_AddStringToObject(data_filed, "thresholdDownChanel", _globalSensorMangerTemp->over_manager->sensor_val1_lower_threshold_ctrl_para);
+                cJSON_AddStringToObject(data_filed, "thresholdDownChanel", _globalSensorMangerTemp->over_manager.sensor_val1_lower_threshold_ctrl_para);
                 memset(subTemp, 0, sizeof(subTemp));
-                strcpy(sensor_para, _globalSensorMangerTemp->over_manager->sensor_val1_lower_threshold_ctrl_para);
+                strcpy(sensor_para, _globalSensorMangerTemp->over_manager.sensor_val1_lower_threshold_ctrl_para);
                 pCHlist = strtok_r(sensor_para, ",", &pCHListSave);
                 // 其他版本功能
                 while (pCHlist != NULL)
@@ -3867,17 +3867,17 @@ char* alarm_sensor_threshold_to_json(GlobalSensorManger* _globalSensorManger)
             cJSON_AddStringToObject(data_filed, "sensorId", temp);
             cJSON_AddNumberToObject(data_filed, "sensorType", _globalSensorMangerTemp->sensor_type);
             cJSON_AddStringToObject(data_filed, "thresholdType", "");
-            sprintf(temp, "%0.2f", _globalSensorMangerTemp->over_manager->sensor_val1_upper_threshold);
+            sprintf(temp, "%0.2f", _globalSensorMangerTemp->over_manager.sensor_val1_upper_threshold);
             cJSON_AddStringToObject(data_filed, "thresholdUpperValue", temp);
-            sprintf(temp, "%0.2f", _globalSensorMangerTemp->over_manager->sensor_val1_lower_threshold);
+            sprintf(temp, "%0.2f", _globalSensorMangerTemp->over_manager.sensor_val1_lower_threshold);
             cJSON_AddStringToObject(data_filed, "thresholdDownValue", temp);
-            if (_globalSensorMangerTemp->over_manager->sensor_val1_upper_threshold_ctrl == ALARM_CTRL_CLOSE_CH)
+            if (_globalSensorMangerTemp->over_manager.sensor_val1_upper_threshold_ctrl == ALARM_CTRL_CLOSE_CH)
             {
                 cJSON_AddStringToObject(data_filed, "thresholdUpperAction", Closetemp);
             }
             else
                 cJSON_AddStringToObject(data_filed, "thresholdUpperAction", Alarmtemp);
-            if (_globalSensorMangerTemp->over_manager->sensor_val1_lower_threshold_ctrl == ALARM_CTRL_CLOSE_CH)
+            if (_globalSensorMangerTemp->over_manager.sensor_val1_lower_threshold_ctrl == ALARM_CTRL_CLOSE_CH)
             {
                 cJSON_AddStringToObject(data_filed, "thresholdDownAction", Closetemp);
             }

pro/src/sqlite_handle.c

@@ -2139,9 +2139,7 @@ int dev_get_sensor_manage_info(sqlite3 *db,int product_id,GlobalSensorManger* _g
         if(_globalSensorMangerTemp==NULL)
             return -1 ;
         memset(_globalSensorMangerTemp,0,sizeof(GlobalSensorManger));            
-        _globalSensorMangerTemp->over_manager = (GlobalSensorOverManage*)malloc(sizeof(GlobalSensorOverManage));
-        if(_globalSensorMangerTemp->over_manager==NULL)
-            return -1 ;
+        
         _globalSensorMangerTemp->product_id = atoi(pResult[i*ncolumn+1]);
         _globalSensorMangerTemp->sensor_id = atoi(pResult[i*ncolumn+0]);
         _globalSensorMangerTemp->sensor_type = atoi(pResult[i*ncolumn+2]);
@@ -2171,27 +2169,27 @@ int dev_get_sensor_manage_info(sqlite3 *db,int product_id,GlobalSensorManger* _g
         _globalSensorMangerTemp->sensor_status = 1;//atoi(pResult[i*ncolumn+8]);
         _globalSensorMangerTemp->sensor_val_count = atoi(pResult[i*ncolumn+9]);
         // 记录超限信息
-        memset(_globalSensorMangerTemp->over_manager->sensor_val1_upper_threshold_ctrl_para, 0 ,sizeof(char)*512);
-        memset(_globalSensorMangerTemp->over_manager->sensor_val1_lower_threshold_ctrl_para, 0 ,sizeof(char)*512);
-        memset(_globalSensorMangerTemp->over_manager->sensor_val2_lower_threshold_ctrl_para, 0 ,sizeof(char)*512);
-        memset(_globalSensorMangerTemp->over_manager->sensor_val2_upper_threshold_ctrl_para, 0 ,sizeof(char)*512);
-
-        _globalSensorMangerTemp->over_manager->sensor_val1_upper_enabled = atoi(pResult[i*ncolumn+10]);
-        _globalSensorMangerTemp->over_manager->sensor_val1_upper_threshold = atof(pResult[i*ncolumn+11]);
-        _globalSensorMangerTemp->over_manager->sensor_val1_upper_threshold_ctrl = atoi(pResult[i*ncolumn+12]);
-        if(pResult[i*ncolumn+13])strcpy(_globalSensorMangerTemp->over_manager->sensor_val1_upper_threshold_ctrl_para ,pResult[i*ncolumn+13]);
-        _globalSensorMangerTemp->over_manager->sensor_val1_lower_enabled = atoi(pResult[i*ncolumn+14]);
-        _globalSensorMangerTemp->over_manager->sensor_val1_lower_threshold = atof(pResult[i*ncolumn+15]);
-        _globalSensorMangerTemp->over_manager->sensor_val1_lower_threshold_ctrl = atoi(pResult[i*ncolumn+16]);
-        if(pResult[i*ncolumn+17])strcpy(_globalSensorMangerTemp->over_manager->sensor_val1_lower_threshold_ctrl_para , pResult[i*ncolumn+17]);
-        _globalSensorMangerTemp->over_manager->sensor_val2_upper_enabled = atoi(pResult[i*ncolumn+18]);
-        _globalSensorMangerTemp->over_manager->sensor_val2_upper_threshold = atof(pResult[i*ncolumn+19]);
-        _globalSensorMangerTemp->over_manager->sensor_val2_upper_threshold_ctrl = atoi(pResult[i*ncolumn+20]);
-        if(pResult[i*ncolumn+21])strcpy(_globalSensorMangerTemp->over_manager->sensor_val2_upper_threshold_ctrl_para , pResult[i*ncolumn+21]);
-        _globalSensorMangerTemp->over_manager->sensor_val2_lower_enabled = atoi(pResult[i*ncolumn+22]);
-        _globalSensorMangerTemp->over_manager->sensor_val2_lower_threshold = atof(pResult[i*ncolumn+23]);
-        _globalSensorMangerTemp->over_manager->sensor_val2_lower_threshold_ctrl = atoi(pResult[i*ncolumn+24]);
-        if(pResult[i*ncolumn+25])strcpy(_globalSensorMangerTemp->over_manager->sensor_val2_lower_threshold_ctrl_para , pResult[i*ncolumn+25]);
+        memset(_globalSensorMangerTemp->over_manager.sensor_val1_upper_threshold_ctrl_para, 0 ,sizeof(char)*512);
+        memset(_globalSensorMangerTemp->over_manager.sensor_val1_lower_threshold_ctrl_para, 0 ,sizeof(char)*512);
+        memset(_globalSensorMangerTemp->over_manager.sensor_val2_lower_threshold_ctrl_para, 0 ,sizeof(char)*512);
+        memset(_globalSensorMangerTemp->over_manager.sensor_val2_upper_threshold_ctrl_para, 0 ,sizeof(char)*512);
+
+        _globalSensorMangerTemp->over_manager.sensor_val1_upper_enabled = atoi(pResult[i*ncolumn+10]);
+        _globalSensorMangerTemp->over_manager.sensor_val1_upper_threshold = atof(pResult[i*ncolumn+11]);
+        _globalSensorMangerTemp->over_manager.sensor_val1_upper_threshold_ctrl = atoi(pResult[i*ncolumn+12]);
+        if(pResult[i*ncolumn+13])strcpy(_globalSensorMangerTemp->over_manager.sensor_val1_upper_threshold_ctrl_para ,pResult[i*ncolumn+13]);
+        _globalSensorMangerTemp->over_manager.sensor_val1_lower_enabled = atoi(pResult[i*ncolumn+14]);
+        _globalSensorMangerTemp->over_manager.sensor_val1_lower_threshold = atof(pResult[i*ncolumn+15]);
+        _globalSensorMangerTemp->over_manager.sensor_val1_lower_threshold_ctrl = atoi(pResult[i*ncolumn+16]);
+        if(pResult[i*ncolumn+17])strcpy(_globalSensorMangerTemp->over_manager.sensor_val1_lower_threshold_ctrl_para , pResult[i*ncolumn+17]);
+        _globalSensorMangerTemp->over_manager.sensor_val2_upper_enabled = atoi(pResult[i*ncolumn+18]);
+        _globalSensorMangerTemp->over_manager.sensor_val2_upper_threshold = atof(pResult[i*ncolumn+19]);
+        _globalSensorMangerTemp->over_manager.sensor_val2_upper_threshold_ctrl = atoi(pResult[i*ncolumn+20]);
+        if(pResult[i*ncolumn+21])strcpy(_globalSensorMangerTemp->over_manager.sensor_val2_upper_threshold_ctrl_para , pResult[i*ncolumn+21]);
+        _globalSensorMangerTemp->over_manager.sensor_val2_lower_enabled = atoi(pResult[i*ncolumn+22]);
+        _globalSensorMangerTemp->over_manager.sensor_val2_lower_threshold = atof(pResult[i*ncolumn+23]);
+        _globalSensorMangerTemp->over_manager.sensor_val2_lower_threshold_ctrl = atoi(pResult[i*ncolumn+24]);
+        if(pResult[i*ncolumn+25])strcpy(_globalSensorMangerTemp->over_manager.sensor_val2_lower_threshold_ctrl_para , pResult[i*ncolumn+25]);
         //尾部插入
         list_add_tail(&_globalSensorMangerTemp->list, &_globalSensorManger->list);
     }
@@ -2524,22 +2522,22 @@ int dev_update_sensor_over_manage(sqlite3 *db,int product_id,int sensor_id,Globa
     sensor_val2_over_l_threshold_ctrl=%d,\
     sensor_val2_over_l_threshold_ctrl_para='%s'\
      WHERE sensor_id=%d;",
-            _globalSensorManger->over_manager->sensor_val1_upper_enabled,
-            _globalSensorManger->over_manager->sensor_val1_upper_threshold,
-            _globalSensorManger->over_manager->sensor_val1_upper_threshold_ctrl,
-            _globalSensorManger->over_manager->sensor_val1_upper_threshold_ctrl_para,
-            _globalSensorManger->over_manager->sensor_val1_lower_enabled,
-            _globalSensorManger->over_manager->sensor_val1_lower_threshold,
-            _globalSensorManger->over_manager->sensor_val1_lower_threshold_ctrl,
-            _globalSensorManger->over_manager->sensor_val1_lower_threshold_ctrl_para,
-            _globalSensorManger->over_manager->sensor_val2_upper_enabled,
-            _globalSensorManger->over_manager->sensor_val2_upper_threshold,
-            _globalSensorManger->over_manager->sensor_val2_upper_threshold_ctrl,
-            _globalSensorManger->over_manager->sensor_val2_upper_threshold_ctrl_para,
-            _globalSensorManger->over_manager->sensor_val2_lower_enabled,
-            _globalSensorManger->over_manager->sensor_val2_lower_threshold,
-            _globalSensorManger->over_manager->sensor_val2_lower_threshold_ctrl,
-            _globalSensorManger->over_manager->sensor_val2_lower_threshold_ctrl_para,
+            _globalSensorManger->over_manager.sensor_val1_upper_enabled,
+            _globalSensorManger->over_manager.sensor_val1_upper_threshold,
+            _globalSensorManger->over_manager.sensor_val1_upper_threshold_ctrl,
+            _globalSensorManger->over_manager.sensor_val1_upper_threshold_ctrl_para,
+            _globalSensorManger->over_manager.sensor_val1_lower_enabled,
+            _globalSensorManger->over_manager.sensor_val1_lower_threshold,
+            _globalSensorManger->over_manager.sensor_val1_lower_threshold_ctrl,
+            _globalSensorManger->over_manager.sensor_val1_lower_threshold_ctrl_para,
+            _globalSensorManger->over_manager.sensor_val2_upper_enabled,
+            _globalSensorManger->over_manager.sensor_val2_upper_threshold,
+            _globalSensorManger->over_manager.sensor_val2_upper_threshold_ctrl,
+            _globalSensorManger->over_manager.sensor_val2_upper_threshold_ctrl_para,
+            _globalSensorManger->over_manager.sensor_val2_lower_enabled,
+            _globalSensorManger->over_manager.sensor_val2_lower_threshold,
+            _globalSensorManger->over_manager.sensor_val2_lower_threshold_ctrl,
+            _globalSensorManger->over_manager.sensor_val2_lower_threshold_ctrl_para,
             sensor_id);
     res = sqlite_SQL_RUN(db, select_sql, &pResult, &nrow, &ncolumn, &err_msg);
     if(res != SQLITE_OK) {
@@ -4797,37 +4795,37 @@ static int db_exec(sqlite3 *db, int tab_id, int io_type, time_t from, time_t to,
                 tmp.sensor_status = 1;
                 tmp.sensor_val_count = sqlite3_column_int(stmt, 10);
 
-                tmp.over_manager->sensor_val1_upper_enabled = sqlite3_column_int(stmt, 11);
-                tmp.over_manager->sensor_val1_upper_threshold = sqlite3_column_double(stmt, 12);
-                tmp.over_manager->sensor_val1_upper_threshold_ctrl = sqlite3_column_int(stmt, 13);
+                tmp.over_manager.sensor_val1_upper_enabled = sqlite3_column_int(stmt, 11);
+                tmp.over_manager.sensor_val1_upper_threshold = sqlite3_column_double(stmt, 12);
+                tmp.over_manager.sensor_val1_upper_threshold_ctrl = sqlite3_column_int(stmt, 13);
 
                 p = (char*)sqlite3_column_text(stmt, 14);
-                tmp.over_manager->sensor_val1_upper_threshold_ctrl_para[0] = 0;
-                if(p) strcpy(tmp.over_manager->sensor_val1_upper_threshold_ctrl_para, p);
+                tmp.over_manager.sensor_val1_upper_threshold_ctrl_para[0] = 0;
+                if(p) strcpy(tmp.over_manager.sensor_val1_upper_threshold_ctrl_para, p);
 
-                tmp.over_manager->sensor_val1_lower_enabled = sqlite3_column_int(stmt, 15);
-                tmp.over_manager->sensor_val1_lower_threshold = sqlite3_column_double(stmt, 16);
-                tmp.over_manager->sensor_val1_lower_threshold_ctrl = sqlite3_column_int(stmt, 17);
+                tmp.over_manager.sensor_val1_lower_enabled = sqlite3_column_int(stmt, 15);
+                tmp.over_manager.sensor_val1_lower_threshold = sqlite3_column_double(stmt, 16);
+                tmp.over_manager.sensor_val1_lower_threshold_ctrl = sqlite3_column_int(stmt, 17);
 
                 p = (char*)sqlite3_column_text(stmt, 18);
-                tmp.over_manager->sensor_val1_lower_threshold_ctrl_para[0] = 0;
-                if(p) strcpy(tmp.over_manager->sensor_val1_lower_threshold_ctrl_para, p);
+                tmp.over_manager.sensor_val1_lower_threshold_ctrl_para[0] = 0;
+                if(p) strcpy(tmp.over_manager.sensor_val1_lower_threshold_ctrl_para, p);
 
-                tmp.over_manager->sensor_val2_upper_enabled = sqlite3_column_int(stmt, 19);
-                tmp.over_manager->sensor_val2_upper_threshold = sqlite3_column_double(stmt, 20);
-                tmp.over_manager->sensor_val2_upper_threshold_ctrl = sqlite3_column_int(stmt, 21);
+                tmp.over_manager.sensor_val2_upper_enabled = sqlite3_column_int(stmt, 19);
+                tmp.over_manager.sensor_val2_upper_threshold = sqlite3_column_double(stmt, 20);
+                tmp.over_manager.sensor_val2_upper_threshold_ctrl = sqlite3_column_int(stmt, 21);
 
                 p = (char*)sqlite3_column_text(stmt, 22);
-                tmp.over_manager->sensor_val2_upper_threshold_ctrl_para[0] = 0;
-                if(p) strcpy(tmp.over_manager->sensor_val2_upper_threshold_ctrl_para, p);
+                tmp.over_manager.sensor_val2_upper_threshold_ctrl_para[0] = 0;
+                if(p) strcpy(tmp.over_manager.sensor_val2_upper_threshold_ctrl_para, p);
 
-                tmp.over_manager->sensor_val2_lower_enabled = sqlite3_column_int(stmt, 23);
-                tmp.over_manager->sensor_val2_lower_threshold = sqlite3_column_double(stmt, 24);
-                tmp.over_manager->sensor_val2_lower_threshold_ctrl = sqlite3_column_int(stmt, 25);
+                tmp.over_manager.sensor_val2_lower_enabled = sqlite3_column_int(stmt, 23);
+                tmp.over_manager.sensor_val2_lower_threshold = sqlite3_column_double(stmt, 24);
+                tmp.over_manager.sensor_val2_lower_threshold_ctrl = sqlite3_column_int(stmt, 25);
 
                 p = (char*)sqlite3_column_text(stmt, 26);
-                tmp.over_manager->sensor_val2_lower_threshold_ctrl_para[0] = 0;
-                if(p) strcpy(tmp.over_manager->sensor_val2_lower_threshold_ctrl_para, p);
+                tmp.over_manager.sensor_val2_lower_threshold_ctrl_para[0] = 0;
+                if(p) strcpy(tmp.over_manager.sensor_val2_lower_threshold_ctrl_para, p);
 
                 xlist_append(l, tab_id, &tmp, sizeof(tmp));
             }