风资源计算优化

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Windresourceanalysis/WindresourceanalysisService.java

@@ -1,5 +1,7 @@
 package com.gyee.runeconomy.service.Windresourceanalysis;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
@@ -41,26 +43,9 @@ public class WindresourceanalysisService {
 
         List<ProBasicWeatherStation> wplsf = CacheContext.weawpls.stream().filter(w -> w.getWindpowerstationId().endsWith("FDC_STA")).collect(Collectors.toList());
 
-        //转换时间为Date类型
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        Date date = sdf.parse(Data);
-
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(date);
-        calendar.add(Calendar.DAY_OF_MONTH, -1);
-        calendar.set(Calendar.HOUR_OF_DAY, 23);
-        calendar.set(Calendar.MINUTE, 59);
-        calendar.set(Calendar.SECOND, 59);
-
-        Date startTime = calendar.getTime();
-
-        Calendar calendar1 = Calendar.getInstance();
-        calendar1.setTime(date);
-        calendar1.set(Calendar.HOUR_OF_DAY, 23);
-        calendar1.set(Calendar.MINUTE, 59);
-        calendar1.set(Calendar.SECOND, 59);
-
-        Date endTime = calendar1.getTime();
+        DateTime date = DateUtil.parse(Data, "yyyy-MM-dd");
+        Date startTime = DateUtil.beginOfDay(date);
+        Date endTime = DateUtil.endOfDay(date);
 
         ProBasicPowerstationPoint pjfs = null;
         ProBasicPowerstationPoint pjfx = null;
@@ -70,7 +55,6 @@ public class WindresourceanalysisService {
         for (ProBasicWeatherStation wp : wplsf) {
             if (wp.getId().contains("GJYF02") || wp.getId().contains("GJYF03") || wp.getId().contains("MLJ")) continue;
 
-
             pjfs = proBasicPowerstationPointService.getPowerstationPoint(wp.getWindpowerstationId(), ContantXk.SSPJFS);
 
             pjfx = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.FCCFTFX70);