地图电梯今日应急统计

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/ESElevatorServiceImpl.java

@@ -117,22 +117,19 @@ public class ESElevatorServiceImpl {
             qb4.must(QueryBuilders.termQuery("sequenceNbr",  alertCalled.getEquipmentId()));
             boolMust.must(qb4);
         } else {
-            if(!ValidationUtil.isEmpty(elevatorDto.getAlarmTypeCode())) {
-                if(elevatorDto.getIsToday() != null && elevatorDto.getIsToday()) {
-                    queryWrapper.ge(AlertCalled::getCallTime, DateUtils.stampToDate(System.currentTimeMillis(),DateUtils.DATE_PATTERN));
-                    queryWrapper.le(AlertCalled::getCallTime, DateUtils.stampToDate(DateUtils.dateAddDays(new Date(),1).getTime(),DateUtils.DATE_PATTERN));
-                }
-
-                alertCalleds  = iAlertCalledService.list(queryWrapper);
-                List<Long> stringList = new ArrayList<>();
-                for (AlertCalled al: alertCalleds
-                ) {
-                    stringList.add(al.getEquipmentId());
-                }
-                List<Long> listL = stringList.stream().distinct().collect(Collectors.toList());
-                qb0.should(QueryBuilders.termsQuery("sequenceNbr",  listL.toArray()));
-                boolMust.must(qb0);
+            if(elevatorDto.getIsToday() != null && elevatorDto.getIsToday()) {
+                queryWrapper.ge(AlertCalled::getCallTime, DateUtils.stampToDate(System.currentTimeMillis(),DateUtils.DATE_PATTERN));
+                queryWrapper.le(AlertCalled::getCallTime, DateUtils.stampToDate(DateUtils.dateAddDays(new Date(),1).getTime(),DateUtils.DATE_PATTERN));
+            }
+            alertCalleds  = iAlertCalledService.list(queryWrapper);
+            List<Long> stringList = new ArrayList<>();
+            for (AlertCalled al: alertCalleds
+            ) {
+                stringList.add(al.getEquipmentId());
             }
+            List<Long> listL = stringList.stream().distinct().collect(Collectors.toList());
+            qb0.should(QueryBuilders.termsQuery("sequenceNbr",  listL.toArray()));
+            boolMust.must(qb0);
         }
 
 
@@ -180,8 +177,6 @@ public class ESElevatorServiceImpl {
                             break;
                         }
                     }
-                } else {
-                    list.add(esElevatorDto);
                 }
             }
         }