bug修复

generationXK-service/pom.xml

@@ -114,12 +114,12 @@
             <version>3.17</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.1.1</version>
-            <scope>test</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.hutool</groupId>-->
+<!--            <artifactId>hutool-all</artifactId>-->
+<!--            <version>5.1.1</version>-->
+<!--            <scope>test</scope>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
@@ -175,6 +175,12 @@
             <version>11.9.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.25</version>
+        </dependency>
+
         <!--        <dependency>-->
         <!--            <groupId>com.gyee</groupId>-->
         <!--            <artifactId>data-adapter</artifactId>-->

generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo1Service.java

@@ -1,9 +1,12 @@
-package com.gyee.generation.service;//package com.gyee.generation.service;
+package com.gyee.generation.service;
 
+import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
+import com.gyee.generation.feign.AdapterApi;
 import com.gyee.generation.init.CacheContext;
+import com.gyee.generation.model.PointData2;
 import com.gyee.generation.model.auto.*;
 import com.gyee.generation.model.vo.CompanyType;
 import com.gyee.generation.model.vo.Location;
@@ -12,6 +15,7 @@ import com.gyee.generation.service.auto.*;
 import com.gyee.generation.util.DateUtils;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
 import com.gyee.generation.util.statisticcs.Initial;
+import com.xxl.job.core.util.DateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -21,6 +25,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.net.URI;
 import java.text.SimpleDateFormat;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
@@ -74,6 +79,14 @@ public class WindPowerInfo1Service {
     @Resource
     private IProEconEquipmentInfoJsService iProEconEquipmentInfoJsService;
 
+    @Resource
+    private AdapterApi adapter;
+
+
+    public URI goldenUri() {
+        return URI.create("http://10.220.1.8:8011/ts");
+    }
+
 
     /**
      * 计算区域日信息
@@ -1366,12 +1379,49 @@ public class WindPowerInfo1Service {
         }
         try {
             boolean b = stationInfoHourService.saveBatch(shs);
+            System.out.println("成功");
         } catch (Exception e) {
             e.printStackTrace();
         }
 
     }
 
+    public void writeReportHistory(Date date) throws Exception {
+        String[] dateTime = {"2024-12-13 08:00:00","2024-12-13 12:00:00", "2024-12-13 16:00:00", "2024-12-13 20:00:00"};
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        String[] split = repInfo1.split(",");
+        List<String> ls = new ArrayList<>(Arrays.asList(split));
+        for (String s : dateTime) {
+            Date date1 = simpleDateFormat.parse(s);
+            long timestamp = date1.getTime();
+            for (long i = timestamp; i < 1735033631000L; i += 86400000) {
+                List<StationInfoHour> shs = new ArrayList<>();
+                for (String l : ls) {
+                    Map<String, PointData2> historySection = adapter.getHistorySection(goldenUri(), l, i);
+                    if (null == historySection || historySection.isEmpty()) {
+                        return;
+                    }
+                        StationInfoHour sh = new StationInfoHour();
+                        sh.setRecordDate(LocalDateTime.ofInstant(Instant.ofEpochMilli(i),ZoneId.systemDefault()));
+                        sh.setWpid("NX_FGS_HA_FDC_STA");
+                        sh.setMeterId(l);
+                        sh.setMeterName(l);
+                        sh.setCode(BigDecimal.valueOf(historySection.get(l).getDoubleValue()));
+                        sh.setCodeModify(BigDecimal.valueOf(historySection.get(l).getDoubleValue()));
+                        shs.add(sh);
+
+                }
+                try {
+                    boolean b = stationInfoHourService.saveBatch(shs);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+    }
+
     public void writeReport2(Date date) throws Exception {
         String[] split = repInfo2.split(",");
         List<String> ls = new ArrayList<>(Arrays.asList(split));
@@ -1404,6 +1454,42 @@ public class WindPowerInfo1Service {
 
     }
 
+    public void writeReportHistory2(Date date) throws Exception {
+        String[] dateTime = {"2024-12-13 01:00:00", "2024-12-13 05:00:00", "2024-12-13 09:00:00","2024-12-13 13:00:00", "2024-12-13 15:00:00", "2024-12-13 21:00:00"};
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        String[] split = repInfo2.split(",");
+        List<String> ls = new ArrayList<>(Arrays.asList(split));
+        for (String s : dateTime) {
+            Date date1 = simpleDateFormat.parse(s);
+            long timestamp = date1.getTime();
+            for (long i = timestamp; i < 1735033631000L; i += 86400000) {
+                List<StationInfoHour> shs = new ArrayList<>();
+                for (String l : ls) {
+                    Map<String, PointData2> historySection = adapter.getHistorySection(goldenUri(), l, i);
+                    if (null == historySection || historySection.isEmpty()) {
+                        return;
+                    }
+                    StationInfoHour sh = new StationInfoHour();
+                    sh.setRecordDate(LocalDateTime.ofInstant(Instant.ofEpochMilli(i),ZoneId.systemDefault()));
+                    sh.setWpid("NX_FGS_HA_FDC_STA");
+                    sh.setMeterId(l);
+                    sh.setMeterName(l);
+                    sh.setCode(BigDecimal.valueOf(historySection.get(l).getDoubleValue()));
+                    sh.setCodeModify(BigDecimal.valueOf(historySection.get(l).getDoubleValue()));
+                    shs.add(sh);
+
+                }
+                try {
+                    boolean b = stationInfoHourService.saveBatch(shs);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+    }
+
 
     public void writeReport3(Date date) throws Exception {
         QueryWrapper<ProBaseBackfill> qw = new QueryWrapper<>();

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

@@ -246,7 +246,7 @@ public class SaticSchedulePgTask {
                 System.out.println("执行用时" + DateUtils.secondsDiff(begin, end) + "秒");
                 System.out.println("停机记录调度调度程序执行结束!。。。。。。");
 
-                Thread.sleep(5000);
+                Thread.sleep(2000);
             }
 
 
@@ -1755,6 +1755,7 @@ public class SaticSchedulePgTask {
 
         Date date = new Date();
         windPowerInfo1Service.writeReport1(date);
+//        windPowerInfo1Service.writeReportHistory(date);
 
     }
 
@@ -1766,6 +1767,7 @@ public class SaticSchedulePgTask {
 
         Date date = new Date();
         windPowerInfo1Service.writeReport2(date);
+//        windPowerInfo1Service.writeReportHistory2(date);
 
     }
 

generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/EdosUtil.java

@@ -740,7 +740,7 @@ public class EdosUtil implements IEdosUtil {
     @Override
     public List<PointData> getRealData(List<String> pointids) throws Exception {
         String join = String.join(",", pointids);
-        String url = baseURL + "/latest";
+        String url = baseURL + "/latests";
         try {
             HttpHeaders headers = new HttpHeaders();
             headers.setContentType(MediaType.APPLICATION_JSON);

runeconomy-xk/src/main/java/com/gyee/runeconomy/util/realtimesource/EdosUtil.java

@@ -967,7 +967,7 @@ public class EdosUtil implements IEdosUtil {
     @Override
     public List<PointData> getRealData(List<String> pointids) throws Exception {
         String join = String.join(",", pointids);
-        String url = baseURL + "/latest";
+        String url = baseURL + "/latests";
         try {
             HttpHeaders headers = new HttpHeaders();
             headers.setContentType(MediaType.APPLICATION_JSON);

runeconomy-xk/src/main/resources/mapper/CurvefittingmonthmainMapper.xml

@@ -101,7 +101,8 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from curvefittingmonthmain
+--     from curvefittingmonthmain
+    from pro_econ_curve_fitt_month_main
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>