Merge remote-tracking branch 'origin/master'

common/src/main/java/com/gyee/common/contant/Contant.java

@@ -273,4 +273,5 @@ public class Contant {
     public static final String RFDLC = "RFDLC"; //日理论发电量
 
 
+    public static final String GZZT = "GZZT"; //故障状态
 }

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

@@ -1,5 +1,7 @@
 package com.gyee.generation;
 
+import com.gyee.generation.service.initialpoint.InitialPointGoldenXkByEqEdosService;
+import com.gyee.generation.util.SpringUtils;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -22,7 +24,7 @@ public class GenerationMain {
 //        cacheService.initRedisCache();
 //
 //
-//        InitialPointGoldenXkByEqEdosService initialPointGoldenXkByEqEdosService= SpringUtils.getBean("initialPointGoldenXkByEqEdosService");
+        InitialPointGoldenXkByEqEdosService initialPointGoldenXkByEqEdosService= SpringUtils.getBean("initialPointGoldenXkByEqEdosService");
 //
 //
 //
@@ -84,11 +86,11 @@ public class GenerationMain {
 //        Date date =new Date();
 //
 //        Calendar c=Calendar.getInstance();
-//        c.set(Calendar.MONTH,11);
-//        c.set(Calendar.DAY_OF_MONTH,1);
+//        c.set(Calendar.MONTH,1);
+//        c.set(Calendar.DAY_OF_MONTH,10);
 //        Date date = DateUtils.truncate(c.getTime());
 //
-//        for (int i = 0; i < 15; i++) {
+//        for (int i = 0; i < 6; i++) {
 //
 //            WindPowerInfo1Service windPowerInfo1Service = SpringUtils.getBean("windPowerInfo1Service");
 //

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-executorWPXNY.properties")
+@PropertySource("classpath:xxl-job-executor.properties")
+//@PropertySource("classpath:xxl-job-executorWPXNY.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/PowerCurveFittingByTimeGfService.java

@@ -1402,11 +1402,11 @@ public class PowerCurveFittingByTimeGfService {
             }
         }
 
-        //判定状态不为运行的进行过滤
-        if (zt.getPointValueInDouble() != 2) {
-            return false;
-        }
-
+//        //判定状态不为运行的进行过滤
+//        if (zt.getPointValueInDouble() != 2) {
+//            return false;
+//        }
+//
 
 //        //设置时间为10分钟前，10钟前有停机事件数据进行过滤
 //        Calendar c = Calendar.getInstance();

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

@@ -1414,13 +1414,13 @@ public class PowerCurveFittingByTimeService {
                 return false;
             }
         }
-
-        //判定状态不为运行的进行过滤
-        if (zt.getPointValueInDouble() != 2) {
-            return false;
-        }
-
-
+//
+//        //判定状态不为运行的进行过滤
+//        if (zt.getPointValueInDouble() != 2) {
+//            return false;
+//        }
+//
+//
 //        //设置时间为10分钟前，10钟前有停机事件数据进行过滤
 //        Calendar c = Calendar.getInstance();
 //        c.setTimeInMillis(zt.getPointTime());

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

@@ -809,7 +809,7 @@ public class WindPowerInfo4Service {
 //日场站统计
                     QueryWrapper<ProEconEquipmentInfoDay5> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("record_date",DateUtils.truncate(begin))
-                            .eq("windpwoer_id",wt.getWindpowerstationId());
+                            .eq("windpowerstation_id",wt.getWindpowerstationId());
                     List<ProEconEquipmentInfoDay5> pestrls = proEconEquipmentInfoDay5Service.list(queryWrapper);
 //                            .stream()
 //                            .filter(i -> i.getRecordDate().compareTo(begin) == 0 && i.getWindpwoerId().equals(wt.getWindpowerstationId())
@@ -1073,7 +1073,7 @@ public class WindPowerInfo4Service {
 //月场站统计
 
                         QueryWrapper<ProEconEquipmentInfoDay5> queryWrapper = new QueryWrapper<>();
-                        queryWrapper.ge("record_date",monthbegin).le("record_date",end).eq("windpwoer_id",wt.getWindpowerstationId());
+                        queryWrapper.ge("record_date",monthbegin).le("record_date",end).eq("windpowerstation_id",wt.getWindpowerstationId());
                         List<ProEconEquipmentInfoDay5> pestrls = proEconEquipmentInfoDay5Service.list(queryWrapper);
 //                                .stream()
 //                                .filter(i ->
@@ -1351,7 +1351,7 @@ public class WindPowerInfo4Service {
                         case "0":
 //年场站统计
                             QueryWrapper<ProEconEquipmentInfoDay5> queryWrapper = new QueryWrapper<>();
-                            queryWrapper.ge("record_date",yearbegin).le("record_date",end).eq("windpwoer_id",wt.getWindpowerstationId());
+                            queryWrapper.ge("record_date",yearbegin).le("record_date",end).eq("windpowerstation_id",wt.getWindpowerstationId());
                             List<ProEconEquipmentInfoDay5> pestrls = proEconEquipmentInfoDay5Service.list(queryWrapper);
 //                                    .stream()
 //                                    .filter(i ->
@@ -1425,7 +1425,7 @@ public class WindPowerInfo4Service {
                         case "1":
 //年工程统计
                             queryWrapper = new QueryWrapper<>();
-                            queryWrapper.ge("record_date",yearbegin).le("record_date",end).eq("windpwoer_id",wt.getWindpowerstationId());
+                            queryWrapper.ge("record_date",yearbegin).le("record_date",end).eq("windpowerstation_id",wt.getWindpowerstationId());
                             pestrls = proEconEquipmentInfoDay5Service.list(queryWrapper);
 //                                    .stream()
 //                                    .filter(i ->

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

@@ -1058,10 +1058,19 @@ public class InitialPointGoldenXkByEqEdosService implements IinitialPoint {
             if (!ls.isEmpty() ) {
                 for (ProBasicEquipment wt : wtls) {
 
+
+
                     List<ProBasicEquipmentPoint> points = new ArrayList<>();
                     for (int i = 0; i < ls.size(); i++) {
 
 
+                        if(!ls.get(i).getUniformCode().contains("AI") && !ls.get(i).getUniformCode().contains("DI"))
+                        {
+
+                        }else if(!wt.getModelId().equals(ls.get(i).getModel()))
+                        {
+                            continue;
+                        }
 
                         ProEconTestingPoint stp = ls.get(i);
 //                        if(!stp.getTypeId().contains("jsfw") && !stp.getModel().equals(wt.getModelId()))

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

@@ -203,8 +203,14 @@ public class SaticSchedulePgTask {
             XxlJobHelper.log("日序执行开始!........");
             powerCurveFittingByTimeService.cureFittingDay(date);
             XxlJobHelper.log("日处理完成!........");
+
+            XxlJobHelper.log("月序执行开始!........");
             powerCurveFittingByTimeService.cureFittingMonth(date,"0");
+            XxlJobHelper.log("月处理完成!........");
+
+            XxlJobHelper.log("年序执行开始!........");
             powerCurveFittingByTimeService.cureFittingYear(date);
+            XxlJobHelper.log("年处理完成!........");
 
             powerCurveFittingByTimeGfService.cureFittingDay(date);
             powerCurveFittingByTimeGfService.cureFittingMonth(date,"0");
@@ -377,7 +383,11 @@ public class SaticSchedulePgTask {
 
         equipmentInfo5Service.calEquipmentInfoDay(date);
 
+        equipmentInfoDayTopService.calEquipmentInfoDayTop(new Date());
+        equipmentInfoDayTopService.calEquipmentInfoMonthTop(new Date());
+        equipmentInfoDayTopService.calEquipmentInfoYearTop(new Date());
 
+        wtAlysisDayService.calEquipmentInfoDay(new Date());
 
         XxlJobHelper.log("设备指标调度程序执行完成!........");
 
@@ -394,9 +404,9 @@ public class SaticSchedulePgTask {
 
         XxlJobHelper.log("等级评估统计调度程序执行开始!........");
         try {
-            equipmentInfoDayTopService.calEquipmentInfoDayTop(new Date());
-            equipmentInfoDayTopService.calEquipmentInfoMonthTop(new Date());
-            equipmentInfoDayTopService.calEquipmentInfoYearTop(new Date());
+//            equipmentInfoDayTopService.calEquipmentInfoDayTop(new Date());
+//            equipmentInfoDayTopService.calEquipmentInfoMonthTop(new Date());
+//            equipmentInfoDayTopService.calEquipmentInfoYearTop(new Date());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -428,7 +438,7 @@ public class SaticSchedulePgTask {
 
         XxlJobHelper.log("分析数据统计调度程序执行开始!........");
         try {
-            wtAlysisDayService.calEquipmentInfoDay(new Date());
+//            wtAlysisDayService.calEquipmentInfoDay(new Date());
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -1,5 +1,5 @@
 server:
-  port: 7031
+  port: 7011
   servlet:
     context-path: /