|
@@ -1,5 +1,6 @@
|
|
|
package com.gyee.runeconomy.service;
|
|
|
|
|
|
+import cn.hutool.core.util.NumberUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
@@ -73,16 +74,17 @@ public class WtAlysisDayService {
|
|
|
|
|
|
pageInfo.getRecords().forEach(rsl -> {
|
|
|
TurbineInfoDay day = dayMap.get(rsl.getRecordDate());
|
|
|
- rsl.setRfdl(day.getRfdl());
|
|
|
+ rsl.setRfdl(NumberUtil.round(day.getRfdl(),2).doubleValue());
|
|
|
double yfdl = calFdl(rsl.getWindturbineId(), "month", rsl.getRecordDate());
|
|
|
- rsl.setYfdl(yfdl);
|
|
|
+ rsl.setYfdl(NumberUtil.round(yfdl,2).doubleValue());
|
|
|
double nfdl = calFdl(rsl.getWindturbineId(), "year", rsl.getRecordDate());
|
|
|
- rsl.setNfdl(nfdl);
|
|
|
- rsl.setRpjfs(day.getPjfs());
|
|
|
- rsl.setRssdl(day.getGzss() + day.getJhjxss() + day.getXdss() + day.getXnss() + day.getSlss());
|
|
|
- rsl.setRgzxs(day.getGzMin() / 60);
|
|
|
- rsl.setRjxxs(day.getJxMin() / 60);
|
|
|
- rsl.setRyxxs(day.getYxMin() / 60);
|
|
|
+ rsl.setNfdl(NumberUtil.round(nfdl,2).doubleValue());
|
|
|
+ rsl.setRpjfs(NumberUtil.round(day.getPjfs(),2).doubleValue());
|
|
|
+ double v = day.getGzss() + day.getJhjxss() + day.getXdss() + day.getXnss() + day.getSlss();
|
|
|
+ rsl.setRssdl(NumberUtil.round(v,2).doubleValue());
|
|
|
+ rsl.setRgzxs(NumberUtil.round(day.getGzMin() / 60,2).doubleValue());
|
|
|
+ rsl.setRjxxs(NumberUtil.round(day.getJxMin() / 60,2).doubleValue());
|
|
|
+ rsl.setRyxxs(NumberUtil.round(day.getYxMin() / 60,2).doubleValue());
|
|
|
});
|
|
|
|
|
|
}
|