|
@@ -475,7 +475,7 @@ public class MatrixService {
|
|
List<PointData> realData = edosUtil.getRealData(wpPoints);
|
|
List<PointData> realData = edosUtil.getRealData(wpPoints);
|
|
resultMap.put("wpid",powerstation.getId());
|
|
resultMap.put("wpid",powerstation.getId());
|
|
resultMap.put("wpname",powerstation.getAname());
|
|
resultMap.put("wpname",powerstation.getAname());
|
|
- resultMap.put("jrts",powerstation.getJrquantityJz()+powerstation.getJrquantityJz()+powerstation.getJrwindQuantityLd()+powerstation.getJrwindQuantityHs());
|
|
|
|
|
|
+ resultMap.put("jrts",powerstation.getJrquantityJz()+powerstation.getJrquantityZc()+powerstation.getJrwindQuantityLd()+powerstation.getJrwindQuantityHs());
|
|
resultMap.put("dfts",realData.get(0).getPointValueInDouble());
|
|
resultMap.put("dfts",realData.get(0).getPointValueInDouble());
|
|
resultMap.put("sdtjts",realData.get(1).getPointValueInDouble());
|
|
resultMap.put("sdtjts",realData.get(1).getPointValueInDouble());
|
|
resultMap.put("djts",realData.get(0).getPointValueInDouble()+realData.get(1).getPointValueInDouble());
|
|
resultMap.put("djts",realData.get(0).getPointValueInDouble()+realData.get(1).getPointValueInDouble());
|