Kaynağa Gözat

计算发电量 为0时不进行入库

hxf 1 yıl önce
ebeveyn
işleme
b0da6d194b

+ 12 - 9
neim-biz/src/main/java/com/jiayue/biz/service/impl/WindTowerCalculationDataServiceImpl.java

@@ -193,15 +193,18 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
                     .map(p -> CalculationUtil.getBattery(BigDecimal.valueOf(p.getWsAve()))).reduce(BigDecimal.ZERO, BigDecimal::add);
 
             //日发电量
-            batterySum = batterySum.divide(BigDecimal.valueOf(6 * 1000), 2, RoundingMode.HALF_UP);
-
-            WindTowerCalculationData windTowerCalculationData = new WindTowerCalculationData();
-            windTowerCalculationData.setValue(batterySum);
-            windTowerCalculationData.setEbId(batteryDay.get(0).getId());
-            windTowerCalculationData.setTime(DateUtil.beginOfDay(new Date(time)));
-            windTowerCalculationData.setEquipmentId(windTowerInfo.getEquipmentNo());
-            batteryList.add(windTowerCalculationData);
-            windTowerCalculationDataList.add(windTowerCalculationData);
+            if(batterySum.compareTo(BigDecimal.ZERO) != 0){
+                batterySum = batterySum.divide(BigDecimal.valueOf(6 * 1000), 2, RoundingMode.HALF_UP);
+
+                WindTowerCalculationData windTowerCalculationData = new WindTowerCalculationData();
+                windTowerCalculationData.setValue(batterySum);
+                windTowerCalculationData.setEbId(batteryDay.get(0).getId());
+                windTowerCalculationData.setTime(DateUtil.beginOfDay(new Date(time)));
+                windTowerCalculationData.setEquipmentId(windTowerInfo.getEquipmentNo());
+                batteryList.add(windTowerCalculationData);
+                windTowerCalculationDataList.add(windTowerCalculationData);
+            }
+
 
         }
         return batteryList;