首页优化

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

@@ -1881,9 +1881,7 @@ public class EconomyPointHomePageService {
             BigDecimal divide1 = BigDecimal.valueOf(divide);
             BigDecimal divisor1 = BigDecimal.valueOf(divisor);
             BigDecimal result = divide1.divide(divisor1, 2, RoundingMode.HALF_UP);
-            DecimalFormat df = new DecimalFormat("#0.00");
-            String formattedResult = df.format(result);
-            return Double.parseDouble(formattedResult);
+            return result.doubleValue();
         }
     }
 
@@ -1921,10 +1919,10 @@ public class EconomyPointHomePageService {
 
         GeneratingCapacityVo rfdl = new GeneratingCapacityVo();
         rfdl.setName("日发电量");
-        rfdl.setValue(Double.valueOf(String.format("%.2f", dayFdl)));
+        rfdl.setValue(NumberUtil.round(dayFdl, 2).doubleValue());
         rfdl.setTotal(dayLlfdl);
         Double rbfb = calDivide(dayFdl, dayLlfdl);
-        rfdl.setBfb(new BigDecimal(rbfb * 100).setScale(2, RoundingMode.HALF_UP).doubleValue());
+        rfdl.setBfb(NumberUtil.round(rbfb, 2).doubleValue());
         ls.add(rfdl);
 
         GeneratingCapacityVo yfdl = new GeneratingCapacityVo();
@@ -1933,18 +1931,18 @@ public class EconomyPointHomePageService {
         BigDecimal monCache = yfdlCal.get(s);
         yfdl.setValue(monCache.add(BigDecimal.valueOf(rfdl.getValue())).setScale(2, RoundingMode.HALF_UP).doubleValue());
         double yllfdl = yllfdlCal.get(s).add(BigDecimal.valueOf(rfdl.getTotal())).doubleValue();
-        yfdl.setTotal(Double.parseDouble(String.format("%.2f", yllfdl)));
+        yfdl.setTotal(NumberUtil.round(yllfdl, 2).doubleValue());
         Double ybfb = calDivide(yfdl.getValue(), yfdl.getTotal());
-        yfdl.setBfb(new BigDecimal(ybfb * 100).setScale(2, RoundingMode.HALF_UP).doubleValue());
+        yfdl.setBfb(NumberUtil.round(ybfb, 2).doubleValue());
         ls.add(yfdl);
 
         GeneratingCapacityVo nfdl = new GeneratingCapacityVo();
         nfdl.setName("年发电量");
         nfdl.setValue(nfdlCal.get(LocalDate.now().getYear()).add(BigDecimal.valueOf(rfdl.getValue())).setScale(2, RoundingMode.HALF_UP).doubleValue());
         double nllfdl = nllfdlCal.get(LocalDate.now().getYear()).add(BigDecimal.valueOf(rfdl.getTotal())).doubleValue();
-        nfdl.setTotal(Double.parseDouble(String.format("%.2f", nllfdl)));
+        nfdl.setTotal(NumberUtil.round(nllfdl, 2).doubleValue());
         Double nbfb = calDivide(nfdl.getValue(), nfdl.getTotal());
-        nfdl.setBfb(new BigDecimal(nbfb * 100).setScale(2, RoundingMode.HALF_UP).doubleValue());
+        nfdl.setBfb(NumberUtil.round(nbfb, 2).doubleValue());
         ls.add(nfdl);
 
         QueryWrapper<StationInfoDay> thisYear = new QueryWrapper<>();