pg数据统计接口修改

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

@@ -76,11 +76,11 @@ public class InputOrOutPutService {
 
 
             ProBasicEquipmentPoint mxzt= pointmap.get(ContantXk.MXZT);
-
+            ProBasicEquipmentPoint ssfs= pointmap.get(ContantXk.CJ_SSFS);
 
             //获取5分钟没个间隔1秒钟，保证状态与时序库保持一致
             List<PointData> statusls = edosUtil.getHistoryDatasSnap(mxzt.getNemCode(), begin.getTime() / 1000, end.getTime() / 1000,null,1L);
-            List<PointData> ssfsls = edosUtil.getHistoryDatasSnap(mxzt.getNemCode(), begin.getTime() / 1000, end.getTime() / 1000,null,1L);
+            List<PointData> ssfsls = edosUtil.getHistoryDatasSnap(ssfs.getNemCode(), begin.getTime() / 1000, end.getTime() / 1000,null,1L);
 
             if(!statusls.isEmpty() && !ssfsls.isEmpty() && ssfsls.size()==statusls.size())
             {
@@ -193,10 +193,10 @@ public class InputOrOutPutService {
                     QueryWrapper<ProEconInOrOutSpeedTotal> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("record_date",daybegin).eq("windturbine_id",wt.getId());
                     Optional<ProEconInOrOutSpeedTotal> total1o = proEconInOrOutSpeedTotalService.list(queryWrapper)
-                    .stream()
+                            .stream()
 //                            .filter(i -> i.getWindturbineId().equals(wt.getId())
 //                                    && i.getRecordDate().compareTo(daybegin) == 0)
-                                    .findFirst();
+                            .findFirst();
 
                     if (total1o.isPresent()) {
                         total1 = total1o.get();

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

@@ -92,7 +92,8 @@ db:
   url: http://124.70.75.91:8011/ts
 #参与计算的场站
 #runWindpowerstation: SD_GDDL_RZLX_FDC_STA,SD_GDDL_QDJN_FDC_STA,SD_GDDL_WHWD_FDC_STA,SD_GDDL_WHXQ_FDC_STA,SD_GDDL_RZWL_FDC_STA,SD_GDDL_WFZC_FDC_STA,SD_GDDL_DZXJ_FDC_STA,SD_GDDL_XTTA_FDC_STA,SD_GDDL_BH1_FDC_STA,SD_GDDL_BH2_FDC_STA,SD_GDDL_CG_FDC_STA,SD_GDDL_FJ_FDC_STA,SD_GDDL_YS_FDC_STA,SD_GDDL_FXFC_FDC_STA,SD_GDDL_JNSS_FDC_STA,SD_GDDL_WFBH_FDC_STA,SD_GDDL_PLHS_FDC_STA,SD_GDDL_JNCQ_FDC_STA,SD_GDDL_LXLN_FDC_STA,SD_GDDL_LQJS_FDC_STA,SD_GDDL_ZYXD_FDC_STA,SD_GDDL_ZYFS_FDC_STA
-runWindpowerstation: SD_GDDL_RZLX_FDC_STA,SD_GDDL_RZWL_FDC_STA
+#runWindpowerstation: SD_GDDL_RZLX_FDC_STA,SD_GDDL_RZWL_FDC_STA
+runWindpowerstation:   HNX_SXNY_FRS_FDC_STA,HNX_SXNY_FL_FDC_STA,HNX_SXNY_HJL_FDC_STA,HNX_LYDL_TEC_FDC_STA,HNX_LYDL_XMS_FDC_STA,HNX_GDDL_XL_FDC_STA,HNX_SXNY_BT_GDC_STA,HNX_LYDL_JM_FDC_STA,HNX_LYDL_XNX_FDC_STA,HNX_GDDL_FYD_FDC_STA
 #计算状态用ai或者di
 clauStatus:
   ai: GJY03_GC,YLZ01_GC,PTZ02_GC   #配置期次