|
@@ -87,15 +87,28 @@ public class ComprehensiveService {
|
|
|
vo.setWpname(wp.getAname());
|
|
|
vo.setCapacity(wp.getJrCapacity()+wp.getJrwindCapacity());
|
|
|
List<String> targetList = new ArrayList<>();
|
|
|
+ List<String> glList = new ArrayList<>();
|
|
|
Map<String, ProBasicPowerstationPoint> powerstationPointMap = wppointmap.get(wp.getId());
|
|
|
Arrays.stream(targetArray).forEach(t->{
|
|
|
if (powerstationPointMap.containsKey(t)){
|
|
|
targetList.add(powerstationPointMap.get(t).getNemCode());
|
|
|
+ if (powerstationPointMap.get(t).getName().contains("功率")){
|
|
|
+ glList.add(powerstationPointMap.get(t).getNemCode());
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
List<PointData> pointDataList = null;
|
|
|
try {
|
|
|
pointDataList = edosUtil.getRealData(targetList);
|
|
|
+ List<String> arr = Arrays.asList(targetArray);
|
|
|
+ for (PointData a : pointDataList){
|
|
|
+ for (String c :glList) {
|
|
|
+ if (a.getPointName().equals(c)) {
|
|
|
+ a.setPointValueInDouble(a.getPointValueInDouble() / 1000);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|