|
@@ -87,21 +87,21 @@ public class SingleAnalysisController {
|
|
|
List<TurbineInfoDay> list = turbineInfoDayService.list(qw);
|
|
|
SingleAnalysisVo sav = subList3.get(0);
|
|
|
double fdl = list.stream().mapToDouble(TurbineInfoDay::getRfdl).sum();
|
|
|
- sav.setFdl(fdl);
|
|
|
+ sav.setFdl(NumberUtil.round(fdl,2).doubleValue());
|
|
|
double fs = list.stream().mapToDouble(TurbineInfoDay::getPjfs).average().orElse(0.0);
|
|
|
sav.setFs(NumberUtil.round(fs,2).doubleValue());
|
|
|
double gzss = list.stream().mapToDouble(TurbineInfoDay::getGzss).sum();
|
|
|
- sav.setGzss(gzss);
|
|
|
+ sav.setGzss(NumberUtil.round(gzss,2).doubleValue());
|
|
|
double jxss = list.stream().mapToDouble(TurbineInfoDay::getJhjxss).sum();
|
|
|
- sav.setJxss(jxss);
|
|
|
+ sav.setJxss(NumberUtil.round(jxss,2).doubleValue());
|
|
|
double xdss = list.stream().mapToDouble(TurbineInfoDay::getXdss).sum();
|
|
|
- sav.setXdss(xdss);
|
|
|
+ sav.setXdss(NumberUtil.round(xdss,2).doubleValue());
|
|
|
double xnss = list.stream().mapToDouble(TurbineInfoDay::getXnss).sum();
|
|
|
- sav.setXnss(xnss);
|
|
|
+ sav.setXnss(NumberUtil.round(xnss,2).doubleValue());
|
|
|
double slss = list.stream().mapToDouble(TurbineInfoDay::getSlss).sum();
|
|
|
- sav.setSlss(slss);
|
|
|
+ sav.setSlss(NumberUtil.round(slss,2).doubleValue());
|
|
|
double llfdl = list.stream().mapToDouble(TurbineInfoDay::getLlfdl).sum();
|
|
|
- sav.setLlfdl(llfdl);
|
|
|
+ sav.setLlfdl(NumberUtil.round(llfdl,2).doubleValue());
|
|
|
double gzmin = list.stream().mapToDouble(TurbineInfoDay::getGzMin).sum();
|
|
|
sav.setGzxs(NumberUtil.round(gzmin / 60, 2).doubleValue());
|
|
|
double jxmin = list.stream().mapToDouble(TurbineInfoDay::getJxMin).sum();
|
|
@@ -113,15 +113,15 @@ public class SingleAnalysisController {
|
|
|
double djmin = list.stream().mapToDouble(TurbineInfoDay::getDjMin).sum();
|
|
|
sav.setDjxs(NumberUtil.round(djmin / 60, 2).doubleValue());
|
|
|
double lyxs = list.stream().mapToDouble(TurbineInfoDay::getLyxs).sum();
|
|
|
- sav.setLyxs(lyxs);
|
|
|
+ sav.setLyxs(NumberUtil.round(lyxs,2).doubleValue());
|
|
|
double sbklyl = list.stream().mapToDouble(TurbineInfoDay::getKlyl).average().orElse(0.0);
|
|
|
sav.setSbklyl(NumberUtil.round(sbklyl,2).doubleValue());
|
|
|
double xfqrfs = list.stream().mapToDouble(TurbineInfoDay::getXfqrfs).average().orElse(0.0);
|
|
|
sav.setXfqr(NumberUtil.round(xfqrfs,2).doubleValue());
|
|
|
double yxfss = list.stream().mapToDouble(TurbineInfoDay::getYxfss).sum();
|
|
|
- sav.setYxfss(yxfss);
|
|
|
+ sav.setYxfss(NumberUtil.round(yxfss,2).doubleValue());
|
|
|
double jfpl = list.stream().mapToDouble(TurbineInfoDay::getJfpl).sum();
|
|
|
- sav.setJfpl(jfpl);
|
|
|
+ sav.setJfpl(NumberUtil.round(jfpl,2).doubleValue());
|
|
|
}
|
|
|
subList2.forEach(sav -> {
|
|
|
TurbineInfoDay day = dayMap.get(sav.getWindturbineid());
|