Merge remote-tracking branch 'origin/master'

power-fitting-JN/src/main/java/com.gyee.power.fitting/dispersionanalysis/CalculateTask.java

@@ -33,7 +33,7 @@ public class CalculateTask {
     private RemoteServiceBuilder remoteService;
 
     //秒 分 时 日 月 周
-    @Scheduled(cron = "0 06 15 * * ?")
+    @Scheduled(cron = "0 0 2 * * ?")
     public void doTask() {
         List<ProBasicEquipment> equipmentList = proBasicEquipmentService.getCacheList();
         Map<String, ProBasicEquipmentPoint> sbztMap = proBasicEquipmentPointService.getEquipmentMapByUniformcode("SBZT");
@@ -68,10 +68,12 @@ public class CalculateTask {
                 TsDoubleData remove = datas8.remove(0);
                 long ts0 = remove != null ? remove.getTs() : starttime;
                 long ts1;
+                int doubleValue0 = remove != null ? (int) remove.getDoubleValue() : 7;
                 int doubleValue1;
                 for (TsDoubleData data : datas8) {
                     ts1 = data.getTs();
                     doubleValue1 = (int) data.getDoubleValue();
+                    if (doubleValue1 == doubleValue0) continue;
 
                     //0待机, 1运行, 2故障, 3检修, 4限电, 5受累, 6离线
                     if (doubleValue1 == 1) {
@@ -91,6 +93,8 @@ public class CalculateTask {
                     }
                     if (ts1 <= starttime) break;
                     ts0 = ts1;
+                    doubleValue0 = doubleValue1;
+
                 }
             }
 
@@ -101,10 +105,12 @@ public class CalculateTask {
                 TsDoubleData remove = datas14.remove(0);
                 long ts0 = remove != null ? remove.getTs() : starttime;
                 long ts1;
+                int doubleValue0 = remove != null ? (int) remove.getDoubleValue() : 7;
                 int doubleValue1;
                 for (TsDoubleData data : datas14) {
                     ts1 = data.getTs();
                     doubleValue1 = (int) data.getDoubleValue();
+                    if (doubleValue1 == doubleValue0) continue;
 
                     //0待机, 1手动停机, 2正常发电, 3发电降出力, 4故障, 5故障受累, 6检修, 7检修受累, 8限电降出力, 9限电停机, 10电网受累, 11环境受累, 12通讯中断, 13设备离线
                     if (doubleValue1 == 1) {
@@ -138,6 +144,7 @@ public class CalculateTask {
                     }
                     if (ts1 <= starttime) break;
                     ts0 = ts1;
+                    doubleValue0 = doubleValue1;
                 }
             }
         }
@@ -156,7 +163,7 @@ public class CalculateTask {
     }
 
     //秒 分 时 日 月 周
-    //@Scheduled(cron = "0 06 15 * * ?")
+//    @Scheduled(cron = "0 11 10 * * ?")
     public void creatStables() {
         List<ProBasicEquipment> equipmentList = proBasicEquipmentService.getCacheList();
 

power-fitting-JN/src/main/java/com.gyee.power.fitting/dispersionanalysis/PhotovoltaicAnalysisTask.java

@@ -51,7 +51,7 @@ public class PhotovoltaicAnalysisTask {
     private PhotovoltaicEfficiencyAnalysis2 photovoltaicEfficiencyAnalysis;
 
     //秒 分 时 日 月 周
-    @Scheduled(cron = "0 06 15 * * ?")
+    @Scheduled(cron = "0 0 1 * * ?")
     public void doTask() {
         //获取逆变器
         QueryWrapper<ProBasicEquipment> eWrapper = new QueryWrapper<>();
@@ -222,7 +222,7 @@ public class PhotovoltaicAnalysisTask {
         DateTime startTime;
         DateTime endTime = DateUtil.beginOfDay(DateUtil.yesterday());
         if (paList == null || paList.getDataDate() == null) {
-            startTime = endTime;
+            startTime = DateUtil.beginOfMonth(DateUtil.date());
         } else {
             startTime = DateUtil.offsetDay(paList.getDataDate(), 1);
             if (startTime.isAfter(endTime)) return null;