计算服务修改

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

@@ -59,80 +59,80 @@ public class GenerationMain {
 
 //        Date date =new Date();
 //
-        Calendar c=Calendar.getInstance();
-        c.set(Calendar.MONTH,7);
-        c.set(Calendar.DAY_OF_MONTH,2);
-        Date date =c.getTime();
-
-        for (int i = 0; i < 30; i++) {
-            WindPowerInfo1Service windPowerInfo1Service = SpringUtils.getBean("windPowerInfo1Service");
-
-            windPowerInfo1Service.calLineInfoDay(date);
-            windPowerInfo1Service.calProjectInfoDay(date);
-            windPowerInfo1Service.calWindpowerInfoDay(date);
-            windPowerInfo1Service.calCompanyInfoDay(date);
-            windPowerInfo1Service.calRegionInfoDay(date);
-
-            WindPowerInfo2Service windPowerInfo2Service = SpringUtils.getBean("windPowerInfo2Service");
-            windPowerInfo2Service.calLineInfoDay(date);
-            windPowerInfo2Service.calProjectInfoDay(date);
-            windPowerInfo2Service.calWindpowerInfoDay(date);
-            windPowerInfo2Service.calCompanyInfoDay(date);
-            windPowerInfo2Service.calRegionInfoDay(date);
-
-            WindPowerInfo3Service windPowerInfo3Service = SpringUtils.getBean("windPowerInfo3Service");
-            windPowerInfo3Service.calLineInfoDay(date);
-            windPowerInfo3Service.calProjectInfoDay(date);
-            windPowerInfo3Service.calWindpowerInfoDay(date);
-            windPowerInfo3Service.calCompanyInfoDay(date);
-            windPowerInfo3Service.calRegionInfoDay(date);
-
-            WindPowerInfo4Service windPowerInfo4Service = SpringUtils.getBean("windPowerInfo4Service");
-            windPowerInfo4Service.calLineInfoDay(date);
-            windPowerInfo4Service.calProjectInfoDay(date);
-            windPowerInfo4Service.calWindpowerInfoDay(date);
-            windPowerInfo4Service.calCompanyInfoDay(date);
-            windPowerInfo4Service.calRegionInfoDay(date);
-
-            WindPowerInfo5Service windPowerInfo5Service = SpringUtils.getBean("windPowerInfo5Service");
-            windPowerInfo5Service.calLineInfoDay(date);
-            windPowerInfo5Service.calProjectInfoDay(date);
-            windPowerInfo5Service.calWindpowerInfoDay(date);
-            windPowerInfo5Service.calCompanyInfoDay(date);
-            windPowerInfo5Service.calRegionInfoDay(date);
-
-            WindPowerInfo6Service windPowerInfo6Service = SpringUtils.getBean("windPowerInfo6Service");
-            windPowerInfo6Service.calLineInfoDay(date);
-            windPowerInfo6Service.calProjectInfoDay(date);
-            windPowerInfo6Service.calWindpowerInfoDay(date);
-            windPowerInfo6Service.calCompanyInfoDay(date);
-            windPowerInfo6Service.calRegionInfoDay(date);
-
-
-            EquipmentInfo1Service equipmentInfo1Service = SpringUtils.getBean("equipmentInfo1Service");
-            equipmentInfo1Service.calEquipmentInfoDay(date);
-            EquipmentInfo2Service equipmentInfo2Service = SpringUtils.getBean("equipmentInfo2Service");
-            equipmentInfo2Service.calEquipmentInfoDay(date);
-            EquipmentInfo3Service equipmentInfo3Service = SpringUtils.getBean("equipmentInfo3Service");
-            equipmentInfo3Service.calEquipmentInfoDay(date);
-            EquipmentInfo4Service equipmentInfo4Service = SpringUtils.getBean("equipmentInfo4Service");
-            equipmentInfo4Service.calEquipmentInfoDay(date);
-            EquipmentInfo5Service equipmentInfo5Service = SpringUtils.getBean("equipmentInfo5Service");
-            equipmentInfo5Service.calEquipmentInfoDay(date);
-
-
-            WtAlysisDayService wtAlysisDayService = SpringUtils.getBean("wtAlysisDayService");
-            wtAlysisDayService.calEquipmentInfoDay(date);
-
-            EquipmentInfoDayTopService equipmentInfoDayTopService = SpringUtils.getBean("equipmentInfoDayTopService");
-            equipmentInfoDayTopService.calEquipmentInfoDayTop(date);
-            equipmentInfoDayTopService.calEquipmentInfoMonthTop(date);
-            equipmentInfoDayTopService.calEquipmentInfoYearTop(date);
-            c.add(Calendar.DAY_OF_MONTH, 1);
-            date = c.getTime();
-
-
-        }
+//        Calendar c=Calendar.getInstance();
+//        c.set(Calendar.MONTH,7);
+//        c.set(Calendar.DAY_OF_MONTH,2);
+//        Date date =c.getTime();
+//
+//        for (int i = 0; i < 30; i++) {
+//            WindPowerInfo1Service windPowerInfo1Service = SpringUtils.getBean("windPowerInfo1Service");
+//
+//            windPowerInfo1Service.calLineInfoDay(date);
+//            windPowerInfo1Service.calProjectInfoDay(date);
+//            windPowerInfo1Service.calWindpowerInfoDay(date);
+//            windPowerInfo1Service.calCompanyInfoDay(date);
+//            windPowerInfo1Service.calRegionInfoDay(date);
+//
+//            WindPowerInfo2Service windPowerInfo2Service = SpringUtils.getBean("windPowerInfo2Service");
+//            windPowerInfo2Service.calLineInfoDay(date);
+//            windPowerInfo2Service.calProjectInfoDay(date);
+//            windPowerInfo2Service.calWindpowerInfoDay(date);
+//            windPowerInfo2Service.calCompanyInfoDay(date);
+//            windPowerInfo2Service.calRegionInfoDay(date);
+//
+//            WindPowerInfo3Service windPowerInfo3Service = SpringUtils.getBean("windPowerInfo3Service");
+//            windPowerInfo3Service.calLineInfoDay(date);
+//            windPowerInfo3Service.calProjectInfoDay(date);
+//            windPowerInfo3Service.calWindpowerInfoDay(date);
+//            windPowerInfo3Service.calCompanyInfoDay(date);
+//            windPowerInfo3Service.calRegionInfoDay(date);
+//
+//            WindPowerInfo4Service windPowerInfo4Service = SpringUtils.getBean("windPowerInfo4Service");
+//            windPowerInfo4Service.calLineInfoDay(date);
+//            windPowerInfo4Service.calProjectInfoDay(date);
+//            windPowerInfo4Service.calWindpowerInfoDay(date);
+//            windPowerInfo4Service.calCompanyInfoDay(date);
+//            windPowerInfo4Service.calRegionInfoDay(date);
+//
+//            WindPowerInfo5Service windPowerInfo5Service = SpringUtils.getBean("windPowerInfo5Service");
+//            windPowerInfo5Service.calLineInfoDay(date);
+//            windPowerInfo5Service.calProjectInfoDay(date);
+//            windPowerInfo5Service.calWindpowerInfoDay(date);
+//            windPowerInfo5Service.calCompanyInfoDay(date);
+//            windPowerInfo5Service.calRegionInfoDay(date);
+//
+//            WindPowerInfo6Service windPowerInfo6Service = SpringUtils.getBean("windPowerInfo6Service");
+//            windPowerInfo6Service.calLineInfoDay(date);
+//            windPowerInfo6Service.calProjectInfoDay(date);
+//            windPowerInfo6Service.calWindpowerInfoDay(date);
+//            windPowerInfo6Service.calCompanyInfoDay(date);
+//            windPowerInfo6Service.calRegionInfoDay(date);
+//
+//
+//            EquipmentInfo1Service equipmentInfo1Service = SpringUtils.getBean("equipmentInfo1Service");
+//            equipmentInfo1Service.calEquipmentInfoDay(date);
+//            EquipmentInfo2Service equipmentInfo2Service = SpringUtils.getBean("equipmentInfo2Service");
+//            equipmentInfo2Service.calEquipmentInfoDay(date);
+//            EquipmentInfo3Service equipmentInfo3Service = SpringUtils.getBean("equipmentInfo3Service");
+//            equipmentInfo3Service.calEquipmentInfoDay(date);
+//            EquipmentInfo4Service equipmentInfo4Service = SpringUtils.getBean("equipmentInfo4Service");
+//            equipmentInfo4Service.calEquipmentInfoDay(date);
+//            EquipmentInfo5Service equipmentInfo5Service = SpringUtils.getBean("equipmentInfo5Service");
+//            equipmentInfo5Service.calEquipmentInfoDay(date);
+//
+//
+//            WtAlysisDayService wtAlysisDayService = SpringUtils.getBean("wtAlysisDayService");
+//            wtAlysisDayService.calEquipmentInfoDay(date);
+//
+//            EquipmentInfoDayTopService equipmentInfoDayTopService = SpringUtils.getBean("equipmentInfoDayTopService");
+//            equipmentInfoDayTopService.calEquipmentInfoDayTop(date);
+//            equipmentInfoDayTopService.calEquipmentInfoMonthTop(date);
+//            equipmentInfoDayTopService.calEquipmentInfoYearTop(date);
+//            c.add(Calendar.DAY_OF_MONTH, 1);
+//            date = c.getTime();
+//
+//
+//        }
 
 
 //        Calendar c=Calendar.getInstance();

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-executorWP.properties")
+//@PropertySource("classpath:xxl-job-executor.properties")
+@PropertySource("classpath:xxl-job-executorWPGD.properties")
 //@PropertySource("classpath:xxl-job-executorRG.properties")
 public class XxlJobConfig implements EnvironmentAware {
     private Environment env;

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

@@ -53,11 +53,11 @@ public class AccessStatusService {
             ProBasicPowerstationPoint qcztPoint = powerstationPointMap.get(ContantXk.QCZT);
 
             ProBasicPowerstationPoint zycglpoint = powerstationPointMap.get(ContantXk.ZYCGL);
-            double djlzt = 0;
-            double fjzt = 0;
-            double agczt = 0;
-            double glyczt = 0;
-            double cftzt = 0;
+            double djlzt = 1;
+            double fjzt = 1;
+            double agczt = 1;
+            double glyczt = 1;
+            double cftzt = 1;
 
             double zycgl = 0;
             Optional<ProBasicMeterPoint> swdlOptional = meterpoints.stream().filter(me -> me.getUniformCode().equals("ZXYG") && me.getMeterType().equals("出线") && me.getMeterSort().equals("主")).findFirst();
@@ -78,7 +78,7 @@ public class AccessStatusService {
             try {
                 double qczt = edosUtil.getSectionData(qcztPoint, currentDate.getTime()).getPointValueInDouble();
                 if (qczt == 6){
-                    fjzt = 1;
+                    fjzt = 0;
                 }
 
             } catch (Exception e) {
@@ -89,7 +89,7 @@ public class AccessStatusService {
                 try {
                     Long pointTime = edosUtil.getRealData(proBasicMeterPoint.getNemCode()).getPointTime();
                     if ((currentDate.getTime() - pointTime) / 1000 > Integer.parseInt(second)){
-                        djlzt = 1;
+                        djlzt = 0;
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -101,7 +101,7 @@ public class AccessStatusService {
                 try {
                     Long pointTime = edosUtil.getRealData(proBasicPowerstationPoint.getNemCode()).getPointTime();
                     if ((currentDate.getTime() - pointTime) / 1000 > Integer.parseInt(second)){
-                        cftzt = 1;
+                        cftzt = 0;
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -113,7 +113,7 @@ public class AccessStatusService {
                 try {
                     Long pointTime = edosUtil.getRealData(agcpowerstationPoint.getNemCode()).getPointTime();
                     if ((currentDate.getTime() - pointTime) / 1000 > Integer.parseInt(second)){
-                        agczt = 1;
+                        agczt = 0;
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -122,7 +122,7 @@ public class AccessStatusService {
                 try {
                     Long pointTime = edosUtil.getRealData(glycpowerstationPoint.getNemCode()).getPointTime();
                     if ((currentDate.getTime() - pointTime) / 1000 > Integer.parseInt(second)){
-                        glyczt = 1;
+                        glyczt = 0;
                     }
                 } catch (Exception e) {
                     e.printStackTrace();

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

@@ -297,6 +297,7 @@ public class StatusService {
                 }
                 else {
                     List<PointData> interruptionRealData = edosUtil.getRealData(interruptionList);
+                    long time = currentDate.getTime();
                     List<PointData> collect = interruptionRealData.stream().filter(i -> (currentDate.getTime() - i.getPointTime()) / 1000 > Integer.parseInt(second)).collect(Collectors.toList());
                     if (collect.size()!=interruptionRealData.size()){
                         double ssgl = edosUtil.getSectionData(ssglPoint,currentDate.getTime()).getPointValueInDouble();
@@ -715,12 +716,12 @@ public class StatusService {
                 //离线台数12
                 ProBasicPowerstationPoint lxnumPointNew = projectmap.get(ContantXk.LXTSMX);
                 PointData lxnumPoint = PointUtil.createPointData(currentDate,prolxnum.get(),lxnumPointNew.getNemCode(),lxnumPointNew.getName());
-                wpdwslnum.addAndGet(prolxnum.intValue());
+                wplxnum.addAndGet(prolxnum.intValue());
                 resultList.add(lxnumPoint);
                 //未知离线12
                 ProBasicPowerstationPoint wznumPointNew = projectmap.get(ContantXk.TXZDTSMX);
                 PointData wznumPoint = PointUtil.createPointData(currentDate,prowznum.get(),wznumPointNew.getNemCode(),wznumPointNew.getName());
-                wphjslnum.addAndGet(prowznum.intValue());
+                wpwznum.addAndGet(prowznum.intValue());
                 resultList.add(wznumPoint);
                 //离线台数6
                 ProBasicPowerstationPoint txzdPointNew = projectmap.get(ContantXk.TXZDTS);

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

@@ -112,7 +112,7 @@ public class SaticScheduleCALTask {
 
 
     /**
-     * 电计量计算指标
+     * 实时计算指标
      * 每秒执行一次
      */
     @XxlJob("realtime_CAL")

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

@@ -1,5 +1,5 @@
 server:
-  port: 7012
+  port: 7071
   servlet:
     context-path: /
 
@@ -9,7 +9,8 @@ spring:
     allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
   #redis集群
   redis:
-    host: 10.81.3.155
+    #host: 127.0.0.1
+    host: 192.168.11.250
     port: 6379
     timeout: 100000
     #    集群环境打开下面注释，单机不需要打开
@@ -27,15 +28,18 @@ spring:
         min-idle: 0
         max-idle: 8
         max-wait: -1
-    database: 0
+    database: 9
   autoconfigure:
     exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://10.81.3.151:5432/wisdom
-    username: gdprod
-    password: gd123
+    url: jdbc:postgresql://192.168.11.248:5432/IMS_NEM_SD?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
@@ -83,29 +87,38 @@ logging:
     com.example: debug
 #db url
 db:
-  url: http://10.81.3.152:8011/ts
-td:
-  url: http://localhost:8011/ts
+  #url: http://127.0.0.1:8011/ts
+  url: http://192.168.11.250:8011/ts
+  #url: http://124.70.75.91:8011/ts
 #参与计算的场站
-runWindpowerstation: YLZ_FDC
+#runWindpowerstation: SD_GDDL_WHWD_FDC_STA,SD_GDDL_WHXQ_FDC_STA,SD_GDDL_RZLX_FDC_STA,SD_GDDL_QDJN_FDC_STA,SD_SXNY_FXFC_FDC_STA,SD_SXNY_LXLN_FDC_STA,SD_SXNY_LQJS_FDC_STA,SD_SXNY_ZYFS_FDC_STA,SD_LYDL_BH2_FDC_STA,SD_GDDL_RZWL_FDC_STA,SD_SXNY_PLHS_FDC_STA,SD_SXNY_ZYXD_FDC_STA,SD_GDDL_DZXJ_FDC_STA,SD_GDDL_XTTA_FDC_STA,SD_GDDL_WFZC_FDC_STA,SD_SXNY_JNSS_FDC_STA,SD_SXNY_WFBH_FDC_STA,SD_LYDL_CG_FDC_STA,SD_LYDL_FJ_FDC_STA,SD_LYDL_YS_FDC_STA,SD_SXNY_JNCQ_FDC_STA,SD_LYDL_BH1_FDC_STA,SD_GHTZ_HZJ_GDC_STA
+runWindpowerstation: SD_GDDL_WHWD_FDC_STA
 #计算状态用ai或者di
 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
+  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
 #判断数据终端
 second: 1800
 #判断降出力
-AI134: 17.4    #叶轮转速给定
+AI110: 17.4    #叶轮转速给定
 AI178: 17.4    #转矩给定
 #AI443:容量
 
-#计算电量直接取，如果不是1就是相减算
-typeOfElectric:
-  #直接取
-  direct: GJY02_GC,YF01_GC,YF02_GC,HSM01_GC,PTZ01_GC,ZK01_GC
-
-
-
+#功率曲线拟合
+curvefitting:
+  #维度
+  dimension: 20
+  #尺度
+  scale: 0.01
+initialcode: INITIAL
+##调用区间间隔时长，需要与XXLJOB调度时长结合，保证查询区间时长大于调度时长，单位分钟
+frequency:
+  #停机
+  shutdown: 6
+  #限电
+  powerrationing: 6
+  #切入切出
+  cutinandout: 6
 
 
 

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

@@ -1,5 +1,5 @@
 server:
-  port: 7012
+  port: 7070
   servlet:
     context-path: /
 
@@ -9,15 +9,16 @@ spring:
     allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
   #redis集群
   redis:
-    host: 10.81.3.155
+    #host: 127.0.0.1
+    host: 192.168.11.250
     port: 6379
     timeout: 100000
     #    集群环境打开下面注释，单机不需要打开
-#    cluster:
-#      #集群信息
-#      nodes: 10.83.68.151:6379,10.83.68.152:6379,10.83.68.153:6379,10.83.68.154:6379,10.83.68.155:6379,10.83.68.156:6379,10.83.68.157:6379,10.83.68.158:6379,10.83.68.159:6379
-#      #默认值是5 一般当此值设置过大时，容易报：Too many Cluster redirections
-#      maxRedirects: 3
+    #    cluster:
+    #      #集群信息
+    #      nodes: 10.83.68.151:6379,10.83.68.152:6379,10.83.68.153:6379,10.83.68.154:6379,10.83.68.155:6379,10.83.68.156:6379,10.83.68.157:6379,10.83.68.158:6379,10.83.68.159:6379
+    #      #默认值是5 一般当此值设置过大时，容易报：Too many Cluster redirections
+    #      maxRedirects: 3
     password:
     application:
       name: test
@@ -27,15 +28,18 @@ spring:
         min-idle: 0
         max-idle: 8
         max-wait: -1
-    database: 0
+    database: 9
   autoconfigure:
     exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://10.81.3.151:5432/wisdom
-    username: gdprod
-    password: gd123
+    url: jdbc:postgresql://192.168.11.248:5432/IMS_NEM_SD?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
@@ -83,9 +87,12 @@ logging:
     com.example: debug
 #db url
 db:
-  url: http://10.81.3.152:8011/ts
+  #url: http://127.0.0.1:8011/ts
+  url: http://192.168.11.250:8011/ts
+  #url: http://124.70.75.91:8011/ts
 #参与计算的场站
-runWindpowerstation: GJY_FDC,DJY_FDC,YF_FDC,HSM_FDC,PTZ_FDC,YLZ_FDC,ZK_FDC,NJL_FDC,YTY_FDC,PDL_FDC
+runWindpowerstation: SD_GDDL_WHWD_FDC_STA,SD_GDDL_WHXQ_FDC_STA,SD_GDDL_RZLX_FDC_STA,SD_GDDL_QDJN_FDC_STA,SD_SXNY_FXFC_FDC_STA,SD_SXNY_LXLN_FDC_STA,SD_SXNY_LQJS_FDC_STA,SD_SXNY_ZYFS_FDC_STA,SD_LYDL_BH2_FDC_STA,SD_GDDL_RZWL_FDC_STA,SD_SXNY_PLHS_FDC_STA,SD_SXNY_ZYXD_FDC_STA,SD_GDDL_DZXJ_FDC_STA,SD_GDDL_XTTA_FDC_STA,SD_GDDL_WFZC_FDC_STA,SD_SXNY_JNSS_FDC_STA,SD_SXNY_WFBH_FDC_STA,SD_LYDL_CG_FDC_STA,SD_LYDL_FJ_FDC_STA,SD_LYDL_YS_FDC_STA,SD_SXNY_JNCQ_FDC_STA,SD_LYDL_BH1_FDC_STA,SD_GHTZ_HZJ_GDC_STA
+#runWindpowerstation: SD_GDDL_RZLX_FDC_STA
 #计算状态用ai或者di
 clauStatus:
   ai: GJY03_GC,YLZ01_GC,PTZ02_GC   #配置期次
@@ -93,17 +100,25 @@ clauStatus:
 #判断数据终端
 second: 1800
 #判断降出力
-AI134: 17.4    #叶轮转速给定
+AI110: 17.4    #叶轮转速给定
 AI178: 17.4    #转矩给定
 #AI443:容量
 
-#计算电量直接取，如果不是1就是相减算
-typeOfElectric:
-  #直接取
-  direct: GJY02_GC,YF01_GC,YF02_GC,HSM01_GC,PTZ01_GC,ZK01_GC
-
-
-
+#功率曲线拟合
+curvefitting:
+  #维度
+  dimension: 20
+  #尺度
+  scale: 0.01
+initialcode: INITIAL
+##调用区间间隔时长，需要与XXLJOB调度时长结合，保证查询区间时长大于调度时长，单位分钟
+frequency:
+  #停机
+  shutdown: 6
+  #限电
+  powerrationing: 6
+  #切入切出
+  cutinandout: 6
 
 
 

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

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: xk
+    active: gd
 #    active: yun
 
 #    active: td

realtime/generationXK-service/src/main/resources/xxl-job-executorWP.properties

@@ -6,20 +6,20 @@ xxl.job.accessToken=
 
 ### xxl-job executor appname
 ### 场站计算
-xxl.job.executor.appname=generationWP-job
+#xxl.job.executor.appname=generationWP-job
 ### 区域公司计算
-#xxl.job.executor.appname=generationRG-job
+xxl.job.executor.appname=generationWPGD-job
 ### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
 xxl.job.executor.address=
 ### xxl-job executor server-info
 xxl.job.executor.ip=
 #场站端口
-xxl.job.executor.port=9201
+#xxl.job.executor.port=9201
 #区域端口
-#xxl.job.executor.port=9202
+xxl.job.executor.port=9301
 
 ### xxl-job executor log-path
-xxl.job.executor.logpath=E:\\jobs\\generationWP-job
+xxl.job.executor.logpath=E:\\jobs\\generationWPGD-job
 ### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30
 

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

@@ -80,9 +80,9 @@ public class GenerationTest {
 //        accessStatusService.fullFieldState();
 
 
-//                statusService.powerRationing();
-//        statusService.statusReal();
-//        statusService.calculateStatusNumber();
+        statusService.powerRationing();
+        statusService.statusReal();
+        statusService.calculateStatusNumber();
 
 //         realtimeService.savaRealtimeTarget();
 //        cycleCalculationService.saveCyle();
@@ -94,7 +94,7 @@ public class GenerationTest {
 //        regionCalService.companyCal();
 //        regionCalService.RegionCal();
 
-        regionCalreService.companyCal();
-        regionCalreService.RegionCal();
+//        regionCalreService.companyCal();
+//        regionCalreService.RegionCal();
     }
 }