计算服务修改

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

@@ -20,8 +20,8 @@ import org.springframework.core.env.Environment;
 @Configuration
 //@PropertySource("classpath:xxl-job-executor.properties")
 //@PropertySource("classpath:xxl-job-executor2.properties")
-//@PropertySource("classpath:xxl-job-executor3.properties")
-@PropertySource("classpath:xxl-job-executor4.properties")
+@PropertySource("classpath:xxl-job-executor3.properties")
+//@PropertySource("classpath:xxl-job-executor4.properties")
 //@PropertySource("classpath:xxl-job-executorWPLY.properties")
 //@PropertySource("classpath:xxl-job-executorRG.properties")
 //@PropertySource("classpath:xxl-job-executorJN.properties")

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

@@ -126,12 +126,16 @@ public class EquipmentInfo1Service {
         List<ProEconEquipmentInfoDay1> templs=new ArrayList<>();
         for(ProEconEquipmentInfoDay1 vo:dayls)
         {
-            templs.add(vo);
-            if(templs.size()==100)
+            if(StringUtils.notEmp(vo.getWindturbineId()))
             {
-                proEconEquipmentInfoDay1Service.saveBatch(templs);
-                templs=new ArrayList<>();
+                templs.add(vo);
+                if(templs.size()==100)
+                {
+                    proEconEquipmentInfoDay1Service.saveBatch(templs);
+                    templs=new ArrayList<>();
+                }
             }
+
         }
 
         if(!templs.isEmpty())

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

@@ -131,12 +131,16 @@ public class EquipmentInfo2Service {
         List<ProEconEquipmentInfoDay2> templs=new ArrayList<>();
         for(ProEconEquipmentInfoDay2 vo:dayls)
         {
-            templs.add(vo);
-            if(templs.size()==100)
+            if(StringUtils.notEmp(vo.getWindturbineId()))
             {
-                proEconEquipmentInfoDay2Service.saveBatch(templs);
-                templs=new ArrayList<>();
+                templs.add(vo);
+                if(templs.size()==100)
+                {
+                    proEconEquipmentInfoDay2Service.saveBatch(templs);
+                    templs=new ArrayList<>();
+                }
             }
+
         }
 
         if(!templs.isEmpty())

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

@@ -135,12 +135,16 @@ public class EquipmentInfo3Service {
         List<ProEconEquipmentInfoDay3> templs=new ArrayList<>();
         for(ProEconEquipmentInfoDay3 vo:dayls)
         {
-            templs.add(vo);
-            if(templs.size()==100)
+            if(StringUtils.notEmp(vo.getWindturbineId()))
             {
-                proEconEquipmentInfoDay3Service.saveBatch(templs);
-                templs=new ArrayList<>();
+                templs.add(vo);
+                if(templs.size()==100)
+                {
+                    proEconEquipmentInfoDay3Service.saveBatch(templs);
+                    templs=new ArrayList<>();
+                }
             }
+
         }
 
         if(!templs.isEmpty())

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

@@ -279,12 +279,16 @@ public class EquipmentInfo4Service {
         List<ProEconEquipmentInfoDay4> templs=new ArrayList<>();
         for(ProEconEquipmentInfoDay4 vo:dayls)
         {
-            templs.add(vo);
-            if(templs.size()==100)
+            if(StringUtils.notEmp(vo.getWindturbineId()))
             {
-                proEconEquipmentInfoDay4Service.saveBatch(templs);
-                templs=new ArrayList<>();
+                templs.add(vo);
+                if(templs.size()==100)
+                {
+                    proEconEquipmentInfoDay4Service.saveBatch(templs);
+                    templs=new ArrayList<>();
+                }
             }
+
         }
 
         if(!templs.isEmpty())

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

@@ -3,6 +3,7 @@ package com.gyee.generation.service;//package com.gyee.generation.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
+import com.gyee.common.model.StringUtils;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.ProBasicEquipment;
 import com.gyee.generation.model.auto.ProBasicEquipmentPoint;
@@ -181,12 +182,16 @@ public class EquipmentInfo5Service {
         List<ProEconEquipmentInfoDay5> templs=new ArrayList<>();
         for(ProEconEquipmentInfoDay5 vo:dayls)
         {
-            templs.add(vo);
-            if(templs.size()==100)
+            if(StringUtils.notEmp(vo.getWindturbineId()))
             {
-                proEconEquipmentInfoDay5Service.saveBatch(templs);
-                templs=new ArrayList<>();
+                templs.add(vo);
+                if(templs.size()==100)
+                {
+                    proEconEquipmentInfoDay5Service.saveBatch(templs);
+                    templs=new ArrayList<>();
+                }
             }
+
         }
 
         if(!templs.isEmpty())

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

@@ -239,9 +239,9 @@ public class SaticSchedulePgTask {
             powerCurveFittingByTimeService.cureFittingYear(date);
             XxlJobHelper.log("年处理完成!........");
 
-            powerCurveFittingByTimeGfService.cureFittingDay(date);
-            powerCurveFittingByTimeGfService.cureFittingMonth(date,"0");
-            powerCurveFittingByTimeGfService.cureFittingYear(date);
+//            powerCurveFittingByTimeGfService.cureFittingDay(date);
+//            powerCurveFittingByTimeGfService.cureFittingMonth(date,"0");
+//            powerCurveFittingByTimeGfService.cureFittingYear(date);
 
 
 

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

@@ -1,9 +1,7 @@
 package com.gyee.generation;
 
 import com.gyee.common.util.DateUtils;
-import com.gyee.generation.service.InitialRedisService;
-import com.gyee.generation.service.InputOrOutPutService;
-import com.gyee.generation.service.ShutdownnewService;
+import com.gyee.generation.service.*;
 import com.gyee.generation.util.SpringUtils;
 import org.springframework.boot.SpringApplication;
 
@@ -90,14 +88,14 @@ public class HealthTest {
 //
 //
 //
-        begin=new Date();
-        System.out.println("停机记录调度程序执行开始!。。。。。。");
-        ShutdownnewService shutdownnewService= SpringUtils.getBean("shutdownnewService");
-
-        shutdownnewService.execShutdown(c.getTime());
-        end=new Date();
-        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
-        System.out.println("停机记录调度程序执行结束!。。。。。。");
+//        begin=new Date();
+//        System.out.println("停机记录调度程序执行开始!。。。。。。");
+//        ShutdownnewService shutdownnewService= SpringUtils.getBean("shutdownnewService");
+//
+//        shutdownnewService.execShutdown(c.getTime());
+//        end=new Date();
+//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+//        System.out.println("停机记录调度程序执行结束!。。。。。。");
 //
 //
 //        begin=new Date();
@@ -187,34 +185,42 @@ public class HealthTest {
 //        System.out.println("场站指标记录调度程序执行结束!。。。。。。");
 //
 //
-//        begin=new Date();
-//        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
-//       EquipmentInfo1Service equipmentInfo1Service= SpringUtils.getBean("equipmentInfo1Service");
-//        EquipmentInfo2Service equipmentInfo2Service= SpringUtils.getBean("equipmentInfo2Service");
-//        EquipmentInfo3Service equipmentInfo3Service= SpringUtils.getBean("equipmentInfo3Service");
-//        EquipmentInfo4Service equipmentInfo4Service= SpringUtils.getBean("equipmentInfo4Service");
-//        EquipmentInfo5Service equipmentInfo5Service= SpringUtils.getBean("equipmentInfo5Service");
-//        EquipmentInfoDayTopService equipmentInfoDayTopService= SpringUtils.getBean("equipmentInfoDayTopService");
-//        WtAlysisDayService wtAlysisDayService= SpringUtils.getBean("wtAlysisDayService");
-//
-//        equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
-//
-//        equipmentInfo2Service.calEquipmentInfoDay(c.getTime());
-//
-//        equipmentInfo3Service.calEquipmentInfoDay(c.getTime());
-//
-//        equipmentInfo4Service.calEquipmentInfoDay(c.getTime());
-//
-//        equipmentInfo5Service.calEquipmentInfoDay(c.getTime());
-//
-//        equipmentInfoDayTopService.calEquipmentInfoDayTop(c.getTime());
-//        equipmentInfoDayTopService.calEquipmentInfoMonthTop(c.getTime());
-//        equipmentInfoDayTopService.calEquipmentInfoYearTop(c.getTime());
 //
-//        wtAlysisDayService.calEquipmentInfoDay(c.getTime());
-//        end=new Date();
-//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
-//        System.out.println("设备指标记录调度程序执行结束!。。。。。。");
+        c.set(Calendar.DAY_OF_MONTH,9);
+        for(int i=0;i<6;i++)
+        {
+            begin=new Date();
+            System.out.println("设备指标记录调度程序执行开始!。。。。。。");
+            EquipmentInfo1Service equipmentInfo1Service= SpringUtils.getBean("equipmentInfo1Service");
+            EquipmentInfo2Service equipmentInfo2Service= SpringUtils.getBean("equipmentInfo2Service");
+            EquipmentInfo3Service equipmentInfo3Service= SpringUtils.getBean("equipmentInfo3Service");
+            EquipmentInfo4Service equipmentInfo4Service= SpringUtils.getBean("equipmentInfo4Service");
+            EquipmentInfo5Service equipmentInfo5Service= SpringUtils.getBean("equipmentInfo5Service");
+            EquipmentInfoDayTopService equipmentInfoDayTopService= SpringUtils.getBean("equipmentInfoDayTopService");
+            WtAlysisDayService wtAlysisDayService= SpringUtils.getBean("wtAlysisDayService");
+
+            equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
+            equipmentInfo2Service.calEquipmentInfoDay(c.getTime());
+
+            equipmentInfo3Service.calEquipmentInfoDay(c.getTime());
+
+            equipmentInfo4Service.calEquipmentInfoDay(c.getTime());
+
+            equipmentInfo5Service.calEquipmentInfoDay(c.getTime());
+
+            equipmentInfoDayTopService.calEquipmentInfoDayTop(c.getTime());
+            equipmentInfoDayTopService.calEquipmentInfoMonthTop(c.getTime());
+            equipmentInfoDayTopService.calEquipmentInfoYearTop(c.getTime());
+
+            wtAlysisDayService.calEquipmentInfoDay(c.getTime());
+            c.add(Calendar.DAY_OF_MONTH,1);
+        }
+
+
+
+        end=new Date();
+        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+        System.out.println("设备指标记录调度程序执行结束!。。。。。。");
 //
 //
 //