|
@@ -692,16 +692,16 @@ public class EconomicService {
|
|
|
double hv = hwtls.get(qkey).stream().mapToDouble(Glqx::getSjgl).average().orElse(0);
|
|
|
|
|
|
Tmelinessvo vo = new Tmelinessvo();
|
|
|
- vo.setWtid(qkey);
|
|
|
-
|
|
|
- for (ProBasicOrganizeEquipment wt : collect){
|
|
|
- if (qkey.equals(wt.getWindturbineId()))
|
|
|
- vo.setWtname(wt.getAname());
|
|
|
- }
|
|
|
- vo.setFrequency(qv);
|
|
|
- vo.setZfrequency(hv);
|
|
|
- vo.setJsl((qv/hv)*100);
|
|
|
- vos.add(vo);
|
|
|
+ for (ProBasicOrganizeEquipment wt : collect) {
|
|
|
+ if (qkey.equals(wt.getWindturbineId()) && wt.getNemName().endsWith("逆变器")) {
|
|
|
+ vo.setWtid(qkey);
|
|
|
+ vo.setWtname(wt.getAname());
|
|
|
+ vo.setFrequency(qv);
|
|
|
+ vo.setZfrequency(hv);
|
|
|
+ vo.setJsl((qv / hv) * 100);
|
|
|
+ vos.add(vo);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
return vos;
|