历史计算服务修改

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconCurveFittMonthSub.java

@@ -45,7 +45,7 @@ public class ProEconCurveFittMonthSub extends Model {
     /**
      * 风速
      */
-    private String speed;
+    private Double speed;
 
     /**
      * 环比

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconCurveFittYearSub.java

@@ -39,7 +39,7 @@ public class ProEconCurveFittYearSub extends Model {
     /**
      * 风速
      */
-    private String speed;
+    private Double speed;
 
     /**
      * 环比

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconCurveFittingSub.java

@@ -57,7 +57,7 @@ public class ProEconCurveFittingSub extends Model {
     /**
      * 风速
      */
-    private String speed;
+    private Double speed;
 
     /**
      * 实际/最优

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

@@ -337,7 +337,10 @@ public class PowerCurveFittingByTimeGfService {
         for (ProBasicEquipment wt : CacheContext.wtls) {
             String windturbineId = wt.getId();
 
-
+            if(wt.getWindpowerstationId().contains(WpType.FDC.id))
+            {
+                continue;
+            }
             Map<String, ProBasicEquipmentPoint> windturbinetestingpointnewMap = CacheContext.wtpAimap.get(wt.getId());
             //设备有功功率
             String pointIdGL = null;
@@ -507,7 +510,7 @@ public class PowerCurveFittingByTimeGfService {
             cfmmonth.setStandardDeviationRate(pcl(windMap.get(key).getYsjglPoints(), monthStandardPoints, modelpower));
 
             mainls.add(cfmmonth);
-           // proEconCurveFittMonthMainService.save(cfmmonth);
+            // proEconCurveFittMonthMainService.save(cfmmonth);
 
             //*********************************************当月曲线偏差记录**********************************************************/
             List<ProEconCurveFittMonthSub> subls=new ArrayList<>();
@@ -580,7 +583,10 @@ public class PowerCurveFittingByTimeGfService {
         for (ProBasicEquipment wt : CacheContext.wtls) {
             String windturbineId = wt.getId();
 
-
+            if(wt.getWindpowerstationId().contains(WpType.FDC.id))
+            {
+                continue;
+            }
             Map<String, ProBasicEquipmentPoint> windturbinetestingpointnewMap = CacheContext.wtpAimap.get(wt.getId());
             //设备有功功率
             String pointIdGL = windturbinetestingpointnewMap.get(ContantXk.CJ_SSGL).getNemCode();
@@ -640,7 +646,7 @@ public class PowerCurveFittingByTimeGfService {
 
 
             //拟合年功率曲线
-          //  curveFittingBuilder(begin, end, dimension, scale, windMap.get(key).getPointIdGL(), windMap.get(key).getPointIdFS(), windMap.get(key).getPointIdZT(), windMap.get(key).getNsjglPoints(), windMap.get(key).getNzyglPoints(), key);
+            //  curveFittingBuilder(begin, end, dimension, scale, windMap.get(key).getPointIdGL(), windMap.get(key).getPointIdFS(), windMap.get(key).getPointIdZT(), windMap.get(key).getNsjglPoints(), windMap.get(key).getNzyglPoints(), key);
             QueryWrapper<ProEconWtPowerCurveFitting> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("windturbine_id",key);
             List<ProEconWtPowerCurveFitting> wtpowerls= proEconWtPowerCurveFittingService.list(queryWrapper)
@@ -785,7 +791,7 @@ public class PowerCurveFittingByTimeGfService {
             cfmyear.setStandardDeviationRate(pcl(windMap.get(key).getNsjglPoints(), yearStandardPoints, modelpower));
 
             mainls.add(cfmyear);
-           // proEconCurveFittYearMainService.save(cfmyear);
+            // proEconCurveFittYearMainService.save(cfmyear);
 
 //*********************************************当年曲线偏差记录**********************************************************/
             List<ProEconCurveFittYearSub> subls=new ArrayList<>();
@@ -815,14 +821,14 @@ public class PowerCurveFittingByTimeGfService {
 
 
     public ProEconCurveFittingSub pLCBuild(String key, Date current, Map<String, CureFittingVo> windMap, Double modelpower, double speed,
-                         List<PointVo> bzglpowerPoints, List<PointVo> lastMonthPoints, List<PointVo> lastYearPoints, List<PointVo> lastStandardPoints
+                                           List<PointVo> bzglpowerPoints, List<PointVo> lastMonthPoints, List<PointVo> lastYearPoints, List<PointVo> lastStandardPoints
     ) {
 
-        String speedStr = String.valueOf(speed);
+        //  String speedStr = String.valueOf(speed);
 
 //*********************************************当日曲线偏差子表记录**********************************************************/
         QueryWrapper<ProEconCurveFittingSub> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.eq("record_date",current).eq("speed",speedStr).eq("windturbine_id",key);
+        queryWrapper2.eq("record_date",current).eq("speed",speed).eq("windturbine_id",key);
         Optional<ProEconCurveFittingSub> cfmso = proEconCurveFittingSubService.list(queryWrapper2)
                 .stream()
 //                .filter(i -> i.getWindturbineId().equals(key)
@@ -840,7 +846,7 @@ public class PowerCurveFittingByTimeGfService {
 
         cfms = new ProEconCurveFittingSub();
         cfms.setWindturbineId(key);
-        cfms.setSpeed(String.valueOf(speed));
+        cfms.setSpeed(speed);
         cfms.setRecordDate(DateUtils.truncate(current));
 
 
@@ -863,13 +869,13 @@ public class PowerCurveFittingByTimeGfService {
     }
 
     public ProEconCurveFittMonthSub pLCBuild(String key, String stringyear, String stringmonth, Map<String, CureFittingVo> windMap, Double modelpower, double speed,
-                         List<PointVo> bzglpowerPoints, List<PointVo> lastMonthPoints, List<PointVo> lastYearPoints, List<PointVo> lastStandardPoints
+                                             List<PointVo> bzglpowerPoints, List<PointVo> lastMonthPoints, List<PointVo> lastYearPoints, List<PointVo> lastStandardPoints
     ) {
-        String speedStr = String.valueOf(speed);
+        //   String speedStr = String.valueOf(speed);
 
         //*********************************************当月曲线偏差子表记录**********************************************************/
         QueryWrapper<ProEconCurveFittMonthSub> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.eq("year",stringyear).eq("month",stringmonth).eq("speed",speedStr).eq("windturbine_id",key);
+        queryWrapper2.eq("year",stringyear).eq("month",stringmonth).eq("speed",speed).eq("windturbine_id",key);
         Optional<ProEconCurveFittMonthSub> cfmsmontho = proEconCurveFittMonthSubService.list(queryWrapper2).stream()
 //                .filter(i -> i.getWindturbineId().equals(key)
 //                && i.getYear().equals(stringyear) && i.getMonth().equals(stringmonth) && i.getSpeed().equals(speedStr))
@@ -889,7 +895,7 @@ public class PowerCurveFittingByTimeGfService {
         cfmsmonth.setWindturbineId(key);
         cfmsmonth.setYear(stringyear);
         cfmsmonth.setMonth(stringmonth);
-        cfmsmonth.setSpeed(String.valueOf(speed));
+        cfmsmonth.setSpeed(speed);
 
 
 
@@ -913,13 +919,13 @@ public class PowerCurveFittingByTimeGfService {
     }
 
     public ProEconCurveFittYearSub pLCBuild(String key, String stringyear, Map<String, CureFittingVo> windMap, Double modelpower, double speed,
-                         List<PointVo> bzglpowerPoints, List<PointVo> lastMonthPoints, List<PointVo> lastYearPoints, List<PointVo> lastStandardPoints
+                                            List<PointVo> bzglpowerPoints, List<PointVo> lastMonthPoints, List<PointVo> lastYearPoints, List<PointVo> lastStandardPoints
     ) {
-        String speedStr = String.valueOf(speed);
+        //
 
         //*********************************************当年曲线偏差子表记录**********************************************************/
         QueryWrapper<ProEconCurveFittYearSub> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("year",stringyear).eq("speed",speedStr).eq("windturbine_id",key);
+        queryWrapper.eq("year",stringyear).eq("speed",speed).eq("windturbine_id",key);
         Optional<ProEconCurveFittYearSub> cfmsyearo = proEconCurveFittYearSubService.list(queryWrapper).stream()
 //                .filter(i -> i.getWindturbineId().equals(key)
 //                && i.getYear().equals(stringyear) && i.getSpeed().equals(speedStr))
@@ -937,22 +943,22 @@ public class PowerCurveFittingByTimeGfService {
         cfmsyear = new ProEconCurveFittYearSub();
         cfmsyear.setWindturbineId(key);
         cfmsyear.setYear(stringyear);
-        cfmsyear.setSpeed(String.valueOf(speed));
+        cfmsyear.setSpeed(speed);
 
-       // proEconCurveFittYearSubService.save(cfmsyear);
+        // proEconCurveFittYearSubService.save(cfmsyear);
 
         //年---实际/最优
-        cfmsyear.setDeviationRate1(pcl2(windMap.get(key).getYsjglPoints(), windMap.get(key).getYzyglPoints(), modelpower, speed));
+        cfmsyear.setDeviationRate1(pcl2(windMap.get(key).getNsjglPoints(), windMap.get(key).getNzyglPoints(), modelpower, speed));
         //年---实际/保证
-        cfmsyear.setDeviationRate2(pcl2(windMap.get(key).getYsjglPoints(), bzglpowerPoints, modelpower, speed));
+        cfmsyear.setDeviationRate2(pcl2(windMap.get(key).getNsjglPoints(), bzglpowerPoints, modelpower, speed));
         //年---最优/保证
-        cfmsyear.setDeviationRate3(pcl2(windMap.get(key).getYzyglPoints(), bzglpowerPoints, modelpower, speed));
+        cfmsyear.setDeviationRate3(pcl2(windMap.get(key).getNzyglPoints(), bzglpowerPoints, modelpower, speed));
         //年---实际/上月实际
-        cfmsyear.setMonthDeviationRate(pcl2(windMap.get(key).getYsjglPoints(), lastMonthPoints, modelpower, speed));
+        cfmsyear.setMonthDeviationRate(pcl2(windMap.get(key).getNsjglPoints(), lastMonthPoints, modelpower, speed));
         //年---实际/同期实际
-        cfmsyear.setYearDeviationRate(pcl2(windMap.get(key).getYsjglPoints(), lastYearPoints, modelpower, speed));
+        cfmsyear.setYearDeviationRate(pcl2(windMap.get(key).getNsjglPoints(), lastYearPoints, modelpower, speed));
         //年---实际/标杆实际
-        cfmsyear.setStandardDeviationRate(pcl2(windMap.get(key).getYsjglPoints(), lastStandardPoints, modelpower, speed));
+        cfmsyear.setStandardDeviationRate(pcl2(windMap.get(key).getNsjglPoints(), lastStandardPoints, modelpower, speed));
 
 //        proEconCurveFittYearSubService.save(cfmsyear);
         return cfmsyear;
@@ -1078,7 +1084,7 @@ public class PowerCurveFittingByTimeGfService {
                     item.setYear(String.valueOf(year));
                     item.setMonth(String.valueOf(month));
                     wtcfls.add(item);
-                   // proEconWtCurveFittingMonthService.save(item);
+                    // proEconWtCurveFittingMonthService.save(item);
                 }
 
             }
@@ -1152,7 +1158,7 @@ public class PowerCurveFittingByTimeGfService {
                     item.setOptimalPower(zyglls.get(i).getY());
                     item.setYear(String.valueOf(year));
                     wtcfls.add(item);
-                   // proEconWtCurveFittingYearService.save(item);
+                    // proEconWtCurveFittingYearService.save(item);
                 }
 
             }

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

@@ -339,7 +339,10 @@ public class PowerCurveFittingByTimeService {
         for (ProBasicEquipment wt : CacheContext.wtls) {
             String windturbineId = wt.getId();
 
-
+            if(wt.getWindpowerstationId().contains(WpType.GDC.id))
+            {
+                continue;
+            }
             Map<String, ProBasicEquipmentPoint> windturbinetestingpointnewMap = CacheContext.wtpAimap.get(wt.getId());
             //设备有功功率
             String pointIdGL = windturbinetestingpointnewMap.get(ContantXk.CJ_SSGL).getNemCode();
@@ -520,7 +523,7 @@ public class PowerCurveFittingByTimeService {
             cfmmonth.setStandardDeviationRate(pcl(windMap.get(key).getYsjglPoints(), monthStandardPoints, modelpower));
 
             mainls.add(cfmmonth);
-           // proEconCurveFittMonthMainService.save(cfmmonth);
+            // proEconCurveFittMonthMainService.save(cfmmonth);
 
             //*********************************************当月曲线偏差记录**********************************************************/
             List<ProEconCurveFittMonthSub> subls=new ArrayList<>();
@@ -593,7 +596,10 @@ public class PowerCurveFittingByTimeService {
         for (ProBasicEquipment wt : CacheContext.wtls) {
             String windturbineId = wt.getId();
 
-
+            if(wt.getWindpowerstationId().contains(WpType.GDC.id))
+            {
+                continue;
+            }
             Map<String, ProBasicEquipmentPoint> windturbinetestingpointnewMap = CacheContext.wtpAimap.get(wt.getId());
             //设备有功功率
             String pointIdGL = windturbinetestingpointnewMap.get(ContantXk.CJ_SSGL).getNemCode();
@@ -653,7 +659,7 @@ public class PowerCurveFittingByTimeService {
 
 
             //拟合年功率曲线
-          //  curveFittingBuilder(begin, end, dimension, scale, windMap.get(key).getPointIdGL(), windMap.get(key).getPointIdFS(), windMap.get(key).getPointIdZT(), windMap.get(key).getNsjglPoints(), windMap.get(key).getNzyglPoints(), key);
+            //  curveFittingBuilder(begin, end, dimension, scale, windMap.get(key).getPointIdGL(), windMap.get(key).getPointIdFS(), windMap.get(key).getPointIdZT(), windMap.get(key).getNsjglPoints(), windMap.get(key).getNzyglPoints(), key);
             QueryWrapper<ProEconWtPowerCurveFitting> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("windturbine_id",key);
             List<ProEconWtPowerCurveFitting> wtpowerls= proEconWtPowerCurveFittingService.list(queryWrapper)
@@ -798,7 +804,7 @@ public class PowerCurveFittingByTimeService {
             cfmyear.setStandardDeviationRate(pcl(windMap.get(key).getNsjglPoints(), yearStandardPoints, modelpower));
 
             mainls.add(cfmyear);
-           // proEconCurveFittYearMainService.save(cfmyear);
+            // proEconCurveFittYearMainService.save(cfmyear);
 
 //*********************************************当年曲线偏差记录**********************************************************/
             List<ProEconCurveFittYearSub> subls=new ArrayList<>();
@@ -828,14 +834,14 @@ public class PowerCurveFittingByTimeService {
 
 
     public ProEconCurveFittingSub pLCBuild(String key, Date current, Map<String, CureFittingVo> windMap, Double modelpower, double speed,
-                         List<PointVo> bzglpowerPoints, List<PointVo> lastMonthPoints, List<PointVo> lastYearPoints, List<PointVo> lastStandardPoints
+                                           List<PointVo> bzglpowerPoints, List<PointVo> lastMonthPoints, List<PointVo> lastYearPoints, List<PointVo> lastStandardPoints
     ) {
 
-        String speedStr = String.valueOf(speed);
+//        String speedStr = String.valueOf(speed);
 
 //*********************************************当日曲线偏差子表记录**********************************************************/
         QueryWrapper<ProEconCurveFittingSub> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.eq("record_date",current).eq("speed",speedStr).eq("windturbine_id",key);
+        queryWrapper2.eq("record_date",current).eq("speed",speed).eq("windturbine_id",key);
         Optional<ProEconCurveFittingSub> cfmso = proEconCurveFittingSubService.list(queryWrapper2)
                 .stream()
 //                .filter(i -> i.getWindturbineId().equals(key)
@@ -853,7 +859,7 @@ public class PowerCurveFittingByTimeService {
 
         cfms = new ProEconCurveFittingSub();
         cfms.setWindturbineId(key);
-        cfms.setSpeed(String.valueOf(speed));
+        cfms.setSpeed(speed);
         cfms.setRecordDate(DateUtils.truncate(current));
 
 
@@ -876,13 +882,13 @@ public class PowerCurveFittingByTimeService {
     }
 
     public ProEconCurveFittMonthSub pLCBuild(String key, String stringyear, String stringmonth, Map<String, CureFittingVo> windMap, Double modelpower, double speed,
-                         List<PointVo> bzglpowerPoints, List<PointVo> lastMonthPoints, List<PointVo> lastYearPoints, List<PointVo> lastStandardPoints
+                                             List<PointVo> bzglpowerPoints, List<PointVo> lastMonthPoints, List<PointVo> lastYearPoints, List<PointVo> lastStandardPoints
     ) {
-        String speedStr = String.valueOf(speed);
+//        String speedStr = String.valueOf(speed);
 
         //*********************************************当月曲线偏差子表记录**********************************************************/
         QueryWrapper<ProEconCurveFittMonthSub> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.eq("year",stringyear).eq("month",stringmonth).eq("speed",speedStr).eq("windturbine_id",key);
+        queryWrapper2.eq("year",stringyear).eq("month",stringmonth).eq("speed",speed).eq("windturbine_id",key);
         Optional<ProEconCurveFittMonthSub> cfmsmontho = proEconCurveFittMonthSubService.list(queryWrapper2).stream()
 //                .filter(i -> i.getWindturbineId().equals(key)
 //                && i.getYear().equals(stringyear) && i.getMonth().equals(stringmonth) && i.getSpeed().equals(speedStr))
@@ -902,7 +908,7 @@ public class PowerCurveFittingByTimeService {
         cfmsmonth.setWindturbineId(key);
         cfmsmonth.setYear(stringyear);
         cfmsmonth.setMonth(stringmonth);
-        cfmsmonth.setSpeed(String.valueOf(speed));
+        cfmsmonth.setSpeed(speed);
 
 
 
@@ -926,13 +932,13 @@ public class PowerCurveFittingByTimeService {
     }
 
     public ProEconCurveFittYearSub pLCBuild(String key, String stringyear, Map<String, CureFittingVo> windMap, Double modelpower, double speed,
-                         List<PointVo> bzglpowerPoints, List<PointVo> lastMonthPoints, List<PointVo> lastYearPoints, List<PointVo> lastStandardPoints
+                                            List<PointVo> bzglpowerPoints, List<PointVo> lastMonthPoints, List<PointVo> lastYearPoints, List<PointVo> lastStandardPoints
     ) {
-        String speedStr = String.valueOf(speed);
+//        String speedStr = String.valueOf(speed);
 
         //*********************************************当年曲线偏差子表记录**********************************************************/
         QueryWrapper<ProEconCurveFittYearSub> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("year",stringyear).eq("speed",speedStr).eq("windturbine_id",key);
+        queryWrapper.eq("year",stringyear).eq("speed",speed).eq("windturbine_id",key);
         Optional<ProEconCurveFittYearSub> cfmsyearo = proEconCurveFittYearSubService.list(queryWrapper).stream()
 //                .filter(i -> i.getWindturbineId().equals(key)
 //                && i.getYear().equals(stringyear) && i.getSpeed().equals(speedStr))
@@ -950,22 +956,22 @@ public class PowerCurveFittingByTimeService {
         cfmsyear = new ProEconCurveFittYearSub();
         cfmsyear.setWindturbineId(key);
         cfmsyear.setYear(stringyear);
-        cfmsyear.setSpeed(String.valueOf(speed));
+        cfmsyear.setSpeed(speed);
 
-       // proEconCurveFittYearSubService.save(cfmsyear);
+        // proEconCurveFittYearSubService.save(cfmsyear);
 
         //年---实际/最优
-        cfmsyear.setDeviationRate1(pcl2(windMap.get(key).getYsjglPoints(), windMap.get(key).getYzyglPoints(), modelpower, speed));
+        cfmsyear.setDeviationRate1(pcl2(windMap.get(key).getNsjglPoints(), windMap.get(key).getNzyglPoints(), modelpower, speed));
         //年---实际/保证
-        cfmsyear.setDeviationRate2(pcl2(windMap.get(key).getYsjglPoints(), bzglpowerPoints, modelpower, speed));
+        cfmsyear.setDeviationRate2(pcl2(windMap.get(key).getNsjglPoints(), bzglpowerPoints, modelpower, speed));
         //年---最优/保证
-        cfmsyear.setDeviationRate3(pcl2(windMap.get(key).getYzyglPoints(), bzglpowerPoints, modelpower, speed));
+        cfmsyear.setDeviationRate3(pcl2(windMap.get(key).getNzyglPoints(), bzglpowerPoints, modelpower, speed));
         //年---实际/上月实际
-        cfmsyear.setMonthDeviationRate(pcl2(windMap.get(key).getYsjglPoints(), lastMonthPoints, modelpower, speed));
+        cfmsyear.setMonthDeviationRate(pcl2(windMap.get(key).getNsjglPoints(), lastMonthPoints, modelpower, speed));
         //年---实际/同期实际
-        cfmsyear.setYearDeviationRate(pcl2(windMap.get(key).getYsjglPoints(), lastYearPoints, modelpower, speed));
+        cfmsyear.setYearDeviationRate(pcl2(windMap.get(key).getNsjglPoints(), lastYearPoints, modelpower, speed));
         //年---实际/标杆实际
-        cfmsyear.setStandardDeviationRate(pcl2(windMap.get(key).getYsjglPoints(), lastStandardPoints, modelpower, speed));
+        cfmsyear.setStandardDeviationRate(pcl2(windMap.get(key).getNsjglPoints(), lastStandardPoints, modelpower, speed));
 
 //        proEconCurveFittYearSubService.save(cfmsyear);
         return cfmsyear;
@@ -1091,7 +1097,7 @@ public class PowerCurveFittingByTimeService {
                     item.setYear(String.valueOf(year));
                     item.setMonth(String.valueOf(month));
                     wtcfls.add(item);
-                   // proEconWtCurveFittingMonthService.save(item);
+                    // proEconWtCurveFittingMonthService.save(item);
                 }
 
             }
@@ -1165,7 +1171,7 @@ public class PowerCurveFittingByTimeService {
                     item.setOptimalPower(zyglls.get(i).getY());
                     item.setYear(String.valueOf(year));
                     wtcfls.add(item);
-                   // proEconWtCurveFittingYearService.save(item);
+                    // proEconWtCurveFittingYearService.save(item);
                 }
 
             }

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

@@ -252,7 +252,7 @@ public class PowerCurveFittingService {
             String stringyear3 = String.valueOf(year3);
             String stringmonth3 = String.valueOf(month3);
 
-           // /*********************************************年曲线偏差上个月和上一年记录**********************************************************/
+            // /*********************************************年曲线偏差上个月和上一年记录**********************************************************/
 
 
             List<ProEconWtCurveFittingYear> wcfyls = proEconWtCurveFittingYearService.list().stream().filter(i -> i.getWindturbineId().equals(key) &&
@@ -286,7 +286,7 @@ public class PowerCurveFittingService {
 
             dayBuildPoints(wcfls, dayLastMonthPoints);
 
-            
+
             wcfls = proEconWtCurveFittingService.list().stream().filter(i -> i.getWindturbineId().equals(key) &&
                     i.getRecordDate().compareTo(d2) == 0).collect(Collectors.toList());
 
@@ -465,7 +465,7 @@ public class PowerCurveFittingService {
         cfmsyear = new ProEconCurveFittYearSub();
         cfmsyear.setWindturbineId(key);
         cfmsyear.setYear(stringyear);
-        cfmsyear.setSpeed(String.valueOf(speed));
+        cfmsyear.setSpeed(speed);
 
         proEconCurveFittYearSubService.save(cfmsyear);
 
@@ -502,7 +502,7 @@ public class PowerCurveFittingService {
         cfmsmonth.setWindturbineId(key);
         cfmsmonth.setYear(stringyear);
         cfmsmonth.setMonth(stringmonth);
-        cfmsmonth.setSpeed(String.valueOf(speed));
+        cfmsmonth.setSpeed(speed);
 
         proEconCurveFittMonthSubService.save(cfmsmonth);
 
@@ -536,7 +536,7 @@ public class PowerCurveFittingService {
 
         cfms = new ProEconCurveFittingSub();
         cfms.setWindturbineId(key);
-        cfms.setSpeed(String.valueOf(speed));
+        cfms.setSpeed(speed);
         cfms.setRecordDate(current);
 
 
@@ -1239,12 +1239,12 @@ public class PowerCurveFittingService {
         double maxval =0.0;
         if(sjglPoints.stream().min(Comparator.comparing(PointVo::getX)).isPresent())
         {
-             min = sjglPoints.stream().min(Comparator.comparing(PointVo::getX)).get().getX() * coefficient;
+            min = sjglPoints.stream().min(Comparator.comparing(PointVo::getX)).get().getX() * coefficient;
 
         }
         if(sjglPoints.stream().max(Comparator.comparing(PointVo::getX)).isPresent())
         {
-             max = sjglPoints.stream().max(Comparator.comparing(PointVo::getX)).get().getX() * coefficient;
+            max = sjglPoints.stream().max(Comparator.comparing(PointVo::getX)).get().getX() * coefficient;
         }
         if(sjglPoints.stream().max(Comparator.comparing(PointVo::getY)).isPresent())
         {