generationXK-service/src/main/java/com/gyee/generation/task/SaticSchedulePgTask.java

@@ -1,6 +1,9 @@
 package com.gyee.generation.task;
 
 
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.gyee.common.util.DateUtils;
 import com.gyee.generation.service.*;
 import com.gyee.generation.service.StationPower.StationPowerService;
@@ -1089,7 +1092,7 @@ public class SaticSchedulePgTask {
 
     /**
      * 设备风资源统计调度
-     * 每天2点执行一次
+     * 每天23:59:00点执行一次
      */
     @XxlJob("wtwindDayInfo_PG")
     public void wtwindDayInfo_PG() {
@@ -1097,13 +1100,33 @@ public class SaticSchedulePgTask {
 
         XxlJobHelper.log("设备风资源统计调度程序执行开始!........");
         try {
-            wpwindDayInfoService.calWpwindDayInfo(new Date());
+            wtwindDayInfoService.calWtwindDayInfo(new Date());
         } catch (Exception e) {
             e.printStackTrace();
         }
         XxlJobHelper.log("设备风资源统计调度任务处理完成!........");
     }
 
+
+
+//    @XxlJob("wtwindDayInfo_PG")
+//    public void wtwindDayInfo_PG() {
+//
+//        DateTime dateTime = DateUtil.beginOfYear(new Date());
+//        DateTime dateTimeEnd = DateUtil.endOfDay(dateTime);
+//        int ilength = DateUtil.dayOfYear(new Date());
+//
+//        for (int i = 0; i < ilength; i++) {
+//            try {
+//                DateTime offset = DateUtil.offset(dateTimeEnd, DateField.DAY_OF_MONTH, i);
+//                wtwindDayInfoService.calWtwindDayInfo(offset);
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            }
+//        }
+//    }
+
+
     /**
      * 场站风资源统计调度
      * 每天2点执行一次
@@ -1114,7 +1137,7 @@ public class SaticSchedulePgTask {
 
         XxlJobHelper.log("场站风资源统计调度程序执行开始!........");
         try {
-            wtwindDayInfoService.calWtwindDayInfo(new Date());
+            wpwindDayInfoService.calWpwindDayInfo(new Date());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -1765,7 +1788,7 @@ public class SaticSchedulePgTask {
 
         Date date = new Date();
         windPowerInfo1Service.writeBoosterStation(date);
-//        date.setTime(1735660800000L);
+//        date.setTime(1753977600000L);
 //        windPowerInfo1Service.writeBoosterStationHistory(date);
 
     }

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/EarlyWarning/ApiClient.java

@@ -17,7 +17,7 @@ public class ApiClient {
     public String getDataFromApi(String begin, String end, String deviceId, String modelId, String deviceType, String alarmIds, String timeType) {
         try {
             // 构建 URL
-            String baseUrl = "http://10.220.1.5:6015/alarm/history/findCtFeatureStatByWtId";
+            String baseUrl = "https://10.220.1.5:6015/alarm/history/findCtFeatureStatByWtId";
             String charset = StandardCharsets.UTF_8.name();  // 获取字符集名称
             String url = String.format("%s?begin=%s&end=%s&deviceid=%s&modelId=%s&deviceType=%s&alarmIds=%s&timeType=%s",
                     baseUrl,
@@ -47,7 +47,7 @@ public class ApiClient {
                                String deviceType,String components, String subcomponents,String alarmId, String isclose, String pageNum,String pageSize) {
         try {
             // 构建 URL
-            String baseUrl = "http://10.220.1.5:6015/alarm/history/findAlarmlist";
+            String baseUrl = "https://10.220.1.5:6015/alarm/history/findAlarmlist";
             String charset = StandardCharsets.UTF_8.name();  // 获取字符集名称
             String url = String.format("%s?begin=%s&end=%s&alarmType=%s&stationid=%s&deviceid=%s&description=%s&modelId=%s&deviceType=%s&components=%s&subcomponents=%s&alarmId=%s&isclose=%s&pageNum=%s&pageSize=%s",
                     baseUrl,
@@ -97,7 +97,7 @@ public class ApiClient {
     public String getglqxgzFromApi(String wpId,String wtId, String modelId,String description ,String begin, String end, String pageNum,String pageSize,String type) {
         try {
             // 构建 URL
-            String baseUrl = "http://10.220.1.5:6015//shutdownevent2/queryshutdowneventlist";
+            String baseUrl = "https://10.220.1.5:6015//shutdownevent2/queryshutdowneventlist";
             String charset = StandardCharsets.UTF_8.name();  // 获取字符集名称
             String url = String.format("%s?wpId=%s&wtId=%s&modelId=%s&description=%s&begin=%s&end=%s&pageNum=%s&pageSize=%s&type=%s",
                     baseUrl,

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/WtwindDayInfoService.java

@@ -129,7 +129,7 @@ public class WtwindDayInfoService {
                         case 3:
                             temp1 = null != winfo.getEne4() ? NumberUtil.round(winfo.getEne4(), 2).doubleValue() : 0.0;
                             temp2 = null != winfo.getEne() ? NumberUtil.round(winfo.getEne(), 2).doubleValue() : 0.0;
-                            temp3 = null != winfo.getEne2() ? NumberUtil.round(winfo.getEne(), 2).doubleValue() : 0.0;
+                            temp3 = null != winfo.getEne2() ? NumberUtil.round(winfo.getEne2(), 2).doubleValue() : 0.0;
 
                             vo.setName("ENE (" + NumberUtil.round(temp1, 2) + "/" + NumberUtil.round(temp2, 2) + ")");
                             vo.setData1(temp3);