1.修改生成分析报告时，页面日期未带入时间引起的异常

wrdep-biz/src/main/java/com/jiayue/biz/service/impl/PdfServiceImpl.java

@@ -398,22 +398,27 @@ public class PdfServiceImpl extends ServiceImpl<WindTowerDataParentTableMapper,
         List<WindTowerInfo> collect = windTowerInfoList.stream().sorted(Comparator.comparing(WindTowerInfo::getEquipmentNo)).collect(Collectors.toList());
         ArrayList<Map<String, Object>> timeList = new ArrayList<>();
         for (WindTowerInfo windTowerInfo : collect) {
-            HashMap<String, Object> hashMap = new HashMap<>();
-            Map<String, Long> startAndEnd = prophaseWeatherDataService.getDataTimeStartAndEnd(windTowerInfo.getEquipmentNo());
-            //获取去年数据截止的时间
-            Date yearDay = DateTimeUtil.getYearDay(startAndEnd.get("endTime"));
-            Date startTime;
-
-            if (startAndEnd.get("startTime") < yearDay.getTime()) {
-                startTime = DateUtil.offsetMonth(yearDay, 1);
-            } else {
-                startTime = new Date(startAndEnd.get("startTime"));
-            }
+            try {
+                HashMap<String, Object> hashMap = new HashMap<>();
 
-            hashMap.put("startTime", startTime);
-            hashMap.put("endTime", new Date(startAndEnd.get("endTime")));
-            hashMap.put("eqId", windTowerInfo.getEquipmentNo());
-            timeList.add(hashMap);
+                Map<String, Long> startAndEnd = prophaseWeatherDataService.getDataTimeStartAndEnd(windTowerInfo.getEquipmentNo());
+                //获取去年数据截止的时间
+                Date yearDay = DateTimeUtil.getYearDay(startAndEnd.get("endTime"));
+                Date startTime;
+
+                if (startAndEnd.get("startTime") < yearDay.getTime()) {
+                    startTime = DateUtil.offsetMonth(yearDay, 1);
+                } else {
+                    startTime = new Date(startAndEnd.get("startTime"));
+                }
+
+                hashMap.put("startTime", startTime);
+                hashMap.put("endTime", new Date(startAndEnd.get("endTime")));
+                hashMap.put("eqId", windTowerInfo.getEquipmentNo());
+                timeList.add(hashMap);
+            }catch (Exception e){
+                log.error("读取测风塔：{"+windTowerInfo.getName() +"} 开始结束时间错误：{"+e.getLocalizedMessage()+"}");
+            }
         }
         return timeList;
     }

wrdep-ui/src/views/dataAnalysis/index.vue

@@ -255,7 +255,8 @@ export default {
       roseData:[],
       weibull:[],
       turbulenceData:[],
-      shearData: {}
+      shearData: {},
+      defaultTimeData: [],//默认时间范围集合
     }
   },
   destroyed() {
@@ -341,7 +342,11 @@ export default {
       })
     },
     changeCft() {
-
+      let data = this.startDateAndEndDate.find(w => w.value == this.cftId)
+      let time = this.defaultTimeData.find(w => w.eqId == this.cftId)
+      console.log(time)
+      this.dataTime = [time.startTime,time.endTime]
+      this.changeHeight(data)
     },
     changeMonth(value) {
       // 今天是月初并且选择的月份是当月