光伏测点推送bug修复

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

@@ -1343,22 +1343,20 @@ public class WindPowerInfo1Service {
 
 
     public void writeHaWindturbine(Date date) throws Exception {
-        LocalDate localDate = LocalDateTime.now().toLocalDate();
         QueryWrapper<ProBaseBackfill> qwf = new QueryWrapper<>();
         qwf.lambda().eq(ProBaseBackfill::getType, "AI0003");
         List<ProBaseBackfill> list = iProBaseBackfillService.list(qwf);
         List<String> str = list.stream().map(ProBaseBackfill::getCode).collect(Collectors.toList());
         List<PointData> realData = edosUtil.getRealData(str);
         QueryWrapper<ProEconAnalysisSubtableBottom> qw = new QueryWrapper<>();
-        qw.lambda().eq(ProEconAnalysisSubtableBottom::getRecordDate, localDate);
+        qw.lambda().eq(ProEconAnalysisSubtableBottom::getRecordDate, date);
         List<ProEconAnalysisSubtableBottom> sel = iProEconAnalysisSubtableBottomService.sel(qw);
         List<ProEconAnalysisSubtableBottom> ls = null;
         if (null == sel || sel.isEmpty()) {
             ls = new ArrayList<>();
             for (PointData real : realData) {
                 ProEconAnalysisSubtableBottom pb = new ProEconAnalysisSubtableBottom();
-                pb.setRecordDate(new Date(real.getPointTime()));
-                String[] split1 = real.getPointName().split("\\.");
+                pb.setRecordDate(date);
                 pb.setWpid("NX_FGS_HA_FDC_STA");
                 pb.setMeterId(real.getPointName());
                 pb.setMeterName(real.getPointName());
@@ -1392,6 +1390,36 @@ public class WindPowerInfo1Service {
     }
 
 
+    public void writeHaWindturbineHistory(Date date) throws Exception {
+        QueryWrapper<ProBaseBackfill> qwf = new QueryWrapper<>();
+        qwf.lambda().eq(ProBaseBackfill::getType, "AI0003");
+        List<ProBaseBackfill> list = iProBaseBackfillService.list(qwf);
+        List<String> str = list.stream().map(ProBaseBackfill::getCode).collect(Collectors.toList());
+        long time = date.getTime();
+
+        for (long i = time; i < 1742778000000L; i += 86400000) {
+            List<ProEconAnalysisSubtableBottom> ls = new ArrayList<>();
+            for (String s : str) {
+                Map<String, PointData2> historySection = adapter.getHistorySection(goldenUri(), s, i);
+                ProEconAnalysisSubtableBottom pb = new ProEconAnalysisSubtableBottom();
+                pb.setRecordDate(new Date(i));
+                pb.setWpid("NX_FGS_HA_FDC_STA");
+                pb.setMeterId(s);
+                pb.setMeterName(s);
+                pb.setStopCode(historySection.get(s).getDoubleValue());
+                pb.setStopCodeModify(historySection.get(s).getDoubleValue());
+                ls.add(pb);
+            }
+            try {
+                boolean b = iProEconAnalysisSubtableBottomService.batchAdd(ls);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+           
+        }
+    }
+
+
 //    public void writeGfHistory(Date date) throws Exception {
 //        String s2 = "2024-12-11 23:55:00";
 //        String[] split = gf.split(",");
@@ -1548,18 +1576,22 @@ 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 17:00:00", "2024-12-13 21:00:00"};
-        String[] dateTime = {"2025-01-24 01:00:00", "2025-01-24 05:00:00", "2025-01-24 09:00:00", "2025-01-24 13:00:00", "2025-01-24 17:00:00", "2025-01-24 21:00:00"};
+        String[] dateTime = {"2025-03-13 01:00:00", "2025-03-13 05:00:00", "2025-03-13 09:00:00", "2025-03-13 13:00:00", "2025-03-13 17:00:00", "2025-03-13 21:00:00"};
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        QueryWrapper<ProBaseBackfill> qwf = new QueryWrapper<>();
+        qwf.lambda().eq(ProBaseBackfill::getType, "AI0006");
+        List<ProBaseBackfill> list = iProBaseBackfillService.list(qwf);
+        List<String> ls = list.stream().map(ProBaseBackfill::getCode).collect(Collectors.toList());
 //        String[] split = repInfo2.split(",");
 //        List<String> ls = new ArrayList<>(Arrays.asList(split));
-        List<String> ls = new ArrayList<>();
-        ls.add("区域集控.惠安风场.升压站.110kV宋四风场线测控.Q1");
-        ls.add("区域集控.惠安风场.升压站.110kV宋四风场线测控.UAB1");
+//        List<String> ls = new ArrayList<>();
+//        ls.add("区域集控.惠安风场.升压站.110kV宋四风场线测控.Q1");
+//        ls.add("区域集控.惠安风场.升压站.110kV宋四风场线测控.UAB1");
         for (String s : dateTime) {
             Date date1 = simpleDateFormat.parse(s);
             long timestamp = date1.getTime();
-            for (long i = timestamp; i < 1740453311000L; i += 86400000) {
+            for (long i = timestamp; i < 1742176332000L; i += 86400000) {
                 List<StationInfoHour> shs = new ArrayList<>();
                 for (String l : ls) {
                     Map<String, PointData2> historySection = adapter.getHistorySection(goldenUri(), l, timestamp);

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

@@ -1752,6 +1752,8 @@ public class SaticSchedulePgTask {
 
         Date date = new Date();
         windPowerInfo1Service.writeHaWindturbine(date);
+//        date.setTime(1742745600000L);
+//        windPowerInfo1Service.writeHaWindturbineHistory(date);
 
     }
 

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/homepage/EconomyPointHomePageService.java

@@ -1693,7 +1693,7 @@ public class EconomyPointHomePageService {
 
 
     public Map<String, Object> getHomeMiddle(String companyId) throws ParseException {
-        Double rfdl = dayFdlCal(LocalDate.now());
+        double rfdl = dayFdlCal(LocalDate.now());
         Integer month = LocalDate.now().getMonthValue();
         int year = LocalDate.now().getYear();
         Map<String, Object> allmap = new HashMap<>();
@@ -1796,7 +1796,7 @@ public class EconomyPointHomePageService {
             }
             for (ValueVo vv : vefdl) {
                 if (vv.getText().equals(text)) {
-                    double bfdl = day1s2.stream().mapToDouble(TurbineInfoDay::getXdss).sum();
+                    double bfdl = day1s2.stream().mapToDouble(TurbineInfoDay::getRfdl).sum();
                     String format = String.format("%.2f", bfdl / 1000);
                     vv.setValue(new BigDecimal(format));
                 }