计划发电量修改

realtime/generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/EdosUtil.java

@@ -65,9 +65,16 @@ public class EdosUtil implements IEdosUtil {
                 if (StringUtils.isNotEmpty(jsonArray)){
                     List<PointData> list = JsonObjectHelper.phrasePointData(jsonArray);
                     if (list.size() > 0)
-                        return list.get(0);
+                    {
+                        PointData po=list.get(0);
+                        po.setPointValueInDouble(StringUtils.round(po.getPointValueInDouble(),4));
+                        return po;
+                    }
                     else
+                    {
                         return ErrorRequest.RequestError(point.getNemCode());
+                    }
+
                 } else {
                     return ErrorRequest.RequestError(point.getNemCode());
                 }
@@ -241,7 +248,9 @@ public class EdosUtil implements IEdosUtil {
 
                     if(snapList.isEmpty())
                     {
-
+                        for (PointData snapItem : resultList) {
+                            snapItem.setPointValueInDouble(StringUtils.round(snapItem.getPointValueInDouble(),4));
+                        }
                         getHistsnapSameTiem(point.getNemCode(), beginDate, pried, resultList);
                     }else
                     {
@@ -262,6 +271,7 @@ public class EdosUtil implements IEdosUtil {
                                 List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
                                 if (sectionlist.size() > 0) {
                                     if(sectionlist.get(0).getPointTime()<=snapItem.getPointTime()){
+                                        snapItem.setPointValueInDouble(StringUtils.round(snapItem.getPointValueInDouble(),4));
                                         resultList.add(snapItem);
                                     }
                                     else{
@@ -470,9 +480,15 @@ public class EdosUtil implements IEdosUtil {
                 if (StringUtils.isNotEmpty(jsonArray)){
                     List<PointData> list = JsonObjectHelper.phrasePointData(jsonArray);
                     if (list.size() > 0)
-                        return list.get(0);
+                    {
+                        PointData po=list.get(0);
+                        po.setPointValueInDouble(StringUtils.round(po.getPointValueInDouble(),4));
+                        return po;
+                    }
                     else
+                    {
                         return ErrorRequest.RequestError(point.getNemCode());
+                    }
                 } else {
                     return ErrorRequest.RequestError(point.getNemCode());
                 }
@@ -550,7 +566,9 @@ public class EdosUtil implements IEdosUtil {
 
                     if(snapList.isEmpty())
                     {
-
+                        for (PointData snapItem : resultList) {
+                            snapItem.setPointValueInDouble(StringUtils.round(snapItem.getPointValueInDouble(),4));
+                        }
                         getHistsnapSameTiem(point.getNemCode(), beginDate, pried, resultList);
                     }else
                     {
@@ -572,6 +590,7 @@ public class EdosUtil implements IEdosUtil {
                                 List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
                                 if (sectionlist.size() > 0) {
                                     if(sectionlist.get(0).getPointTime()<=snapItem.getPointTime()){
+                                        snapItem.setPointValueInDouble(StringUtils.round(snapItem.getPointValueInDouble(),4));
                                         resultList.add(snapItem);
                                     }
                                     else{
@@ -715,9 +734,15 @@ public class EdosUtil implements IEdosUtil {
                 if (StringUtils.isNotEmpty(jsonArray)){
                     List<PointData> list = JsonObjectHelper.phrasePointData(jsonArray);
                     if (list.size() > 0)
-                        return list.get(0);
+                    {
+                        PointData po=list.get(0);
+                        po.setPointValueInDouble(StringUtils.round(po.getPointValueInDouble(),4));
+                        return po;
+                    }
                     else
+                    {
                         return ErrorRequest.RequestError(pointid);
+                    }
                 } else {
                     return ErrorRequest.RequestError(pointid);
                 }
@@ -810,8 +835,11 @@ public class EdosUtil implements IEdosUtil {
                         pointData.setPointValueInDouble(0.0);
                     }else
                     {
-                        pointData.setPointValueInDouble(Double.parseDouble(pointValue));
+                        double value=Double.parseDouble(pointValue);
+                        pointData.setPointValueInDouble(StringUtils.round(value,4));
                     }
+
+
                     pointData.setPointValue(pointValue);
                     // //System.out.println("key= " + key + ", ts = " + ts + ", value = " + pointValue);
                 }
@@ -903,7 +931,8 @@ public class EdosUtil implements IEdosUtil {
                         pointData.setPointValueInDouble(0.0);
                     }else
                     {
-                        pointData.setPointValueInDouble(Double.parseDouble(pointValue));
+                        double value=Double.parseDouble(pointValue);
+                        pointData.setPointValueInDouble(StringUtils.round(value,4));
                     }
                     pointData.setPointValue(pointValue);
                     pointData.setPointTime(ts);
@@ -1062,6 +1091,9 @@ public class EdosUtil implements IEdosUtil {
                     if(list.isEmpty())
                     {
 
+                        for (PointData snapItem : list) {
+                            snapItem.setPointValueInDouble(StringUtils.round(snapItem.getPointValueInDouble(),4));
+                        }
                         getHistsnapSameTiem(pointid, beginDate, pried, resultList);
                     }else
                     {
@@ -1081,6 +1113,8 @@ public class EdosUtil implements IEdosUtil {
                                 List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
                                 if (sectionlist.size() > 0) {
                                     if(sectionlist.get(0).getPointTime()<=snapItem.getPointTime()){
+
+                                        snapItem.setPointValueInDouble(StringUtils.round(snapItem.getPointValueInDouble(),4));
                                         resultList.add(snapItem);
                                     }
                                     else{
@@ -1816,7 +1850,9 @@ public class EdosUtil implements IEdosUtil {
 
                     if(resultList.isEmpty())
                     {
-
+                        for (PointData snapItem : resultList) {
+                            snapItem.setPointValueInDouble(StringUtils.round(snapItem.getPointValueInDouble(),4));
+                        }
                         getHistsnapSameTiem(pointid, beginDate, finalInterval, resultList);
                     }else
                     {

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

@@ -1,6 +1,6 @@
 
 server:
-  port: 7020
+  port: 7085
   servlet:
     context-path: /
 
@@ -33,40 +33,54 @@ spring:
   autoconfigure:
     exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
   datasource:
+    #type: com.alibaba.druid.pool.DruidDataSource
     type: com.alibaba.druid.pool.DruidDataSource
-    driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://10.81.3.151:5432/IMS_NEM_JN?rewriteBatchedStatements=true
-    username: postgres
-    password: postgres
-    #    url: jdbc:postgresql://124.70.75.91:5432/jn_test?rewriteBatchedStatements=true
-    #    username: postgres
-    #    password: gd123
-    oracle-schema=:
-    #    type: com.alibaba.druid.pool.DruidDataSource
-    #    url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC
-    #    username: root
-    #    password: root
-    #    driver-class-name: com.mysql.jdbc.Driver
-    druid:
-      max-active: 1000
-      initial-size: 1
-      min-idle: 3
-      max-wait: 60000
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-  servlet:
-    multipart:
-      # 开启 multipart 上传功能
-      enabled: true
-      # 文件写入磁盘的阈值
-      file-size-threshold: 2KB
-      # 最大文件大小
-      max-file-size: 200MB
-      # 最大请求大小
-      max-request-size: 215MB
+    dynamic:
+      primary: master #设置默认的数据源或者数据源组,默认值即为master
+      strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
+      datasource:
+        master:
+          url: jdbc:postgresql://10.81.3.151:5432/IMS_NEM_JN
+          username: postgres
+          password: gd123
+          driver-class-name: org.postgresql.Driver
+        slave:
+          driver-class-name: com.taosdata.jdbc.TSDBDriver
+          url: jdbc:TAOS://10.81.3.154:6030/nemjn?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8
+          username: root
+          password: taosdata
+        #配置初始化连接数大小
+      initial-size: 10
+      # 最大连接数
+      max-active: 50
+      #最小连接数
+      min-idle: 10
+      #获取连接等待超时时间
+      max-wait: 5000
+      pool-prepared-statements: true #是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。
+      max-pool-prepared-statement-per-connection-size: 20
+      validation-query: SELECT 1 FROM DUAL
+      validation-query-timeout: 20000
+      test-on-borrow: false #申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+      test-on-return: false #归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+      test-while-idle: true #建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
+      time-between-eviction-runs-millis: 60000 #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      min-evictable-idle-time-millis: 300000  #一个连接在池中最小生存的时间，单位是毫秒
+      #StatViewServlet配置。（因为暴露的监控信息比较敏感，支持密码加密和访问ip限定）
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        #可以增加访问账号密码【去掉注释就可以】
+        #login-username: admin
+        #login-password: admin
+      filter:
+        stat:
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: false
+        wall:
+          config:
+            multi-statement-allow: true
 
 mybatis-plus:
   configuration:
@@ -85,7 +99,7 @@ mybatis-plus:
 # 日志配置
 logging:
   level:
-    root: info
+    root: error
   charset:
     # 输出控制台编码
     console: UTF-8
@@ -110,15 +124,14 @@ logging:
 
 #db url
 db:
-  url1: http://10.81.3.160:8011/ts
-  url2: http://10.81.3.160:8011/ts
+  url1: http://10.81.3.152:8098/ts
+  url2: http://10.81.3.152:8099/ts
 #  url1: http://127.0.0.1:8011/ts
 #  url2: http://127.0.0.1:8011/ts
 
 #参与计算的场站
-#runWindpowerstation: SXJ_KGDL_GJY_FDC_STA
-runWindpowerstation: SXJ_KGDL_YG_GDC_STA
-#计算状态用ai或者di
+#runWindpowerstation: SDL_GDDL_QDJN_FDC_STA,SDL_GDDL_RZJX_FDC_STA,SDL_GDDL_WHWD_FDC_STA,SDL_GDDL_WHXQ_FDC_STA,SDL_GDDL_RZWL_FDC_STA,SDL_GDDL_WFZC_FDC_STA,SDL_GDDL_DZXJF_FDC_STA,SDL_GDDL_DZXJS_FDC_STA,SDL_GDDL_XTTA_FDC_STA
+runWindpowerstation: SXJ_KGDL_XWT_FDC_STA
 clauStatus:
   ai: GJY03_GC,YLZ01_GC,PTZ02_GC   #配置期次
   di: GJY01_GC,GJY02_GC,DJY01_GC,DJY02_GC,YF01_GC,YF02_GC,HSM01_GC,PTZ01_GC,ZK01_GC,NJL01_GC,YTY01_GC,PDL01_GC

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

@@ -99,7 +99,7 @@ mybatis-plus:
 # 日志配置
 logging:
   level:
-    root: info
+    root: error
   charset:
     # 输出控制台编码
     console: UTF-8
@@ -130,8 +130,8 @@ db:
 #  url2: http://127.0.0.1:8011/ts
 
 #参与计算的场站
-#runWindpowerstation: SXJ_KGDL_GJY_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_STA,SXJ_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
+runWindpowerstation: SXJ_KGDL_XWT_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_STA,SXJ_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:

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

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: jntaos
+    active: jn
 #    active: yun
 
 #    active: td

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

@@ -56,7 +56,7 @@ public class GenerationTest {
 //        realtimeService.savaRealtimeTarget();
 //        cycleCalculationService.saveCyle();
 //        statusService.powerRationing();
-//        statusService.statusReal();
+        statusService.statusReal();
 //        statusService.calculateStatusNumber();
 //        regionCalService.companyCal();
 //        regionCalService.RegionCal();

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

@@ -1,7 +1,8 @@
 package com.gyee.generation;
 
-import com.gyee.common.util.DateUtils;
-import com.gyee.generation.service.*;
+import com.gyee.generation.service.InitialRedisService;
+import com.gyee.generation.service.InputOrOutPutService;
+import com.gyee.generation.service.initalcache.CacheService;
 import com.gyee.generation.util.SpringUtils;
 import org.springframework.boot.SpringApplication;
 
@@ -21,8 +22,10 @@ public class HealthTest {
         Calendar c = Calendar.getInstance();
         Date begin=null;
         Date end=null;
-//        CacheService cacheService= SpringUtils.getBean("cacheService");
-//        cacheService.initRedisCache();
+        CacheService cacheService= SpringUtils.getBean("cacheService");
+        cacheService.initRedisCache();
+
+        System.out.println("完成!。。。。。。");
 //
 //
 //
@@ -186,41 +189,41 @@ public class HealthTest {
 //
 //
 //
-        c.set(Calendar.DAY_OF_MONTH,9);
-        for(int i=0;i<6;i++)
-        {
-            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");
-
-            equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
-            equipmentInfo2Service.calEquipmentInfoDay(c.getTime());
-
-            equipmentInfo3Service.calEquipmentInfoDay(c.getTime());
-
-            equipmentInfo4Service.calEquipmentInfoDay(c.getTime());
-
-            equipmentInfo5Service.calEquipmentInfoDay(c.getTime());
-
-            equipmentInfoDayTopService.calEquipmentInfoDayTop(c.getTime());
-            equipmentInfoDayTopService.calEquipmentInfoMonthTop(c.getTime());
-            equipmentInfoDayTopService.calEquipmentInfoYearTop(c.getTime());
-
-            wtAlysisDayService.calEquipmentInfoDay(c.getTime());
-            c.add(Calendar.DAY_OF_MONTH,1);
-        }
-
-
-
-        end=new Date();
-        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
-        System.out.println("设备指标记录调度程序执行结束!。。。。。。");
+//        c.set(Calendar.DAY_OF_MONTH,9);
+//        for(int i=0;i<6;i++)
+//        {
+//            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");
+//
+//            equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
+//            equipmentInfo2Service.calEquipmentInfoDay(c.getTime());
+//
+//            equipmentInfo3Service.calEquipmentInfoDay(c.getTime());
+//
+//            equipmentInfo4Service.calEquipmentInfoDay(c.getTime());
+//
+//            equipmentInfo5Service.calEquipmentInfoDay(c.getTime());
+//
+//            equipmentInfoDayTopService.calEquipmentInfoDayTop(c.getTime());
+//            equipmentInfoDayTopService.calEquipmentInfoMonthTop(c.getTime());
+//            equipmentInfoDayTopService.calEquipmentInfoYearTop(c.getTime());
+//
+//            wtAlysisDayService.calEquipmentInfoDay(c.getTime());
+//            c.add(Calendar.DAY_OF_MONTH,1);
+//        }
+//
+//
+//
+//        end=new Date();
+//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+//        System.out.println("设备指标记录调度程序执行结束!。。。。。。");
 //
 //
 //

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

@@ -0,0 +1,264 @@
+package com.gyee.generation;
+
+import com.gyee.common.util.DateUtils;
+import com.gyee.generation.service.realtimelibrary.CalculationService;
+import com.gyee.generation.service.realtimelibrary.CycleCalculationService;
+import com.gyee.generation.service.realtimelibrary.RealtimeService;
+import com.gyee.generation.service.realtimelibrary.StatusService;
+import com.gyee.generation.util.SpringUtils;
+import org.springframework.boot.SpringApplication;
+
+import java.util.Calendar;
+import java.util.Date;
+
+public class RealTest {
+
+
+    public static void main(String[] args) throws Exception {
+        SpringApplication.run(GenerationMain.class, args);
+        StatusService statusService= SpringUtils.getBean("statusService");
+        CycleCalculationService cycleCalculationService= SpringUtils.getBean("cycleCalculationService");
+
+        CalculationService calculationService= SpringUtils.getBean("calculationService");
+        RealtimeService realtimeService= SpringUtils.getBean("realtimeService");
+
+//        inputOrOutPutService.initialInputOrOutputSpeed();
+        Calendar c = Calendar.getInstance();
+        Date begin=null;
+        Date end=null;
+//        CacheService cacheService= SpringUtils.getBean("cacheService");
+//        cacheService.initRedisCache();
+
+
+       begin=new Date();
+        System.out.println("状态判定调度程序执行开始!。。。。。。");
+//       statusService.statusReal();
+//        realtimeService.savaRealtimeTarget();
+//       cycleCalculationService.saveCyle();
+        end=new Date();
+        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+        System.out.println("状态判定调度程序执行结束!。。。。。。");
+        System.out.println("完成!。。。。。。");
+//
+//
+//
+//        //
+//        System.out.println("故障转换率记录调度程序执行开始!。。。。。。");
+//        TimelinessRateService timelinessRateService = SpringUtils.getBean("timelinessRateService");
+//        timelinessRateService.failRate(c.getTime());
+//        System.out.println("故障转换率记录调度程序执行结束!。。。。。。");
+//
+//        begin=new Date();
+//        System.out.println("切15分钟数据统计记录调度程序执行开始!。。。。。。");
+//        EquipmentInfo15minuteService equipmentInfo15minuteService = SpringUtils.getBean("equipmentInfo15minuteService");
+//        equipmentInfo15minuteService.calEquipmentInfo15minute(c.getTime());
+//        end=new Date();
+//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+//        System.out.println("切15分钟数据统计记录记录调度程序执行结束!。。。。。。");
+//
+//
+
+
+
+//        List<ProBasicEquipment> wtls= CacheContext.wpwtmap.get("SXJ_KGDL_GJY_FDC_STA");
+//        List<ProBasicEquipment> wtls= new ArrayList<>();
+//        for(ProBasicPowerstation wp: CacheContext.wpls)
+//        {
+//            if(wp.getId().contains("FDC"))
+//            {
+//                wtls.addAll(CacheContext.wpwtmap.get(wp.getId()));
+//            }
+//        }
+
+//        List<ProBasicEquipment> wtls= CacheContext.wpwtmap.get("SXJ_KGDL_GJY_FDC_STA");
+//
+//        while (true)
+//        {
+//            begin=new Date();
+//            System.out.println("切入切出状态切换记录调度程序执行开始!。。。。。。");
+//            inputOrOutPutService.inputOrOutputSpeed(c.getTime());
+//            end=new Date();
+//            System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+//            System.out.println("切入切出状态切换记录调度程序执行结束!。。。。。。");
+//        }
+//
+//
+//        begin=new Date();
+//        System.out.println("初始化散点图调度程序执行开始!。。。。。。");
+//
+//
+//        initialRedisService.intialWtScatter();
+//        end=new Date();
+//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+//        System.out.println("初始化散点图度程序执行结束!。。。。。。");
+
+
+//        begin=new Date();
+//        System.out.println("切入切出统计调度程序执行开始!。。。。。。");
+//
+//
+//        inputOrOutPutService.inputOrOutput(c.getTime());
+//        end=new Date();
+//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+//        System.out.println("切入切出统计调度程序执行结束!。。。。。。");
+//
+//
+//
+//        begin=new Date();
+//        System.out.println("停机记录调度程序执行开始!。。。。。。");
+//        ShutdownnewService shutdownnewService= SpringUtils.getBean("shutdownnewService");
+//
+//        shutdownnewService.execShutdown(c.getTime());
+//        end=new Date();
+//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+//        System.out.println("停机记录调度程序执行结束!。。。。。。");
+//
+//
+//        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("限电停机记录调度程序执行结束!。。。。。。");
+//
+//
+//        begin=new Date();
+//        System.out.println("曲线拟合调度程序执行开始!。。。。。。");
+//        PowerCurveFittingByTimeService powerCurveFittingByTimeService= SpringUtils.getBean("powerCurveFittingByTimeService");
+//
+////        XxlJobHelper.log("日序执行开始!........");
+////        powerCurveFittingByTimeService.cureFittingDay(c.getTime());
+////        XxlJobHelper.log("日处理完成!........");
+////
+//        XxlJobHelper.log("月序执行开始!........");
+//        powerCurveFittingByTimeService.cureFittingMonth(c.getTime(),"1");
+//        XxlJobHelper.log("月处理完成!........");
+////
+////        XxlJobHelper.log("年序执行开始!........");
+////        powerCurveFittingByTimeService.cureFittingYear(c.getTime());
+////        XxlJobHelper.log("年处理完成!........");
+////
+//        end=new Date();
+//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+//        System.out.println("曲线拟合调度程序执行结束!。。。。。。");
+//
+//
+//        begin=new Date();
+//        System.out.println("场站指标记录调度程序执行开始!。。。。。。");
+//        WindPowerInfo1Service windPowerInfo1Service= SpringUtils.getBean("windPowerInfo1Service");
+//        WindPowerInfo2Service windPowerInfo2Service= SpringUtils.getBean("windPowerInfo2Service");
+//        WindPowerInfo3Service windPowerInfo3Service= SpringUtils.getBean("windPowerInfo3Service");
+//        WindPowerInfo4Service windPowerInfo4Service= SpringUtils.getBean("windPowerInfo4Service");
+//        WindPowerInfo5Service windPowerInfo5Service= SpringUtils.getBean("windPowerInfo5Service");
+//        WindPowerInfo6Service windPowerInfo6Service= SpringUtils.getBean("windPowerInfo6Service");
+//
+//        windPowerInfo1Service.calLineInfoDay(c.getTime());
+//        windPowerInfo1Service.calProjectInfoDay(c.getTime());
+//        windPowerInfo1Service.calWindpowerInfoDay(c.getTime());
+//        windPowerInfo1Service.calCompanyInfoDay(c.getTime());
+//        windPowerInfo1Service.calRegionInfoDay(c.getTime());
+//
+//        windPowerInfo2Service.calLineInfoDay(c.getTime());
+//        windPowerInfo2Service.calProjectInfoDay(c.getTime());
+//        windPowerInfo2Service.calWindpowerInfoDay(c.getTime());
+//        windPowerInfo2Service.calCompanyInfoDay(c.getTime());
+//        windPowerInfo2Service.calRegionInfoDay(c.getTime());
+//
+//        windPowerInfo3Service.calLineInfoDay(c.getTime());
+//        windPowerInfo3Service.calProjectInfoDay(c.getTime());
+//        windPowerInfo3Service.calWindpowerInfoDay(c.getTime());
+//        windPowerInfo3Service.calCompanyInfoDay(c.getTime());
+//        windPowerInfo3Service.calRegionInfoDay(c.getTime());
+//
+//        windPowerInfo4Service.calLineInfoDay(c.getTime());
+//        windPowerInfo4Service.calProjectInfoDay(c.getTime());
+//        windPowerInfo4Service.calWindpowerInfoDay(c.getTime());
+//        windPowerInfo4Service.calCompanyInfoDay(c.getTime());
+//        windPowerInfo4Service.calRegionInfoDay(c.getTime());
+//
+//        windPowerInfo5Service.calLineInfoDay(c.getTime());
+//        windPowerInfo5Service.calProjectInfoDay(c.getTime());
+//        windPowerInfo5Service.calWindpowerInfoDay(c.getTime());
+//        windPowerInfo5Service.calCompanyInfoDay(c.getTime());
+//        windPowerInfo5Service.calRegionInfoDay(c.getTime());
+//
+//        windPowerInfo6Service.calLineInfoDay(c.getTime());
+//        windPowerInfo6Service.calProjectInfoDay(c.getTime());
+//        windPowerInfo6Service.calWindpowerInfoDay(c.getTime());
+//        windPowerInfo6Service.calCompanyInfoDay(c.getTime());
+//        windPowerInfo6Service.calRegionInfoDay(c.getTime());
+//
+//        end=new Date();
+//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+//        System.out.println("场站指标记录调度程序执行结束!。。。。。。");
+//
+//
+//
+//        c.set(Calendar.DAY_OF_MONTH,9);
+//        for(int i=0;i<6;i++)
+//        {
+//            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");
+//
+//            equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
+//            equipmentInfo2Service.calEquipmentInfoDay(c.getTime());
+//
+//            equipmentInfo3Service.calEquipmentInfoDay(c.getTime());
+//
+//            equipmentInfo4Service.calEquipmentInfoDay(c.getTime());
+//
+//            equipmentInfo5Service.calEquipmentInfoDay(c.getTime());
+//
+//            equipmentInfoDayTopService.calEquipmentInfoDayTop(c.getTime());
+//            equipmentInfoDayTopService.calEquipmentInfoMonthTop(c.getTime());
+//            equipmentInfoDayTopService.calEquipmentInfoYearTop(c.getTime());
+//
+//            wtAlysisDayService.calEquipmentInfoDay(c.getTime());
+//            c.add(Calendar.DAY_OF_MONTH,1);
+//        }
+//
+//
+//
+//        end=new Date();
+//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+//        System.out.println("设备指标记录调度程序执行结束!。。。。。。");
+//
+//
+//
+//
+//        begin=new Date();
+//        System.out.println("功率一致性系数和拟合优度调度程序执行开始!。。。。。。");
+//        WindturbineGoodnessService windturbineGoodnessService= SpringUtils.getBean("windturbineGoodnessService");
+//
+//        windturbineGoodnessService.calWindturbineGoodness(c.getTime());
+//        end=new Date();
+//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+//        System.out.println("功率一致性系数和拟合优度调度程序执行结束!。。。。。。");
+//
+//        c.add(Calendar.DAY_OF_MONTH,-1);
+//        begin=new Date();
+//        System.out.println("设备数据和场站数据风资源调度程序执行开始!。。。。。。");
+//        WpwindDayInfoService wpwindDayInfoService= SpringUtils.getBean("wpwindDayInfoService");
+//        WtwindDayInfoService wtwindDayInfoService= SpringUtils.getBean("wtwindDayInfoService");
+//        wpwindDayInfoService.calWpwindDayInfo(c.getTime());
+//        wtwindDayInfoService.calWtwindDayInfo(c.getTime());
+//        end=new Date();
+//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+//        System.out.println("设备数据和场站数据风资源调度程序执行结束!。。。。。。");
+    }
+}