计算服务修正

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

@@ -17,73 +17,90 @@ public class GenerationMain {
         SpringApplication.run(GenerationMain.class, args);
 //        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
 //
-//        AccessStatusService accessStatusService = SpringUtils.getBean("accessStatusService");
-//        accessStatusService.accessStatus();
-//        //全场状态
-//        accessStatusService.fullFieldState();
+//
 //
 //
 //        Calendar c = Calendar.getInstance();
 //        Date begin = null;
 //        Date end = null;
-//////        c.setTime(DateUtils.truncate(c.getTime()));
-//////        c.set(Calendar.DAY_OF_MONTH, 1);
-//////        c.set(Calendar.HOUR_OF_DAY, 23);
-//////        c.set(Calendar.MINUTE, 59);
-//////        c.set(Calendar.SECOND, 59);
-////
-////
-////
-////
+//        c.setTime(DateUtils.truncate(c.getTime()));
+//        c.set(Calendar.DAY_OF_MONTH, 23);
+////        c.set(Calendar.HOUR_OF_DAY, 23);
+////        c.set(Calendar.MINUTE, 59);
+////        c.set(Calendar.SECOND, 59);
+//////
+//////
+//////
+//////
 //        begin = new Date();
 //        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
-//        for (int i = 0; i < 1; i++) {
-////            System.out.println(DateUtils.format(c.getTime(), "yyyy-MM-dd HH:mm:ss").toString());
-////            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");
-////            WindPowerInfo1Service windPowerInfo1Service = SpringUtils.getBean("windPowerInfo1Service");
-////            WindPowerInfo2Service windPowerInfo2Service = SpringUtils.getBean("windPowerInfo2Service");
-////            WindPowerInfo3Service windPowerInfo3Service = SpringUtils.getBean("windPowerInfo3Service");
-////            WindPowerInfo4Service windPowerInfo4Service = SpringUtils.getBean("windPowerInfo4Service");
-////            WindPowerInfo5Service windPowerInfo5Service = SpringUtils.getBean("windPowerInfo5Service");
-////            WindPowerInfo6Service windPowerInfo6Service = SpringUtils.getBean("windPowerInfo6Service");
-////
-//////            CycleCalculationRebuildService cycleCalculationRebuildService = SpringUtils.getBean("cycleCalculationRebuildService");
+//        for (int i = 0; i < 5; i++) {
+//////           System.out.println(DateUtils.format(c.getTime(), "yyyy-MM-dd HH:mm:ss").toString());
+//////            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");
+//////            WindPowerInfo1Service windPowerInfo1Service = SpringUtils.getBean("windPowerInfo1Service");
+//////            WindPowerInfo2Service windPowerInfo2Service = SpringUtils.getBean("windPowerInfo2Service");
+//////            WindPowerInfo3Service windPowerInfo3Service = SpringUtils.getBean("windPowerInfo3Service");
+//////            WindPowerInfo4Service windPowerInfo4Service = SpringUtils.getBean("windPowerInfo4Service");
+//////            WindPowerInfo5Service windPowerInfo5Service = SpringUtils.getBean("windPowerInfo5Service");
+//////            WindPowerInfo6Service windPowerInfo6Service = SpringUtils.getBean("windPowerInfo6Service");
 //////
-//////            cycleCalculationRebuildService.saveCyle(c.getTime());
+//////            PowerCurveFittingByTimeService powerCurveFittingByTimeService = SpringUtils.getBean("powerCurveFittingByTimeService");
+//////             System.out.println("日序执行开始!........");
+//////            powerCurveFittingByTimeService.cureFittingDay(c.getTime(), "SXJ_KGDL_XWT_FDC_STA");
+//////             System.out.println("日处理完成!........");
 //////
-//            CycleCalculationService cycleCalculationService = SpringUtils.getBean("cycleCalculationService");
-//
-//            cycleCalculationService.saveCyle();
-//////            equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
-//////            equipmentInfo2Service.calEquipmentInfoDay(c.getTime());
-//////            equipmentInfo3Service.calEquipmentInfoDay(c.getTime());
+//////             System.out.println("月序执行开始!........");
+//////            powerCurveFittingByTimeService.cureFittingMonth(c.getTime(), "0", "SXJ_KGDL_XWT_FDC_STA");
+//////             System.out.println("月处理完成!........");
+//////
+//////             System.out.println("年序执行开始!........");
+//////            powerCurveFittingByTimeService.cureFittingYear(c.getTime(), "SXJ_KGDL_XWT_FDC_STA");
+//////             System.out.println("年处理完成!........");
 //////
-//////            windPowerInfo1Service.calLineInfoDay(c.getTime());
-//////            windPowerInfo1Service.calProjectInfoDay(c.getTime());
-//////            windPowerInfo1Service.calWindpowerInfoDay(c.getTime());
-//////            windPowerInfo1Service.calCompanyInfoDay(c.getTime());
-//////            windPowerInfo1Service.calRegionInfoDay(c.getTime());
+////////            CycleCalculationRebuildService cycleCalculationRebuildService = SpringUtils.getBean("cycleCalculationRebuildService");
+////////
+////////            cycleCalculationRebuildService.saveCyle(c.getTime());
+////////
+//////            CycleCalculationService cycleCalculationService = SpringUtils.getBean("cycleCalculationService");
 //////
-//////            windPowerInfo2Service.calLineInfoDay(c.getTime());
-//////            windPowerInfo2Service.calProjectInfoDay(c.getTime());
-//////            windPowerInfo2Service.calWindpowerInfoDay(c.getTime());
-//////            windPowerInfo2Service.calCompanyInfoDay(c.getTime());
-//////            windPowerInfo2Service.calRegionInfoDay(c.getTime());
+//////            cycleCalculationService.saveCyle();
+////////            equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
+////////            equipmentInfo2Service.calEquipmentInfoDay(c.getTime());
+////////            equipmentInfo3Service.calEquipmentInfoDay(c.getTime());
+////////
+////////            windPowerInfo1Service.calLineInfoDay(c.getTime());
+////////            windPowerInfo1Service.calProjectInfoDay(c.getTime());
+////////            windPowerInfo1Service.calWindpowerInfoDay(c.getTime());
+////////            windPowerInfo1Service.calCompanyInfoDay(c.getTime());
+////////            windPowerInfo1Service.calRegionInfoDay(c.getTime());
+////////
+////////            windPowerInfo2Service.calLineInfoDay(c.getTime());
+////////            windPowerInfo2Service.calProjectInfoDay(c.getTime());
+////////            windPowerInfo2Service.calWindpowerInfoDay(c.getTime());
+////////            windPowerInfo2Service.calCompanyInfoDay(c.getTime());
+////////            windPowerInfo2Service.calRegionInfoDay(c.getTime());
+////////
+////////
+////////            windPowerInfo3Service.calLineInfoDay(c.getTime());
+////////            windPowerInfo3Service.calProjectInfoDay(c.getTime());
+////////            windPowerInfo3Service.calWindpowerInfoDay(c.getTime());
+////////            windPowerInfo3Service.calCompanyInfoDay(c.getTime());
+////////            windPowerInfo3Service.calRegionInfoDay(c.getTime());
 //////
 //////
-//////            windPowerInfo3Service.calLineInfoDay(c.getTime());
-//////            windPowerInfo3Service.calProjectInfoDay(c.getTime());
-//////            windPowerInfo3Service.calWindpowerInfoDay(c.getTime());
-//////            windPowerInfo3Service.calCompanyInfoDay(c.getTime());
-//////            windPowerInfo3Service.calRegionInfoDay(c.getTime());
+////        ShutdownnewService shutdownnewService = SpringUtils.getBean("shutdownnewService");
+////         shutdownnewService.execShutdown(c.getTime());
 ////
 //
+//        WindturbineGoodnessService windturbineGoodnessService= SpringUtils.getBean("windturbineGoodnessService");
+//        windturbineGoodnessService.calWindturbineGoodness(c.getTime());
+//
 //            c.add(Calendar.DAY_OF_MONTH, 1);
 //            System.out.println(end);
 //            System.out.println("完成一次!。。。。。。");

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

@@ -7,6 +7,7 @@
 //import org.springframework.context.EnvironmentAware;
 //import org.springframework.context.annotation.Bean;
 //import org.springframework.context.annotation.Configuration;
+//import org.springframework.context.annotation.PropertySource;
 //import org.springframework.core.env.Environment;
 //
 ///**
@@ -18,7 +19,7 @@
 //
 //@Configuration
 ////@PropertySource("classpath:xxl-job-executor.properties")
-////@PropertySource("classpath:xxl-job-executor2.properties")
+//@PropertySource("classpath:xxl-job-executor2.properties")
 ////@PropertySource("classpath:xxl-job-executor3.properties")
 ////@PropertySource("classpath:xxl-job-executor4.properties")
 ////@PropertySource("classpath:xxl-job-executor5.properties")

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

@@ -9,6 +9,7 @@ import com.gyee.generation.model.auto.*;
 import com.gyee.generation.model.vo.*;
 import com.gyee.generation.service.auto.*;
 import com.gyee.generation.util.DateUtils;
+import com.gyee.generation.util.DeviationRateUtil;
 import com.gyee.generation.util.StringUtils;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
 import com.gyee.generation.util.realtimesource.math.LineUtil;
@@ -274,17 +275,17 @@ public class PowerCurveFittingByTimeService {
 
 
             //日---实际/最优
-            cfmday.setDeviationRate1(pcl(windMap.get(key).getRsjglPoints(), windMap.get(key).getRzyglPoints(), modelpower));
+            cfmday.setDeviationRate1(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getRsjglPoints(), windMap.get(key).getRzyglPoints(), modelpower));
             //日---实际/保证
-            cfmday.setDeviationRate2(pcl(windMap.get(key).getRsjglPoints(), bzglpowerPoints, modelpower));
+            cfmday.setDeviationRate2(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getRsjglPoints(), bzglpowerPoints, modelpower));
             //日---最优/保证
-            cfmday.setDeviationRate3(pcl(windMap.get(key).getRzyglPoints(), bzglpowerPoints, modelpower));
+            cfmday.setDeviationRate3(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getRzyglPoints(), bzglpowerPoints, modelpower));
             //日---实际/上日实际
-            cfmday.setMonthDeviationRate(pcl(windMap.get(key).getRsjglPoints(), dayLastMonthPoints, modelpower));
+            cfmday.setMonthDeviationRate(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getRsjglPoints(), dayLastMonthPoints, modelpower));
             //日---实际/同期实际
-            cfmday.setYearDeviationRate(pcl(windMap.get(key).getRsjglPoints(), dayLastYearPoints, modelpower));
+            cfmday.setYearDeviationRate(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getRsjglPoints(), dayLastYearPoints, modelpower));
             //日---实际/标杆实际
-            cfmday.setStandardDeviationRate(pcl(windMap.get(key).getRsjglPoints(), dayStandardPoints, modelpower));
+            cfmday.setStandardDeviationRate(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getRsjglPoints(), dayStandardPoints, modelpower));
 
             mainls.add(cfmday);
             //proEconCurveFittingMainService.save(cfmday);
@@ -576,17 +577,17 @@ public class PowerCurveFittingByTimeService {
             cfmmonth.setMonth(String.valueOf(day_month));
 
             //月---实际/最优
-            cfmmonth.setDeviationRate1(pcl(windMap.get(key).getYsjglPoints(), windMap.get(key).getYzyglPoints(), modelpower));
+            cfmmonth.setDeviationRate1(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getYsjglPoints(), windMap.get(key).getYzyglPoints(), modelpower));
             //月---实际/保证
-            cfmmonth.setDeviationRate2(pcl(windMap.get(key).getYsjglPoints(), bzglpowerPoints, modelpower));
+            cfmmonth.setDeviationRate2(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getYsjglPoints(), bzglpowerPoints, modelpower));
             //月---最优/保证
-            cfmmonth.setDeviationRate3(pcl(windMap.get(key).getYzyglPoints(), bzglpowerPoints, modelpower));
+            cfmmonth.setDeviationRate3(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getYzyglPoints(), bzglpowerPoints, modelpower));
             //月---实际/上月实际
-            cfmmonth.setMonthDeviationRate(pcl(windMap.get(key).getYsjglPoints(), monthLastMonthPoints, modelpower));
+            cfmmonth.setMonthDeviationRate(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getYsjglPoints(), monthLastMonthPoints, modelpower));
             //月---实际/同期实际
-            cfmmonth.setYearDeviationRate(pcl(windMap.get(key).getYsjglPoints(), monthLastYearPoints, modelpower));
+            cfmmonth.setYearDeviationRate(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getYsjglPoints(), monthLastYearPoints, modelpower));
             //月---实际/标杆实际
-            cfmmonth.setStandardDeviationRate(pcl(windMap.get(key).getYsjglPoints(), monthStandardPoints, modelpower));
+            cfmmonth.setStandardDeviationRate(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getYsjglPoints(), monthStandardPoints, modelpower));
 
             mainls.add(cfmmonth);
             // proEconCurveFittMonthMainService.save(cfmmonth);
@@ -903,17 +904,17 @@ public class PowerCurveFittingByTimeService {
 
 
             //年---实际/最优
-            cfmyear.setDeviationRate1(pcl(windMap.get(key).getNsjglPoints(), windMap.get(key).getNzyglPoints(), modelpower));
+            cfmyear.setDeviationRate1(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getNsjglPoints(), windMap.get(key).getNzyglPoints(), modelpower));
             //年---实际/保证
-            cfmyear.setDeviationRate2(pcl(windMap.get(key).getNsjglPoints(), bzglpowerPoints, modelpower));
+            cfmyear.setDeviationRate2(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getNsjglPoints(), bzglpowerPoints, modelpower));
             //年---最优/保证
-            cfmyear.setDeviationRate3(pcl(windMap.get(key).getNzyglPoints(), bzglpowerPoints, modelpower));
+            cfmyear.setDeviationRate3(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getNzyglPoints(), bzglpowerPoints, modelpower));
             //年---实际/上月实际
-            cfmyear.setMonthDeviationRate(pcl(windMap.get(key).getNsjglPoints(), yearLastMonthPoints, modelpower));
+            cfmyear.setMonthDeviationRate(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getNsjglPoints(), yearLastMonthPoints, modelpower));
             //年---实际/同期实际
-            cfmyear.setYearDeviationRate(pcl(windMap.get(key).getNsjglPoints(), yearLastYearPoints, modelpower));
+            cfmyear.setYearDeviationRate(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getNsjglPoints(), yearLastYearPoints, modelpower));
             //年---实际/标杆实际
-            cfmyear.setStandardDeviationRate(pcl(windMap.get(key).getNsjglPoints(), yearStandardPoints, modelpower));
+            cfmyear.setStandardDeviationRate(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getNsjglPoints(), yearStandardPoints, modelpower));
 
             mainls.add(cfmyear);
             // proEconCurveFittYearMainService.save(cfmyear);
@@ -1007,17 +1008,17 @@ public class PowerCurveFittingByTimeService {
         cfms.setRecordDate(DateUtils.truncate(current));
 
 
-        cfms.setDeviationRate1(pcl2(windMap.get(key).getRsjglPoints(), windMap.get(key).getRzyglPoints(), modelpower, speed));
+        cfms.setDeviationRate1(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getRsjglPoints(), windMap.get(key).getRzyglPoints(), modelpower, speed));
         //日---实际/保证
-        cfms.setDeviationRate2(pcl2(windMap.get(key).getRsjglPoints(), bzglpowerPoints, modelpower, speed));
+        cfms.setDeviationRate2(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getRsjglPoints(), bzglpowerPoints, modelpower, speed));
         //日---最优/保证
-        cfms.setDeviationRate3(pcl2(windMap.get(key).getRzyglPoints(), bzglpowerPoints, modelpower, speed));
+        cfms.setDeviationRate3(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getRzyglPoints(), bzglpowerPoints, modelpower, speed));
         //日---实际/上日实际
-        cfms.setMonthDeviationRate(pcl2(windMap.get(key).getRsjglPoints(), lastMonthPoints, modelpower, speed));
+        cfms.setMonthDeviationRate(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getRsjglPoints(), lastMonthPoints, modelpower, speed));
         //日---实际/同期实际
-        cfms.setYearDeviationRate(pcl2(windMap.get(key).getRsjglPoints(), lastYearPoints, modelpower, speed));
+        cfms.setYearDeviationRate(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getRsjglPoints(), lastYearPoints, modelpower, speed));
         //日---实际/标杆实际
-        cfms.setStandardDeviationRate(pcl2(windMap.get(key).getRsjglPoints(), lastStandardPoints, modelpower, speed));
+        cfms.setStandardDeviationRate(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getRsjglPoints(), lastStandardPoints, modelpower, speed));
 
         return cfms;
 
@@ -1057,17 +1058,17 @@ public class PowerCurveFittingByTimeService {
 
 
         //月---实际/最优
-        cfmsmonth.setDeviationRate1(pcl2(windMap.get(key).getYsjglPoints(), windMap.get(key).getYzyglPoints(), modelpower, speed));
+        cfmsmonth.setDeviationRate1(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getYsjglPoints(), windMap.get(key).getYzyglPoints(), modelpower, speed));
         //月---实际/保证
-        cfmsmonth.setDeviationRate2(pcl2(windMap.get(key).getYsjglPoints(), bzglpowerPoints, modelpower, speed));
+        cfmsmonth.setDeviationRate2(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getYsjglPoints(), bzglpowerPoints, modelpower, speed));
         //月---最优/保证
-        cfmsmonth.setDeviationRate3(pcl2(windMap.get(key).getYzyglPoints(), bzglpowerPoints, modelpower, speed));
+        cfmsmonth.setDeviationRate3(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getYzyglPoints(), bzglpowerPoints, modelpower, speed));
         //月---实际/上月实际
-        cfmsmonth.setMonthDeviationRate(pcl2(windMap.get(key).getYsjglPoints(), lastMonthPoints, modelpower, speed));
+        cfmsmonth.setMonthDeviationRate(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getYsjglPoints(), lastMonthPoints, modelpower, speed));
         //月---实际/同期实际
-        cfmsmonth.setYearDeviationRate(pcl2(windMap.get(key).getYsjglPoints(), lastYearPoints, modelpower, speed));
+        cfmsmonth.setYearDeviationRate(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getYsjglPoints(), lastYearPoints, modelpower, speed));
         //月---实际/标杆实际
-        cfmsmonth.setStandardDeviationRate(pcl2(windMap.get(key).getYsjglPoints(), lastStandardPoints, modelpower, speed));
+        cfmsmonth.setStandardDeviationRate(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getYsjglPoints(), lastStandardPoints, modelpower, speed));
 
 //        proEconCurveFittMonthSubService.save(cfmsmonth);
 
@@ -1105,17 +1106,17 @@ public class PowerCurveFittingByTimeService {
         // proEconCurveFittYearSubService.save(cfmsyear);
 
         //年---实际/最优
-        cfmsyear.setDeviationRate1(pcl2(windMap.get(key).getNsjglPoints(), windMap.get(key).getNzyglPoints(), modelpower, speed));
+        cfmsyear.setDeviationRate1(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getNsjglPoints(), windMap.get(key).getNzyglPoints(), modelpower, speed));
         //年---实际/保证
-        cfmsyear.setDeviationRate2(pcl2(windMap.get(key).getNsjglPoints(), bzglpowerPoints, modelpower, speed));
+        cfmsyear.setDeviationRate2(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getNsjglPoints(), bzglpowerPoints, modelpower, speed));
         //年---最优/保证
-        cfmsyear.setDeviationRate3(pcl2(windMap.get(key).getNzyglPoints(), bzglpowerPoints, modelpower, speed));
+        cfmsyear.setDeviationRate3(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getNzyglPoints(), bzglpowerPoints, modelpower, speed));
         //年---实际/上月实际
-        cfmsyear.setMonthDeviationRate(pcl2(windMap.get(key).getNsjglPoints(), lastMonthPoints, modelpower, speed));
+        cfmsyear.setMonthDeviationRate(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getNsjglPoints(), lastMonthPoints, modelpower, speed));
         //年---实际/同期实际
-        cfmsyear.setYearDeviationRate(pcl2(windMap.get(key).getNsjglPoints(), lastYearPoints, modelpower, speed));
+        cfmsyear.setYearDeviationRate(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getNsjglPoints(), lastYearPoints, modelpower, speed));
         //年---实际/标杆实际
-        cfmsyear.setStandardDeviationRate(pcl2(windMap.get(key).getNsjglPoints(), lastStandardPoints, modelpower, speed));
+        cfmsyear.setStandardDeviationRate(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getNsjglPoints(), lastStandardPoints, modelpower, speed));
 
 //        proEconCurveFittYearSubService.save(cfmsyear);
         return cfmsyear;
@@ -1273,39 +1274,43 @@ public class PowerCurveFittingByTimeService {
             logger.warn(String.format("下标不一致的风机编号：{0}，实际功率：{1}，最有功率：{2}", windturbineId, sjglls.size(), zyglls.size()));
 
 
-            for (int i = 0; i < sjglls.size(); i++) {
-                ProEconWtCurveFittingMonth item = new ProEconWtCurveFittingMonth();
-                item.setWindturbineId(windturbineId);
-                if (CacheContext.wtmap.containsKey(windturbineId)) {
+            if(!sjglls.isEmpty() && !zyglls.isEmpty()   && sjglls.size() == zyglls.size())
+            {
+                for (int i = 0; i < sjglls.size(); i++) {
+                    ProEconWtCurveFittingMonth item = new ProEconWtCurveFittingMonth();
+                    item.setWindturbineId(windturbineId);
+                    if (CacheContext.wtmap.containsKey(windturbineId)) {
 
-                    ProBasicEquipment wt = CacheContext.wtmap.get(windturbineId);
-                    if (wt.getWindpowerstationId().contains(WpType.GDC.id)) {
-                        continue;
-                        //item.SPEED = Double.Truncate(pointsF1[i].X);
-                    } else {
+                        ProBasicEquipment wt = CacheContext.wtmap.get(windturbineId);
+                        if (wt.getWindpowerstationId().contains(WpType.GDC.id)) {
+                            continue;
+                            //item.SPEED = Double.Truncate(pointsF1[i].X);
+                        } else {
 
 //                        item.setSpeed(sjglls.get(i).getX());
-                        item.setSpeed(StringUtils.round(sjglls.get(i).getX(),2));
-                    }
+                            item.setSpeed(StringUtils.round(sjglls.get(i).getX(),2));
+                        }
 //                    item.setActualPower(sjglls.get(i).getY());
 
-                    int finalI = i;
-                    OptionalDouble op = zyglls.stream().filter(x -> Objects.equals(x.getX(), sjglls.get(finalI).getX())).mapToDouble(PointVo::getY).findFirst();
+                        int finalI = i;
+                        OptionalDouble op = zyglls.stream().filter(x -> Objects.equals(x.getX(), sjglls.get(finalI).getX())).mapToDouble(PointVo::getY).findFirst();
 
-                    if (op.isPresent()) {
-                        item.setOptimalPower(op.getAsDouble());
-                    } else {
-                        item.setOptimalPower(0.0);
+                        if (op.isPresent()) {
+                            item.setOptimalPower(op.getAsDouble());
+                        } else {
+                            item.setOptimalPower(0.0);
+                        }
+                        item.setActualPower(StringUtils.round(sjglls.get(i).getY(),2));
+                        item.setOptimalPower(StringUtils.round(zyglls.get(i).getY(),2));
+                        item.setYear(String.valueOf(year));
+                        item.setMonth(String.valueOf(month));
+                        wtcfls.add(item);
+                        //proEconWtCurveFittingMonthService.save(item);
                     }
-                    item.setActualPower(StringUtils.round(sjglls.get(i).getY(),2));
-                    item.setOptimalPower(StringUtils.round(zyglls.get(i).getY(),2));
-                    item.setYear(String.valueOf(year));
-                    item.setMonth(String.valueOf(month));
-                    wtcfls.add(item);
-                    //proEconWtCurveFittingMonthService.save(item);
-                }
 
+                }
             }
+
         }
         //*********************************************当月曲线偏差记录**********************************************************/
 
@@ -1558,67 +1563,67 @@ public class PowerCurveFittingByTimeService {
         }
     }
 
-    //曲线偏差率
-    private double pcl(List<PointVo> points1, List<PointVo> points2, Double modelpower) {
-        double result = -0;
-        double pc = 0;
-        if (points1 != null && points1.size() != 0 && points2 != null && points2.size() != 0) {
-            double count = 0;
-            double sum = 0;
-            double max = modelpower;
-            for (PointVo point : points1) {
-                List<PointVo> item = points2.stream().filter(it -> Objects.equals(it.getX(), point.getX())).collect(Collectors.toList());
-                if (item.size() > 0) {
-                    sum += Math.pow((point.getY() - item.get(0).getY()), 2);
-                    count++;
-                    pc += point.getY() - item.get(0).getY();
-                }
-            }
-            sum = Math.sqrt(sum);
-            count = Math.sqrt(count);
-            max = max * count;
-            if (max != 0) {
-                result = sum / max * 100;
-            }
-
-            if (pc < 0) {
-                result = 0 - result;
-            }
-        }
-        return result;
-    }
-
-    //曲线偏差率2
-    private double pcl2(List<PointVo> points1, List<PointVo> points2, Double modelpower, double speed) {
-        double minSpeed = speed;
-        double maxSpeed = minSpeed + 1;
-        double result = -0;
-        double pc = 0;
-        if (points1 != null && points1.size() != 0 && points2 != null && points2.size() != 0) {
-            double count = 0;
-            double sum = 0;
-            double max = modelpower;
-            for (PointVo point : points1) {
-                List<PointVo> item = points2.stream().filter(it -> Objects.equals(it.getX(), point.getX())).collect(Collectors.toList());
-                if (item.size() > 0 && item.get(0).getX() >= minSpeed && item.get(0).getX() < maxSpeed) {
-                    sum += Math.pow((point.getY() - item.get(0).getY()), 2);
-                    count++;
-                    pc += point.getY() - item.get(0).getY();
-                }
-            }
-            sum = Math.sqrt(sum);
-            count = Math.sqrt(count);
-            max = max * count;
-            if (max != 0) {
-                result = sum / max * 100;
-            }
-
-            if (pc < 0) {
-                result = 0 - result;
-            }
-        }
-        return result;
-    }
+//    //曲线偏差率
+//    private double DeviationRateUtil.calculateDeviationRate(List<PointVo> points1, List<PointVo> points2, Double modelpower) {
+//        double result = -0;
+//        double pc = 0;
+//        if (points1 != null && points1.size() != 0 && points2 != null && points2.size() != 0) {
+//            double count = 0;
+//            double sum = 0;
+//            double max = modelpower;
+//            for (PointVo point : points1) {
+//                List<PointVo> item = points2.stream().filter(it -> Objects.equals(it.getX(), point.getX())).collect(Collectors.toList());
+//                if (item.size() > 0) {
+//                    sum += Math.pow((point.getY() - item.get(0).getY()), 2);
+//                    count++;
+//                    pc += point.getY() - item.get(0).getY();
+//                }
+//            }
+//            sum = Math.sqrt(sum);
+//            count = Math.sqrt(count);
+//            max = max * count;
+//            if (max != 0) {
+//                result = sum / max * 100;
+//            }
+//
+//            if (pc < 0) {
+//                result = 0 - result;
+//            }
+//        }
+//        return result;
+//    }
+//
+//    //曲线偏差率2
+//    private double DeviationRateUtil.calculateDeviationRate(List<PointVo> points1, List<PointVo> points2, Double modelpower, double speed) {
+//        double minSpeed = speed;
+//        double maxSpeed = minSpeed + 1;
+//        double result = -0;
+//        double pc = 0;
+//        if (points1 != null && points1.size() != 0 && points2 != null && points2.size() != 0) {
+//            double count = 0;
+//            double sum = 0;
+//            double max = modelpower;
+//            for (PointVo point : points1) {
+//                List<PointVo> item = points2.stream().filter(it -> Objects.equals(it.getX(), point.getX())).collect(Collectors.toList());
+//                if (item.size() > 0 && item.get(0).getX() >= minSpeed && item.get(0).getX() < maxSpeed) {
+//                    sum += Math.pow((point.getY() - item.get(0).getY()), 2);
+//                    count++;
+//                    pc += point.getY() - item.get(0).getY();
+//                }
+//            }
+//            sum = Math.sqrt(sum);
+//            count = Math.sqrt(count);
+//            max = max * count;
+//            if (max != 0) {
+//                result = sum / max * 100;
+//            }
+//
+//            if (pc < 0) {
+//                result = 0 - result;
+//            }
+//        }
+//        return result;
+//    }
 
     //todo-sl 添加数据筛选
     private boolean filterData(PointData gl, PointData fs, List<PointData> ztls,List<PointData> qfztls,int i, double maxPower,double maxSpeed, String windturbineId) throws Exception {

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

@@ -206,14 +206,14 @@ public class WindturbineGoodnessService {
             templs.add(vo);
             if(templs.size()==1000)
             {
-                proEconWindturbineGoodnessService.saveOrUpdateBatch(templs);
+                proEconWindturbineGoodnessService.saveBatch(templs);
                 templs=new ArrayList<>();
             }
         }
 
         if(!templs.isEmpty())
         {
-            proEconWindturbineGoodnessService.saveOrUpdateBatch(templs);
+            proEconWindturbineGoodnessService.saveBatch(templs);
         }
 
         System.out.println("拟合优度风机存储结束");

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

@@ -202,7 +202,21 @@ public class SaticSchedulePgTask {
         XxlJobHelper.log("停机记录调度程序执行开始!........");
 
         try {
-            shutdownnewService.execShutdown(new Date());
+            while(true)
+            {
+                Date begin = new Date();
+                System.out.println("停机记录调度程序执行开始!。。。。。。");
+
+                shutdownnewService.execShutdown(new Date());
+
+
+                Date end = new Date();
+                System.out.println("执行用时" + DateUtils.millisecondDiff(begin, end) + "秒");
+                System.out.println("停机记录调度调度程序执行结束!。。。。。。");
+
+                Thread.sleep(200);
+            }
+
 
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -0,0 +1,148 @@
+package com.gyee.generation.util;
+
+import com.gyee.generation.model.vo.PointVo;
+
+import java.util.*;
+
+public class DeviationRateUtil {
+
+    //定义一个方法，计算功率曲线偏差率
+    public static double calculateDeviationRate(List<PointVo> actualPower, List<PointVo> theoreticalPower, Double modelpower) {
+        //检查输入数组是否为空或长度不一致
+        if (actualPower == null || theoreticalPower == null) {
+            return 0.0; //返回非数值
+        }
+
+        double max = modelpower;
+        //计算功率曲线偏差率
+        double deviationRate = 0;
+        //计算实际功率和理论功率的平均值
+        double actualMean = 0.0;
+        double theoreticalMean = 0.0;
+
+
+        Map<Double, PointVo> actualPowerMap = new TreeMap<>();
+        Map<Double, PointVo> theoreticalPowerMap = new TreeMap<>();
+
+        for (int i = 0; i < actualPower.size(); i++) {
+
+            if (actualPower.get(i).getY() < max * 1.5) {
+
+                if (!actualPowerMap.containsKey(actualPower.get(i).getX())) {
+                    actualMean += actualPower.get(i).getY();
+                    actualPowerMap.put(actualPower.get(i).getX(), actualPower.get(i));
+                }
+            }
+
+        }
+        for (int i = 0; i < theoreticalPower.size(); i++) {
+
+            if (theoreticalPower.get(i).getY() < max * 1.5) {
+
+                if (!theoreticalPowerMap.containsKey(theoreticalPower.get(i).getX())) {
+                    theoreticalMean += theoreticalPower.get(i).getY();
+                    theoreticalPowerMap.put(theoreticalPower.get(i).getX(), theoreticalPower.get(i));
+                }
+
+            }
+
+        }
+
+        if (!actualPower.isEmpty() && !theoreticalPowerMap.isEmpty()) {
+            actualMean /= actualPower.size();
+            theoreticalMean /= theoreticalPowerMap.size();
+            //计算实际功率和理论功率的标准差
+            double actualSD = 0.0;
+            double theoreticalSD = 0.0;
+            for (int i = 0; i < actualPower.size(); i++) {
+                actualSD += Math.pow(actualPower.get(i).getY() - actualMean, 2);
+
+                if (theoreticalPowerMap.containsKey(actualPower.get(i).getX())) {
+                    PointVo vo = theoreticalPowerMap.get(actualPower.get(i).getX());
+                    theoreticalSD += Math.pow(vo.getY() - theoreticalMean, 2);
+                }
+
+            }
+            actualSD = Math.sqrt(actualSD / actualPower.size());
+            theoreticalSD = Math.sqrt(theoreticalSD / theoreticalPowerMap.size());
+            //计算功率曲线偏差率
+            if (theoreticalMean != 0) {
+                deviationRate = (actualSD - theoreticalSD) / theoreticalMean * 100;
+            }
+
+        }
+
+        return deviationRate; //返回百分比形式的偏差率
+    }
+
+    //定义一个方法，计算功率曲线偏差率
+    public static double calculateDeviationRate(List<PointVo> actualPower, List<PointVo> theoreticalPower, Double modelpower, Double speed) {
+        //检查输入数组是否为空或长度不一致
+        if (actualPower == null || theoreticalPower == null) {
+            return 0.0; //返回非数值
+        }
+        double minSpeed = speed;
+        double maxSpeed = minSpeed + 1;
+        double max = modelpower;
+        //计算功率曲线偏差率
+        double deviationRate = 0;
+        //计算实际功率和理论功率的平均值
+        double actualMean = 0.0;
+        double theoreticalMean = 0.0;
+
+
+        Map<Double, PointVo> actualPowerMap = new TreeMap<>();
+        Map<Double, PointVo> theoreticalPowerMap = new TreeMap<>();
+
+        for (int i = 0; i < actualPower.size(); i++) {
+
+
+            if (actualPower.get(i).getY() < max * 1.5 && actualPower.get(i).getX() >= minSpeed && actualPower.get(i).getX() < maxSpeed) {
+
+                if (!actualPowerMap.containsKey(actualPower.get(i).getX())) {
+                    actualMean += actualPower.get(i).getY();
+                    actualPowerMap.put(actualPower.get(i).getX(), actualPower.get(i));
+                }
+
+            }
+
+        }
+        for (int i = 0; i < theoreticalPower.size(); i++) {
+
+            if (theoreticalPower.get(i).getY() < max * 1.5 && theoreticalPower.get(i).getX() >= minSpeed && theoreticalPower.get(i).getX() < maxSpeed) {
+
+                if (!theoreticalPowerMap.containsKey(theoreticalPower.get(i).getX())) {
+                    theoreticalMean += theoreticalPower.get(i).getY();
+                    theoreticalPowerMap.put(theoreticalPower.get(i).getX(), theoreticalPower.get(i));
+                }
+
+            }
+        }
+
+        if (!actualPower.isEmpty() && !theoreticalPowerMap.isEmpty()) {
+            actualMean /= actualPower.size();
+            theoreticalMean /= theoreticalPowerMap.size();
+            //计算实际功率和理论功率的标准差
+            double actualSD = 0.0;
+            double theoreticalSD = 0.0;
+            for (int i = 0; i < actualPower.size(); i++) {
+                actualSD += Math.pow(actualPower.get(i).getY() - actualMean, 2);
+
+                if (theoreticalPowerMap.containsKey(actualPower.get(i).getX())) {
+                    PointVo vo = theoreticalPowerMap.get(actualPower.get(i).getX());
+                    theoreticalSD += Math.pow(vo.getY() - theoreticalMean, 2);
+                }
+
+            }
+            actualSD = Math.sqrt(actualSD / actualPower.size());
+            theoreticalSD = Math.sqrt(theoreticalSD / theoreticalPowerMap.size());
+            //计算功率曲线偏差率
+            if (theoreticalMean != 0) {
+                deviationRate = (actualSD - theoreticalSD) / theoreticalMean * 100;
+            }
+
+        }
+
+        return deviationRate; //返回百分比形式的偏差率
+    }
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/util/math/LightToTheoreticalPower.java

@@ -105,6 +105,7 @@ public class LightToTheoreticalPower {
             llfdl = calculateEnergy(lightData, power);
             rfdl = powerData.get(powerData.size() - 1).getPointValueInDouble();
             stateBegin = new Date(status.get(0).getPointTime());
+            stateEnd= new Date(status.get(status.size()-1).getPointTime());
             for (PointData po : powerData) {
                 pmap.put(po.getPointTime(), po);
             }
@@ -279,8 +280,30 @@ public class LightToTheoreticalPower {
 
             }
 
+            rdjssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rdjssdl);
+            rsdtjssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rsdtjssdl);
+            rqxjclssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rqxjclssdl);
+            double lldl = getLldl(pointid, stateBegin, stateEnd);
+            rgzssdl = rgzssdl + lldl;
+            rcnslgzssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rcnslgzssdl);
+            lldl = getLldl(pointid, stateBegin, stateEnd);
+            rjxssdl = rjxssdl + lldl;
+            lldl = getLldl(pointid, stateBegin, stateEnd);
+            rjxssdl = rjxssdl + lldl;
+            rcnsljxssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rcnsljxssdl);
+            rxdjclssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rxdjclssdl);
+            lldl = getLldl(pointid, stateBegin, stateEnd);
+            rxdtjssdl = rxdtjssdl + lldl;
+            lldl = getLldl(pointid, stateBegin, stateEnd);
+            rcwsldwssdl = rcwsldwssdl + lldl;
+            lldl = getLldl(pointid, stateBegin, stateEnd);
+            rcwsltqssdl = rcwsltqssdl + lldl;
+
         }
 
+
+
+
         vo.setLlfdl(llfdl);
         vo.setRfdl(rfdl);
         vo.setRgzssdl(rgzssdl);

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

@@ -130,8 +130,8 @@ db:
 #  url2: http://127.0.0.1:8011/ts
 
 #参与计算的场站
-runWindpowerstation: SXJ_KGDL_FS_GDC_STA
-#runWindpowerstation: SXJ_KGDL_DJY_FDC_STA,SXJ_KGDL_NJL_FDC_STA,SXJ_KGDL_YF_FDC_STA,SXJ_KGDL_YLZ_FDC_STA,SXJ_KGDL_XWT_FDC_STA,SXJ_KGDL_PTZ_FDC_STA,SXJ_KGDL_GJY_FDC_STA,SXJ_KGDL_BHB_FDC_STA,SXJ_KGDL_HSM_FDC_STA,SXJ_KGDL_YTY_FDC_STA,SXJ_KGDL_BHB3_FDC_STA,SXJ_KGDL_SY_GDC_STA,SXJ_KGDL_PDL_FDC_STA,SXJ_KGDL_ZK_FDC_STA,SXJ_KGDL_JR_GDC_STA,SXJ_KGDL_FS_GDC_STA,SXJ_KGDL_HR_GDC_STA,SXJ_KGDL_YY_GDC_STA,SXJ_KGDL_PL_GDC_STA,SXJ_KGDL_YG_GDC_STA,SXJ_KGDL_YX_GDC_STA,SXJ_KGDL_TZ_GDC_STA,SXJ_KGDL_TL_GDC_STA
+#runWindpowerstation: SXJ_KGDL_XWT_FDC_STA
+runWindpowerstation: SXJ_KGDL_DJY_FDC_STA,SXJ_KGDL_NJL_FDC_STA,SXJ_KGDL_YF_FDC_STA,SXJ_KGDL_YLZ_FDC_STA,SXJ_KGDL_XWT_FDC_STA,SXJ_KGDL_PTZ_FDC_STA,SXJ_KGDL_GJY_FDC_STA,SXJ_KGDL_BHB_FDC_STA,SXJ_KGDL_HSM_FDC_STA,SXJ_KGDL_YTY_FDC_STA,SXJ_KGDL_BHB3_FDC_STA,SXJ_KGDL_SY_GDC_STA,SXJ_KGDL_PDL_FDC_STA,SXJ_KGDL_ZK_FDC_STA,SXJ_KGDL_JR_GDC_STA,SXJ_KGDL_FS_GDC_STA,SXJ_KGDL_HR_GDC_STA,SXJ_KGDL_YY_GDC_STA,SXJ_KGDL_PL_GDC_STA,SXJ_KGDL_YG_GDC_STA,SXJ_KGDL_YX_GDC_STA,SXJ_KGDL_TZ_GDC_STA,SXJ_KGDL_TL_GDC_STA
 #runWindpowerstation: SXJ_KGDL_DJY_FDC_STA,SXJ_KGDL_NJL_FDC_STA,SXJ_KGDL_YF_FDC_STA,SXJ_KGDL_YLZ_FDC_STA,SXJ_KGDL_XWT_FDC_STA,SXJ_KGDL_PTZ_FDC_STA,SXJ_KGDL_GJY_FDC_STA,SXJ_KGDL_BHB_FDC_STA,SXJ_KGDL_HSM_FDC_STA,SXJ_KGDL_YTY_FDC_STA,SXJ_KGDL_BHB3_FDC_STA,SXJ_KGDL_PDL_FDC_STA,SXJ_KGDL_ZK_FDC_STA
 #runWindpowerstation: SXJ_KGDL_SY_GDC_STA,SXJ_KGDL_JR_GDC_STA,SXJ_KGDL_FS_GDC_STA,SXJ_KGDL_HR_GDC_STA,SXJ_KGDL_YY_GDC_STA,SXJ_KGDL_PL_GDC_STA,SXJ_KGDL_YG_GDC_STA,SXJ_KGDL_YX_GDC_STA,SXJ_KGDL_TZ_GDC_STA,SXJ_KGDL_TL_GDC_STA,SXJ_KGDL_SY_GDC_STA