wangchangsheng 3 роки тому
батько
коміт
13f2aaf183

+ 8 - 1
src/main/java/com/gyee/frame/service/health/HealthMainService.java

@@ -38,6 +38,7 @@ public class HealthMainService {
     private final int digit = 2;
     private final double NUM = 3.6;
     private final double XZNUM = 1.25;
+    private final double YCFDLXS = 1.08;
 
     IRealTimeDataBaseUtil realApiUtil = RealTimeDataBaseFactory.createRealTimeDataBase();
 
@@ -683,7 +684,13 @@ public class HealthMainService {
 
                     }
 
-                    ycdl1month = powerToPowerService.getPowerByWp(speedmap, wpId, 24);
+                    //ycdl1month = powerToPowerService.getPowerByWp(speedmap, wpId, 24);
+                    //预测电量临时算法=(月发电量+日预测发电量*(日历天数-当前日数))*预测发电量系数
+                    cal = Calendar.getInstance();
+                    cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+                    int daynum = cal.get(Calendar.DAY_OF_MONTH);
+                    cal = Calendar.getInstance();
+                    ycdl1month = StringUtils.round((yfdl + ycdl1day*(daynum-cal.get(Calendar.DAY_OF_MONTH)))*YCFDLXS, 2);
 
                 }