代码优化

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

@@ -134,24 +134,24 @@ public class SingleAnalysisController {
         subList2.forEach(sav -> {
             List<TurbineInfoDay> days = dayMap.get(sav.getWindturbineid());
             Optional<TurbineInfoDay> tbo = days.stream().reduce((sum, day) -> {
-                sum.setRfdl(sum.getRfdl() + day.getRfdl());
-                sum.setPjfs(sum.getPjfs() + day.getPjfs());
-                sum.setGzss(sum.getGzss() + day.getGzss());
-                sum.setJhjxss(sum.getJhjxss() + day.getJhjxss());
-                sum.setXdss(sum.getXdss() + day.getXdss());
-                sum.setXnss(sum.getXnss() + day.getXnss());
-                sum.setSlss(sum.getSlss() + day.getSlss());
-                sum.setLlfdl(sum.getLlfdl() + day.getLlfdl());
-                sum.setGzMin(sum.getGzMin() + day.getGzMin());
-                sum.setJxMin(sum.getJxMin() + day.getJxMin());
-                sum.setXdMin(sum.getTjMin() + day.getTjMin());
-                sum.setYxMin(sum.getYxMin() + day.getYxMin());
-                sum.setDjMin(sum.getDjMin() + day.getDjMin());
-                sum.setLyxs(sum.getLyxs() + day.getLyxs());
-                sum.setKlyl(sum.getKlyl() + day.getKlyl());
-                sum.setXfqrfs(sum.getXfqrfs() + day.getXfqrfs());
-                sum.setYxfss(sum.getYxfss() + day.getYxfss());
-                sum.setJfpl(sum.getJfpl() + day.getJfpl());
+                sum.setRfdl((null != sum.getRfdl() ? sum.getRfdl() : 0.0) + (null != day.getRfdl() ? day.getRfdl() : 0.0));
+                sum.setPjfs((null != sum.getPjfs() ? sum.getPjfs() : 0.0) + (null != day.getPjfs() ? day.getPjfs() : 0.0));
+                sum.setGzss(null != sum.getGzss() ? sum.getGzss() : 0.0 + (null != day.getGzss() ? day.getGzss() : 0.0));
+                sum.setJhjxss((null != sum.getJhjxss() ? sum.getJhjxss() : 0.0) + (null != day.getJhjxss() ? day.getJhjxss() : 0.0));
+                sum.setXdss((null != sum.getXdss() ? sum.getXdss() : 0.0) + (null != day.getXdss() ? day.getXdss() : 0.0));
+                sum.setXnss((null != sum.getXnss() ? sum.getXnss() : 0.0) + (null != day.getXnss() ? day.getXnss() : 0.0));
+                sum.setSlss((null != sum.getSlss() ? sum.getSlss() : 0.0) + (null != day.getSlss() ? day.getSlss() : 0.0));
+                sum.setLlfdl((null != sum.getLlfdl() ? sum.getLlfdl() : 0.0) + (null != day.getLlfdl() ? day.getLlfdl() : 0.0));
+                sum.setGzMin((null != sum.getGzMin() ? sum.getGzMin() : 0.0) + (null != day.getGzMin() ? day.getGzMin() : 0.0));
+                sum.setJxMin((null != sum.getJxMin() ? sum.getJxMin() : 0.0) + (null != day.getJxMin() ? day.getJxMin() : 0.0));
+                sum.setXdMin((null != sum.getTjMin() ? sum.getTjMin() : 0.0) + (null != day.getTjMin() ? day.getTjMin() : 0.0));
+                sum.setYxMin((null != sum.getYxMin() ? sum.getYxMin() : 0.0) + (null != day.getYxMin() ? day.getYxMin() : 0.0));
+                sum.setDjMin((null != sum.getDjMin() ? sum.getDjMin() : 0.0) + (null != day.getDjMin() ? day.getDjMin() : 0.0));
+                sum.setLyxs((null != sum.getLyxs() ? sum.getLyxs() : 0.0) + (null != day.getLyxs() ? day.getLyxs() : 0.0));
+                sum.setKlyl((null != sum.getKlyl() ? sum.getKlyl() : 0.0) + (null != day.getKlyl() ? day.getKlyl() : 0.0));
+                sum.setXfqrfs((null != sum.getXfqrfs() ? sum.getXfqrfs() : 0.0) + (null != day.getXfqrfs() ? day.getXfqrfs() : 0.0));
+                sum.setYxfss((null != sum.getYxfss() ? sum.getYxfss() : 0.0) + (null != day.getYxfss() ? day.getYxfss() : 0.0));
+                sum.setJfpl((null != sum.getJfpl() ? sum.getJfpl() : 0.0) + (null != day.getJfpl() ? day.getJfpl() : 0.0));
                 return sum;
             });
             TurbineInfoDay tb;

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/specific/SpecificService.java

@@ -3346,7 +3346,11 @@ public class SpecificService {
             double llfdl = i.getLlfdl() != null ? i.getLlfdl() : 0.0;
             double rfdl = i.getGzss() != null ? i.getGzss() : 0.0;
             if (llfdl != 0) {
-                Double calculatedValue = DoubleUtils.keepPrecision(rfdl / llfdl * 100, 2);
+                double rf = rfdl / llfdl * 100;
+                if (rf < 0) {
+                    rf = 0.0;
+                }
+                Double calculatedValue = DoubleUtils.keepPrecision(rf, 2);
                 vo.setCurrent(calculatedValue);
             } else {
                 vo.setCurrent(0.0);