首页优化

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/homepage/EconomyPointHomePageService.java

@@ -1721,15 +1721,15 @@ public class EconomyPointHomePageService {
         //计划发电量
         pd.setZfdljh(NumberUtil.round(yjh / 4, 0).doubleValue());
         pd.setYfdljh(NumberUtil.round(yjh, 0).doubleValue());
-        Double zjd = calDivide(pd.getZfdlsj(), pd.getZfdljh());
+        double zjd = calDivide(pd.getZfdlsj(), pd.getZfdljh());
         pd.setZjd(NumberUtil.round(zjd * 100,2).doubleValue());
         pd.setZwcl(NumberUtil.round(zjd,2).doubleValue());
-        Double yjd = calDivide(pd.getYfdlsj(), pd.getYfdljh());
+        double yjd = calDivide(pd.getYfdlsj(), pd.getYfdljh());
         pd.setYjd(NumberUtil.round(yjd * 100,2).doubleValue());
         pd.setYwcl(NumberUtil.round(yjd,2).doubleValue());
 
         pd.setNfdljh(NumberUtil.round(njh, 0).doubleValue());
-        Double njd = calDivide(pd.getNfdlsj(), pd.getNfdljh());
+        double njd = calDivide(pd.getNfdlsj(), pd.getNfdljh());
         pd.setNjd(NumberUtil.round(njd * 100,2).doubleValue());
         pd.setNwcl(NumberUtil.round(njd,2).doubleValue());
         allmap.put("planData", pd);
@@ -1880,7 +1880,7 @@ public class EconomyPointHomePageService {
         } else {
             BigDecimal divide1 = BigDecimal.valueOf(divide);
             BigDecimal divisor1 = BigDecimal.valueOf(divisor);
-            BigDecimal result = divide1.divide(divisor1, 2, RoundingMode.HALF_UP);
+            BigDecimal result = divide1.divide(divisor1, 6, RoundingMode.HALF_UP);
             return result.doubleValue();
         }
     }
@@ -1920,9 +1920,9 @@ public class EconomyPointHomePageService {
         GeneratingCapacityVo rfdl = new GeneratingCapacityVo();
         rfdl.setName("日发电量");
         rfdl.setValue(NumberUtil.round(dayFdl, 2).doubleValue());
-        rfdl.setTotal(dayLlfdl);
+        rfdl.setTotal(NumberUtil.round(dayLlfdl,2).doubleValue());
         Double rbfb = calDivide(dayFdl, dayLlfdl);
-        rfdl.setBfb(NumberUtil.round(rbfb, 2).doubleValue());
+        rfdl.setBfb(NumberUtil.round(rbfb * 100, 2).doubleValue());
         ls.add(rfdl);
 
         GeneratingCapacityVo yfdl = new GeneratingCapacityVo();
@@ -1933,7 +1933,7 @@ public class EconomyPointHomePageService {
         double yllfdl = yllfdlCal.get(s).add(BigDecimal.valueOf(rfdl.getTotal())).doubleValue();
         yfdl.setTotal(NumberUtil.round(yllfdl, 2).doubleValue());
         Double ybfb = calDivide(yfdl.getValue(), yfdl.getTotal());
-        yfdl.setBfb(NumberUtil.round(ybfb, 2).doubleValue());
+        yfdl.setBfb(NumberUtil.round(ybfb * 100, 2).doubleValue());
         ls.add(yfdl);
 
         GeneratingCapacityVo nfdl = new GeneratingCapacityVo();
@@ -1942,7 +1942,7 @@ public class EconomyPointHomePageService {
         double nllfdl = nllfdlCal.get(LocalDate.now().getYear()).add(BigDecimal.valueOf(rfdl.getTotal())).doubleValue();
         nfdl.setTotal(NumberUtil.round(nllfdl, 2).doubleValue());
         Double nbfb = calDivide(nfdl.getValue(), nfdl.getTotal());
-        nfdl.setBfb(NumberUtil.round(nbfb, 2).doubleValue());
+        nfdl.setBfb(NumberUtil.round(nbfb * 100, 2).doubleValue());
         ls.add(nfdl);
 
         QueryWrapper<StationInfoDay> thisYear = new QueryWrapper<>();
@@ -2052,8 +2052,8 @@ public class EconomyPointHomePageService {
         } else {
             Double nfdlc = calDivide(yearData.get(0).getRfdl(), 1000.0);
             Double nllfdlc = calDivide(yearData.get(0).getLlfdl(), 1000.0);
-            nfdlCal.put(intYear, new BigDecimal(nfdlc));
-            nllfdlCal.put(intYear, new BigDecimal(nllfdlc));
+            nfdlCal.put(intYear, BigDecimal.valueOf(NumberUtil.round(nfdlc, 2).doubleValue()));
+            nllfdlCal.put(intYear, BigDecimal.valueOf(NumberUtil.round(nllfdlc, 2).doubleValue()));
         }
         currentqw.clear();
 
@@ -2089,8 +2089,8 @@ public class EconomyPointHomePageService {
             String yearAndMonth = LocalDate.now().getYear() + "-" + LocalDate.now().getMonthValue();
             Double yfdlc = calDivide(monthData.get(0).getRfdl(), 1000.0);
             Double yllfdlc = calDivide(monthData.get(0).getLlfdl(), 1000.0);
-            yfdlCal.put(yearAndMonth, new BigDecimal(yfdlc));
-            yllfdlCal.put(yearAndMonth, new BigDecimal(yllfdlc));
+            yfdlCal.put(yearAndMonth, BigDecimal.valueOf(NumberUtil.round(yfdlc, 2).doubleValue()));
+            yllfdlCal.put(yearAndMonth, BigDecimal.valueOf(NumberUtil.round(yllfdlc, 2).doubleValue()));
         }
         currentqw.clear();