1、修改productid上传web是数字的bug

pro/src/appweb_handle.c

@@ -1028,40 +1028,6 @@ static void channelStatusMonitoring(void* conn)
         if(product_chn_id==0)
         {
             dev_search_latest_power_All_info(&__globalDeviceManage,&_over_chn_pwr_back_info);
-            /*
-            list_for_each_entry(_globalPowerMangerTemp, &__globalDeviceManage._globalPowerManger.list, list)
-            {
-                //log_d("start serach ch%d.",_globalPowerMangerTemp->product_ch_id);
-                _OverChnPwrAckInfo* _overChnPwrBackInfoTemp = (_OverChnPwrAckInfo*)malloc(sizeof(_OverChnPwrAckInfo));
-                if(_overChnPwrBackInfoTemp==NULL)
-                {
-                    log_e("_overChnPwrBackInfoTemp malloc err.");
-                }
-                //查询数据库总电源信息
-                if(dev_search_latest_power_info(__globalDeviceManage.db,__globalDeviceManage._global_device_info->product_id,_globalPowerMangerTemp->product_ch_id,&_powerInfo)!=0)
-                {
-                    log_e("serach total pwr err.");
-                }
-                else
-                {   
-                    //填数据
-                    _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->productChName = _globalPowerMangerTemp->product_ch_name;
-                    _overChnPwrBackInfoTemp->productChId = _globalPowerMangerTemp->product_ch_id;
-                    _overChnPwrBackInfoTemp->status = _powerInfo._power_info.status;
-                    _overChnPwrBackInfoTemp->voltage = _powerInfo._power_info.voltage;
-                    _overChnPwrBackInfoTemp->current = _powerInfo._power_info.current;
-                    _overChnPwrBackInfoTemp->power = _powerInfo._power_info.power ;
-                    _overChnPwrBackInfoTemp->freq = _powerInfo._power_info.freq ;
-                    _overChnPwrBackInfoTemp->consumption = _powerInfo._power_info.consumption ;
-                    _overChnPwrBackInfoTemp->factor = _powerInfo._power_info.factor ;
-                
-                    list_add_tail(&_overChnPwrBackInfoTemp->list,&_over_chn_pwr_back_info.list);
-                    //log_d("serach ch%d pwr ok.",_globalPowerMangerTemp->product_ch_id);
-                }
-            }*/
         }
         else //指定通道
         {

pro/src/cascade.c

@@ -20,7 +20,7 @@
 #define MB_MAX_LEN      250
 
 
-#define MB_PARA_SIM
+//#define MB_PARA_SIM
 //#define SLAVE_DATA_SIM
 
 
@@ -628,7 +628,7 @@ static int power_add(cascade_handle_t *cas)
         
         pm->product_id = dm2->_global_device_info->product_id;
         pm->product_saddr = info->board[i].addr;
-        pm->product_ch_id = i;
+        pm->product_ch_id = i+1;
         pm->product_ch_addr = info->board[i].ch_addr;
         sprintf(pm->product_ch_name,"CH%d",pm->product_ch_id);
         pm->product_ch_type = info->board[i].type;

pro/src/json_handle.c

@@ -1136,7 +1136,11 @@ cJSON* json_to_chn_pwr_status_monitor(const char* str,_OverChnPwrRequest* _over_
     cJSON* cjson_product_id = cJSON_GetObjectItem(cjson,"productId");
     if(cjson_product_id!=NULL)    //通道
     {
-        _over_chn_pwr_request->product_id = atoi(cjson_product_id->valuestring);
+        if (cjson_product_id->valuestring)
+        {
+           _over_chn_pwr_request->product_id = atoi(cjson_product_id->valuestring);
+        }
+        else   _over_chn_pwr_request->product_id = cjson_product_id->valueint;
     }
 
     cJSON* cjson_chn_id = cJSON_GetObjectItem(cjson,"productChId");
@@ -2585,7 +2589,8 @@ char* ws_over_status_ack_to_json(int type,_OverAllPwrAckInfo* _over_all_pwr_back
     cJSON* data_filed = cJSON_CreateObject();
     cJSON_AddStringToObject(data_filed,"productName",_over_all_pwr_back_info->product_name);
     cJSON_AddStringToObject(data_filed,"productNumber",_over_all_pwr_back_info->product_number);
-    cJSON_AddNumberToObject(data_filed,"productId",_over_all_pwr_back_info->product_id);
+    sprintf(temp,"%d",_over_all_pwr_back_info->product_id);
+    cJSON_AddStringToObject(data_filed,"productId",temp);
     sprintf(temp,"%0.3f",_over_all_pwr_back_info->voltage);
     cJSON_AddStringToObject(data_filed,"productVoltage",temp);
     sprintf(temp,"%d",AC_MAX_VOLTAGE_VAL);
@@ -2656,7 +2661,8 @@ char* ws_chn_status_ack_to_json(int type,_OverChnPwrAckInfo* _over_chn_pwr_back_
         cJSON* data_filed = cJSON_CreateObject();
         cJSON_AddStringToObject(data_filed,"productName",_chnPwrTemp->product_name);
         cJSON_AddStringToObject(data_filed,"productNumber",_chnPwrTemp->product_number);
-        cJSON_AddNumberToObject(data_filed,"productId",_chnPwrTemp->product_id);
+        sprintf(temp,"%d",_chnPwrTemp->product_id);
+        cJSON_AddStringToObject(data_filed,"productId",temp);
         cJSON_AddStringToObject(data_filed,"productChName",_chnPwrTemp->productChName);
         cJSON_AddNumberToObject(data_filed,"productChId",_chnPwrTemp->productChId);
         sprintf(temp,"%0.3f",_chnPwrTemp->voltage);