|
|
@@ -91,17 +91,12 @@ static char* g_product_type_str[] = {
|
|
|
"SmartPDU(DC)",
|
|
|
"SmartPDU(AC)",
|
|
|
"SmartPDU",
|
|
|
- "SmartPDU(Three_AC_Tree)",
|
|
|
- "SmartPDU(Three_AC_One)",
|
|
|
- "SmartPDU(Three_AC_One_B)",
|
|
|
-};
|
|
|
-static char* g_product_pwr_type_str[] = {
|
|
|
- "xxx",
|
|
|
- "直流",
|
|
|
- "交流单相",
|
|
|
- "交流三相三出",
|
|
|
- "交流三相单出",
|
|
|
+ "SmartPDU(AC_3P-IN & 3P-OUT)",
|
|
|
+ "SmartPDU(AC_3P-IN & 1P-OUT)",
|
|
|
+ "SmartPDU(AC_3P-IN & 1P-OUT)",
|
|
|
+ "SmartPDU(AC_3P-IN & 2P-OUT)",
|
|
|
};
|
|
|
+
|
|
|
static web_handle_t webHandle;
|
|
|
static int webSetCallback(void);
|
|
|
|
|
|
@@ -5340,7 +5335,7 @@ static void equipmentMintenance(void *conn)
|
|
|
_over_back_sts_info.product_Code = __globalDeviceManage._globalDevInfo.product.pnumber;
|
|
|
// _over_back_sts_info.product_type = malloc(32);
|
|
|
//strcpy(_over_back_sts_info.product_type, "GC Series");
|
|
|
- _over_back_sts_info.product_type=g_product_type_str[__globalDeviceManage._globalDevInfo.product.type];
|
|
|
+ _over_back_sts_info.product_type=g_product_type_str[__globalDeviceManage._globalDevInfo.product.pwr_type];
|
|
|
_over_back_sts_info.productVersion = __globalDeviceManage._globalDevInfo.product.version;
|
|
|
|
|
|
_over_back_sts_info.product_sysTime = malloc(32);
|
|
|
@@ -5399,7 +5394,7 @@ static void equipmentMintenance(void *conn)
|
|
|
breaker_info.product_id = __globalDeviceManage._globalDevInfo.product.id;
|
|
|
breaker_info.product_name = __globalDeviceManage._globalDevInfo.product.name;
|
|
|
breaker_info.product_number = __globalDeviceManage._globalDevInfo.product.number;
|
|
|
- breaker_info.product_type = __globalDeviceManage._globalDevInfo.product.type;
|
|
|
+ breaker_info.product_type = __globalDeviceManage._globalDevInfo.product.pwr_type;
|
|
|
ack_str = over_breaker_product_list_info_to_json(&__globalDeviceManage,&breaker_info,false);
|
|
|
}else if(strcmp(_Over_equipment_mintenance.type,"listKgTdQuery")==0)
|
|
|
{
|
