1.1版本,统一调度

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

@@ -11,6 +11,7 @@ import com.gyee.gaia.meter.util.ScriptShell;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -25,6 +26,7 @@ import java.util.*;
  * Data  : 2023: 04: 27
  **/
 @Service
+@RefreshScope
 class SaveMeterInfoHistoryDay {
 
 
@@ -1872,6 +1874,10 @@ class SaveMeterInfoHistoryDay {
         this.saveCalculating_GF();
     }
 
+
+
+
+    //补数(全)
     @XxlJob("meterinfoDayMonthYear_GF_FD")
     public void  meterinfoDayMonthYear(){
         saveMeterInfoHistoryMonthYear.sumGF_FD();

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

@@ -12,6 +12,7 @@ import com.gyee.gaia.meter.service.impl.MeterInfoCalculatingServiceImpl;
 import com.gyee.gaia.meter.service.impl.MeterPointServiceImpl;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -26,6 +27,7 @@ import java.util.List;
  * Data  : 2023: 05: 17
  **/
 @Service
+@RefreshScope
 public class SaveMeterInfoHistoryMonthYear {
 
     @Resource
@@ -1420,7 +1422,10 @@ public class SaveMeterInfoHistoryMonthYear {
             meterInfoCalculating.setWindpowerstationId(meterPoint.getWindpowerstationId());
 
             QueryWrapper<MeterInfoCalculating> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("code", meterPoint.getNemCode()).eq("date", dateTime1.toLocalDateTime().withDayOfYear(1).withNano(0).withSecond(0).withMinute(0).withHour(0)).eq("windpowerstation_id", meterPoint.getWindpowerstationId());
+            queryWrapper
+                    .eq("code", meterPoint.getNemCode())
+                    .eq("date", dateTime1.toLocalDateTime().withDayOfYear(1).withNano(0).withSecond(0).withMinute(0).withHour(0))
+                    .eq("windpowerstation_id", meterPoint.getWindpowerstationId());
             List<MeterInfoCalculating> list = meterInfoCalculatingService.list(queryWrapper);
             if (list.size() > 0) {
                 meterInfoCalculating.update(queryWrapper);
@@ -1517,7 +1522,9 @@ public class SaveMeterInfoHistoryMonthYear {
             //根据每个场站的id,dateTime1,和集电线路总发电量的code拿到产站日发电量(集电线路项目期次侧)
             List<MeterInfoCalculating> meterInfoCalculatingDay = meterInfoCalculatingService.list(new QueryWrapper<MeterInfoCalculating>()
                     .eq("date", dateTime1.toLocalDateTime())
-                    .like("code", "_POWERSTATIONFDL_MONTH"));
+                    .like("code", "_POWERSTATIONFDL_MONTH")
+                    .like("windpowerstation_id", "_GDC_")
+            );
             //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue
             if (meterInfoCalculatingDay.size() > 0) {
                 for (MeterInfoCalculating meterInfoCalculating : meterInfoCalculatingDay) {
@@ -1578,7 +1585,8 @@ public class SaveMeterInfoHistoryMonthYear {
             //根据每个场站的id,dateTime1,和集电线路总发电量的code拿到产站日发电量(集电线路期次)
             MeterInfoCalculating meterInfoCalculating = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>()
                     .eq("date", dateTime1.toLocalDateTime())
-                    .eq("code", "DL.NX_GD_GFFDL_MONTH"));
+                    .eq("code", "DL.NX_GD_GFFDL_MONTH")
+            );
 
             //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue
             if (meterInfoCalculating != null) {
@@ -1596,7 +1604,9 @@ public class SaveMeterInfoHistoryMonthYear {
         meterInfoCalculating.setUpdateTime(LocalDateTime.now());
 
         QueryWrapper<MeterInfoCalculating> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("code", meterPoint.getNemCode()).eq("date", dateTime1.toLocalDateTime().withDayOfYear(1).withNano(0).withSecond(0).withMinute(0).withHour(0));
+        queryWrapper
+                .eq("code", meterPoint.getNemCode())
+                .eq("date", dateTime1.toLocalDateTime().withDayOfYear(1).withNano(0).withSecond(0).withMinute(0).withHour(0));
         List<MeterInfoCalculating> list = meterInfoCalculatingService.list(queryWrapper);
         if (list.size() > 0) {
             meterInfoCalculating.update(queryWrapper);

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

@@ -1542,7 +1542,9 @@ public class SaveMeterInfoHistoryMonthYearTest {
             //根据每个场站的id,dateTime1,和集电线路总发电量的code拿到产站日发电量(集电线路项目期次侧)
             List<MeterInfoCalculating> meterInfoCalculatingDay = meterInfoCalculatingService.list(new QueryWrapper<MeterInfoCalculating>()
                     .eq("date", dateTime1.toLocalDateTime())
-                    .like("code", "_POWERSTATIONFDL_MONTH"));
+                    .like("code", "_POWERSTATIONFDL_MONTH")
+                    .like("windpowerstation_id", "_GDC_")
+            );
             //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue
             if (meterInfoCalculatingDay.size() > 0) {
                 for (MeterInfoCalculating meterInfoCalculating : meterInfoCalculatingDay) {
@@ -1604,7 +1606,8 @@ public class SaveMeterInfoHistoryMonthYearTest {
             //根据每个场站的id,dateTime1,和集电线路总发电量的code拿到产站日发电量(集电线路期次)
             MeterInfoCalculating meterInfoCalculating = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>()
                     .eq("date", dateTime1.toLocalDateTime())
-                    .eq("code", "DL.NX_GD_GFFDL_MONTH"));
+                    .eq("code", "DL.NX_GD_GFFDL_MONTH")
+            );
 
             //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue
             if (meterInfoCalculating != null) {
@@ -1730,7 +1733,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_MONTH"));
 
                 for (MeterInfoCalculating meterInfoCalculating : meterInfoCalculatingDay) {
                     //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue
@@ -1738,8 +1741,6 @@ public class SaveMeterInfoHistoryMonthYearTest {
                 }
 
             }
-
-
             // 将每个场站的每个月的value值存入到MeterInfoCalculating
             MeterInfoCalculating meterInfoCalculating = new MeterInfoCalculating();
             meterInfoCalculating.setName(meterPoint.getName());
@@ -1751,7 +1752,10 @@ public class SaveMeterInfoHistoryMonthYearTest {
             meterInfoCalculating.setWindpowerstationId(meterPoint.getWindpowerstationId());
 
             QueryWrapper<MeterInfoCalculating> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("code", meterPoint.getNemCode()).eq("date", dateTime1.toLocalDateTime().withDayOfMonth(1).withNano(0).withSecond(0).withMinute(0).withHour(0)).eq("windpowerstation_id", meterPoint.getWindpowerstationId());
+            queryWrapper
+                    .eq("code", meterPoint.getNemCode())
+                    .eq("date", dateTime1.toLocalDateTime().withDayOfYear(1).withNano(0).withSecond(0).withMinute(0).withHour(0))
+                    .eq("windpowerstation_id", meterPoint.getWindpowerstationId());
             List<MeterInfoCalculating> list = meterInfoCalculatingService.list(queryWrapper);
             if (list.size() > 0) {
                 meterInfoCalculating.update(queryWrapper);
@@ -1934,7 +1938,9 @@ public class SaveMeterInfoHistoryMonthYearTest {
         meterInfoCalculating.setUpdateTime(LocalDateTime.now());
 
         QueryWrapper<MeterInfoCalculating> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("code", meterPoint.getNemCode()).eq("date", dateTime1.toLocalDateTime().withDayOfYear(1).withNano(0).withSecond(0).withMinute(0).withHour(0));
+        queryWrapper
+                .eq("code", meterPoint.getNemCode())
+                .eq("date", dateTime1.toLocalDateTime().withDayOfYear(1).withNano(0).withSecond(0).withMinute(0).withHour(0));
         List<MeterInfoCalculating> list = meterInfoCalculatingService.list(queryWrapper);
         if (list.size() > 0) {
             meterInfoCalculating.update(queryWrapper);

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

@@ -798,7 +798,10 @@ public class SaveFDL_Day_Month_Year {
             //根据每个场站的id,dateTime1,和集电线路总发电量的code拿到产站日发电量(集电线路项目期次侧)
             List<MeterInfoCalculating> meterInfoCalculatingDay = meterInfoCalculatingService.list(new QueryWrapper<MeterInfoCalculating>()
                     .eq("date", dateTime1.toLocalDateTime())
-                    .like("code", "_POWERSTATIONFDL_MONTH"));
+                    .like("code", "_POWERSTATIONFDL_MONTH")
+                    .like("windpowerstation_id", "_GDC_")
+
+            );
             //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue
             if (meterInfoCalculatingDay.size() > 0) {
                 for (MeterInfoCalculating meterInfoCalculating : meterInfoCalculatingDay) {
@@ -856,7 +859,9 @@ public class SaveFDL_Day_Month_Year {
             //根据每个场站的id,dateTime1,和集电线路总发电量的code拿到产站日发电量(集电线路期次)
             MeterInfoCalculating meterInfoCalculating = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>()
                     .eq("date", dateTime1.toLocalDateTime())
-                    .eq("code", "DL.NX_GD_GFFDL_MONTH"));
+                    .eq("code", "DL.NX_GD_GFFDL_MONTH")
+                    .like("windpowerstation_id", "_GDC_")
+            );
 
             //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue
             if (meterInfoCalculating != null) {

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

@@ -596,7 +596,9 @@ public class SaveSWDL_Day_Month_Year {
             meterInfoCalculating.setWindpowerstationId(meterPoint.getWindpowerstationId());
 
             QueryWrapper<MeterInfoCalculating> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("code", meterPoint.getNemCode()).eq("date", dateTime1.toLocalDateTime().withDayOfMonth(1).withNano(0).withSecond(0).withMinute(0).withHour(0)).eq("windpowerstation_id", meterPoint.getWindpowerstationId());
+            queryWrapper.eq("code", meterPoint.getNemCode())
+                    .eq("date", dateTime1.toLocalDateTime().withDayOfYear(1).withNano(0).withSecond(0).withMinute(0).withHour(0))
+                    .eq("windpowerstation_id", meterPoint.getWindpowerstationId());
             List<MeterInfoCalculating> list = meterInfoCalculatingService.list(queryWrapper);
             if (list.size() > 0) {
                 meterInfoCalculating.update(queryWrapper);