解决2个内存问题

04-软件设计及源码/03-核心板/V1.0/05.src/smart_pdu/CMakeLists.txt

@@ -99,7 +99,9 @@ set(SRC_DIR  ${PROJECT_BINARY_DIR})
 set(DST_DIR ${PROJECT_SOURCE_DIR}/../output/out)
 
 add_custom_command(TARGET  smartPDU  POST_BUILD
-                                            COMMAND  cp -upf  ${SRC_DIR}/smartPDU ${DST_DIR}/root/run/app/)
+                   COMMAND  mkdir -p  ${DST_DIR}/root/run/app
+                   COMMAND  cp -upf  ${SRC_DIR}/smartPDU ${DST_DIR}/root/run/app/)
 
 add_custom_command(TARGET  smartUPG  POST_BUILD
-                                            COMMAND  cp -upf  ${SRC_DIR}/smartUPG ${DST_DIR}/usr/sbin/)
+                   COMMAND  mkdir -p  ${DST_DIR}/usr/sbin
+                   COMMAND  cp -upf  ${SRC_DIR}/smartUPG ${DST_DIR}/usr/sbin/)

04-软件设计及源码/03-核心板/V1.0/05.src/smart_pdu/src/appweb_handle.c

@@ -65,7 +65,7 @@ static char* g_product_type_str[4] = {
     "SmartPdu(Tree_AC_One)",
 };
 
-static char* g_product_pwr_type_str[4] = {
+static char* g_product_pwr_type_str[5] = {
     "xxx",
     "直流",
     "交流单相",
@@ -437,7 +437,7 @@ static void loginOutFunc(void* conn)
 #endif
 
     //转换json参数
-    if(json_to_User_loginOut_info(rx_body_buf,g_token)!=0)
+    if(json_to_User_loginOut_info(rx_body_buf,&g_token)!=0)
     {
         http_reply(conn, 400, NULL);
         return ;        
@@ -445,6 +445,7 @@ static void loginOutFunc(void* conn)
     
     ack_str = log_info_to_json(g_token);
     http_reply(conn, 200, ack_str);
+    free(g_token);
 
     cJSON_free((void*)ack_str);
 }

04-软件设计及源码/03-核心板/V1.0/05.src/smart_pdu/src/json_handle.c

@@ -711,7 +711,7 @@ int json_to_User_login_info(const char* str,_User_Log* _newUserLogin)
 /// @param _over_all_sts_ 
 /// @param  
 /// @return 
-int json_to_User_loginOut_info(const char* str,char* _UserLoginOutToken)
+int json_to_User_loginOut_info(const char* str,char** _UserLoginOutToken)
 {
     cJSON* cjson = NULL;
     cjson = cJSON_Parse(str);
@@ -722,8 +722,16 @@ int json_to_User_loginOut_info(const char* str,char* _UserLoginOutToken)
     }
 
     cJSON *cjson_token= cJSON_GetObjectItem(cjson, "token");
-    if (cjson_token != NULL)
-    _UserLoginOutToken = cjson_token->valuestring;
+    if (cjson_token != NULL && _UserLoginOutToken!=NULL) {
+        int len=strlen(cjson_token->valuestring);
+        char *p = (char*)malloc(len+2);
+        if(p) {
+            strcpy(p, cjson_token->valuestring);
+        }
+        *_UserLoginOutToken = p;
+    }
+    cJSON_Delete(cjson);
+
     return 0 ;
 }
 

04-软件设计及源码/03-核心板/V1.0/05.src/smart_pdu/src/json_handle.h

@@ -10,36 +10,36 @@
 #include "common.h"
 #include "cJSON.h"
 
-/// @brief 鑾峰彇鐢ㄦ埛淇℃伅
+/// @brief 获取用户信息
 typedef struct
 {
     char* user_token;
 }_Get_Info_Request;
 
-/// @brief 电压、电流、功率、耗电量统计接口
+/// @brief 电压、电流、功率、耗电量统计接口
 typedef struct
 {
     float ydata[60];    //value
-    char  xAxis[60][32];//时间点
+    char  xAxis[60][32];//时间点
 }_Get_Total_Value;
 
-/// @brief 绯荤粺鎬绘暟淇℃伅
+/// @brief 系统总数信息
 typedef struct
 {
-    int channel_total  ;//閫氶亾鎬绘暟
-    int warn_total     ;//鍛婅�鎬绘暟
-    int sensor_total   ;//浼犳劅鍣ㄦ€绘暟
-    int log_total      ;//杩愯�鏃ュ織鎬绘暟
+    int channel_total  ;//通道总数
+    int warn_total     ;//告警总数
+    int sensor_total   ;//传感器总数
+    int log_total      ;//运行日志总数
 }_Get_System_Total;
 
-//鍔熺巼瓒嬪娍鎺ュ彛
+//功率趋势接口
 typedef struct
 {
-    float  ydata[3][60]     ;//0锛氭湁鍔熷姛鐜囷紱1锛氭棤鍔熷姛鐜囷紱2锛氳�鍦ㄥ姛鐜囷紱
-    char   xAxis[60][32]    ;//时间点      
+    float  ydata[3][60]     ;//0：有功功率；1：无功功率；2：视在功率；
+    char   xAxis[60][32]    ;//时间点      
 }_Power_Trend_Info;
 
-/// @brief 鎬讳綋璁惧�淇℃伅
+/// @brief 总体设备信息
 typedef struct
 {
     char*   user_token;
@@ -58,7 +58,7 @@ typedef struct
 
 
 
-/// @brief 总设备信息返回
+/// @brief 总设备信息返回
 typedef struct
 {
     char* product_name;
@@ -70,14 +70,14 @@ typedef struct
     char* productPwrType;
     char* productVersion;
     char* productConsumption;
-    int productMemory; //鍐呭瓨
-    char* occupancyRate;//磁盘占用率
-    char* productAddr; //IP鍦板潃
-    char productCount; //级联设备数
+    int productMemory; //内存
+    char* occupancyRate;//磁盘占用率
+    char* productAddr; //IP地址
+    char productCount; //级联设备数
     _Get_System_Total  system_total;
 }_OverBackStsInfo;
 
-/// @brief 鐢垫簮鎬讳綋鐩戞帶璇锋眰淇℃伅
+/// @brief 电源总体监控请求信息
 typedef struct 
 {
     char* user_token;
@@ -87,7 +87,7 @@ typedef struct
 }_OverAllPwrRequest;
 
 
-/// @brief 鐢垫簮閫氶亾鐩戞帶璇锋眰淇℃伅
+/// @brief 电源通道监控请求信息
 typedef struct 
 {
     char* user_token;
@@ -106,7 +106,7 @@ typedef struct
     int outputType;
 }_OverChnPwrRequest;
 
-/// @brief 鎬讳綋鐢垫簮杩斿洖淇℃伅
+/// @brief 总体电源返回信息
 typedef struct
 {
     char*           product_name;
@@ -115,60 +115,60 @@ typedef struct
     char*           productChName;
     char            productChId;    
     int             status;
-    float           voltage                                     ;//鐢靛帇
-    float           current                                     ;//鐢垫祦
-    float           power                                       ;//鍔熺巼
-    float           freq                                        ;//棰戠巼
-    float           consumption                                 ;//耗电量
+    float           voltage                                     ;//电压
+    float           current                                     ;//电流
+    float           power                                       ;//功率
+    float           freq                                        ;//频率
+    float           consumption                                 ;//耗电量
     float           factor                                      ;
-    unsigned short      product_ch_start_delay                  ;//閫氶亾寤舵椂 
-    unsigned short      product_ch_stop_delay                   ;//閫氶亾寤舵椂 
-    int             product_type;                               //閫氶亾绫诲瀷
-    int             product_phType;                             //涓夌浉绫诲瀷
-    float           ph_voltage                                     ;//鐢靛帇
-    float           ph_current                                     ;//鐢垫祦
-    float           ph_power                                       ;//鍔熺巼
-    float           ph_consumption                                 ;//耗电量  
-    int             ph_outputType   ;//杈撳嚭绫诲瀷
-    int             ph_outputStatus ;//输出状态-该通道是否输出  
+    unsigned short      product_ch_start_delay                  ;//通道延时 
+    unsigned short      product_ch_stop_delay                   ;//通道延时 
+    int             product_type;                               //通道类型
+    int             product_phType;                             //三相类型
+    float           ph_voltage                                     ;//电压
+    float           ph_current                                     ;//电流
+    float           ph_power                                       ;//功率
+    float           ph_consumption                                 ;//耗电量  
+    int             ph_outputType   ;//输出类型
+    int             ph_outputStatus ;//输出状态-该通道是否输出  
     struct list_head   list;   
 }_OverChnPwrAckInfo;
 
-/// @brief 鎬讳綋鐢垫簮杩斿洖淇℃伅
+/// @brief 总体电源返回信息
 typedef struct
 {
     char*           product_name;
     char*           product_number;   
     int             product_id;
-    float           voltage                                     ;//鐢靛帇
-    float           current                                     ;//鐢垫祦
-    float           power                                       ;//鍔熺巼
-    float           freq                                        ;//棰戠巼
-    float           consumption                                 ;//耗电量
-    float           factor                                      ;//鍔熺巼鍥犵礌
-    _Get_Total_Value	_total_voltage							;//鐢靛帇缁熻�
-	_Get_Total_Value	_total_current							;//鐢垫祦缁熻�
-	_Get_Total_Value	_total_power							;//鍔熺巼缁熻�
-	_Get_Total_Value	_total_consumption						;//耗电量统计
-    _Power_Trend_Info   _Power_Trend_Info                       ;//有功、无功、视在功率统计
+    float           voltage                                     ;//电压
+    float           current                                     ;//电流
+    float           power                                       ;//功率
+    float           freq                                        ;//频率
+    float           consumption                                 ;//耗电量
+    float           factor                                      ;//功率因素
+    _Get_Total_Value	_total_voltage							;//电压统计
+	_Get_Total_Value	_total_current							;//电流统计
+	_Get_Total_Value	_total_power							;//功率统计
+	_Get_Total_Value	_total_consumption						;//耗电量统计
+    _Power_Trend_Info   _Power_Trend_Info                       ;//有功、无功、视在功率统计
 }_OverAllPwrAckInfo;
 
 
-/// @brief 浼犳劅鍣ㄦ€讳綋璇锋眰淇℃伅
+/// @brief 传感器总体请求信息
 typedef struct
 {
-    float  ydata[2][60]     ;//0锛氭俯搴︼紝1锛氭箍搴︼紱
-    char   xAxis[60][32]    ;//时间点
+    float  ydata[2][60]     ;//0：温度，1：湿度；
+    char   xAxis[60][32]    ;//时间点
 }_Sensor_Temp_Humi_Icon;
 typedef struct
 {
-    float  ydata[60]        ;//气体值
-    char   xAxis[60][32]    ;//时间点
+    float  ydata[60]        ;//气体值
+    char   xAxis[60][32]    ;//时间点
 }_Sensor_Gas_Icon;
 typedef struct
 {
-    float  ydata[2][60]     ;//0锛氭皵娴侊紝1锛氭皵鍘嬶紱
-    char   xAxis[60][32]    ;//时间点
+    float  ydata[2][60]     ;//0：气流，1：气压；
+    char   xAxis[60][32]    ;//时间点
 }_Sensor_Air_Press_Icon;
 typedef struct
 {
@@ -193,7 +193,7 @@ typedef struct
 }_OverSensorRequest;
 
 
-/// @brief 传感器应答状态
+/// @brief 传感器应答状态
 typedef struct
 {
     int    accessControlStatus;
@@ -219,7 +219,7 @@ typedef struct
     struct list_head list;
 }_OverSensorBackInfo;
 
-/// @brief 电源类阈值设置
+/// @brief 电源类阈值设置
 typedef struct 
 {
     char* alarmContentUpperValue;
@@ -236,7 +236,7 @@ typedef struct
     bool bUpdatevoltageUpperValue;
 }_Power_AlarmRequestInfo;
 
-/// @brief 传感器类阈值设置
+/// @brief 传感器类阈值设置
 typedef struct 
 {
     char* connectionStatus  ;
@@ -248,7 +248,7 @@ typedef struct
 }_Sensor_AlarmRequestInfo;
 
 
-/// @brief 鍛婅�淇℃伅鏌ヨ�
+/// @brief 告警信息查询
 typedef struct
 {
     char* user_token;
@@ -259,7 +259,7 @@ typedef struct
     _Sensor_AlarmRequestInfo _sensor_info;
 }_AlarmRequestInfo;
 
-/// @brief 鍛婅�鍝嶅簲淇℃伅
+/// @brief 告警响应信息
 typedef struct
 {
     char alarmNumber[16];
@@ -272,7 +272,7 @@ typedef struct
 }_AlarmAckInfo;
 
 
-/// @brief SMPT鏈嶅姟淇℃伅
+/// @brief SMPT服务信息
 typedef struct 
 {
     char*  mode;
@@ -284,7 +284,7 @@ typedef struct
     char* receiveAccount;
 }_SMPT_ServerRequestInfo;
 
-/// @brief SNMP淇℃伅
+/// @brief SNMP信息
 typedef struct
 {
     char*   mode;
@@ -293,14 +293,14 @@ typedef struct
     char*   trapmode;
 }_SNMP_ServerRequestInfo;
 
-/// @brief SNMP TRAP淇℃伅
+/// @brief SNMP TRAP信息
 typedef struct
 {
     char* mode;
     char* stType;
 }_SNMPTRAP_ServerRequestInfo;
 
-/// @brief NTP淇℃伅
+/// @brief NTP信息
 typedef struct 
 {
     char*   mode;
@@ -313,7 +313,7 @@ typedef struct
 }_NTP_ServiceRequestInfo;
 
 
-/// @brief 瀹氭椂璁剧疆
+/// @brief 定时设置
 typedef struct
 {
     char* productChName;
@@ -324,7 +324,7 @@ typedef struct
 }_DS_ServiceRequestInfo;
 
 
-/// @brief 鏃跺簭璁剧疆
+/// @brief 时序设置
 typedef struct
 {
     char* productId;
@@ -336,7 +336,7 @@ typedef struct
     // char* closeInterval;
 }_POSIX_ServiceRequestInfo;
 
-/// @brief 鍒嗙粍璁剧疆
+/// @brief 分组设置
 typedef struct
 {
     char* mode;
@@ -347,7 +347,7 @@ typedef struct
 
 
 
-/// @brief 鏈嶅姟淇℃伅鏌ヨ�
+/// @brief 服务信息查询
 typedef struct
 {
     char* user_token;
@@ -362,7 +362,7 @@ typedef struct
 }_ServiceManageRequestInfo;
 
 
-/// @brief 缃戠粶鍙傛暟閰嶇疆
+/// @brief 网络参数配置
 typedef struct
 {
     char* mode;
@@ -373,7 +373,7 @@ typedef struct
     char* dns2;
 }_NET_CommunicationRequestInfo;
 
-/// @brief  RS鍙傛暟閰嶇疆
+/// @brief  RS参数配置
 typedef struct 
 {
     char* mode;
@@ -382,7 +382,7 @@ typedef struct
 }_RS_CommunicationRequestInfo;
 
 
-/// @brief 閫氫俊淇℃伅鏌ヨ�
+/// @brief 通信信息查询
 typedef struct
 {
     char* user_token;
@@ -393,7 +393,7 @@ typedef struct
 
 
 
-/// @brief鏃ュ織淇℃伅鏌ヨ�
+/// @brief日志信息查询
 typedef struct
 {
     char* user_token;
@@ -406,7 +406,7 @@ typedef struct
     char* openName;
 }_LogInformationRequestInfo;
 
-/// @brief 鏃ュ織搴旂瓟绫诲�
+/// @brief 日志应答类容
 typedef struct
 {
     char* alarm_number;
@@ -417,7 +417,7 @@ typedef struct
     char alarmContent[64];
 }_LogInformationAckInfo;
 
-/// @brief 璁惧�缁存姢
+/// @brief 设备维护
 typedef struct
 {
     char*   user_token;
@@ -427,7 +427,7 @@ typedef struct
     char*   product_number;
 }_Equipment_Mintenance;
 
- /// @brief 鐢ㄦ埛瑙掕壊绠＄悊
+ /// @brief 用户角色管理
 typedef struct
 {
     char*   user_token;
@@ -435,8 +435,8 @@ typedef struct
     char*   createTime;
     int     userId; 
     char*   userName;
-    char*   nickName;//鐢ㄩ€斾笉鏄庯紵
-    bool    delFlag;//鐢ㄩ€斾笉鏄庯紵
+    char*   nickName;//用途不明？
+    bool    delFlag;//用途不明？
     int     roleId;
     char*   roleName;
     char*   password;
@@ -450,7 +450,7 @@ char* ctrl_sts_ack_to_json(void);
 
 void get_rand_str(char* s,int num);
 int json_to_User_login_info(const char* str,_User_Log* _newUserLogin);
-int json_to_User_loginOut_info(const char* str,char* _UserLoginOutToken);
+int json_to_User_loginOut_info(const char* str,char** _UserLoginOutToken);
 char* log_info_to_json(const char* token);
 char* log_LoginFailedinfo_to_json();
 

04-软件设计及源码/03-核心板/V1.0/05.src/smart_pdu/src/sqlite_handle.c

@@ -437,11 +437,11 @@ int dev_search_latest_power_info(sqlite3 *db,int product_id,int product_ch_id,Gl
 /// @param db 
 /// @param _globalPowerManger 
 /// @return 
-int dev_search_latest_power_All_info(GlobalDeviceManager* __globalDeviceManger,_OverChnPwrAckInfo* __overChnPwrAckInfo)
+int dev_search_latest_power_All_info(GlobalDeviceManager* globalDeviceManger,_OverChnPwrAckInfo* __overChnPwrAckInfo)
 {
     GlobalPowerManger* _globalPowerMangerTemp = NULL ;
     char* upgrade_msg = NULL ;
-    list_for_each_entry(_globalPowerMangerTemp, &__globalDeviceManger->_globalPowerManger.list, list)
+    list_for_each_entry(_globalPowerMangerTemp, &globalDeviceManger->_globalPowerManger.list, list)
     {
         if (_globalPowerMangerTemp->product_ch_type==TREE_AC_TYPE)
         {
@@ -466,9 +466,9 @@ int dev_search_latest_power_All_info(GlobalDeviceManager* __globalDeviceManger,_
                     log_e("_overChnPwrBackInfoTemp malloc err.");
                     return -1;
                 }
-                _overChnPwrBackInfoTemp->product_name = __globalDeviceManage._global_device_info->product_name;
-                _overChnPwrBackInfoTemp->product_number = __globalDeviceManage._global_device_info->product_number;
-                _overChnPwrBackInfoTemp->product_id = __globalDeviceManage._global_device_info->product_id;
+                _overChnPwrBackInfoTemp->product_name = globalDeviceManger->_global_device_info->product_name;
+                _overChnPwrBackInfoTemp->product_number = globalDeviceManger->_global_device_info->product_number;
+                _overChnPwrBackInfoTemp->product_id = globalDeviceManger->_global_device_info->product_id;
                 _overChnPwrBackInfoTemp->productChName = _globalPowerMangerTemp->product_ch_name;
                 _overChnPwrBackInfoTemp->productChId = _globalPowerMangerTemp->product_ch_id;
                 _overChnPwrBackInfoTemp->status = _globalPowerMangerTemp->_PowerInfo.status;
@@ -488,7 +488,8 @@ int dev_search_latest_power_All_info(GlobalDeviceManager* __globalDeviceManger,_
                 _overChnPwrBackInfoTemp->ph_consumption = _TreeACTemp->_PowerInfo.consumption;
                 _overChnPwrBackInfoTemp->ph_outputType   = _TreeACTemp->product_ph_outputType;
                 _overChnPwrBackInfoTemp->ph_outputStatus = _TreeACTemp->product_ph_outputStatus;
-                if (__globalDeviceManage._global_device_info->product_pwr_type == SmartPDU_Tree_AC_One && _TreeACTemp->product_ph_outputType == 2 && _TreeACTemp->product_ph_outputStatus == 2) // 如果是单项输出并且则非输出通道数据为0
+                if (globalDeviceManger->_global_device_info->product_pwr_type == SmartPDU_Tree_AC_One && 
+                    _TreeACTemp->product_ph_outputType == 2 && _TreeACTemp->product_ph_outputStatus == 2) // 如果是单项输出并且则非输出通道数据为0
                 { 
                      // 3-1模式 单项状态，不输出则数据为空
                     _overChnPwrBackInfoTemp->ph_voltage = 0.0;
@@ -514,9 +515,9 @@ int dev_search_latest_power_All_info(GlobalDeviceManager* __globalDeviceManger,_
                 return -1;
             }
             // 填数据
-            _overChnPwrBackInfoTemp->product_name = __globalDeviceManage._global_device_info->product_name;
-            _overChnPwrBackInfoTemp->product_number = __globalDeviceManage._global_device_info->product_number;
-            _overChnPwrBackInfoTemp->product_id = __globalDeviceManage._global_device_info->product_id;
+            _overChnPwrBackInfoTemp->product_name = globalDeviceManger->_global_device_info->product_name;
+            _overChnPwrBackInfoTemp->product_number = globalDeviceManger->_global_device_info->product_number;
+            _overChnPwrBackInfoTemp->product_id = globalDeviceManger->_global_device_info->product_id;
             _overChnPwrBackInfoTemp->productChName = _globalPowerMangerTemp->product_ch_name;
             _overChnPwrBackInfoTemp->productChId = _globalPowerMangerTemp->product_ch_id;
             _overChnPwrBackInfoTemp->status = _globalPowerMangerTemp->_PowerInfo.status;
@@ -537,7 +538,7 @@ int dev_search_latest_power_All_info(GlobalDeviceManager* __globalDeviceManger,_
 /// @param db 
 /// @param _globalPowerManger 
 /// @return 
-int dev_search_latest_power_statistic_info(GlobalDeviceManager* __globalDeviceManger)
+int dev_search_latest_power_statistic_info(GlobalDeviceManager* globalDeviceManger)
 {
     _OverAllPwrAckInfo _over_all_pwr_back_info; //设备电源信息
     GlobalPowerManger* _globalPowerMangerTemp = NULL ;
@@ -551,7 +552,7 @@ int dev_search_latest_power_statistic_info(GlobalDeviceManager* __globalDeviceMa
     _over_all_pwr_back_info.product_id = __globalDeviceManage._global_device_info->product_id;
     _over_all_pwr_back_info.product_number = __globalDeviceManage._global_device_info->product_number;
     int nTempSum=0;
-    list_for_each_entry(_globalPowerMangerTemp, &__globalDeviceManger->_globalPowerManger.list, list)
+    list_for_each_entry(_globalPowerMangerTemp, &globalDeviceManger->_globalPowerManger.list, list)
     {
         //有通道电压不为0的才记录在内
         if (_globalPowerMangerTemp->_PowerInfo.voltage > 1)
@@ -571,7 +572,7 @@ int dev_search_latest_power_statistic_info(GlobalDeviceManager* __globalDeviceMa
 
 
     nTempSum=0;
-    list_for_each_entry(_globalPowerMangerTemp, &__globalDeviceManger->_globalPowerManger.list, list)
+    list_for_each_entry(_globalPowerMangerTemp, &globalDeviceManger->_globalPowerManger.list, list)
     {
         _over_all_pwr_back_info.consumption += _globalPowerMangerTemp->_PowerInfo.consumption ;
 
@@ -628,9 +629,9 @@ int dev_search_latest_power_statistic_info(GlobalDeviceManager* __globalDeviceMa
        // mg_ws_send(WStemp->ws_client, upgrade_msg, strlen(upgrade_msg), WEBSOCKET_OP_TEXT);
       //  WStemp = WStemp->next;
     // }
-    if (__globalDeviceManger->ws_client != NULL)
+    if (globalDeviceManger->ws_client != NULL)
     {
-        mg_ws_send(__globalDeviceManger->ws_client, upgrade_msg, strlen(upgrade_msg), WEBSOCKET_OP_TEXT);
+        mg_ws_send(globalDeviceManger->ws_client, upgrade_msg, strlen(upgrade_msg), WEBSOCKET_OP_TEXT);
     }
     //释放资源,一定要记得释放json字符串
     free(upgrade_msg);

04-软件设计及源码/03-核心板/V1.0/05.src/smart_pdu/src/sqlite_handle.h

@@ -23,9 +23,9 @@ int dev_change_last_Index(sqlite3 *db,int* nIndex,int nDeleteNumber);
 int dev_change_t_ac_last_Index(sqlite3 *db,int* nIndex,int nDeleteNumber);
 int dev_insert_power_info(sqlite3 *db,GlobalPowerInfo* _globalPowerChnInfo,int* nIndex);
 int dev_search_latest_power_info(sqlite3 *db,int product_id,int product_ch_id,GlobalPowerInfo* _globalPowerInfo);
-int dev_search_latest_power_All_info(GlobalDeviceManager* __globalDeviceManger,_OverChnPwrAckInfo* __overChnPwrAckInfo);
+int dev_search_latest_power_All_info(GlobalDeviceManager* globalDeviceManger,_OverChnPwrAckInfo* __overChnPwrAckInfo);
 
-int dev_search_latest_power_statistic_info(GlobalDeviceManager* __globalDeviceManger);
+int dev_search_latest_power_statistic_info(GlobalDeviceManager* globalDeviceManger);
 int dev_search_latest_t_ac_power_statistic_info(int nCh,int nType,_OverAllPwrAckInfo* __overChnPwrAckInfo);
 
 int dev_search_time_power_info(sqlite3 *db,int product_id,int product_ch_id,int total_type,GlobalPowerInfo* _globalPowerInfo,char* start_time,char* end_time);