1、修改传感器名称问题；

2、修改传感器历史记录信息，按最近60个记录排序

pro/src/appweb_handle.c

@@ -2122,7 +2122,8 @@ static void sensorStatusMonitoring(void* conn)
             memset(_overSensorBackInfoTemp,0,sizeof(_OverSensorBackInfo));
             //基本信息
             _overSensorBackInfoTemp->sensorId = _globalSensorManagerTemp->sensor_id;
-            strcpy(_overSensorBackInfoTemp->sensorName,language_sensor_name[__globalDeviceManage._globalDevInfo.product.language][(int)_globalSensorManagerTemp->sensor_type]);
+            //strcpy(_overSensorBackInfoTemp->sensorName,language_sensor_name[__globalDeviceManage._globalDevInfo.product.language][(int)_globalSensorManagerTemp->sensor_type]);
+            strcpy(_overSensorBackInfoTemp->sensorName,_globalSensorManagerTemp->sensor_name);
             
             _overSensorBackInfoTemp->sensorType = _globalSensorManagerTemp->sensor_type;
             memcpy(&_overSensorBackInfoTemp->comSlogan,&_globalSensorManagerTemp->sensor_port_name,sizeof(_overSensorBackInfoTemp->comSlogan));

pro/src/json_handle.c

@@ -2721,26 +2721,6 @@ char* over_all_sensor_info_to_json(_OverSensorBackInfo* _over_all_sensor_back_in
         cJSON_AddStringToObject(data_filed,"gasConcentration",temp);
         sprintf(temp,"%0.2f",_temp->humidityValue);
         cJSON_AddStringToObject(data_filed,"humidityValue",temp);
-        //switch (_temp->sensorType)
-        //{
-        //case SENSOR_TYPE_TEMPERATURE:
-        //    cJSON_AddStringToObject(data_filed,"sensorName",language_temperature[__globalDeviceManage._globalDevInfo.product.language]);//_temp->sensorName);
-        //    break;
-        //case SENSOR_TYPE_SMOKE:
-        //    cJSON_AddStringToObject(data_filed,"sensorName",language_temperature[__globalDeviceManage._globalDevInfo.product.language]);
-        //    break;
-        //case SENSOR_TYPE_WATER:
-        //    cJSON_AddStringToObject(data_filed,"sensorName",language_temperature[__globalDeviceManage._globalDevInfo.product.language]);
-        //    break;
-        //case SENSOR_TYPE_GAS:
-        //    cJSON_AddStringToObject(data_filed,"sensorName",language_temperature[__globalDeviceManage._globalDevInfo.product.language]);
-        //    break;
-        //case SENSOR_TYPE_AIR_PRESS:
-        //    cJSON_AddStringToObject(data_filed,"sensorName",language_temperature[__globalDeviceManage._globalDevInfo.product.language]);
-        //    break;
-        //default:
-        //    break;
-        //}
         cJSON_AddStringToObject(data_filed,"sensorName",_temp->sensorName);
         sprintf(temp, "%d", _temp->sensorId);
         cJSON_AddStringToObject(data_filed,"sensorId",temp);
@@ -2862,8 +2842,9 @@ char *ws_sensor_status_ack_to_json(GlobalSensorManger *_globalSensorManger)
             memset(_overSensorBackInfoTemp, 0, sizeof(_OverSensorBackInfo));
             // 基本信息
             _overSensorBackInfoTemp->sensorId = _globalSensorManagerTemp->sensor_id;
-            strcpy(_overSensorBackInfoTemp->sensorName,language_sensor_name[__globalDeviceManage._globalDevInfo.product.language][(int)_globalSensorManagerTemp->sensor_type]);
-            
+           // strcpy(_overSensorBackInfoTemp->sensorName,language_sensor_name[__globalDeviceManage._globalDevInfo.product.language][(int)_globalSensorManagerTemp->sensor_type]);
+            strcpy(_overSensorBackInfoTemp->sensorName,_globalSensorManagerTemp->sensor_name);
+
             _overSensorBackInfoTemp->sensorType = _globalSensorManagerTemp->sensor_type;
             memcpy(&_overSensorBackInfoTemp->comSlogan, &_globalSensorManagerTemp->sensor_port_name, sizeof(_overSensorBackInfoTemp->comSlogan));
             // strcpy(_overSensorBackInfoTemp->comSlogan,_globalSensorManagerTemp->sensor_port_name);

pro/src/sqlite_handle.c

@@ -2178,8 +2178,8 @@ int dev_get_sensor_manage_info(sqlite3 *db,int product_id,GlobalSensorManger* _g
         _globalSensorMangerTemp->sensor_type = atoi(pResult[i*ncolumn+2]);
         _globalSensorMangerTemp->sensor_interface_type = atoi(pResult[i*ncolumn+3]);
 
-        //strcpy(_globalSensorMangerTemp->sensor_name,pResult[i*ncolumn+4]);
-        strcpy(_globalSensorMangerTemp->sensor_name,language_sensor_name[__globalDeviceManage._globalDevInfo.product.language][(int)_globalSensorMangerTemp->sensor_type]);
+        strcpy(_globalSensorMangerTemp->sensor_name,pResult[i*ncolumn+4]);
+        //strcpy(_globalSensorMangerTemp->sensor_name,language_sensor_name[__globalDeviceManage._globalDevInfo.product.language][(int)_globalSensorMangerTemp->sensor_type]);
 
         strcpy(_globalSensorMangerTemp->sensor_port_name,pResult[i*ncolumn+5]);
         if( _globalSensorMangerTemp->sensor_interface_type==1)
@@ -2338,7 +2338,7 @@ int dev_search_sensor_info(sqlite3 *db,
     char** pResult = NULL;  //用来指向sql执行结果的指针
     char* err_msg=NULL;
  
-    sprintf(select_sql,"SELECT* FROM Table_SensorInfo WHERE (product_id=%d) AND (sensor_id=%d) AND (sensor_samp_time BETWEEN '%s' AND '%s') LIMIT %d OFFSET %d;",
+    sprintf(select_sql,"SELECT* FROM Table_SensorInfo WHERE (product_id=%d) AND (sensor_id=%d) AND (sensor_samp_time BETWEEN '%s' AND '%s') ORDER BY sensor_samp_time DESC LIMIT %d OFFSET %d;",
                         product_id,
                         sensor_id,
                         start_time,
@@ -2359,7 +2359,7 @@ int dev_search_sensor_info(sqlite3 *db,
     }
     
     //初始化头
-    for (size_t i = 1; i <= nrow; i++)
+    for (size_t i = nrow; i >0; i--)
     {
         GlobalSensorInfo* _globalSensorInfoTemp = (GlobalSensorInfo*)malloc(sizeof(GlobalSensorInfo));
         if(_globalSensorInfoTemp==NULL)