修改电量计算规则

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

@@ -183,12 +183,12 @@ public class CycleCalculationService {
                 wtResultList.add(PointUtil.createPointData(date,rfdl,rfdlPoint.getNemCode(),rfdlPoint.getName()));
 
                 double yfdl = ssfdl - monthfirstfdl;
-                if (yfdl<0 || yfdl>modelpower.get(wt.getModelId())*24*31*1.5){
+                if (yfdl<0 || yfdl<rfdl || yfdl>modelpower.get(wt.getModelId())*24*31*1.5){
                     yfdl = rfdl*day;
                 }
                 wtResultList.add(PointUtil.createPointData(date,yfdl,yfdlPoint.getNemCode(),yfdlPoint.getName()));
                 double nfdl = ssfdl - yearfirstfdl;
-                if (nfdl<0 || nfdl>modelpower.get(wt.getModelId())*24*31*12*1.5){
+                if (nfdl<0 || nfdl<yfdl || nfdl>modelpower.get(wt.getModelId())*24*31*12*1.5){
                     nfdl = yfdl*month;
                 }
                 wtResultList.add(PointUtil.createPointData(date,nfdl,nfdlPoint.getNemCode(),nfdlPoint.getName()));