修改配置

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

@@ -33,10 +33,10 @@ public class GenerationMain {
 //        proEconStaOriginalService.calEquipmentInfoDay(new Date());
 //        System.out.println("结束生成风机报表指标统计。。。。。。");
 
-        ProEconStaOriginalService proEconStaOriginalService= SpringUtils.getBean("proEconStaOriginalService");
-         System.out.println("开始生成场站报表指标统计。。。。。。");
-         proEconStaOriginalService.calEquipmentInfoDay(new Date());
-         System.out.println("结束生成场站报表指标统计。。。。。。");
+//        ProEconStaOriginalService proEconStaOriginalService= SpringUtils.getBean("proEconStaOriginalService");
+//         System.out.println("开始生成场站报表指标统计。。。。。。");
+//         proEconStaOriginalService.calEquipmentInfoDay(new Date());
+//         System.out.println("结束生成场站报表指标统计。。。。。。");
 //        InitialPointGoldenXkByEqEdosService initialPointGoldenXkByEqEdosService= SpringUtils.getBean("initialPointGoldenXkByEqEdosService");
 //
 //

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

@@ -88,6 +88,7 @@ public class StatusService {
             Map<String, ProBasicPowerstationPoint> stringProBasicPowerstationPointMap = subwppointmap.get(sub.getId());
 
             ProBasicPowerstationPoint agcPoint = stringProBasicPowerstationPointMap.get(ContantXk.TPOINT_WP_AGC);
+
             ProBasicPowerstationPoint cxglPoint = stringProBasicPowerstationPointMap.get(ContantXk.TPOINT_WP_CXGL);
             ProBasicPowerstationPoint xdztPoint = stringProBasicPowerstationPointMap.get(ContantXk.TPOINT_WP_XDZT);
             ProBasicPowerstationPoint zsglPoint = stringProBasicPowerstationPointMap.get(ContantXk.TPOINT_WP_ZSGL);
@@ -166,6 +167,7 @@ public class StatusService {
                 }
             }
             double xdValue = 0;
+
             if (b){
                 xdValue = 1;
                 //判断风机是否限电
@@ -216,9 +218,11 @@ public class StatusService {
 
                 });
             }
-
-            resultList.add(PointUtil.createPointData(currentDate,xdValue,xdztPoint.getNemCode(),xdztPoint.getName()));
-
+            if (agcPoint.getNemCode().equals("INITIAL")){
+                resultList.add(PointUtil.createPointData(currentDate,0,xdztPoint.getNemCode(),xdztPoint.getName()));
+            }else{
+                resultList.add(PointUtil.createPointData(currentDate,xdValue,xdztPoint.getNemCode(),xdztPoint.getName()));
+            }
         });
         edosUtil.sendMultiPoint(resultList);
     }

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

@@ -1,5 +1,5 @@
 server:
-  port: 7031
+  port: 7011
   servlet:
     context-path: /
 
@@ -10,7 +10,7 @@ spring:
   #redis集群
   redis:
     #    host: 124.70.18.168
-    host: 10.152.8.190
+    host: 10.153.172.65
     port: 6379
     timeout: 100000
     #    集群环境打开下面注释，单机不需要打开
@@ -34,7 +34,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://10.152.8.190:5432/IMS_NEM_HNX?rewriteBatchedStatements=true
+    url: jdbc:postgresql://10.153.172.63:5432/IMS_NEM_SDL?rewriteBatchedStatements=true
     username: postgres
     password: postgres
     #    url: jdbc:postgresql://124.70.75.91:5432/jn_test
@@ -88,10 +88,11 @@ logging:
 #db url
 db:
   #  url: http://127.0.0.1:8011/ts
-  url: http://10.152.8.190:8011/ts
+  url: http://10.153.172.65:8011/ts
 #参与计算的场站
-runWindpowerstation: HNX_LYDL_TEC_FDC_STA,HNX_GDDL_XL_FDC_STA,HNX_LYDL_XNX_FDC_STA,HNX_LYDL_XMS_FDC_STA,HNX_LYDL_JM_FDC_STA,HNX_SXNY_BT_GDC_STA,HNX_SXNY_FRS_FDC_STA,HNX_SXNY_HJL_FDC_STA,HNX_GDDL_FYD_FDC_STA,HNX_SXNY_FL_FDC_STA
-#计算状态用ai或者di
+#runWindpowerstation: SDL_SXNY_JNSS_FDC_STA
+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,SDL_LYDL_BEIH_FDC_STA,SDL_LYDL_BINH_FDC_STA,SDL_LYDL_CG_FDC_STA,SDL_LYDL_FJ_FDC_STA,SDL_LYDL_YS_FDC_STA,SDL_SXNY_FXFC_FDC_STA,SDL_SXNY_JNSS_FDC_STA,SDL_SXNY_WFBH_FDC_STA,SDL_SXNY_PLHS_FDC_STA,SDL_SXNY_JNCQ_FDC_STA,SDL_SXNY_LQJS_FDC_STA,SDL_SXNY_ZYXD_FDC_STA,SDL_SXNY_ZYFS_FDC_STA,SDL_SXNY_LYJN_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-xny.yml

@@ -83,8 +83,8 @@ mybatis-plus:
       logic-delete-value: 0
 logging:
   level:
-    root: info
-    com.example: debug
+    root: error
+    com.example: error
 #db url
 db:
   url: http://10.153.172.65:8011/ts
@@ -94,7 +94,7 @@ db:
 #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: HNX_SXNY_FRS_FDC_STA,HNX_SXNY_HJL_FDC_STA,HNX_SXNY_FL_FDC_STA
 #runWindpowerstation: SDL_SXNY_FXFC_FDC_STA,SDL_SXNY_JNSS_FDC_STA,SDL_SXNY_WFBH_FDC_STA,SDL_SXNY_PLHS_FDC_STA,SDL_SXNY_JNCQ_FDC_STA,SDL_SXNY_LQJS_FDC_STA,SDL_SXNY_ZYXD_FDC_STA,SDL_SXNY_ZYFS_FDC_STA,SDL_SXNY_LYJN_FDC_STA
-runWindpowerstation: SDL_SXNY_JNSS_FDC_STA
+runWindpowerstation: SDL_SXNY_ZYXD_FDC_STA
 #判断数据终端
 second: 1800
 #判断降出力

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

@@ -19,7 +19,7 @@ xxl.job.executor.port=9201
 #xxl.job.executor.port=9202
 
 ### xxl-job executor log-path
-xxl.job.executor.logpath=E:\\jobs\\generationWP-job
+xxl.job.executor.logpath=/data/nem/computeEngine/logs
 ### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30
 

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

@@ -19,7 +19,7 @@ xxl.job.executor.ip=
 xxl.job.executor.port=9202
 
 ### xxl-job executor log-path
-xxl.job.executor.logpath=C:\\jobs\\generationRG-job
+xxl.job.executor.logpath=/data/nem/computeEngine/logs
 ### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30
 

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

@@ -19,7 +19,7 @@ xxl.job.executor.ip=
 xxl.job.executor.port=9301
 
 ### xxl-job executor log-path
-xxl.job.executor.logpath=C:\\jobs\\generationWPGD-job
+xxl.job.executor.logpath=/data/nem/computeEngine/logs
 ### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30
 

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

@@ -19,7 +19,7 @@ xxl.job.executor.ip=
 xxl.job.executor.port=9303
 
 ### xxl-job executor log-path
-xxl.job.executor.logpath=C:\\jobs\\generationWPGH-job
+xxl.job.executor.logpath=/data/nem/computeEngine/logs
 ### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30
 

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

@@ -19,7 +19,7 @@ xxl.job.executor.ip=
 xxl.job.executor.port=9302
 
 ### xxl-job executor log-path
-xxl.job.executor.logpath=C:\\jobs\\generationWPLY-job
+xxl.job.executor.logpath=/data/nem/computeEngine/logs
 ### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30
 

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

@@ -19,7 +19,7 @@ xxl.job.executor.ip=
 xxl.job.executor.port=9304
 
 ### xxl-job executor log-path
-xxl.job.executor.logpath=C:\\jobs\\generationWPXNY-job
+xxl.job.executor.logpath=/data/nem/computeEngine/logs
 ### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30
 

web/runeconomy-xk/src/main/resources/application-yun.yml

@@ -83,7 +83,7 @@ mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
     auto-mapping-behavior: full
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     default-enum-type-handler: org.apache.ibatis.type.EnumOrdinalTypeHandler
   mapper-locations: classpath*:mapper/**/*Mapper.xml
   global-config:
@@ -103,7 +103,7 @@ mybatis-plus:
 logging:
   level:
     root: info
-    com.example: error
+    com.example: debug
 initialcode: INITIAL
 db:
   url: http://124.70.75.91:8011/ts