实时负荷取值修改，预测功率小数位修改

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

@@ -557,9 +557,19 @@ public class MonitorService {
                 ProBasicPowerstationPoint aqtsvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.AQTS);
                 aqts = edosUtil.getRealData(aqtsvalue).getPointValueInDouble();
 
-                //实时功率
-                ProBasicPowerstationPoint sjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
-                sjgl = edosUtil.getRealData(sjglvalue).getPointValueInDouble() + (gflr * 1000) + (fdlr * 1000);
+                if (wpId.contains(QS)) {
+                    //实时功率
+                    ProBasicPowerstationPoint sjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
+                    sjgl = edosUtil.getRealData(sjglvalue).getPointValueInDouble() + (fdlr * 1000) + (gflr * 1000);
+                }else if (wpId.contains(FD)){
+                    //实时功率
+                    ProBasicPowerstationPoint sjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
+                    sjgl = edosUtil.getRealData(sjglvalue).getPointValueInDouble() + (fdlr * 1000);
+                }else if (wpId.contains(GF)) {
+                    //实时功率
+                    ProBasicPowerstationPoint sjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
+                    sjgl = edosUtil.getRealData(sjglvalue).getPointValueInDouble() + (gflr * 1000);
+                }
 
 
                 //实时风速

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

@@ -12,6 +12,7 @@ import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
 import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay1;
 import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay1Service;
+import com.gyee.runeconomy.util.MathUtil;
 import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
 import org.springframework.stereotype.Service;
 
@@ -151,7 +152,7 @@ public class StationMonitorService {
         nfdl = new BigDecimal(nfdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
         resultMap.put("nfdl",nfdl);
         resultMap.put("sspjfsgzd",realData.get(24).getPointValueInDouble());
-        resultMap.put("yggl",realData.get(25).getPointValueInDouble());
+        resultMap.put("yggl", MathUtil.twoBit(realData.get(25).getPointValueInDouble()));
         resultMap.put("fhl",(proBasicPowerstation.getJrwindCapacity()+proBasicPowerstation.getJrCapacity())!=0?realData.get(25).getPointValueInDouble()/(proBasicPowerstation.getJrwindCapacity()+proBasicPowerstation.getJrCapacity())*100:0);
         resultMap.put("ylyxs",realData.get(26).getPointValueInDouble());
         resultMap.put("nlyxs",realData.get(27).getPointValueInDouble());