|
@@ -210,7 +210,7 @@ public class WpInfoPushService {
|
|
//SCADA发电量
|
|
//SCADA发电量
|
|
scadafdl = StringUtils.round(jczblist.get(9).getPointValueInDouble(), 2);
|
|
scadafdl = StringUtils.round(jczblist.get(9).getPointValueInDouble(), 2);
|
|
//jczbmap.put("scadafdl",scadafdl );
|
|
//jczbmap.put("scadafdl",scadafdl );
|
|
- vo.setScadafdl(scadafdl);
|
|
|
|
|
|
+ vo.setScadafdl(scadafdl/10000);
|
|
//预测功率
|
|
//预测功率
|
|
double ycgl = StringUtils.round(jczblist.get(10).getPointValueInDouble(), 2);
|
|
double ycgl = StringUtils.round(jczblist.get(10).getPointValueInDouble(), 2);
|
|
|
|
|
|
@@ -648,7 +648,7 @@ public class WpInfoPushService {
|
|
|
|
|
|
//wxssmap.put("rslssdl", rslssdl);
|
|
//wxssmap.put("rslssdl", rslssdl);
|
|
vo.setSlss(rslssdl);
|
|
vo.setSlss(rslssdl);
|
|
- vo.setLlfdl(MathUtil.twoBit(scadafdl + rjxssdl + rgzssdl + rqfssdl + rxdssdl + rslssdl));
|
|
|
|
|
|
+ vo.setLlfdl(MathUtil.twoBit(scadafdl + rjxssdl + rgzssdl + rqfssdl + rxdssdl + rslssdl)/10000);
|
|
|
|
|
|
} else {
|
|
} else {
|
|
|
|
|