Parcourir la source

product_id数据类型不匹配,改正

guohui il y a 2 ans
Parent
commit
0bc4666d15

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

@@ -487,10 +487,6 @@ static void getUserRouters(void* conn)
     cJSON_free((void*)ack_str);
 }
 
-static int get_addr(char *prodId)
-{
-   return atoi(prodId);
-}
 /// @brief 设备总体信息
 /// @param stream 
 static void overallStatusMonitoring(void* conn)
@@ -529,7 +525,7 @@ static void overallStatusMonitoring(void* conn)
         //总信息
          __globalDeviceManage.view_page = 1 ;
 
-        cur_dev_addr = get_addr(_over_all_sts_monitor.product_id);
+        cur_dev_addr = _over_all_sts_monitor.product_id;
         if(cur_dev_addr>0) {
             return;
         }
@@ -952,7 +948,7 @@ static void channelStatusMonitoring(void* conn)
 
         __globalDeviceManage.view_page = 2 ; //通道信息
 
-        cur_dev_addr = get_addr(_over_chn_pwr_request.product_id);
+        cur_dev_addr = _over_chn_pwr_request.product_id;
         if(cur_dev_addr>0) {
             return;
         }

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

@@ -781,7 +781,7 @@ int json_to_overall_status_monitor(const char* str,_Over_All_Sts_Monitor* _over_
 
     cJSON *cjson_product_id = cJSON_GetObjectItem(cjson, "productId");
     if (cjson_product_id != NULL)
-        _over_all_sts_monitor->product_id = cjson_product_id->valuestring;
+        _over_all_sts_monitor->product_id = cjson_product_id->valueint;
 
     cJSON *cjson_productNumber = cJSON_GetObjectItem(cjson, "productNumber");
     if (cjson_productNumber != NULL)
@@ -1047,7 +1047,7 @@ int json_to_chn_pwr_status_monitor(const char* str,_OverChnPwrRequest* _over_chn
     cJSON* cjson_product_id = cJSON_GetObjectItem(cjson,"productId");
     if(cjson_product_id!=NULL)    //通道
     {
-        _over_chn_pwr_request->product_id = cjson_product_id->valuestring;
+        _over_chn_pwr_request->product_id = cjson_product_id->valueint;
     }
 
     cJSON* cjson_chn_id = cJSON_GetObjectItem(cjson,"productChId");

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

@@ -45,7 +45,7 @@ typedef struct
     char*   user_token;
     char*   type; //listInfoQuery listQuery open close listHisQuery
     char*   product_name;
-    char*   product_id;
+    int     product_id;
     char*   product_number;
     char*   start_time;
     char*   end_time;
@@ -98,7 +98,7 @@ typedef struct
     char* type;
     char* lType;
     char* product_name;
-    char* product_id;
+    int  product_id;
     char* productChName;
     int productChId;
     char* start_time;