电量计算修改

web/backmanagerconfig/src/main/java/com/gyee/backconfig/model/auto/Companys.java

@@ -44,7 +44,7 @@ public class Companys extends Model {
 
     private Integer quantityzc;
 
-    private Integer jrwindcapacity;
+    private Double jrwindcapacity;
 
     private String jrwindcapacityunit;
 

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/websocket/WpInfoPushService.java

@@ -209,10 +209,10 @@ public class WpInfoPushService {
                 jczbmap.put("fczt", fczt);
 
                 //SCADA发电量
-                scadafdl = StringUtils.round(jczblist.get(9).getPointValueInDouble(), 2);
+                scadafdl = StringUtils.round(jczblist.get(9).getPointValueInDouble()/10000, 2);
                 //jczbmap.put("scadafdl",scadafdl );
-                BigDecimal b2 = new BigDecimal(scadafdl).divide(new BigDecimal(10000),2, BigDecimal.ROUND_HALF_UP);
-                vo.setScadafdl(b2.doubleValue());
+//                scadafdl = new BigDecimal(scadafdl).divide(new BigDecimal(10000),2, BigDecimal.ROUND_HALF_UP);
+                vo.setScadafdl(scadafdl);
                 //预测功率
                 double ycgl = StringUtils.round(jczblist.get(10).getPointValueInDouble(), 2);
 
@@ -652,8 +652,8 @@ public class WpInfoPushService {
                 vo.setSlss(rslssdl);
 //                vo.setLlfdl(MathUtil.twoBit(scadafdl + rjxssdl + rgzssdl + rqfssdl + rxdssdl + rslssdl)/10000);
 
-                BigDecimal b3 = new BigDecimal(scadafdl+rjxssdl + rgzssdl + rqfssdl + rxdssdl + rslssdl).divide(new BigDecimal(10000),2, BigDecimal.ROUND_HALF_UP);
-                vo.setLlfdl(b3.doubleValue());
+                BigDecimal b3 = new BigDecimal(scadafdl+rjxssdl + rgzssdl + rqfssdl + rxdssdl + rslssdl);
+                vo.setLlfdl(MathUtil.twoBit(b3.doubleValue()));
             } else {
 
                 wxssmap.put("rjxsl", 0.0);