优化后台计算算法

realtime/generationXK-service/src/main/java/com/gyee/generation/config/XxlJobConfig.java

@@ -18,8 +18,8 @@ import org.springframework.core.env.Environment;
 
 
 @Configuration
-@PropertySource("classpath:xxl-job-executor.properties")
-//@PropertySource("classpath:xxl-job-executor2.properties")
+//@PropertySource("classpath:xxl-job-executor.properties")
+@PropertySource("classpath:xxl-job-executor2.properties")
 //@PropertySource("classpath:xxl-job-executor3.properties")
 //@PropertySource("classpath:xxl-job-executorWPLY.properties")
 //@PropertySource("classpath:xxl-job-executorRG.properties")

realtime/generationXK-service/src/main/java/com/gyee/generation/service/EquipmentInfo5Service.java

@@ -1,13 +1,15 @@
 package com.gyee.generation.service;//package com.gyee.generation.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.common.contant.ContantXk;
+import com.gyee.common.model.PointData;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.ProBasicEquipment;
+import com.gyee.generation.model.auto.ProBasicEquipmentPoint;
 import com.gyee.generation.model.auto.ProEconEquipmentInfoDay5;
 import com.gyee.generation.model.auto.ProEconShutdownEvent2;
 import com.gyee.generation.service.auto.IProEconEquipmentInfoDay5Service;
 import com.gyee.generation.service.auto.IProEconShutdownEvent2Service;
-import com.gyee.generation.task.thread.EquipmentInfo5Thread;
 import com.gyee.generation.util.DateUtils;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
 import com.gyee.generation.util.statisticcs.Initial;
@@ -15,8 +17,6 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.*;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executor;
 import java.util.stream.Collectors;
 
 @Service
@@ -33,8 +33,6 @@ public class EquipmentInfo5Service {
     private IProEconEquipmentInfoDay5Service proEconEquipmentInfoDay5Service;
 
 
-    @Resource
-    private Executor executor;
     public void calEquipmentInfoDay(Date currentDate) throws Exception {
         resetRate(DateUtils.truncate(currentDate));
 
@@ -58,6 +56,11 @@ public class EquipmentInfo5Service {
         Map<String, ProEconEquipmentInfoDay5> rates = new HashMap<>();
 
         for (ProBasicEquipment wt : CacheContext.wtls) {
+
+            if(wt.getWindpowerstationId().contains("GDC"))
+            {
+                continue;
+            }
             ProEconEquipmentInfoDay5 rate = new ProEconEquipmentInfoDay5();
             rate.setRecordDate(currentDate);
             rate.setWindpowerstationId(wt.getWindpowerstationId());
@@ -146,8 +149,9 @@ public class EquipmentInfo5Service {
 
             }
 
-            stateRate(currentDate,rates);
         }
+
+        stateRate(currentDate,rates);
         List<ProEconEquipmentInfoDay5> dayls=new ArrayList<>();
         QueryWrapper<ProEconEquipmentInfoDay5> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.ge("record_date",currentDate);
@@ -180,14 +184,14 @@ public class EquipmentInfo5Service {
             templs.add(vo);
             if(templs.size()==100)
             {
-                proEconEquipmentInfoDay5Service.saveOrUpdateBatch(templs);
+                proEconEquipmentInfoDay5Service.saveBatch(templs);
                 templs=new ArrayList<>();
             }
         }
 
         if(!templs.isEmpty())
         {
-            proEconEquipmentInfoDay5Service.saveOrUpdateBatch(templs);
+            proEconEquipmentInfoDay5Service.saveBatch(templs);
         }
 
      //   proEconEquipmentInfoDay5Service.saveBatch(dayls);
@@ -210,6 +214,7 @@ public class EquipmentInfo5Service {
         dayInfo.setTimerate6(day.getTimerate6());
         dayInfo.setTimerate7(day.getTimerate7());
         dayInfo.setTimerate8(day.getTimerate8());
+        dayInfo.setTimerate9(day.getTimerate9());
         dayInfo.setTimerate10(day.getTimerate10());
         dayInfo.setTimerate11(day.getTimerate11());
         dayInfo.setTimerate12(day.getTimerate12());
@@ -252,16 +257,241 @@ public class EquipmentInfo5Service {
         Date beginDate = DateUtils.truncate(currentDate);
         Date endDate = DateUtils.addDays(currentDate, 1);
 
-
-        final CountDownLatch latch = new CountDownLatch(+CacheContext.wtls.size());
+//
+//        final CountDownLatch latch = new CountDownLatch(+CacheContext.wtls.size());
         for (ProBasicEquipment wt : CacheContext.wtls) {
 
-            new Thread(new EquipmentInfo5Thread(executor, wt,rates,
-                    endDate,  beginDate,
-                    edosUtil, stateDescription1,
-                    stateDescription2,latch)).start();
+            if(wt.getWindpowerstationId().contains("GDC"))
+            {
+                continue;
+            }
+            ProEconEquipmentInfoDay5 rate = rates.get(wt.getId());
+
+            List<PointData> speedDataList = null;
+            List<PointData> statusDataList = null;
+            if (CacheContext.wtpAimap.containsKey(wt.getId())) {
+                Map<String, ProBasicEquipmentPoint> wtpmap = CacheContext.wtpAimap.get(wt.getId());
+                if (wtpmap.containsKey(ContantXk.CJ_SSFS)) {
+                    ProBasicEquipmentPoint point = wtpmap.get(ContantXk.CJ_SSFS);
+                    speedDataList = edosUtil.getHistoryDatasSnap(point.getNemCode(), beginDate.getTime() / 1000, endDate.getTime() / 1000);
+                }
+                if (wtpmap.containsKey(ContantXk.MXZT)) {
+                    ProBasicEquipmentPoint point = wtpmap.get(ContantXk.MXZT);
+                    statusDataList = edosUtil.getHistoryDatasSnap(point.getNemCode(), beginDate.getTime() / 1000, endDate.getTime() / 1000);
+                }
+
+            }
+
+
+
+            if (speedDataList != null && statusDataList != null && statusDataList.size() == speedDataList.size() && !speedDataList.isEmpty()) {
+
+                double laststatus = -1;
+                Date begin = new Date();
+                for (int i = 0; i < speedDataList.size(); i++) {
+
+                    double status = statusDataList.get(i).getPointValueInDouble();
+                    double speed = speedDataList.get(i).getPointValueInDouble();
+                    if (i == 0) {
+                        begin = new Date(speedDataList.get(i).getPointTime());
+                        laststatus = status;
+                    }
+
+                    if (speed <= 3.0) {
+                        if (laststatus != status &&
+                                (status == stateDescription1.get(3.0) || status == stateDescription2.get(3.0))) {
+
+                            Date end = new Date(speedDataList.get(i).getPointTime());
+                            double zhcs = DateUtils.hoursDiff2(begin, end);
+                            if (zhcs < 0.25)//5分钟
+                            {
+
+                                double temp = rate.getTimerate1();
+                                temp = temp + 1;
+                                rate.setTimerate1(temp);
+
+                                temp = rate.getTimerate2();
+                                temp = temp + 1;
+                                rate.setTimerate2(temp);
+
+                                temp = rate.getTimerate3();
+                                temp = temp + 1;
+                                rate.setTimerate3(temp);
+
+                                temp = rate.getTimerate4();
+                                temp = temp + 1;
+                                rate.setTimerate4(temp);
+
+                            } else if (zhcs < 0.33)//10分钟
+                            {
+                                double temp = rate.getTimerate2();
+                                temp = temp + 1;
+                                rate.setTimerate2(temp);
+
+                                temp = rate.getTimerate3();
+                                temp = temp + 1;
+                                rate.setTimerate3(temp);
+
+                                temp = rate.getTimerate4();
+                                temp = temp + 1;
+                                rate.setTimerate4(temp);
+                            } else if (zhcs < 0.42)//15分钟
+                            {
+                                double temp = rate.getTimerate3();
+                                temp = temp + 1;
+                                rate.setTimerate3(temp);
+
+                                temp = rate.getTimerate4();
+                                temp = temp + 1;
+                                rate.setTimerate4(temp);
+                            } else if (zhcs < 0.5)//20分钟
+                            {
+                                double temp = rate.getTimerate4();
+                                temp = temp + 1;
+                                rate.setTimerate4(temp);
+                            }
+
+
+                            double temp = rate.getTimerate13();
+                            temp = temp + 1;
+                            rate.setTimerate13(temp);
+                        }
+
+                        laststatus = status;
+                        begin = new Date(speedDataList.get(i).getPointTime());
+                    } else if (speed <= 4.0 && speed > 3.0) {
+                        if (laststatus != status &&
+                                (status == stateDescription1.get(3.5) || status == stateDescription2.get(3.5))) {
+
+                            Date end = new Date(speedDataList.get(i).getPointTime());
+                            double zhcs = DateUtils.hoursDiff2(begin, end);
+                            if (zhcs < 0.25)//5分钟
+                            {
+
+                                double temp = rate.getTimerate5();
+                                temp = temp + 1;
+                                rate.setTimerate5(temp);
+
+                                temp = rate.getTimerate6();
+                                temp = temp + 1;
+                                rate.setTimerate6(temp);
+
+                                temp = rate.getTimerate7();
+                                temp = temp + 1;
+                                rate.setTimerate7(temp);
+
+                                temp = rate.getTimerate8();
+                                temp = temp + 1;
+                                rate.setTimerate8(temp);
+                            } else if (zhcs < 0.33)//10分钟
+                            {
+
+                                double temp = rate.getTimerate6();
+                                temp = temp + 1;
+                                rate.setTimerate6(temp);
+
+                                temp = rate.getTimerate7();
+                                temp = temp + 1;
+                                rate.setTimerate7(temp);
+
+                                temp = rate.getTimerate8();
+                                temp = temp + 1;
+                                rate.setTimerate8(temp);
+                            } else if (zhcs < 0.42)//15分钟
+                            {
+                                double temp = rate.getTimerate7();
+                                temp = temp + 1;
+                                rate.setTimerate7(temp);
+
+                                temp = rate.getTimerate8();
+                                temp = temp + 1;
+                                rate.setTimerate8(temp);
+
+                            } else if (zhcs < 0.5)//20分钟
+                            {
+                                double temp = rate.getTimerate8();
+                                temp = temp + 1;
+                                rate.setTimerate8(temp);
+                            }
+
+                            //}
+                            double temp = rate.getTimerate14();
+                            temp = temp + 1;
+                            rate.setTimerate14(temp);
+
+                        }
+
+                        laststatus = status;
+                        begin = new Date(speedDataList.get(i).getPointTime());
+                    } else {
+                        if (laststatus != status &&
+                                (status == stateDescription1.get(4.0) || status == stateDescription2.get(4.0))) {
+
+                            Date end = new Date(speedDataList.get(i).getPointTime());
+                            double zhcs = DateUtils.hoursDiff2(begin, end);
+                            if (zhcs < 0.25)//5分钟
+                            {
+
+                                double temp = rate.getTimerate9();
+                                temp = temp + 1;
+                                rate.setTimerate9(temp);
+
+                                temp = rate.getTimerate10();
+                                temp = temp + 1;
+                                rate.setTimerate10(temp);
+
+                                temp = rate.getTimerate11();
+                                temp = temp + 1;
+                                rate.setTimerate11(temp);
+
+                                temp = rate.getTimerate12();
+                                temp = temp + 1;
+                                rate.setTimerate12(temp);
+                            } else if (zhcs < 0.33)//10分钟
+                            {
+
+                                double temp = rate.getTimerate10();
+                                temp = temp + 1;
+                                rate.setTimerate10(temp);
+
+                                temp = rate.getTimerate11();
+                                temp = temp + 1;
+                                rate.setTimerate11(temp);
+
+                                temp = rate.getTimerate12();
+                                temp = temp + 1;
+                                rate.setTimerate12(temp);
+                            } else if (zhcs < 0.42)//15分钟
+                            {
+
+                                double temp = rate.getTimerate11();
+                                temp = temp + 1;
+                                rate.setTimerate11(temp);
+
+                                temp = rate.getTimerate12();
+                                temp = temp + 1;
+                                rate.setTimerate12(temp);
+                            } else if (zhcs < 0.5)//20分钟
+                            {
+                                double temp = rate.getTimerate12();
+                                temp = temp + 1;
+                                rate.setTimerate12(temp);
+                            }
+
+                            double temp = rate.getTimerate15();
+                            temp = temp + 1;
+                            rate.setTimerate15(temp);
+
+
+                            laststatus = status;
+                            begin = new Date(speedDataList.get(i).getPointTime());
+                        }
+                    }
+                }
+
+            }
         }
-        latch.await();
+       // latch.await();
 
 
     }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/PowerCurveFittingByTimeService.java

@@ -1104,13 +1104,16 @@ public class PowerCurveFittingByTimeService {
 //                        if (l) {
 //                            continue;
 //                        }
-                        item.setSpeed(sjglls.get(i).getX());
-
+//                        item.setSpeed(sjglls.get(i).getX());
+                        item.setSpeed(StringUtils.round(sjglls.get(i).getX(),2));
                     }
 
 
-                    item.setActualPower(sjglls.get(i).getY());
-                    item.setOptimalPower(zyglls.get(i).getY());
+//                    item.setActualPower(sjglls.get(i).getY());
+//                    item.setOptimalPower(zyglls.get(i).getY());
+
+                    item.setActualPower(StringUtils.round(sjglls.get(i).getY(),2));
+                    item.setOptimalPower(StringUtils.round(zyglls.get(i).getY(),2));
                     item.setRecordDate(DateUtils.truncate(current));
 
                     wtcfls.add(item);
@@ -1136,7 +1139,8 @@ public class PowerCurveFittingByTimeService {
                         if (l) {
                             continue;
                         }
-                        item.setSpeed(sjglls.get(i).getX());
+//                        item.setSpeed(sjglls.get(i).getX());
+                        item.setSpeed(StringUtils.round(sjglls.get(i).getX(),2));
                     }
 
 
@@ -1149,7 +1153,9 @@ public class PowerCurveFittingByTimeService {
                         item.setOptimalPower(0.0);
                     }
 
-                    item.setActualPower(sjglls.get(i).getY());
+//                    item.setActualPower(sjglls.get(i).getY());
+                    item.setActualPower(StringUtils.round(sjglls.get(i).getY(),2));
+                    item.setOptimalPower(StringUtils.round(zyglls.get(i).getY(),2));
                     item.setRecordDate(current);
                     wtcfls.add(item);
                     //proEconWtCurveFittingService.save(item);
@@ -1203,11 +1209,13 @@ public class PowerCurveFittingByTimeService {
                         continue;
                         // item.SPEED = Double.Truncate(pointsF1[i].X);
                     } else {
-                        item.setSpeed(sjglls.get(i).getX());
-
+                        //item.setSpeed(sjglls.get(i).getX());
+                        item.setSpeed(StringUtils.round(sjglls.get(i).getX(),2));
                     }
-                    item.setActualPower(sjglls.get(i).getY());
-                    item.setOptimalPower(zyglls.get(i).getY());
+//                    item.setActualPower(sjglls.get(i).getY());
+//                    item.setOptimalPower(zyglls.get(i).getY());
+                    item.setActualPower(StringUtils.round(sjglls.get(i).getY(),2));
+                    item.setOptimalPower(StringUtils.round(zyglls.get(i).getY(),2));
                     item.setYear(String.valueOf(year));
                     item.setMonth(String.valueOf(month));
                     wtcfls.add(item);
@@ -1230,9 +1238,10 @@ public class PowerCurveFittingByTimeService {
                         //item.SPEED = Double.Truncate(pointsF1[i].X);
                     } else {
 
-                        item.setSpeed(sjglls.get(i).getX());
+//                        item.setSpeed(sjglls.get(i).getX());
+                        item.setSpeed(StringUtils.round(sjglls.get(i).getX(),2));
                     }
-                    item.setActualPower(sjglls.get(i).getY());
+//                    item.setActualPower(sjglls.get(i).getY());
 
                     int finalI = i;
                     OptionalDouble op = zyglls.stream().filter(x -> Objects.equals(x.getX(), sjglls.get(finalI).getX())).mapToDouble(PointVo::getY).findFirst();
@@ -1242,7 +1251,8 @@ public class PowerCurveFittingByTimeService {
                     } else {
                         item.setOptimalPower(0.0);
                     }
-
+                    item.setActualPower(StringUtils.round(sjglls.get(i).getY(),2));
+                    item.setOptimalPower(StringUtils.round(zyglls.get(i).getY(),2));
                     item.setYear(String.valueOf(year));
                     item.setMonth(String.valueOf(month));
                     wtcfls.add(item);
@@ -1293,11 +1303,13 @@ public class PowerCurveFittingByTimeService {
                         continue;
                         // item.SPEED = Double.Truncate(pointsF1[i].X);
                     } else {
-                        item.setSpeed(sjglls.get(i).getX());
-
+//                        item.setSpeed(sjglls.get(i).getX());
+                        item.setSpeed(StringUtils.round(sjglls.get(i).getX(),2));
                     }
-                    item.setActualPower(sjglls.get(i).getY());
-                    item.setOptimalPower(zyglls.get(i).getY());
+//                    item.setActualPower(sjglls.get(i).getY());
+//                    item.setOptimalPower(zyglls.get(i).getY());
+                    item.setActualPower(StringUtils.round(sjglls.get(i).getY(),2));
+                    item.setOptimalPower(StringUtils.round(zyglls.get(i).getY(),2));
                     item.setYear(String.valueOf(year));
                     wtcfls.add(item);
                     // proEconWtCurveFittingYearService.save(item);
@@ -1319,9 +1331,10 @@ public class PowerCurveFittingByTimeService {
                         //item.SPEED = Double.Truncate(pointsF1[i].X);
                     } else {
 
-                        item.setSpeed(sjglls.get(i).getX());
+//                        item.setSpeed(sjglls.get(i).getX());
+                        item.setSpeed(StringUtils.round(sjglls.get(i).getX(),2));
                     }
-                    item.setActualPower(sjglls.get(i).getY());
+//                    item.setActualPower(sjglls.get(i).getY());
 
                     int finalI = i;
                     OptionalDouble op = zyglls.stream().filter(x -> Objects.equals(x.getX(), sjglls.get(finalI).getX())).mapToDouble(PointVo::getY).findFirst();
@@ -1331,7 +1344,8 @@ public class PowerCurveFittingByTimeService {
                     } else {
                         item.setOptimalPower(0.0);
                     }
-
+                    item.setActualPower(StringUtils.round(sjglls.get(i).getY(),2));
+                    item.setOptimalPower(StringUtils.round(zyglls.get(i).getY(),2));
                     item.setYear(String.valueOf(year));
                     wtcfls.add(item);
                     //proEconWtCurveFittingYearService.save(item);
@@ -1394,11 +1408,15 @@ public class PowerCurveFittingByTimeService {
                             continue;
                         }
                         item.setSpeed(monthSjglls.get(i).getX());
+                        item.setSpeed(StringUtils.round(monthSjglls.get(i).getX(),2));
                     }
 
 
-                    item.setActualPower(monthSjglls.get(i).getY());
-                    item.setOptimalPower(monthZyglls.get(i).getY());
+//                    item.setActualPower(monthSjglls.get(i).getY());
+//                    item.setOptimalPower(monthZyglls.get(i).getY());
+
+                    item.setActualPower(StringUtils.round(monthSjglls.get(i).getY(),2));
+                    item.setOptimalPower(StringUtils.round(monthZyglls.get(i).getY(),2));
 
                     wtcfls.add(item);
                     //proEconWtPowerCurveFittingService.save(item);
@@ -1425,11 +1443,12 @@ public class PowerCurveFittingByTimeService {
                         if (l) {
                             continue;
                         }
-                        item.setSpeed(monthSjglls.get(i).getX());
+//                        item.setSpeed(monthSjglls.get(i).getX());
+                        item.setSpeed(StringUtils.round(monthSjglls.get(i).getX(),2));
                     }
 
 
-                    item.setActualPower(monthSjglls.get(i).getY());
+//                    item.setActualPower(monthSjglls.get(i).getY());
                     int finalI = i;
                     OptionalDouble op = monthZyglls.stream().filter(x -> Objects.equals(x.getX(), monthSjglls.get(finalI).getX())).mapToDouble(PointVo::getY).findFirst();
 
@@ -1438,7 +1457,8 @@ public class PowerCurveFittingByTimeService {
                     } else {
                         item.setOptimalPower(0.0);
                     }
-
+                    item.setActualPower(StringUtils.round(monthSjglls.get(i).getY(),2));
+                    item.setOptimalPower(StringUtils.round(monthZyglls.get(i).getY(),2));
                     wtcfls.add(item);
                     //proEconWtPowerCurveFittingService.save(item);
                 }

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

@@ -216,8 +216,8 @@ public class SaticSchedulePgTask {
             XxlJobHelper.log("年处理完成!........");
 
             powerCurveFittingByTimeGfService.cureFittingDay(date);
-            powerCurveFittingByTimeGfService.cureFittingMonth(date,"0");
-            powerCurveFittingByTimeGfService.cureFittingYear(date);
+//            powerCurveFittingByTimeGfService.cureFittingMonth(date,"0");
+//            powerCurveFittingByTimeGfService.cureFittingYear(date);
 
 
 

realtime/generationXK-service/src/main/resources/application-jn.yml

@@ -117,7 +117,7 @@ db:
 
 #参与计算的场站
 #runWindpowerstation: SXJ_KGDL_GJY_FDC_STA
-runWindpowerstation: SXJ_KGDL_BHB3_FDC_STA,SXJ_KGDL_BHB_FDC_STA,SXJ_KGDL_GJY_FDC_STA,SXJ_KGDL_HSM_FDC_STA,SXJ_KGDL_NJL_FDC_STA,SXJ_KGDL_PDL_FDC_STA,SXJ_KGDL_PTZ_FDC_STA,SXJ_KGDL_SY_GDC_STA,SXJ_KGDL_XWT_FDC_STA,SXJ_KGDL_YF_FDC_STA,SXJ_KGDL_YLZ_FDC_STA,SXJ_KGDL_YTY_FDC_STA,SXJ_KGDL_ZK_FDC_STA
+runWindpowerstation: SXJ_KGDL_NJL_FDC_STA,SXJ_KGDL_YF_FDC_STA,SXJ_KGDL_YLZ_FDC_STA,SXJ_KGDL_XWT_FDC_STA,SXJ_KGDL_PTZ_FDC_STA,SXJ_KGDL_GJY_FDC_STA,SXJ_KGDL_BHB_FDC_STA,SXJ_KGDL_HSM_FDC_STA,SXJ_KGDL_YTY_FDC_STA,SXJ_KGDL_BHB3_FDC_STA,SXJ_KGDL_SY_GDC_STA,SXJ_KGDL_PDL_FDC_STA,SXJ_KGDL_ZK_FDC_STASXJ_KGDL_JR_GDC_STA,SXJ_KGDL_FS_GDC_STA,SXJ_KGDL_HR_GDC_STA,SXJ_KGDL_YY_GDC_STA,SXJ_KGDL_PL_GDC_STA,SXJ_KGDL_TL_GDC_STA
 #计算状态用ai或者di
 clauStatus:
   ai: GJY03_GC,YLZ01_GC,PTZ02_GC   #配置期次

realtime/generationXK-service/src/test/java/com/gyee/generation/HealthTest.java

@@ -1,16 +1,12 @@
 package com.gyee.generation;
 
-import com.gyee.generation.model.auto.ProBasicPowerstation;
-import com.gyee.generation.service.InputOrOutPutService;
-import com.gyee.generation.service.LimitEventnewService;
+import com.gyee.generation.service.*;
 import com.gyee.generation.util.DateUtils;
 import com.gyee.generation.util.SpringUtils;
 import org.springframework.boot.SpringApplication;
 
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.List;
 
 public class HealthTest {
 
@@ -94,21 +90,21 @@ public class HealthTest {
 //        System.out.println("停机记录调度程序执行结束!。。。。。。");
 //
 //
-        begin=new Date();
-        System.out.println("限电停机记录调度程序执行开始!。。。。。。");
-        LimitEventnewService limitEventnewService= SpringUtils.getBean("limitEventnewService");
+//        begin=new Date();
+//        System.out.println("限电停机记录调度程序执行开始!。。。。。。");
+//        LimitEventnewService limitEventnewService= SpringUtils.getBean("limitEventnewService");
+////
+//
+//       List<ProBasicPowerstation> wpls=new ArrayList<>();
+//
+////        ProBasicPowerstation wp=  CacheContext.wpmap.get("SXJ_KGDL_GJY_FDC_STA");
+////       wpls.add(wp);
+////        List<ProBasicEquipment> wtls=CacheContext.wpwtmap.get("SXJ_KGDL_GJY_FDC_STA");
+//        limitEventnewService.execBrownouts(c.getTime());
+//        end=new Date();
+//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+//        System.out.println("限电停机记录调度程序执行结束!。。。。。。");
 //
-
-       List<ProBasicPowerstation> wpls=new ArrayList<>();
-
-//        ProBasicPowerstation wp=  CacheContext.wpmap.get("SXJ_KGDL_GJY_FDC_STA");
-//       wpls.add(wp);
-//        List<ProBasicEquipment> wtls=CacheContext.wpwtmap.get("SXJ_KGDL_GJY_FDC_STA");
-        limitEventnewService.execBrownouts(c.getTime());
-        end=new Date();
-        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
-        System.out.println("限电停机记录调度程序执行结束!。。。。。。");
-
 //
 //        begin=new Date();
 //        System.out.println("曲线拟合调度程序执行开始!。。。。。。");
@@ -181,13 +177,13 @@ public class HealthTest {
 //        System.out.println("场站指标记录调度程序执行结束!。。。。。。");
 //
 //
-//        begin=new Date();
-//        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
-//       EquipmentInfo1Service equipmentInfo1Service= SpringUtils.getBean("equipmentInfo1Service");
-//        EquipmentInfo2Service equipmentInfo2Service= SpringUtils.getBean("equipmentInfo2Service");
-//        EquipmentInfo3Service equipmentInfo3Service= SpringUtils.getBean("equipmentInfo3Service");
-//        EquipmentInfo4Service equipmentInfo4Service= SpringUtils.getBean("equipmentInfo4Service");
-//        EquipmentInfo5Service equipmentInfo5Service= SpringUtils.getBean("equipmentInfo5Service");
+        begin=new Date();
+        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
+       EquipmentInfo1Service equipmentInfo1Service= SpringUtils.getBean("equipmentInfo1Service");
+        EquipmentInfo2Service equipmentInfo2Service= SpringUtils.getBean("equipmentInfo2Service");
+        EquipmentInfo3Service equipmentInfo3Service= SpringUtils.getBean("equipmentInfo3Service");
+        EquipmentInfo4Service equipmentInfo4Service= SpringUtils.getBean("equipmentInfo4Service");
+        EquipmentInfo5Service equipmentInfo5Service= SpringUtils.getBean("equipmentInfo5Service");
 //        EquipmentInfoDayTopService equipmentInfoDayTopService= SpringUtils.getBean("equipmentInfoDayTopService");
 //        WtAlysisDayService wtAlysisDayService= SpringUtils.getBean("wtAlysisDayService");
 //
@@ -199,16 +195,16 @@ public class HealthTest {
 //
 //        equipmentInfo4Service.calEquipmentInfoDay(c.getTime());
 //
-//        equipmentInfo5Service.calEquipmentInfoDay(c.getTime());
+        equipmentInfo5Service.calEquipmentInfoDay(c.getTime());
 //
 //        equipmentInfoDayTopService.calEquipmentInfoDayTop(c.getTime());
 //        equipmentInfoDayTopService.calEquipmentInfoMonthTop(c.getTime());
 //        equipmentInfoDayTopService.calEquipmentInfoYearTop(c.getTime());
 //
 //        wtAlysisDayService.calEquipmentInfoDay(c.getTime());
-//        end=new Date();
-//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
-//        System.out.println("设备指标记录调度程序执行结束!。。。。。。");
+        end=new Date();
+        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+        System.out.println("设备指标记录调度程序执行结束!。。。。。。");
 //
 //
 //