峰平谷 统计

jeecg-module-gather/src/main/java/org/jeecg/modules/fpgJob/LeanModelStatistics.java

@@ -438,11 +438,6 @@ public class LeanModelStatistics {
             // 处理数据业务逻辑
             fpgGatherList.forEach(fpgGatherData -> { // 循环处理采集数据处理
                 fpgGatherData.setFpgModelUpdatetime(new Date());
-                // -数情况直接退出
-                if (fpgGatherData.getActivePower().compareTo(BigDecimal.ZERO) < 0) {
-                    fpgGatherUpdateList.add(fpgGatherData);
-                    return;
-                }
                 try {
                     String finalDatestr = "";
                     // 统计单位
@@ -529,7 +524,7 @@ public class LeanModelStatistics {
                     }
 
                     FpgStatiscsModelMongodb fpgStatiscsModelMongo = mongoTemplate.findOne(query, FpgStatiscsModelMongodb.class, collectionName);
-                    // 功率
+                    // 功率 5 分钟上报一次  除以 12
                     BigDecimal activePower =  fpgGatherData.getActivePower().compareTo(new BigDecimal("0.00")) > 0 ? fpgGatherData.getActivePower().divide(new BigDecimal("12"), 8, RoundingMode.HALF_UP) : new BigDecimal("0.00");
                     // 电流
                     BigDecimal selectricCurrent = fpgGatherData.getRunCurrent() == null ? new BigDecimal("0.00") : fpgGatherData.getRunCurrent();
@@ -539,8 +534,6 @@ public class LeanModelStatistics {
                         // 基础数据变更不受条件影响
                         UpdateDefinition update = new Update();
                         ((Update) update).set("updateTime", curentDate);
-                        // 功率 5 分钟上报一次  除以 12
-                        activePower = fpgGatherData.getActivePower() == null ? new BigDecimal("0.00") : activePower;
                         BigDecimal oldPower = fpgStatiscsModelMongo.getPower() == null ? new BigDecimal("0.00") : fpgStatiscsModelMongo.getPower();
                         BigDecimal oldingTime = fpgStatiscsModelMongo.getIngTime() == null ? new BigDecimal("0.00") : fpgStatiscsModelMongo.getIngTime();
                         BigDecimal oldSelectricCurrent = fpgStatiscsModelMongo.getSelectricCurrent() == null ? new BigDecimal("0.00") : fpgStatiscsModelMongo.getSelectricCurrent();