1、修改部分总体电源信息上传数据结构。

pro/src/appweb_handle.c

@@ -831,20 +831,39 @@ static void overallStatusMonitoring(void* conn)
                     dev_search_latest_t_ac_power_statistic_info(0, 2, &_over_all_pwr_back_info,&__globalDeviceManage);
                     ack_str = over_all_pwr_monitor_to_json(2,&_over_all_pwr_back_info);
                 }
+                else
+                {
+                    _over_all_pwr_back_info.voltage = __globalDeviceManage._globalPowerManger._PowerInfo.voltage;
+                    _over_all_pwr_back_info.current = __globalDeviceManage._globalPowerManger._PowerInfo.current;
+                    _over_all_pwr_back_info.power = __globalDeviceManage._globalPowerManger._PowerInfo.power;
+                    _over_all_pwr_back_info.freq = __globalDeviceManage._globalPowerManger._PowerInfo.freq;
+                    _over_all_pwr_back_info.consumption = __globalDeviceManage._globalPowerManger._PowerInfo.consumption;
+                    _over_all_pwr_back_info.factor = __globalDeviceManage._globalPowerManger._PowerInfo.factor;
+                    ack_str = over_all_pwr_monitor_to_json(-1, &_over_all_pwr_back_info);
+                }
             }
-            else {
+            else
+            {
+               /*
                 if (dev_search_latest_power_info(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product.id, 0, &__globalPowerInfo) != 0)
                 {
                     log_e("serach total pwr err.");
                 }
-                _over_all_pwr_back_info.voltage = __globalPowerInfo._power_info.voltage ; 
-                _over_all_pwr_back_info.current = __globalPowerInfo._power_info.current ;
-                _over_all_pwr_back_info.power =  __globalPowerInfo._power_info.power ;
-                _over_all_pwr_back_info.freq =  __globalPowerInfo._power_info.freq ;
-                _over_all_pwr_back_info.consumption =  __globalPowerInfo._power_info.consumption ;
-                _over_all_pwr_back_info.factor = __globalPowerInfo._power_info.factor ;
-            }
-            ack_str = over_all_pwr_monitor_to_json(0,&_over_all_pwr_back_info);
+                _over_all_pwr_back_info.voltage = __globalPowerInfo._power_info.voltage;
+                _over_all_pwr_back_info.current = __globalPowerInfo._power_info.current;
+                _over_all_pwr_back_info.power = __globalPowerInfo._power_info.power;
+                _over_all_pwr_back_info.freq = __globalPowerInfo._power_info.freq;
+                _over_all_pwr_back_info.consumption = __globalPowerInfo._power_info.consumption;
+                _over_all_pwr_back_info.factor = __globalPowerInfo._power_info.factor;
+                */
+                _over_all_pwr_back_info.voltage = __globalDeviceManage._globalPowerManger._PowerInfo.voltage;
+                _over_all_pwr_back_info.current = __globalDeviceManage._globalPowerManger._PowerInfo.current;
+                _over_all_pwr_back_info.power = __globalDeviceManage._globalPowerManger._PowerInfo.power;
+                _over_all_pwr_back_info.freq = __globalDeviceManage._globalPowerManger._PowerInfo.freq;
+                _over_all_pwr_back_info.consumption = __globalDeviceManage._globalPowerManger._PowerInfo.consumption;
+                _over_all_pwr_back_info.factor = __globalDeviceManage._globalPowerManger._PowerInfo.factor;
+                ack_str = over_all_pwr_monitor_to_json(-1, &_over_all_pwr_back_info);
+            }
         }
     }
     //打开所有开关

pro/src/json_handle.c

@@ -2067,7 +2067,7 @@ char* over_all_pwr_monitor_Tree_AC_to_json(_OverAllPwrAckInfo* _over_all_pwr_bac
     //第二条记录
     cJSON* data_filed1= cJSON_CreateObject();
     
-    if (_over_all_pwr_back_info_L1->product_id == 0) {
+    if (_over_all_pwr_back_info_L2->product_id == 0) {
         sprintf(temp, "%s", _over_all_pwr_back_info_L2->product_name);
     }
     else {
@@ -2112,11 +2112,11 @@ char* over_all_pwr_monitor_Tree_AC_to_json(_OverAllPwrAckInfo* _over_all_pwr_bac
     //第三条记录
     cJSON* data_filed2= cJSON_CreateObject();
     
-    if (_over_all_pwr_back_info_L1->product_id == 0) {
-        sprintf(temp, "%s", _over_all_pwr_back_info_L2->product_name);
+    if (_over_all_pwr_back_info_L3->product_id == 0) {
+        sprintf(temp, "%s", _over_all_pwr_back_info_L3->product_name);
     }
     else {
-        sprintf(temp, "%s %d", _over_all_pwr_back_info_L2->product_name, _over_all_pwr_back_info_L2->product_id);
+        sprintf(temp, "%s %d", _over_all_pwr_back_info_L3->product_name, _over_all_pwr_back_info_L3->product_id);
     }
     cJSON_AddStringToObject(data_filed2,"productName",temp);
     //cJSON_AddStringToObject(data_filed2,"productNumber",_over_all_pwr_back_info_L3->product_number);
@@ -2216,7 +2216,7 @@ char* over_all_pwr_monitor_to_json(int phaseType,_OverAllPwrAckInfo* _over_all_p
     }
     else    
     {
-        cJSON_AddStringToObject(data_filed,"productPhOrder","L1");
+        cJSON_AddStringToObject(data_filed,"productPhOrder","All");
     }
 
     sprintf(temp,"%0.3f",_over_all_pwr_back_info->voltage);
@@ -2247,6 +2247,26 @@ char* over_all_pwr_monitor_to_json(int phaseType,_OverAllPwrAckInfo* _over_all_p
     sprintf(temp,"%0.3f",1.0);
     cJSON_AddStringToObject(data_filed,"productPowerFactorMaximum",temp);
 
+    /*
+    //计算有功功率和无功功率，暂时屏蔽，待需求确认，liyuezong 2025.08.30
+    float FactorTemp = _over_all_pwr_back_info->factor;
+    float PowerTemp = _over_all_pwr_back_info->power;
+    float ReaPowerTemp = 0;
+    float AppPowerTemp = 0;
+    if (FactorTemp < 0.005 || FactorTemp > 1)
+    {
+        FactorTemp = 1.0;
+    }
+     AppPowerTemp= PowerTemp / FactorTemp;
+     ReaPowerTemp= AppPowerTemp- PowerTemp;
+
+    sprintf(temp,"%0.3f",ReaPowerTemp/1000.0);
+    cJSON_AddStringToObject(data_filed,"productReactivePower",temp);
+    sprintf(temp,"%0.3f",AppPowerTemp/1000.0);
+    cJSON_AddStringToObject(data_filed,"productApparentPower",temp);
+    */
+
+
     // cJSON_AddNumberToObject(data_filed,"productVoltage",_over_all_pwr_back_info->voltage);
     // cJSON_AddNumberToObject(data_filed,"productCurrent",_over_all_pwr_back_info->current);
     // cJSON_AddNumberToObject(data_filed,"productPower",_over_all_pwr_back_info->power);