上传近期修改

pro/src/appweb_handle.c

@@ -91,12 +91,17 @@ static char* g_product_type_str[] = {
     "SmartPDU(DC)",
     "SmartPDU(AC)",
     "SmartPDU",
-    "SmartPDU(AC_3P-IN & 3P-OUT)",
-    "SmartPDU(AC_3P-IN & 1P-OUT)",
-    "SmartPDU(AC_3P-IN & 1P-OUT)",
-    "SmartPDU(AC_3P-IN & 2P-OUT)",
+    "SmartPDU(Three_AC_Tree)",
+    "SmartPDU(Three_AC_One)",
+    "SmartPDU(Three_AC_One_B)",
+};
+static char* g_product_pwr_type_str[] = {
+    "xxx",
+    "直流",
+    "交流单相",
+    "交流三相三出",
+    "交流三相单出",
 };
-
 static web_handle_t webHandle;
 static int webSetCallback(void);
 
@@ -2144,7 +2149,7 @@ static void channelStatusMonitoring(void* conn)
                         GlobalTreeACManager *_globalTACManager = NULL;
                         list_for_each_entry(_globalTACManager, &_globalPowerMangerTemp->list_Tree_AC, list_Tree_AC)
                         {
-                            if (__globalDeviceManage._globalDevInfo.product.pwr_type == SmartPDU_Tree_AC_Tree)
+                            if (__globalDeviceManage._globalDevInfo.product.pwr_type == SmartPDU_Tree_AC_Tree||__globalDeviceManage._globalDevInfo.product.pwr_type == SmartPDU_Tree_AC_Two)
                             {
                                 if (g_switch_set_t_ac_phchn_reset(&__globalDeviceManage._globalRelaySampManger, _globalTACManager->product_saddr, _globalTACManager->product_ch_addr - 1) < 0)
                                 {
@@ -5348,7 +5353,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.pwr_type];
+        _over_back_sts_info.product_type=g_product_type_str[__globalDeviceManage._globalDevInfo.product.type];
         _over_back_sts_info.productVersion = __globalDeviceManage._globalDevInfo.product.version;
  
         _over_back_sts_info.product_sysTime = malloc(32);
@@ -5407,7 +5412,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.pwr_type;
+        breaker_info.product_type = __globalDeviceManage._globalDevInfo.product.type;
         ack_str = over_breaker_product_list_info_to_json(&__globalDeviceManage,&breaker_info,false);
     }else if(strcmp(_Over_equipment_mintenance.type,"listKgTdQuery")==0)
     {