|
@@ -388,9 +388,9 @@ public class IndexDetailService extends SocketToolService{
|
|
|
double temp2 = 0;
|
|
|
for (int i = 0; i < vos.size(); i++) {
|
|
|
|
|
|
- temp1 = new BigDecimal(gzssls.get(i).getPointValueInDouble()).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
- temp2 = new BigDecimal(gzslls.get(i).getPointValueInDouble()).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
- vos.get(i).setValue4(StringUtils.round(temp1+temp2, 2));// 故障损失
|
|
|
+ temp1 =gzssls.get(i).getPointValueInDouble();
|
|
|
+ temp2 =gzslls.get(i).getPointValueInDouble();
|
|
|
+ vos.get(i).setValue2(StringUtils.round(temp1+temp2, 2));// 故障损失
|
|
|
|
|
|
}
|
|
|
|
|
@@ -408,8 +408,8 @@ public class IndexDetailService extends SocketToolService{
|
|
|
double temp2 = 0;
|
|
|
for (int i = 0; i < vos.size(); i++) {
|
|
|
|
|
|
- temp1 = new BigDecimal(jxssls.get(i).getPointValueInDouble()).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
- temp2 = new BigDecimal(jxslls.get(i).getPointValueInDouble()).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
+ temp1 = jxssls.get(i).getPointValueInDouble();
|
|
|
+ temp2 = jxslls.get(i).getPointValueInDouble();
|
|
|
vos.get(i).setValue3(StringUtils.round(temp1+temp2, 2));// 检修损失
|
|
|
|
|
|
}
|
|
@@ -424,8 +424,8 @@ public class IndexDetailService extends SocketToolService{
|
|
|
|
|
|
double temp = 0;
|
|
|
for (int i = 0; i < vos.size(); i++) {
|
|
|
- temp = new BigDecimal(xdssls.get(i).getPointValueInDouble()).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
- vos.get(i).setValue4(temp);// 限电损失
|
|
|
+ temp = xdssls.get(i).getPointValueInDouble();
|
|
|
+ vos.get(i).setValue4(StringUtils.round(temp, 2));// 限电损失
|
|
|
|
|
|
}
|
|
|
|
|
@@ -438,8 +438,8 @@ public class IndexDetailService extends SocketToolService{
|
|
|
|
|
|
double temp = 0;
|
|
|
for (int i = 0; i < vos.size(); i++) {
|
|
|
- temp = new BigDecimal(xnssls.get(i).getPointValueInDouble()).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
- vos.get(i).setValue5(temp);// 性能损失
|
|
|
+ temp = xnssls.get(i).getPointValueInDouble();
|
|
|
+ vos.get(i).setValue5(StringUtils.round(temp, 2));// 性能损失
|
|
|
|
|
|
}
|
|
|
|
|
@@ -457,8 +457,8 @@ public class IndexDetailService extends SocketToolService{
|
|
|
double temp2 = 0;
|
|
|
for (int i = 0; i < vos.size(); i++) {
|
|
|
|
|
|
- temp1 = new BigDecimal(slssls.get(i).getPointValueInDouble()).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
- temp2 = new BigDecimal(slslls.get(i).getPointValueInDouble()).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
+ temp1 = slssls.get(i).getPointValueInDouble();
|
|
|
+ temp2 = slslls.get(i).getPointValueInDouble();
|
|
|
vos.get(i).setValue6(StringUtils.round(temp1+temp2, 2));// 受累损失
|
|
|
|
|
|
}
|