td相关bug修改

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TdInfoQueryController.java

 package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
-import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.text.CharSequenceUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
@@ -58,17 +58,18 @@ public class TdInfoQueryController {
     @PostMapping(value = "/getFanHealthIndexInfo")
     @ApiOperation(httpMethod = "POST", value = "分页查询健康指数信息 - 风电", notes = "分页查询健康指数信息 - 风电")
     public ResponseModel<Page<FanHealthIndex>> getFanHealthIndexInfo(@RequestBody FanHealthIndexDto dto) throws ParseException {
-
-        String startDate = dto.getStartDate();
-        Date date = DateUtils.dateParse(startDate, DATE_TIME_PATTERN);
-        String startDateString = DateUtils.dateFormat(DateUtils.dateAddHours(date, -8), DATE_TIME_PATTERN);
-        dto.setStartDate(startDateString);
-
-        String endDate = dto.getEndDate();
-        Date endDateDate = DateUtils.dateParse(endDate, DATE_TIME_PATTERN);
-        String endDateString = DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, -8), DATE_TIME_PATTERN);
-        dto.setStartDate(endDateString);
-
+        if (CharSequenceUtil.isNotEmpty(dto.getStartDate())) {
+            String startDate = dto.getStartDate();
+            Date date = DateUtils.dateParse(startDate, DATE_TIME_PATTERN);
+            String startDateString = DateUtils.dateFormat(DateUtils.dateAddHours(date, -8), DATE_TIME_PATTERN);
+            dto.setStartDate(startDateString);
+        }
+        if (CharSequenceUtil.isNotEmpty(dto.getEndDate())) {
+            String endDate = dto.getEndDate();
+            Date endDateDate = DateUtils.dateParse(endDate, DATE_TIME_PATTERN);
+            String endDateString = DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, -8), DATE_TIME_PATTERN);
+            dto.setStartDate(endDateString);
+        }
         Page<FanHealthIndex> resultPage = new Page<>(dto.getCurrent(), dto.getSize());
         dto.setCurrent((dto.getCurrent() - 1) * dto.getSize());
         List<Map<String, String>> orderWeight = dto.getSorts().stream().sorted(Comparator.comparing(t -> Integer.parseInt(t.get("orderWeight")))).collect(Collectors.toList());
@@ -91,15 +92,18 @@ public class TdInfoQueryController {
     @PostMapping(value = "/getPvHealthIndexInfo")
     @ApiOperation(httpMethod = "POST", value = "分页查询健康指数信息 - 光伏", notes = "分页查询健康指数信息 - 光伏")
     public ResponseModel<Page<PvHealthIndex>> getPvHealthIndexInfo(@RequestBody PvHealthIndexDto dto) throws ParseException {
-        String startDate = dto.getStartDate();
-        Date date = DateUtils.dateParse(startDate, DATE_TIME_PATTERN);
-        String startDateString = DateUtils.dateFormat(DateUtils.dateAddHours(date, -8), DATE_TIME_PATTERN);
-        dto.setStartDate(startDateString);
-
-        String endDate = dto.getEndDate();
-        Date endDateDate = DateUtils.dateParse(endDate, DATE_TIME_PATTERN);
-        String endDateString = DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, -8), DATE_TIME_PATTERN);
-        dto.setStartDate(endDateString);
+        if (CharSequenceUtil.isNotEmpty(dto.getStartDate())) {
+            String startDate = dto.getStartDate();
+            Date date = DateUtils.dateParse(startDate, DATE_TIME_PATTERN);
+            String startDateString = DateUtils.dateFormat(DateUtils.dateAddHours(date, -8), DATE_TIME_PATTERN);
+            dto.setStartDate(startDateString);
+        }
+        if (CharSequenceUtil.isNotEmpty(dto.getEndDate())) {
+            String endDate = dto.getEndDate();
+            Date endDateDate = DateUtils.dateParse(endDate, DATE_TIME_PATTERN);
+            String endDateString = DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, -8), DATE_TIME_PATTERN);
+            dto.setStartDate(endDateString);
+        }
 
         Page<PvHealthIndex> resultPage = new Page<>(dto.getCurrent(), dto.getSize());
         dto.setCurrent((dto.getCurrent() - 1) * dto.getSize());