|
|
@@ -62,25 +62,25 @@ public class ProEconBrownoutsEvent2ServiceImpl extends ServiceImpl<ProEconBrowno
|
|
|
sfz++;
|
|
|
swfz++;
|
|
|
esfz++;
|
|
|
- }else if(bro.getStopHours() <= 0.17){
|
|
|
+ } else if (bro.getStopHours() <= 0.17) {
|
|
|
sfz++;
|
|
|
swfz++;
|
|
|
esfz++;
|
|
|
- }else if(bro.getStopHours() <= 0.25){
|
|
|
+ } else if (bro.getStopHours() <= 0.25) {
|
|
|
swfz++;
|
|
|
esfz++;
|
|
|
- }else if(bro.getStopHours() <= 0.33){
|
|
|
+ } else if (bro.getStopHours() <= 0.33) {
|
|
|
esfz++;
|
|
|
}
|
|
|
}
|
|
|
fw.setWfz(wfz);
|
|
|
- fw.setWfzfwl(NumberUtil.round(wfz/fw.getYfwcs(),2).doubleValue());
|
|
|
+ fw.setWfzfwl(NumberUtil.round((wfz / fw.getYfwcs()) * 100, 2).doubleValue());
|
|
|
fw.setSfz(sfz);
|
|
|
- fw.setSfzfwl(NumberUtil.round(sfz/fw.getYfwcs(),2).doubleValue());
|
|
|
+ fw.setSfzfwl(NumberUtil.round((sfz / fw.getYfwcs()) * 100, 2).doubleValue());
|
|
|
fw.setSwfz(swfz);
|
|
|
- fw.setSwfzfwl(NumberUtil.round(swfz/fw.getYfwcs(),2).doubleValue());
|
|
|
+ fw.setSwfzfwl(NumberUtil.round((swfz / fw.getYfwcs()) * 100, 2).doubleValue());
|
|
|
fw.setEsfz(esfz);
|
|
|
- fw.setEsfzfwl(NumberUtil.round(esfz/fw.getYfwcs(),2).doubleValue());
|
|
|
+ fw.setEsfzfwl(NumberUtil.round((esfz / fw.getYfwcs()) * 100, 2).doubleValue());
|
|
|
}
|
|
|
|
|
|
FwjslDTO fw2 = new FwjslDTO();
|
|
|
@@ -104,6 +104,7 @@ public class ProEconBrownoutsEvent2ServiceImpl extends ServiceImpl<ProEconBrowno
|
|
|
|
|
|
/**
|
|
|
* 复位及时率-风机统计
|
|
|
+ *
|
|
|
* @param companyId
|
|
|
* @param windpowerstationId
|
|
|
* @param beginDate
|
|
|
@@ -191,7 +192,7 @@ public class ProEconBrownoutsEvent2ServiceImpl extends ServiceImpl<ProEconBrowno
|
|
|
}
|
|
|
}
|
|
|
qx.setXqCount(xqcs);
|
|
|
- qx.setXqjsl(NumberUtil.round((xqcs / (double) brownouts.size() * 100),2).doubleValue());
|
|
|
+ qx.setXqjsl(NumberUtil.round((xqcs / (double) brownouts.size() * 100), 2).doubleValue());
|
|
|
}
|
|
|
|
|
|
QxjslDTO qx2 = new QxjslDTO();
|
|
|
@@ -252,7 +253,7 @@ public class ProEconBrownoutsEvent2ServiceImpl extends ServiceImpl<ProEconBrowno
|
|
|
|
|
|
|
|
|
@Override
|
|
|
- public Map<String, Double> getFwXq(String yearmonth,String yearmon) {
|
|
|
+ public Map<String, Double> getFwXq(String yearmonth, String yearmon) {
|
|
|
DateTime ym = DateUtil.parse(yearmonth, "yyyy-MM");
|
|
|
|
|
|
DateTime begin = DateUtil.beginOfMonth(ym);
|
|
|
@@ -294,6 +295,4 @@ public class ProEconBrownoutsEvent2ServiceImpl extends ServiceImpl<ProEconBrowno
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
}
|