|
|
@@ -388,7 +388,7 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
|
|
|
List<TurbineInfoDay> turSorted = turls.stream().sorted(Comparator.comparing(TurbineInfoDay::getScore).reversed().thenComparing(TurbineInfoDay::getTurbineId)).collect(Collectors.toList());
|
|
|
|
|
|
for (int i = 1; i < turSorted.size(); i++) {
|
|
|
- turSorted.get(i - 1).setScore((double) i);
|
|
|
+ turSorted.get(i - 1).setEdfs((double) i);
|
|
|
}
|
|
|
|
|
|
Map<String, TurbineInfoDay> turMap = turls.stream().collect(Collectors.toMap(TurbineInfoDay::getTurbineId, Function.identity()));
|
|
|
@@ -415,8 +415,8 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
|
|
|
i.setDayyxfss(NumberUtil.round(tur.getYxfss(), 2).doubleValue());
|
|
|
i.setDayxfqr(NumberUtil.round(tur.getXfqrfs(), 2).doubleValue());
|
|
|
i.setDayjfpl(NumberUtil.round(tur.getJfpl(), 2).doubleValue());
|
|
|
- double rank = tur.getScore();
|
|
|
- i.setDayRank((int) rank);
|
|
|
+ double rank = tur.getEdfs();
|
|
|
+ i.setDayRank((int)rank);
|
|
|
i.setDayLevel(level(tur.getScore(), DateUtil.dayOfMonth(i.getRecordDate()) - 1));
|
|
|
i.setDayjfpl(NumberUtil.round(tur.getJfpl() * 100, 2).doubleValue());
|
|
|
});
|