测风塔下拉框时间设置为实时

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

@@ -1,12 +1,14 @@
 package com.jiayue.biz.service.impl;
 
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.db.Entity;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jiayue.biz.domain.Equipment;
 import com.jiayue.biz.domain.ProjectInfo;
 import com.jiayue.biz.domain.StatisticsSituation;
 import com.jiayue.biz.service.ProjectInfoService;
+import com.jiayue.biz.service.ProphaseWeatherDataService;
 import com.jiayue.common.core.redis.RedisCache;
 import com.jiayue.common.utils.DateUtil;
 import lombok.AllArgsConstructor;
@@ -40,6 +42,9 @@ public class WindTowerInfoServiceImpl extends ServiceImpl<WindTowerInfoMapper, W
     @Autowired
     ProjectInfoService projectInfoService;
 
+    @Autowired
+    ProphaseWeatherDataService prophaseWeatherDataService;
+
 
     @Override
     public List<WindTowerInfo> getDashAllWindInfo() {
@@ -133,8 +138,9 @@ public class WindTowerInfoServiceImpl extends ServiceImpl<WindTowerInfoMapper, W
         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 (StatisticsSituation s : statisticsSituationList) {
-            maps.put(s.getEquipmentId(), Long.parseLong(s.getStartTimeAndEndTime().split(",")[1]));
+        for (WindTowerInfo windTowerInfo : windTowerInfoList) {
+            Map<String, Long> dataTimeStartAndEnd = prophaseWeatherDataService.getDataTimeStartAndEnd(windTowerInfo.getEquipmentNo());
+            maps.put(windTowerInfo.getEquipmentNo(), dataTimeStartAndEnd.get("endTime"));
         }
         List<Map.Entry<String, Long>> lstEntry = new ArrayList<>(maps.entrySet());
         //根据value 排序 降序