查询测风塔时附加时间 修改为实时查询

neim-biz/src/main/java/com/jiayue/biz/service/impl/WindTowerInfoServiceImpl.java

@@ -132,11 +132,9 @@ public class WindTowerInfoServiceImpl extends ServiceImpl<WindTowerInfoMapper, W
         }
         //TODO韩雪峰  新建的塔没有统计概述的时候无法显示  需要考虑到这种情况
         List<WindTowerInfo> windTowerInfoList = this.list();
-        List<StatisticsSituation> statisticsSituationList = statisticsSituationService.list();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         List<Map<String, String>> mapList = new ArrayList<>();
         List<Map<String, String>> statusMapList = new ArrayList<>();
-        //List<WindTowerInfo> windTowerInfoListCollect = windTowerInfoList.stream().sorted(Comparator.comparing(WindTowerInfo::getEquipmentNo)).collect(Collectors.toList());
         Map<String, Long> maps = new HashMap<>();
         for (WindTowerInfo windTowerInfo : windTowerInfoList) {
             Map<String, Long> dataTimeStartAndEnd = prophaseWeatherDataService.getDataTimeStartAndEnd(windTowerInfo.getEquipmentNo());
@@ -169,13 +167,10 @@ public class WindTowerInfoServiceImpl extends ServiceImpl<WindTowerInfoMapper, W
             map.put("wdHeights", w.getWdHeights());
             map.put("heights", w.getHeights());
             map.put("status", w.getStatus());
-            List<StatisticsSituation> collect = statisticsSituationList.stream().filter(s -> s.getEquipmentId().equals(w.getEquipmentNo())).collect(Collectors.toList());
-            if (!collect.isEmpty()) {
-                //collect.get(0).getStartTimeAndEndTime().split(",") =  "1638288000000,1638373800000"
-                String[] strings = collect.get(0).getStartTimeAndEndTime().split(",");
-                String str = sdf.format(new Date(Long.parseLong(strings[0]))) + "-" + sdf.format(new Date(Long.parseLong(strings[1])));
-                map.put("date", str);
-            }
+            Map<String, Long> dataTimeStartAndEnd = prophaseWeatherDataService.getDataTimeStartAndEnd(w.getEquipmentNo());
+            String str = sdf.format(new Date(dataTimeStartAndEnd.get("startTime"))) + "-" + sdf.format(new Date(dataTimeStartAndEnd.get("endTIme")));
+            map.put("date", str);
+
             if (w.getStatus() == null || w.getStatus().equals("")) {
                 statusMapList.add(map);
             } else {