分场站计算，分站用变和厂用电量

ruoyi-admin/src/test/java/com/ruoyi/NewTests.java

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateRange;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.ucp.entity.*;
@@ -35,28 +36,32 @@ public class NewTests {
 //        calcStationZhcydl(date);
 //        calcNhglZs(date);
         // 创建日期范围生成器
-        DateTime start = DateUtil.parse("2024-06-26");
+        DateTime start = DateUtil.parse("2024-01-02");
 //        DateTime start = DateUtil.parse("2024-05-01");
-        DateTime end = DateUtil.parse("2024-06-26");
+        DateTime end = DateUtil.parse("2024-07-15");
         DateRange range = DateUtil.range(start, end, DateField.DAY_OF_YEAR);
         for (DateTime time : range) {
-            date=time.toJdkDate();
+            date = time.toJdkDate();
             System.out.println(DateUtil.date().toString() + "：" + time.toString());
             //安全天数
 //            calcAQTS(time.toJdkDate());
-//            task.calcLineDjlRfdl(date);
-//            //上网购网厂用电量
-//            task.calcStationSwGwCyDl(date);
+            /*task.calcLineRfdl(date,"GJNY_SXGS_ZZ_FDC_STA");
+            task.calcStationSwGwCyRdl(date);
+            task.calcStationZhcyRfDl(date);
+            task.calcLineSwGWCyDl(date);
+            task.writeReportPool(date);
+            task.writeReportPoolProject(date);*/
 //            //计算综合厂用电量
 //            task.calcStationZhcydl(date);
 //
-//            task.calcTurbineRFDL(date);
-//            task.calcStationRfdlFj(date);
-//            task.writeReportPool(date);
+            task.calcTurbineRFDL(date);
+            task.calcStationRfdlFj(date);
+            task.calcTurbine5s2(date);
+            task.writeReportPool5SPjfsLlfdl(date);
 
 //            task.writeReportPool(date);
-//            task.calcTurbine5s2(date);
-
+//            int test = task.test(date, "zuozhuang.610825F02Y0AFA10GS009DQ0251DG02RAW00", 1320);
+//            System.out.println(test);
         }
 //        task.calcGlqxnh(start,end);
 //        calcTurbineRFDL(date);
@@ -64,6 +69,26 @@ public class NewTests {
 //        writeReportPool(date);
 
 //        task.calcStationSspjfs();
-        task.calcRealtimeTurbineZt();
+//        while (true) {
+//            task.calcRealtimeTurbineZt();
+//            ThreadUtil.sleep(1000);
+//        }
+    }
+
+    @Test
+    public void test2() {
+        // 创建日期范围生成器
+        DateTime start = DateUtil.parse("2024-07-10");
+        DateTime end = DateUtil.parse("2024-07-16");
+        DateRange range = DateUtil.range(start, end, DateField.DAY_OF_YEAR);
+        for (DateTime date : range) {
+            System.out.println(DateUtil.date() + "：" + date);
+//            task.calcLineRfdl(date,"GJNY_SXGS_JSL_FDC_STA");
+//            task.calcStationSwGwCyRdl(date,"GJNY_SXGS_JSL_FDC_STA");
+//            task.calcStationZhcyRfDl(date,"GJNY_SXGS_JSL_FDC_STA");
+//            task.calcLineSwGWCyDl(date,"GJNY_SXGS_JSL_FDC_STA");
+            task.writeReportPool(date);
+            task.writeReportPoolProject(date);
+        }
     }
 }

ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java

@@ -49,6 +49,7 @@ public class JobInvokeUtil {
         String JavaGlue = "package com.ruoyi.quartz;\n" +
                 "import com.ruoyi.quartz.handler.IJobHandler;\n" +
                 "import cn.hutool.core.date.DateUtil;\n" +
+                "import cn.hutool.core.thread.ThreadUtil;\n" +
                 "public class JavaGlueJobHandler extends IJobHandler {\n" +
                 "\n" +
                 "    private IJobHandler task;\n" +

universal-computing-platform/src/main/java/com/ruoyi/ucp/entity/LineInfoDay.java

@@ -37,5 +37,6 @@ public class LineInfoDay implements Serializable {
     private double  swdl;
     private double  gwdl;
     private double  cydl;
+    private double  zyb;
 
 }

universal-computing-platform/src/main/java/com/ruoyi/ucp/entity/ProEconReportIndicatorPool.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.time.LocalDate;
+import java.util.Date;
 
 /**
  * <p>
@@ -35,7 +35,7 @@ public class ProEconReportIndicatorPool extends Model<ProEconReportIndicatorPool
     /**
      * 日期
      */
-    private LocalDate recordDate;
+    private Date recordDate;
 
     /**
      * 类型

universal-computing-platform/src/main/java/com/ruoyi/ucp/entity/StationInfoDay.java

@@ -44,4 +44,6 @@ public class StationInfoDay implements Serializable {
     private Double hjwd;
 
     private Double rfdlFj;
+
+    private Integer zyb;
 }

universal-computing-platform/src/main/java/com/ruoyi/ucp/entity/TurbineInfoDay.java

@@ -40,5 +40,7 @@ public class TurbineInfoDay implements Serializable {
     private Double edfs;
     private Double xfqrfs;
     private Double hjwd;
+    private Double djss;
+    private Double gzss;
 
 }