Procházet zdrojové kódy

去除最高最低平均250值

hanqingsong před 5 roky
rodič
revize
565986d68f

+ 5 - 5
depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/pushs/service/impl/GrainPushsServiceImpl.java

@@ -202,15 +202,15 @@ public class GrainPushsServiceImpl implements GrainPushsService {
202 202
                         if (collect1.size() > 0) {
203 203
                             lsyerAvg = lsyerSum / collect1.size();
204 204
                         }
205
-                        tTestdataLayer.setLavg(new BigDecimal(lsyerAvg == 0 ? 250 : lsyerAvg));
205
+                        tTestdataLayer.setLavg(new BigDecimal(lsyerAvg));
206 206
                         BigDecimal lsyerMax = points.stream().filter(TPoints -> !TPoints.getTemp().equals(new BigDecimal("250.0"))).map(TPoints::getTemp).reduce(BigDecimal.ZERO, BigDecimal::max);
207
-                        tTestdataLayer.setLmax(new BigDecimal(lsyerMax.toString().equals("0") ? "250.0" : lsyerMax.toString()));
207
+                        tTestdataLayer.setLmax(new BigDecimal(lsyerMax.toString()));
208 208
                         List<Double> lsyerMins = Lists.newArrayList();
209 209
                         List<BigDecimal> bigList = points.stream().filter(TPoints -> !TPoints.getTemp().equals(new BigDecimal("250.0"))).map(t -> t.getTemp()).collect(Collectors.toList());
210 210
                         bigList.forEach(bigDecimal -> {
211 211
                             lsyerMins.add(bigDecimal.doubleValue());
212 212
                         });
213
-                        Double wlsyerMin = lsyerMins.size() == 0 ? 250.0 : Collections.min(lsyerMins);
213
+                        Double wlsyerMin = lsyerMins.size() == 0 ? 0.0 : Collections.min(lsyerMins);
214 214
                         BigDecimal lsyerMin = new BigDecimal(wlsyerMin);
215 215
                         tTestdataLayer.setLmin(lsyerMin);
216 216
                         tTestdataLayer.setLhouse(house);
@@ -291,10 +291,10 @@ public class GrainPushsServiceImpl implements GrainPushsService {
291 291
                 });
292 292
 
293 293
                 if (tTestdataList.size() > 0) {
294
-                    temperatureRecordService.insertBatch(tTestdataList);
294
+//                    temperatureRecordService.insertBatch(tTestdataList);
295 295
                 }
296 296
                 if (tTestdataLayerArrayList.size() > 0) {
297
-                    tTestdataLayerMapper.insertBatch(tTestdataLayerArrayList);
297
+//                    tTestdataLayerMapper.insertBatch(tTestdataLayerArrayList);
298 298
                 }
299 299
                 if (tWarningThresholdHistorieList.size() > 0) {
300 300
                     tWarningThresholdHistoryMapper.insertBatch(tWarningThresholdHistorieList);