历史计算服务调整

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");
 //
 //
 //

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/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");

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

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