光伏发电量

electricity/meter/src/main/java/com/gyee/gaia/meter/service/SaveMeterInfoHistoryMonthYearTest.java

@@ -993,7 +993,10 @@ public class SaveMeterInfoHistoryMonthYearTest {
                 dateTime1 = DateUtil.offsetDay(startDateTime, i);
 
                 //根据每个场站的id,dateTime1,和集电线路总发电量的code拿到产站日发电量(集电线路总发电量)
-                List<MeterInfoCalculating> meterInfoCalculatingDay = meterInfoCalculatingService.list(new QueryWrapper<MeterInfoCalculating>().eq("windpowerstation_id", meterPoint.getWindpowerstationId()).eq("date", dateTime1.toLocalDateTime()).like("code", "%SWDL_SBS%_MONTH"));
+                List<MeterInfoCalculating> meterInfoCalculatingDay = meterInfoCalculatingService.list(new QueryWrapper<MeterInfoCalculating>()
+                        .eq("windpowerstation_id", meterPoint.getWindpowerstationId())
+                        .eq("date", dateTime1.toLocalDateTime())
+                        .like("code", "%SWDL_SBS%_MONTH"));
 
                 for (MeterInfoCalculating meterInfoCalculating : meterInfoCalculatingDay) {
                     //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue
@@ -1669,13 +1672,15 @@ public class SaveMeterInfoHistoryMonthYearTest {
         //开始日期到结束日期的天数
         LocalDateTime day1 = LocalDateTimeUtil.of(startDateTime);
         LocalDateTime day2 = LocalDateTimeUtil.of(endDateTime);
-        long between = ChronoUnit.MONTHS.between(day1, day2);
+        long between = ChronoUnit.DAYS.between(day1, day2);
 
         //2,meterPointJSD_YFDLList
         for (MeterPoint meterPoint : meterPointJSD_YFDLList) {
 
             DateTime dateTime1 = DateTime.of(0);
             double monthValue = 0.0;
+
+
             for (int i = 0; i <= between; i++) {
                 //开始时间00:00:01
                 dateTime1 = DateUtil.offsetDay(startDateTime, i);
@@ -1684,7 +1689,7 @@ public class SaveMeterInfoHistoryMonthYearTest {
                 List<MeterInfoCalculating> meterInfoCalculatingDay = meterInfoCalculatingService.list(new QueryWrapper<MeterInfoCalculating>()
                         .eq("windpowerstation_id", meterPoint.getWindpowerstationId())
                         .eq("date", dateTime1.toLocalDateTime())
-                        .like("code", "POWERSTATIONSWDL_MONTH"));
+                        .like("code", "_POWERSTATIONSWDL_P0"));
 
                 for (MeterInfoCalculating meterInfoCalculating : meterInfoCalculatingDay) {
                     //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue
@@ -1693,7 +1698,6 @@ public class SaveMeterInfoHistoryMonthYearTest {
 
             }
 
-
             // 将每个场站的每个月的value值存入到MeterInfoCalculating
             MeterInfoCalculating meterInfoCalculating = new MeterInfoCalculating();
             meterInfoCalculating.setName(meterPoint.getName());
@@ -1717,10 +1721,14 @@ public class SaveMeterInfoHistoryMonthYearTest {
 
     }
 
+
+
+
     @Test
     void savePowerstationSwdl_GF_Year() {
 
-        List<MeterPoint> meterPointJSD_YFDLList = meterPointService.list(new QueryWrapper<MeterPoint>().eq("property", "JSD_SWDL_YEAR"));
+        List<MeterPoint> meterPointJSD_YFDLList = meterPointService.list(new QueryWrapper<MeterPoint>()
+                .eq("property", "JSD_SWDL_YEAR"));
 
         //设置取值开始时间
         String startString = startTimeString;
@@ -1731,7 +1739,7 @@ public class SaveMeterInfoHistoryMonthYearTest {
         //开始日期到结束日期的天数
         LocalDateTime day1 = LocalDateTimeUtil.of(startDateTime);
         LocalDateTime day2 = LocalDateTimeUtil.of(endDateTime);
-        long between = ChronoUnit.YEARS.between(day1, day2);
+        long between = ChronoUnit.MONTHS.between(day1, day2);
 
         //2,meterPointJSD_YFDLList
         for (MeterPoint meterPoint : meterPointJSD_YFDLList) {
@@ -1746,7 +1754,7 @@ public class SaveMeterInfoHistoryMonthYearTest {
                 List<MeterInfoCalculating> meterInfoCalculatingDay = meterInfoCalculatingService.list(new QueryWrapper<MeterInfoCalculating>()
                         .eq("windpowerstation_id", meterPoint.getWindpowerstationId())
                         .eq("date", dateTime1.toLocalDateTime())
-                        .like("code", "%POWERSTATIONSWDL_YEAR"));
+                        .like("code", "%POWERSTATIONSWDL_MONTH"));
 
                 for (MeterInfoCalculating meterInfoCalculating : meterInfoCalculatingDay) {
                     //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue