1、修改操作日志和运行日志首页查询无效bug；

2、修改操作日志和运行日志分页符无效bug；
3、修改在数据为空时，总体及通道历史记录查询无效bug；
4、修改报警气体传感器报警提示错误

pro/src/appweb_handle.c

@@ -884,7 +884,8 @@ static void overallStatusMonitoring(void* conn)
             {
                 log_e("serach total voltage err.");
             }
-            else {
+            //else 
+            {
                         // 传值给总管理结构体
                 for (int i = 0; i < TOTAL_COUNT; i++)
                 {
@@ -903,7 +904,8 @@ static void overallStatusMonitoring(void* conn)
             {
                 log_e("serach total voltage err.");
             }
-            else {
+            //else 
+            {
                 // 传值给总管理结构体
                 for (int i = 0; i < TOTAL_COUNT; i++)
                 {
@@ -1703,7 +1705,8 @@ static void channelStatusMonitoring(void* conn)
             {
                 log_e("serach total power voltage err.");
             }
-            else {
+          //  else 
+            {
                 // 传值给总管理结构体
                 for (int i = 0; i < TOTAL_COUNT; i++)
                 {
@@ -1720,7 +1723,8 @@ static void channelStatusMonitoring(void* conn)
             {
                 log_e("serach total voltage err.");
             }
-            else {
+           // else
+             {
                 // 传值给总管理结构体
                 for (int i = 0; i < TOTAL_COUNT; i++)
                 {
@@ -1771,7 +1775,8 @@ static void channelStatusMonitoring(void* conn)
             {
                 log_e("serach total power current err.");
             }
-            else {
+           // else
+             {
                 // 传值给总管理结构体
                 for (int i = 0; i < TOTAL_COUNT; i++)
                 {
@@ -1790,7 +1795,8 @@ static void channelStatusMonitoring(void* conn)
             {
                 log_e("serach total current err.");
             }
-            else {
+            //else 
+            {
                 // 传值给总管理结构体
                 for (int i = 0; i < TOTAL_COUNT; i++)
                 {
@@ -1841,7 +1847,8 @@ static void channelStatusMonitoring(void* conn)
             {
                 log_e("serach total power  err.");
             }
-            else {
+            //else
+             {
                 // 传值给总管理结构体
                 for (int i = 0; i < TOTAL_COUNT; i++)
                 {
@@ -1860,7 +1867,8 @@ static void channelStatusMonitoring(void* conn)
             {
                 log_e("serach total power err.");
             }
-            else {
+            //else
+             {
                 // 传值给总管理结构体
                 for (int i = 0; i < TOTAL_COUNT; i++)
                 {
@@ -1911,7 +1919,8 @@ static void channelStatusMonitoring(void* conn)
             {
                 log_e("serach total power  err.");
             } 
-            else {
+           // else 
+            {
                 for (int i = 0; i < TOTAL_COUNT; i++)
                 {
                     strcpy(pch->_total_consumption.xAxis[i], __globalPowerInfo._total_consumption.xAxis[i]);
@@ -1929,7 +1938,8 @@ static void channelStatusMonitoring(void* conn)
             {
                 log_e("serach total power consumption err.");
             }
-            else {
+           // else
+             {
                 // 传值给总管理结构体
                 for (int i = 0; i < TOTAL_COUNT; i++)
                 {
@@ -3461,7 +3471,7 @@ static void logInformation(void *conn)
                             0,     //注意注意 此处需要查询的参数是0 1 2
                             start_time,//启动时间
                             stop_time,  //结束时间
-                            __logInformationRequestInfo.pagenum-1,  //页
+                            __logInformationRequestInfo.pagenum,  //页
                             __logInformationRequestInfo.pagesize, //条
                             &_alarm_ack_info,&nAlarmNum);      
 
@@ -3483,7 +3493,7 @@ static void logInformation(void *conn)
                             0,     //注意注意 此处需要查询的参数是0 1 2
                             __logInformationRequestInfo.startTime,//开始时间
                             __logInformationRequestInfo.endtime,  //结束时间
-                            __logInformationRequestInfo.pagenum-1,  //页
+                            __logInformationRequestInfo.pagenum,  //页
                             __logInformationRequestInfo.pagesize, //条
                             &_alarm_ack_info,&nAlarmNum);
 
@@ -3528,7 +3538,7 @@ static void logInformation(void *conn)
                                   ALARM_TYPE_OPRATION, // alarm_type,        操作日志
                                   start_time,
                                   stop_time,
-                                  __logInformationRequestInfo.pagenum - 1,
+                                  __logInformationRequestInfo.pagenum,
                                   __logInformationRequestInfo.pagesize,
                                   &_alarm_ack_info, &nAlarmNum);
         }
@@ -3539,7 +3549,7 @@ static void logInformation(void *conn)
                                 ALARM_TYPE_OPRATION,// alarm_type,        操作日志
                                 __logInformationRequestInfo.startTime,
                                 __logInformationRequestInfo.endtime,
-                                __logInformationRequestInfo.pagenum-1,
+                                __logInformationRequestInfo.pagenum,
                                 __logInformationRequestInfo.pagesize,
                                 &_alarm_ack_info,&nAlarmNum);
         }
@@ -3580,7 +3590,7 @@ static void logInformation(void *conn)
                                   ALARM_TYPE_RUNNING, // alarm_type,        运行日志
                                   start_time,
                                   stop_time,
-                                  __logInformationRequestInfo.pagenum - 1,
+                                  __logInformationRequestInfo.pagenum,
                                   __logInformationRequestInfo.pagesize,
                                   &_alarm_ack_info, &nAlarmNum);
         }
@@ -3591,7 +3601,7 @@ static void logInformation(void *conn)
                                   ALARM_TYPE_RUNNING, // alarm_type,        运行日志
                                 __logInformationRequestInfo.startTime,
                                 __logInformationRequestInfo.endtime,
-                                  __logInformationRequestInfo.pagenum - 1,
+                                  __logInformationRequestInfo.pagenum,
                                   __logInformationRequestInfo.pagesize,
                                   &_alarm_ack_info, &nAlarmNum);
         }

pro/src/json_handle.c

@@ -4390,18 +4390,13 @@ cJSON* json_to_loginformation_manage(const char* str,_LogInformationRequestInfo*
     if(cjson_alarm_type!=NULL)
         _logInformationRequestInfo->alarmType = cjson_alarm_type->valuestring ;  
 
+    cJSON *cjson_begin_time = cJSON_GetObjectItem(cjson, "startTime");
+    if (cjson_begin_time != NULL)
+        _logInformationRequestInfo->startTime = cjson_begin_time->valuestring;
 
-    cJSON* cjson_params = cJSON_GetObjectItem(cjson,"params");
-    // if(cjson_params!=NULL)
-    // {
-        cJSON* cjson_begin_time = cJSON_GetObjectItem(cjson_params,"startTime");
-        if(cjson_begin_time!=NULL)
-            _logInformationRequestInfo->startTime = cjson_begin_time->valuestring ;  
-
-        cJSON* cjson_end_time = cJSON_GetObjectItem(cjson_params,"endTime");
-        if(cjson_end_time!=NULL)
-            _logInformationRequestInfo->endtime = cjson_end_time->valuestring ;  
-    // }
+    cJSON *cjson_end_time = cJSON_GetObjectItem(cjson, "endTime");
+    if (cjson_end_time != NULL)
+        _logInformationRequestInfo->endtime = cjson_end_time->valuestring;
 
     cJSON* cjson_pagenum = cJSON_GetObjectItem(cjson,"pageNum");
     if(cjson_pagenum!=NULL)
@@ -4927,7 +4922,15 @@ cJSON* json_to_user_manage(const char* str,_UserRoleManageInfo* _UserRoleManageR
     {     
         cJSON* cjson_user_userName = cJSON_GetObjectItem(cjson,"userName");
         if(cjson_user_userName!=NULL)
-            _UserRoleManageRequestInfo->userName = "admin";//cjson_user_userName->valuestring ;
+            _UserRoleManageRequestInfo->userName =cjson_user_userName->valuestring ;
+
+        cJSON *cjson_pagenum = cJSON_GetObjectItem(cjson, "pageNum");
+        if (cjson_pagenum != NULL)
+            _UserRoleManageRequestInfo->pagenum = cjson_pagenum->valueint;
+
+        cJSON *cjson_pagesize = cJSON_GetObjectItem(cjson, "pageSize");
+        if (cjson_pagesize != NULL)
+            _UserRoleManageRequestInfo->pagesize = cjson_pagesize->valueint;
     }
     //删除用户
     if(strcmp(_UserRoleManageRequestInfo->type,"deleteUser")==0)

pro/src/json_handle.h

@@ -546,7 +546,8 @@ typedef struct
     char*   roleName;
     char*   password;
     int   userIds;
-
+    int pagenum;
+    int pagesize;
 
 }_UserRoleManageInfo;
 

pro/src/sqlite_handle.c

@@ -3953,6 +3953,22 @@ int dev_sensor_Alarm_send_message(GlobalDeviceManager* globalDeviceManger,Global
         }
     }
     break;
+    case SENSOR_TYPE_GAS:
+    {
+        switch (_AlarmType)
+        {
+        case SENSOR_VAL1_UPPER:
+            sprintf(AlarmText, "%s |$%s$", __globalPowerTemp->sensor_name, language_alarm_Up[languagesID]);
+            break;
+        case SENSOR_VAL1_LOWER:
+            sprintf(AlarmText, "%s |$%s$", __globalPowerTemp->sensor_name, language_alarm_Down[languagesID]);
+            break;
+        default:
+            sprintf(AlarmText, "%s |$%s$", __globalPowerTemp->sensor_name, language_alarm_NULL_ERROR[languagesID]);
+            break;
+        }
+    }
+    break;
     default:
         sprintf(AlarmText,"%s |$%s$",__globalPowerTemp->sensor_name,language_alarm_NULL_ERROR[languagesID]);
         break;