首页功率修改

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MonitorService.java

@@ -573,7 +573,7 @@ public class MonitorService {
                 fnlyl = edosUtil.getRealData(fnlylvalue).getPointValueInDouble();
 
                 //理论功率
-                ProBasicPowerstationPoint llglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZLLGL);
+                ProBasicPowerstationPoint llglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZNHGLZS);
                 llgl = edosUtil.getRealData(llglvalue).getPointValueInDouble();
 
                 //节约水
@@ -634,7 +634,7 @@ public class MonitorService {
 
                 //实时功率
                 ProBasicPowerstationPoint sjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
-                sjgl = edosUtil.getRealData(sjglvalue).getPointValueInDouble() + (gflr * 1000) + (fdlr * 1000);
+                sjgl = edosUtil.getRealData(sjglvalue).getPointValueInDouble();
 
                 //实时风速
                 ProBasicPowerstationPoint ssfsvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSPJFS);
@@ -656,7 +656,7 @@ public class MonitorService {
                 nfdl = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
 
                 //理论功率
-                ProBasicPowerstationPoint llglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZLLGL);
+                ProBasicPowerstationPoint llglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZNHGLZS);
                 llgl = edosUtil.getRealData(llglvalue).getPointValueInDouble();
 
                 //节约水
@@ -1256,7 +1256,7 @@ public class MonitorService {
         }
 
         ProBasicPowerstationPoint bzgl = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZBZGL);
-        ProBasicPowerstationPoint llgl = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZLLGL);
+        ProBasicPowerstationPoint llgl = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZNHGLZS);
         ProBasicPowerstationPoint sjgl = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
 
         List<PointData> bzglls = edosUtil.getHistoryDatasSnap(bzgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 3600L);
@@ -1307,7 +1307,7 @@ public class MonitorService {
         }
 
         ProBasicPowerstationPoint ssfs = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSPJFS);
-        ProBasicPowerstationPoint llgl = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZLLGL);
+        ProBasicPowerstationPoint llgl = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.TPOINT_WP_YCGL); //预测功率
         ProBasicPowerstationPoint sjgl = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
         ProBasicPowerstationPoint gzzs = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.RPJGZD);
         ProBasicPowerstationPoint fnlyl = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.FNLYL);