|
|
@@ -167,7 +167,7 @@ public class WpInfoPushService {
|
|
|
//jczbmap.put("sjgl", sjgl);
|
|
|
//日发电量
|
|
|
double fdl = MathUtil.twoBit(jczblist.get(1).getPointValueInDouble());
|
|
|
- vo.setFdl(fdl);
|
|
|
+ vo.setFdl(fdl/10000);
|
|
|
// jczbmap.put("rfdl", rfdl);
|
|
|
|
|
|
// //月发电量
|
|
|
@@ -179,7 +179,7 @@ public class WpInfoPushService {
|
|
|
if(zjrl!=0)
|
|
|
{
|
|
|
//月利用小时
|
|
|
- double ylyxs = (new BigDecimal(jczblist.get(2).getPointValueInDouble()).multiply(new BigDecimal(10))).divide(new BigDecimal(zjrl), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
+ double ylyxs = (new BigDecimal(jczblist.get(2).getPointValueInDouble())).divide(new BigDecimal(zjrl*1000), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
//jczbmap.put("ylyxs",ylyxs );
|
|
|
vo.setLyxs(ylyxs);
|
|
|
}else
|
|
|
@@ -194,7 +194,7 @@ public class WpInfoPushService {
|
|
|
//上网电量
|
|
|
double swdl = MathUtil.twoBit(jczblist.get(5).getPointValueInDouble());
|
|
|
// jczbmap.put("swdl",swdl );
|
|
|
- vo.setSwdl(swdl);
|
|
|
+ vo.setSwdl(swdl/10000);
|
|
|
//保证功率
|
|
|
bzgl = new BigDecimal(jczblist.get(6).getPointValueInDouble()).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
//jczbmap.put("bzgl", bzgl);
|
|
|
@@ -210,7 +210,8 @@ public class WpInfoPushService {
|
|
|
//SCADA发电量
|
|
|
scadafdl = StringUtils.round(jczblist.get(9).getPointValueInDouble(), 2);
|
|
|
//jczbmap.put("scadafdl",scadafdl );
|
|
|
- vo.setScadafdl(scadafdl/10000);
|
|
|
+ BigDecimal b2 = new BigDecimal(scadafdl).divide(new BigDecimal(10000),2, BigDecimal.ROUND_HALF_UP);
|
|
|
+ vo.setScadafdl(b2.doubleValue());
|
|
|
//预测功率
|
|
|
double ycgl = StringUtils.round(jczblist.get(10).getPointValueInDouble(), 2);
|
|
|
|
