首页开机容量改为装机容量的累加，生产数据板块中实际功率、理论功率采用当前最新的值累加

cpp-admin/src/main/java/com/cpp/web/controller/largeScreen/LargeScreenController.java

@@ -103,9 +103,9 @@ public class LargeScreenController {
                     fzdSumCount++;
                 }
                 // 累计开机容量
-                if (powerStationStatusData != null) {
-                    gfOpenCapacitySum = gfOpenCapacitySum.add(powerStationStatusData.getOpenCapacity());
-                }
+//                if (powerStationStatusData != null) {
+                    gfOpenCapacitySum = gfOpenCapacitySum.add(electricField.getCapacity());
+//                }
             } else {
                 // 获取测风塔风速
                 WindTowerStatusData windTowerStatusData = LatestDataUtil.getData(electricField.getStationCode(), WindTowerStatusData.class);
@@ -114,9 +114,9 @@ public class LargeScreenController {
                     wsSumCount++;
                 }
                 // 累计开机容量
-                if (powerStationStatusData != null) {
-                    fdOpenCapacitySum = fdOpenCapacitySum.add(powerStationStatusData.getOpenCapacity());
-                }
+//                if (powerStationStatusData != null) {
+                    fdOpenCapacitySum = fdOpenCapacitySum.add(electricField.getCapacity());
+//                }
             }
         }
         // 封装首页场站数据统计
@@ -173,23 +173,14 @@ public class LargeScreenController {
         QueryWrapper<PowerStationStatusData> powerStationStatusDataQueryWrapper = new QueryWrapper<>();
         powerStationStatusDataQueryWrapper.between("time", dayStartTime, dayEndTimeFor5);
         List<PowerStationStatusData> powerStationStatusDataList = powerStationStatusDataService.list(powerStationStatusDataQueryWrapper);
-        // 实际功率总和
-        BigDecimal realPowerSum = BigDecimal.ZERO;
-        // 理论功率总和
-        BigDecimal theoryPowerSum = BigDecimal.ZERO;
         // 计算实际发电量
         BigDecimal realGeneratingSum = BigDecimal.ZERO;
         for (PowerStationStatusData powerStationStatusData : powerStationStatusDataList) {
             // 统计实际功率总和
             if (powerStationStatusData.getRealValue() != null) {
-                realPowerSum = realPowerSum.add(powerStationStatusData.getRealValue());
                 // 发电量(万kWh) = 实际 * 0.08 * 0.1
                 realGeneratingSum = realGeneratingSum.add(powerStationStatusData.getRealValue().multiply(new BigDecimal("0.08")).multiply(new BigDecimal("0.1")).setScale(2, RoundingMode.HALF_UP));
             }
-            // 统计理论功率总和
-            if (powerStationStatusData.getTheoryValue() != null) {
-                theoryPowerSum = theoryPowerSum.add(powerStationStatusData.getTheoryValue());
-            }
         }
         // 获取中心侧预测的当日所有短期预测功率
         int counts = -4;
@@ -224,6 +215,21 @@ public class LargeScreenController {
             forecastGeneratingSum = forecastGeneratingSum.add(dayPowerGeneration.getForecastPowerGeneration());
         }
 
+        /////计算当前时刻最新的实际功率总和以及理论功率
+        // 实际功率总和
+        BigDecimal realPowerSum = BigDecimal.ZERO;
+        // 理论功率总和
+        BigDecimal theoryPowerSum = BigDecimal.ZERO;
+        List<ElectricField> electricFieldList = electricFieldService.list();
+        for (ElectricField electricField : electricFieldList) {
+            PowerStationStatusData currentPowerStationStatusData = LatestDataUtil.getData(electricField.getStationCode(), PowerStationStatusData.class);
+            if (currentPowerStationStatusData != null) {
+                realPowerSum = realPowerSum.add(currentPowerStationStatusData.getRealValue());
+                theoryPowerSum = theoryPowerSum.add(currentPowerStationStatusData.getTheoryValue());
+            }
+        }
+
+
         ProductionDataTotalDto productionDataTotalDto = new ProductionDataTotalDto();
         productionDataTotalDto.setRealGeneratingSum(realGeneratingSum);
         productionDataTotalDto.setForecastGeneratingSum(forecastGeneratingSum);

cpp-ui/src/views/largeScreen/components/center-top.vue

@@ -122,7 +122,7 @@ export default {
       }
 
       let status = Number(row.status) === 1?'运行':Number(row.status) === 2?'限电':Number(row.status) === 3?'检修':'无通讯'
-      let content = `${row.name}<br/>当前状态：${status}<br/>容量状态：${row.capacity} MW<br/>`+hjLabel+`：${row.hj} ` +hjUnit+`<br/>实时功率：${row.sjgl} MW<br/>短期功率：${row.dq} MW<br/>
+      let content = `${row.name}<br/>当前状态：${status}<br/>装机容量：${row.capacity} MW<br/>`+hjLabel+`：${row.hj} ` +hjUnit+`<br/>实时功率：${row.sjgl} MW<br/>短期功率：${row.dq} MW<br/>
                      超短期功率：${row.cdq} MW<br/>可用功率：${row.kygl} MW<br/>理论功率：${row.llgl} MW`
       this.createTips(row, content)
     },

cpp-ui/src/views/largeScreen/index.vue

@@ -36,7 +36,7 @@
             <div class="flex width-50">
               <img src="../../assets/images/dashboard/num2.png" class="left-img"/>
               <div class="flex-column justify-center items-center left-img-text">
-                <span>风电开机容量</span>
+                <span>风电装机容量</span>
                 <span>{{ envData.fdOpenCapcitySum }} MW</span>
               </div>
             </div>
@@ -52,7 +52,7 @@
             <div class="flex width-50">
               <img src="../../assets/images/dashboard/num2.png" class="left-img"/>
               <div class="flex-column justify-center items-center left-img-text">
-                <span>光伏开机容量</span>
+                <span>光伏装机容量</span>
                 <span>{{ envData.gfOpenCapcitySum }} MW</span>
               </div>
             </div>