修改查询

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

@@ -171,7 +171,10 @@ public class TdInfoQueryController extends BaseController {
             String orderColumn = convert(split[0]) + " " + replace;
             dto.setSortOne(orderColumn);
         }
-
+        if(dto.getEndDateTs()==null&&dto.getStartDateTs()==null) 
+        {
+        	 return ResponseHelper.buildResponse(resultPage);
+        }
         List<FanHealthIndex> fanHealthIndexIPage = fanHealthIndexMapper.getInfoByPage(dto);
         fanHealthIndexIPage.forEach(item -> {
             item.setHealthIndex(Double.valueOf(df.format(item.getHealthIndex())));
@@ -230,9 +233,6 @@ public class TdInfoQueryController extends BaseController {
             	Long startTs = pvHealthIndexMapper.getTsByRecDate("pv_health_index_data", startDate+" 00:00:00", "Asc ");
                 dto.setStartDateTs(startTs);
             }
-
-
-
         }
         if (CharSequenceUtil.isNotEmpty(dto.getEndDate())) {
             String dateNowShortStr = DateUtils.getDateNowShortStr();
@@ -287,6 +287,10 @@ public class TdInfoQueryController extends BaseController {
         }
         String join = String.join(",", orderByList);
         dto.setOrderColumns(join);
+        if(dto.getEndDateTs()==null&&dto.getStartDateTs()==null) 
+        {
+        	 return ResponseHelper.buildResponse(resultPage);
+        }
         List<PvHealthIndex> pvHealthIndexIPage = pvHealthIndexMapper.getInfoByPage(dto);
         pvHealthIndexIPage.forEach(item -> {
             item.setHealthIndex(Double.valueOf(df.format(item.getHealthIndex())));