Merge remote-tracking branch 'origin/master'

src/main/java/com/gyee/SpringbootStart.java

@@ -23,11 +23,11 @@ public class SpringbootStart {
 
         InitialRedis initialRedis=new InitialRedis();
 //        System.out.println("初始化开始！");
-        initialRedis.intialWindturbinepowercurvefitting();
-        initialRedis.intialWpScatter();
-        initialRedis.intialPjScatter();
-        initialRedis.intialLnScatter();
-        initialRedis.intialWtScatter();
+//        initialRedis.intialWindturbinepowercurvefitting();
+//        initialRedis.intialWpScatter();
+//        initialRedis.intialPjScatter();
+//        initialRedis.intialLnScatter();
+//        initialRedis.intialWtScatter();
 //        System.out.println("初始化完成！");
     }
 }

src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -473,6 +473,7 @@ public class GenreSetPushService {
                 rycfdl = rfdl * YCFDLXS;
             }
             //预测电量临时算法=(月发电量+日预测发电量*(日历天数-当前日数))*预测发电量系数
+            c = Calendar.getInstance();
             double yycfdl = (yfdl + rycfdl*(daynum-c.get(Calendar.DAY_OF_MONTH)))*YCFDLXS;
             jczbmap.put("rycfdl", MathUtil.twoBit(rycfdl));
             jczbmap.put("yycfdl", MathUtil.twoBit(yycfdl));

src/test/java/test/InitialPointServiceTest.java

@@ -20,11 +20,11 @@ public class InitialPointServiceTest {
 
         InitialPointGoldenService initialPointGoldenService= SpringUtils.getBean("initialPointGoldenService");
 
-//        initialPointGoldenService.initalFj();
+        initialPointGoldenService.initalFj();
 
-//        initialPointGoldenService.initalFc(true);
+        initialPointGoldenService.initalFc(true);
 
-//        initialPointGoldenService.initalDd();
+        initialPointGoldenService.initalDd();
 
         initialPointGoldenService.initalFgl();