添加时间工具类

fiveep-service/src/main/java/com/bizmatics/service/impl/HtAnalogDataServiceImpl.java

@@ -196,14 +196,14 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
             Date dayStartTime = DateUtils.getDayStartTime(setDays);
             Date dayEndTime = DateUtils.getDayEndTime(setDays);
             maxList.add(hadSiteStatics.stream()
-                    .filter(hadSiteStatic -> isEffectiveDate(hadSiteStatic.getHadTime(),dayStartTime,dayEndTime)
+                    .filter(hadSiteStatic -> DateUtils.isEffectiveDate(hadSiteStatic.getHadTime(),dayStartTime,dayEndTime)
                     ).findFirst().map(HadSiteStatic::getMaxDemand).orElse(0.00));
 
             minList.add(hadSiteStatics.stream()
-                    .filter(hadSiteStatic -> isEffectiveDate(hadSiteStatic.getHadTime(),dayStartTime,dayEndTime)
+                    .filter(hadSiteStatic -> DateUtils.isEffectiveDate(hadSiteStatic.getHadTime(),dayStartTime,dayEndTime)
                     ).findFirst().map(HadSiteStatic::getMinDemand).orElse(0.00));
             avgList.add(hadSiteStatics.stream()
-                    .filter(hadSiteStatic -> isEffectiveDate(hadSiteStatic.getHadTime(),dayStartTime,dayEndTime)
+                    .filter(hadSiteStatic -> DateUtils.isEffectiveDate(hadSiteStatic.getHadTime(),dayStartTime,dayEndTime)
                     ).findFirst().map(HadSiteStatic::getAvgDemand).orElse(0.00));
             dateList.add(DateUtils.getDay(setDays));
         }
@@ -241,7 +241,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
             dateList.add(DateUtils.getTime(hours));
             Date finalDate = date;
             Optional<HtAnalogData> htAnalogData = Optional.ofNullable(htList).flatMap(hts -> hts.stream()
-                    .filter(hads -> isEffectiveDate(hads.getDataTime(), finalDate, hours))
+                    .filter(hads -> DateUtils.isEffectiveDate(hads.getDataTime(), finalDate, hours))
                     .findFirst());
             iaList.add(htAnalogData.map(HtAnalogData::getIa).orElse(0.00));
             ibList.add(htAnalogData.map(HtAnalogData::getIb).orElse(0.00));
@@ -259,29 +259,6 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         list.add(CommonIcoVO.builder().name("UB").list(ubList).listDate(dateList).build());
         list.add(CommonIcoVO.builder().name("UC").list(ucList).listDate(dateList).build());
         return list;
-
     }
 
-
-    public static boolean isEffectiveDate(Date nowTime, Date startTime, Date endTime) {
-        if (nowTime.getTime() == startTime.getTime()
-                || nowTime.getTime() == endTime.getTime()) {
-            return true;
-        }
-
-        Calendar date = Calendar.getInstance();
-        date.setTime(nowTime);
-
-        Calendar begin = Calendar.getInstance();
-        begin.setTime(startTime);
-
-        Calendar end = Calendar.getInstance();
-        end.setTime(endTime);
-
-        if (date.after(begin) && date.before(end)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
 }