保留两位小数

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/SingleAnalysisController.java

@@ -125,24 +125,24 @@ public class SingleAnalysisController {
         }
         subList2.forEach(sav -> {
             TurbineInfoDay day = dayMap.get(sav.getWindturbineid());
-            sav.setFdl(day.getRfdl());
-            sav.setFs(day.getPjfs());
-            sav.setGzss(day.getGzss());
-            sav.setJxss(day.getJhjxss());
-            sav.setXdss(day.getXdss());
-            sav.setXnss(day.getXnss());
-            sav.setSlss(day.getSlss());
-            sav.setLlfdl(day.getLlfdl());
+            sav.setFdl(NumberUtil.round(day.getRfdl(),2).doubleValue());
+            sav.setFs(NumberUtil.round(day.getPjfs(),2).doubleValue());
+            sav.setGzss(NumberUtil.round(day.getGzss(),2).doubleValue());
+            sav.setJxss(NumberUtil.round(day.getJhjxss(),2).doubleValue());
+            sav.setXdss(NumberUtil.round(day.getXdss(),2).doubleValue());
+            sav.setXnss(NumberUtil.round(day.getXnss(),2).doubleValue());
+            sav.setSlss(NumberUtil.round(day.getSlss(),2).doubleValue());
+            sav.setLlfdl(NumberUtil.round(day.getLlfdl(),2).doubleValue());
             sav.setGzxs(NumberUtil.round(day.getGzMin() / 60, 2).doubleValue());
             sav.setJxxs(NumberUtil.round(day.getJxMin() / 60, 2).doubleValue());
             sav.setTjxs(NumberUtil.round(day.getTjMin() / 60, 2).doubleValue());
             sav.setYxxs(NumberUtil.round(day.getYxMin() / 60, 2).doubleValue());
             sav.setDjxs(NumberUtil.round(day.getDjMin() / 60, 2).doubleValue());
-            sav.setLyxs(day.getLyxs());
-            sav.setSbklyl(day.getKlyl());
-            sav.setXfqr(day.getXfqrfs());
-            sav.setYxfss(day.getYxfss());
-            sav.setJfpl(day.getJfpl());
+            sav.setLyxs(NumberUtil.round(day.getLyxs(),2).doubleValue());
+            sav.setSbklyl(NumberUtil.round(day.getKlyl(),2).doubleValue());
+            sav.setXfqr(NumberUtil.round(day.getXfqrfs(),2).doubleValue());
+            sav.setYxfss(NumberUtil.round(day.getYxfss(),2).doubleValue());
+            sav.setJfpl(NumberUtil.round(day.getJfpl(),2).doubleValue());
         });
 
         return R.data(ResultMsg.ok(map));

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconEquipmentInfoDayTopServiceImpl.java

@@ -1,5 +1,6 @@
 package com.gyee.runeconomy.service.auto.impl;
 
+import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -57,21 +58,17 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
         Map<String, TurbineInfoDay> dayMap = tidRecords.stream().collect(Collectors.toMap(TurbineInfoDay::getTurbineId, Function.identity()));
         peeidtRecords.forEach(peeidt->{
             TurbineInfoDay day = dayMap.get(peeidt.getWindturbineId());
-            //"dayfdl": 10.96,
-            peeidt.setDayfdl(day.getRfdl());
-            peeidt.setDayllfdl(day.getLlfdl());
-            peeidt.setDayfs(day.getPjfs());
-            //                    "daygl": 359.37,平均功率
-            peeidt.setDaygzssdl(day.getGzss());
-            peeidt.setDayxdssdl(day.getXdss());
-            peeidt.setDaywhssdl(day.getFjhjxss());
-            peeidt.setDayxnssdl(day.getXnss());
-            peeidt.setDaylyxs(day.getLyxs());
-            peeidt.setDaysbklyl(day.getKlyl());
-            //                    "daydxkyxs": 100.0,等效可用系数
-            peeidt.setDayyxfss(day.getYxfss());
-            peeidt.setDayjfpl(day.getJfpl());
-//            peeidt.setDayglyzxxs(day.getGlyzxxs());
+            peeidt.setDayfdl(NumberUtil.round(day.getRfdl(),2).doubleValue());
+            peeidt.setDayllfdl(NumberUtil.round(day.getLlfdl(),2).doubleValue());
+            peeidt.setDayfs(NumberUtil.round(day.getPjfs(),2).doubleValue());
+            peeidt.setDaygzssdl(NumberUtil.round(day.getGzss(),2).doubleValue());
+            peeidt.setDayxdssdl(NumberUtil.round(day.getXdss(),2).doubleValue());
+            peeidt.setDaywhssdl(NumberUtil.round(day.getFjhjxss(),2).doubleValue());
+            peeidt.setDayxnssdl(NumberUtil.round(day.getXnss(),2).doubleValue());
+            peeidt.setDaylyxs(NumberUtil.round(day.getLyxs(),2).doubleValue());
+            peeidt.setDaysbklyl(NumberUtil.round(day.getKlyl(),2).doubleValue());
+            peeidt.setDayyxfss(NumberUtil.round(day.getYxfss(),2).doubleValue());
+            peeidt.setDayjfpl(NumberUtil.round(day.getJfpl(),2).doubleValue());
         });
         return peeidtRecords;
     }
@@ -196,21 +193,17 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
         Map<Date, TurbineInfoDay> dayMap = tidRecords.stream().collect(Collectors.toMap(TurbineInfoDay::getRecordDate, Function.identity()));
         peeidtRecords.forEach(peeidt->{
             TurbineInfoDay day = dayMap.get(peeidt.getRecordDate());
-            //"dayfdl": 10.96,
-            peeidt.setDayfdl(day.getRfdl());
-            peeidt.setDayllfdl(day.getLlfdl());
-            peeidt.setDayfs(day.getPjfs());
-            //                    "daygl": 359.37,平均功率
-            peeidt.setDaygzssdl(day.getGzss());
-            peeidt.setDayxdssdl(day.getXdss());
-            peeidt.setDaywhssdl(day.getFjhjxss());
-            peeidt.setDayxnssdl(day.getXnss());
-            peeidt.setDaylyxs(day.getLyxs());
-            peeidt.setDaysbklyl(day.getKlyl());
-            //                    "daydxkyxs": 100.0,等效可用系数
-            peeidt.setDayyxfss(day.getYxfss());
-            peeidt.setDayjfpl(day.getJfpl());
-//            peeidt.setDayglyzxxs(day.getGlyzxxs());
+            peeidt.setDayfdl(NumberUtil.round(day.getRfdl(),2).doubleValue());
+            peeidt.setDayllfdl(NumberUtil.round(day.getLlfdl(),2).doubleValue());
+            peeidt.setDayfs(NumberUtil.round(day.getPjfs(),2).doubleValue());
+            peeidt.setDaygzssdl(NumberUtil.round(day.getGzss(),2).doubleValue());
+            peeidt.setDayxdssdl(NumberUtil.round(day.getXdss(),2).doubleValue());
+            peeidt.setDaywhssdl(NumberUtil.round(day.getFjhjxss(),2).doubleValue());
+            peeidt.setDayxnssdl(NumberUtil.round(day.getXnss(),2).doubleValue());
+            peeidt.setDaylyxs(NumberUtil.round(day.getLyxs(),2).doubleValue());
+            peeidt.setDaysbklyl(NumberUtil.round(day.getKlyl(),2).doubleValue());
+            peeidt.setDayyxfss(NumberUtil.round(day.getYxfss(),2).doubleValue());
+            peeidt.setDayjfpl(NumberUtil.round(day.getJfpl(),2).doubleValue());
         });
         return peeidtRecords;
     }