历史计算服务调整

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

@@ -86,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/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/task/SaticSchedulePgTask.java

@@ -383,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("设备指标调度程序执行完成!........");
 
@@ -400,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();
         }
@@ -434,7 +438,7 @@ public class SaticSchedulePgTask {
 
         XxlJobHelper.log("分析数据统计调度程序执行开始!........");
         try {
-            wtAlysisDayService.calEquipmentInfoDay(new Date());
+//            wtAlysisDayService.calEquipmentInfoDay(new Date());
         } catch (Exception e) {
             e.printStackTrace();
         }