1、数据库查询时间默认为一周，减少处理时间

pro/src/appweb_handle.c

@@ -2931,18 +2931,12 @@ static void alarmProtect(void *conn)
         //初始化表
         INIT_LIST_HEAD(&_alarm_ack_info.list);
         //查询数据库，最近的10个报警信息
-#if 1
-         ret = dev_serarch_all_alarm(__globalDeviceManage.db,
-            __globalDeviceManage._globalDevInfo.product.id,
-           -1,1,10,
-            &_alarm_ack_info,&nAlarmNumber);
-#else
+
         ret = dev_search_alarm_info(__globalDeviceManage.db,
             __globalDeviceManage._globalDevInfo.product.id,
            -1,_alarm_request_info.startTime,_alarm_request_info.endTime,
            1,10,
             &_alarm_ack_info,&nAlarmNumber);
-#endif
         if(ret!=0) {
             log_e("get power alarm error.");
         }
@@ -2964,18 +2958,12 @@ static void alarmProtect(void *conn)
         //初始化表
         INIT_LIST_HEAD(&_alarm_ack_info.list);
         //查询数据库
-#if 1
-        ret = dev_serarch_all_alarm(__globalDeviceManage.db,
-            __globalDeviceManage._globalDevInfo.product.id,
-            ALARM_TYPE_POWER,_alarm_request_info.pagenum,_alarm_request_info.pagesize,
-            &_alarm_ack_info,&nAlarmNumber);
-#else
+
         ret = dev_search_alarm_info(__globalDeviceManage.db,
             __globalDeviceManage._globalDevInfo.product.id,
             ALARM_TYPE_POWER,_alarm_request_info.startTime,_alarm_request_info.endTime,
             _alarm_request_info.pagenum,_alarm_request_info.pagesize,
             &_alarm_ack_info,&nAlarmNumber);
-#endif
         if(ret!=0) {
             log_e("get power alarm error.");
         }
@@ -2998,18 +2986,11 @@ static void alarmProtect(void *conn)
         INIT_LIST_HEAD(&_alarm_ack_info.list);
         //查询数据库
 
-#if 1
-        ret = dev_serarch_all_alarm(__globalDeviceManage.db,
-            __globalDeviceManage._globalDevInfo.product.id,
-            ALARM_TYPE_SENSOR,_alarm_request_info.pagenum,_alarm_request_info.pagesize,
-            &_alarm_ack_info,&nAlarmNumber);
-#else
         ret = dev_search_alarm_info(__globalDeviceManage.db,
             __globalDeviceManage._globalDevInfo.product.id,
             ALARM_TYPE_SENSOR,_alarm_request_info.startTime,_alarm_request_info.endTime,
             _alarm_request_info.pagenum,_alarm_request_info.pagesize,
             &_alarm_ack_info,&nAlarmNumber);
-#endif
         if(ret!=0) {
             log_e("get sensor alarm error.");
         }
@@ -3030,18 +3011,12 @@ static void alarmProtect(void *conn)
     {
         //初始化表
         INIT_LIST_HEAD(&_alarm_ack_info.list);
-#if 1
-        ret = dev_serarch_all_alarm(__globalDeviceManage.db,
-            __globalDeviceManage._globalDevInfo.product.id,
-            ALARM_TYPE_NETWORK,_alarm_request_info.pagenum,_alarm_request_info.pagesize,
-            &_alarm_ack_info,&nAlarmNumber);
-#else
+
         ret = dev_search_alarm_info(__globalDeviceManage.db,
             __globalDeviceManage._globalDevInfo.product.id,
             ALARM_TYPE_NETWORK,_alarm_request_info.startTime,_alarm_request_info.endTime,
             _alarm_request_info.pagenum,_alarm_request_info.pagesize,
             &_alarm_ack_info,&nAlarmNumber);
-#endif
         if(ret!=0) {
             log_e("get net alarm error.");
         }

pro/src/sqlite_handle.c

@@ -24,6 +24,16 @@ typedef struct {
 static sql_handle_t sqlHandle={0};
 static int overwrite_flag=0;
 
+static int time_to_utc(char *time, uint32_t *utc)
+{
+
+}
+static int utc_to_time(uint32_t *utc, char *time)
+{
+
+}
+
+
 
 static int get_count(sqlite3 *db, char *table)
 {
@@ -46,11 +56,12 @@ static int get_count(sqlite3 *db, char *table)
 
     return count;
 }
+
 static int get_count_ex(sqlite3 *db, char *sql)
 {
     int r;
     sqlite3_stmt *stmt=NULL;
-    
+
     r = sqlite3_prepare_v2(db, sql, -1, &stmt, 0);
     if (r != SQLITE_OK) {
         log_e("Failed to prepare statement: %s\n", sqlite3_errmsg(db));
@@ -160,9 +171,6 @@ int sqlite_SQL_RUN(sqlite3 *db,const char *select_sql, char ***pResult, int *nro
 /// @return 0:正常
 int dev_get_device_info(sqlite3 *db,GlobalDeviceInfo* _globalDeviceInfo)
 {
-#ifdef KEY_PARAS_IN_FILE
-    *_globalDeviceInfo = paras_get()->dev;
-#else
     int res = 0 ;
     int rowIndex = 1 ;
     char *errorMsg = NULL;
@@ -214,7 +222,7 @@ int dev_get_device_info(sqlite3 *db,GlobalDeviceInfo* _globalDeviceInfo)
     strcpy(_globalDeviceInfo->relay.path,pResult[rowIndex*ncolumn+13]);
 
     sqlite3_free_table(pResult);
-#endif
+
     return 0;
 } 
 
@@ -226,10 +234,6 @@ int dev_get_device_info(sqlite3 *db,GlobalDeviceInfo* _globalDeviceInfo)
 /// @return 
 int dev_update_device_genera_info(sqlite3 *db,GlobalDeviceInfo* _globalDeviceInfo)
 {
-#ifdef KEY_PARAS_IN_FILE
-    paras_get()->dev = *_globalDeviceInfo;
-    return paras_save();
-#else
     int res ;
     char select_sql[2000] = {0};
     char *errorMsg = NULL;
@@ -254,7 +258,6 @@ int dev_update_device_genera_info(sqlite3 *db,GlobalDeviceInfo* _globalDeviceInf
         return -1 ; 
     } 
     sqlite3_free_table(pResult);
-#endif
 
     return 0;
 }
@@ -265,10 +268,6 @@ int dev_update_device_genera_info(sqlite3 *db,GlobalDeviceInfo* _globalDeviceInf
 /// @return 
 int dev_update_device_modus_info(sqlite3 *db,GlobalDeviceInfo* _globalDeviceInfo)
 {
-#ifdef KEY_PARAS_IN_FILE
-    paras_get()->dev = *_globalDeviceInfo;
-    return paras_save();
-#else
     if (_globalDeviceInfo == NULL || db == NULL)
     {
         return -1;
@@ -293,7 +292,6 @@ int dev_update_device_modus_info(sqlite3 *db,GlobalDeviceInfo* _globalDeviceInfo
         return -1 ;
     }
     sqlite3_free_table(pResult);
-#endif
 
     return 0;
 }
@@ -1373,9 +1371,6 @@ int dev_check_power_manage_info(sqlite3 *db, int cnt)
 /// @return 
 int dev_insert_power_manage_info(sqlite3 *db,int product_id,int product_ch_id,GlobalPowerManger* _globalPowerChnManger)
 {
-#ifdef KEY_PARAS_IN_FILE
-    return paras_power_set(product_ch_id, _globalPowerChnManger);
-#else
     int res ;
     char select_sql[2000] = {0};
     char *errorMsg = NULL;
@@ -1422,7 +1417,6 @@ int dev_insert_power_manage_info(sqlite3 *db,int product_id,int product_ch_id,Gl
         return -1 ;
     }
     sqlite3_free_table(pResult);
-#endif
 
     return 0;
 }
@@ -1435,9 +1429,6 @@ int dev_insert_power_manage_info(sqlite3 *db,int product_id,int product_ch_id,Gl
 /// @return 
 int dev_get_power_manage_info(sqlite3 *db,int product_id,int product_addr,int product_ch_id,GlobalPowerManger* _globalPowerChnManger)
 {
-#ifdef KEY_PARAS_IN_FILE
-    return paras_power_get(product_addr, product_ch_id, _globalPowerChnManger);
-#else
     int res = 0 ;
     int rowIndex = 1 ;
     char *errorMsg = NULL;
@@ -1521,7 +1512,6 @@ int dev_get_power_manage_info(sqlite3 *db,int product_id,int product_addr,int pr
     //获取板TYPE
     _globalPowerChnManger->product_ch_addr = atoi(pResult[rowIndex*ncolumn+28]); 
     sqlite3_free_table(pResult);
-#endif
 
     return 0;
 }
@@ -2808,7 +2798,7 @@ int dev_search_alarm_info(sqlite3* db,
     }
     *nAlarmSum = atoi(pResult[1]);
 #else
-    int cnt - get_count_ex(0;)
+    int cnt = get_count_ex(db, select_sql);
 	if(cnt<0) {
         return -1;
     }