调整计算

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

@@ -19,7 +19,7 @@ import org.springframework.core.env.Environment;
 
 @Configuration
 @PropertySource("classpath:xxl-job-executor.properties")
-//@PropertySource("classpath:xxl-job-executorWPXNY.properties")
+//@PropertySource("classpath:xxl-job-executorWPLY.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/realtimelibrary/CycleCalculationService.java

@@ -159,11 +159,11 @@ public class CycleCalculationService {
             ProBasicEquipmentPoint llfdl15Point = equipmentPointMap.get(ContantXk.LLFDL15);
 
             try {
-                double ssfdl = edosUtil.getSectionData(rssfdlPoint, currentDate.getTime()).getPointValueInDouble();
-                double zerofdl = edosUtil.getSectionData(rssfdlPoint, samedayZero.getTime()).getPointValueInDouble();
-                double monthfirstfdl = edosUtil.getSectionData(rssfdlPoint, monthFirstZero.getTime()).getPointValueInDouble();
-                double yearfirstfdl = edosUtil.getSectionData(rssfdlPoint, yearFirstZero.getTime()).getPointValueInDouble();
-                double date15agofdl = edosUtil.getSectionData(rssfdlPoint, date15age.getTime()).getPointValueInDouble();
+                double ssfdl = edosUtil.getSectionData(rssfdlPoint, currentDate.getTime()).getPointValueInDouble()*rssfdlPoint.getCoefficient();
+                double zerofdl = edosUtil.getSectionData(rssfdlPoint, samedayZero.getTime()).getPointValueInDouble()*rssfdlPoint.getCoefficient();
+                double monthfirstfdl = edosUtil.getSectionData(rssfdlPoint, monthFirstZero.getTime()).getPointValueInDouble()*rssfdlPoint.getCoefficient();
+                double yearfirstfdl = edosUtil.getSectionData(rssfdlPoint, yearFirstZero.getTime()).getPointValueInDouble()*rssfdlPoint.getCoefficient();
+                double date15agofdl = edosUtil.getSectionData(rssfdlPoint, date15age.getTime()).getPointValueInDouble()*rssfdlPoint.getCoefficient();
 
                 double rfdl = ssfdl - zerofdl;
                 wtResultList.add(PointUtil.createPointData(date,rfdl,rfdlPoint.getNemCode(),rfdlPoint.getName()));

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

@@ -282,9 +282,9 @@ public class RealtimeService {
                 Map<String, ProBasicPowerstationPoint> basicWppointMap = linepointmap.get(wp.getId());
                 ProBasicPowerstationPoint ssbfPoint = null;
                 if (wp.getSpare4().equals("1")){
-                    ssbfPoint = proBasicWppointMap.get(ContantXk.SSPJFS);
+                    ssbfPoint = basicWppointMap.get(ContantXk.SSPJFS);
                 }else if (wp.getSpare4().equals("2")){
-                    ssbfPoint = proBasicWppointMap.get(ContantXk.SSPJGZD);
+                    ssbfPoint = basicWppointMap.get(ContantXk.SSPJGZD);
                 }
 
                 ProBasicPowerstationPoint ssglPoint = basicWppointMap.get(ContantXk.SSZGL);
@@ -398,9 +398,9 @@ public class RealtimeService {
 
                 ProBasicPowerstationPoint ssbfPoint = null;
                 if (wp.getSpare4().equals("1")){
-                    ssbfPoint = proBasicWppointMap.get(ContantXk.SSPJFS);
+                    ssbfPoint = basicWppointMap.get(ContantXk.SSPJFS);
                 }else if (wp.getSpare4().equals("2")){
-                    ssbfPoint = proBasicWppointMap.get(ContantXk.SSPJGZD);
+                    ssbfPoint = basicWppointMap.get(ContantXk.SSPJGZD);
                 }
                 ProBasicPowerstationPoint ssglPoint = basicWppointMap.get(ContantXk.SSZGL);
                 //理论功率测点

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

@@ -86,8 +86,8 @@ public class GenerationTest {
 //        statusService.statusReal();
 //        statusService.calculateStatusNumber();
 
-//         realtimeService.savaRealtimeTarget();
-//        cycleCalculationService.saveCyle();
+//          realtimeService.savaRealtimeTarget();
+        cycleCalculationService.saveCyle();
 
 //        electricityMeteringService.saveGenerationDatas();
 
@@ -99,6 +99,6 @@ public class GenerationTest {
 //        regionCalreService.companyCal();
 //        regionCalreService.RegionCal();
 
-        safetyDayService.saveSafetyday();
+//        safetyDayService.saveSafetyday();
     }
 }