Merge branch 'master' of http://jiecheng2024.tpddns.cn:3000/liyuezong/SmartPDCode

pro/src/json_handle.c

@@ -4946,7 +4946,7 @@ cJSON* json_to_user_manage(const char* str,_UserRoleManageInfo* _UserRoleManageR
         cJSON* cjson_user_roleId = cJSON_GetObjectItem(cjson,"roleId");  
         cJSON* cjson_user_roleName = cJSON_GetObjectItem(cjson,"roleName");
         cJSON* cjson_user_password = cJSON_GetObjectItem(cjson,"password");
-
+        cJSON* cjson_user_createtime = cJSON_GetObjectItem(cjson,"createTime");
 
         if (cjson_user_userId != NULL)
             _UserRoleManageRequestInfo->userId = cjson_user_userId->valueint;
@@ -4962,6 +4962,8 @@ cJSON* json_to_user_manage(const char* str,_UserRoleManageInfo* _UserRoleManageR
             _UserRoleManageRequestInfo->roleName = cjson_user_roleName->valuestring;
         if (cjson_user_password != NULL)
             _UserRoleManageRequestInfo->password = cjson_user_password->valuestring;
+        if (cjson_user_createtime != NULL)
+            _UserRoleManageRequestInfo->createTime = cjson_user_createtime->valuestring;
     }
 
     return cjson;

pro/src/sqlite_handle.c

@@ -358,7 +358,7 @@ int dev_change_last_Index(sqlite3 *db,int* nIndex,int nDeleteNumber,char* tableN
         return -1 ;  
     }    
     sqlite3_free_table(pResult);
-    dev_sql_VACCUM(db);
+
 
     sprintf(select_sql,"UPDATE %s SET product_Index = product_Index - %d;",tableName,nDeleteNumber);
     res = sqlite3_get_table(db, select_sql, &pResult, &nrow, &ncolumn, &err_msg);
@@ -667,7 +667,6 @@ int dev_delete_power_info_all(sqlite3 *db)
         return -1 ; 
     }
     sqlite3_free_table(pResult);
-    dev_sql_VACCUM(db);
 
     return 0;
 }
@@ -1356,7 +1355,6 @@ int dev_check_power_manage_info(sqlite3 *db, int cnt)
             sqlite3_free(errmsg);
             r = -1;
         }
-        dev_sql_VACCUM(db);
     }
     return r;
 }
@@ -1842,7 +1840,6 @@ int dev_delete_ac_power_info_all(sqlite3 *db)
         return -1 ; 
     }
     sqlite3_free_table(pResult);
-    dev_sql_VACCUM(db);
 
     return 0;
 }
@@ -2051,7 +2048,6 @@ int dev_delete_breaker_manage(sqlite3 *db,int product_id,int breaker_id)
         return -1 ;
     }
     sqlite3_free_table(pResult);
-    dev_sql_VACCUM(db);
 
     return 0;
 }
@@ -2407,7 +2403,6 @@ int dev_delete_sensor_manage(sqlite3 *db,int product_id,int sensor_id)
         return -1 ;
     }
     sqlite3_free_table(pResult);
-    dev_sql_VACCUM(db);
 
     return 0;
 }
@@ -2428,7 +2423,6 @@ int dev_delete_sensor_info_all(sqlite3 *db)
         return -1 ;
     }
     sqlite3_free_table(pResult);
-    dev_sql_VACCUM(db);
 
     return 0;
 }
@@ -2876,7 +2870,6 @@ int dev_delete_alarm_info_all(sqlite3* db,int alarm_type)
         return -1 ;   
     }
     sqlite3_free_table(pResult);
-    dev_sql_VACCUM(db);
 
     return 0;
 }
@@ -3118,7 +3111,6 @@ int dev_delete__group_info(sqlite3 *db,int product_id)
         return -1 ;
     }
     sqlite3_free_table(pResult);
-    dev_sql_VACCUM(db);
 
     return 0;
 }
@@ -3348,7 +3340,6 @@ int dev_delete_user_info(sqlite3 *db,int userID)
         return -1 ;
     }
     sqlite3_free_table(pResult);
-    dev_sql_VACCUM(db);
 
     return 0;
 }
@@ -3619,7 +3610,6 @@ int dev_delete_power_ds(sqlite3 *db,int product_id,int nChn,_PowerDSManage_t* _p
         return -1;
     }
     sqlite3_free_table(pResult);
-    dev_sql_VACCUM(db);
 
     return 0;
 }