调整计算

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

@@ -1561,17 +1561,17 @@ public class RegionCalService {
         double ysbklyl = 0;
         double ydxkyxs = 0;
         if (type.equals("-1")){
-            rlyxs = rfdl.get() / region.getJrwindCapacity();
-            ylyxs = yfdl.get() / region.getJrwindCapacity();
-            nlyxs = nfdl.get() / region.getJrwindCapacity();
+            rlyxs = region.getJrwindCapacity()!=0?rfdl.get() / region.getJrwindCapacity():0;
+            ylyxs = region.getJrwindCapacity()!=0?yfdl.get() / region.getJrwindCapacity():0;
+            nlyxs = region.getJrwindCapacity()!=0?nfdl.get() / region.getJrwindCapacity():0;
         }else if(type.equals("-2")){
-            rlyxs = rfdl.get() / region.getJrCapacity();
-            ylyxs = yfdl.get() / region.getJrCapacity();
-            nlyxs = nfdl.get() / region.getJrCapacity();
+            rlyxs = region.getJrCapacity()!=0?rfdl.get() / region.getJrCapacity():0;
+            ylyxs = region.getJrCapacity()!=0?yfdl.get() / region.getJrCapacity():0;
+            nlyxs = region.getJrCapacity()!=0?nfdl.get() / region.getJrCapacity():0;
         }else {
-            rlyxs = rfdl.get() / (region.getJrwindCapacity()+region.getJrCapacity());
-            ylyxs = yfdl.get() / (region.getJrwindCapacity()+region.getJrCapacity());
-            nlyxs = nfdl.get() / (region.getJrwindCapacity()+region.getJrCapacity());
+            rlyxs = (region.getJrwindCapacity()+region.getJrCapacity())!=0?rfdl.get() / (region.getJrwindCapacity()+region.getJrCapacity()):0;
+            ylyxs = (region.getJrwindCapacity()+region.getJrCapacity())!=0?yfdl.get() / (region.getJrwindCapacity()+region.getJrCapacity()):0;
+            nlyxs = (region.getJrwindCapacity()+region.getJrCapacity())!=0?nfdl.get() / (region.getJrwindCapacity()+region.getJrCapacity()):0;
         }
         Date monthFirst = DateUtils.getMonthFirst(currentDate);
         double hoursDiff = DateUtils.hoursDiff2(currentDate, monthFirst);
@@ -3026,17 +3026,17 @@ public class RegionCalService {
         double ysbklyl = 0;
         double ydxkyxs = 0;
         if (type.equals("-1")){
-            rlyxs = rfdl.get() / company.getJrwindCapacity();
-            ylyxs = yfdl.get() / company.getJrwindCapacity();
-            nlyxs = nfdl.get() / company.getJrwindCapacity();
+            rlyxs = company.getJrwindCapacity()!=0?rfdl.get() / company.getJrwindCapacity():0;
+            ylyxs = company.getJrwindCapacity()!=0?yfdl.get() / company.getJrwindCapacity():0;
+            nlyxs = company.getJrwindCapacity()!=0?nfdl.get() / company.getJrwindCapacity():0;
         }else if(type.equals("-2")){
-            rlyxs = rfdl.get() / company.getJrCapacity();
-            ylyxs = yfdl.get() / company.getJrCapacity();
-            nlyxs = nfdl.get() / company.getJrCapacity();
+            rlyxs = company.getJrCapacity()!=0?rfdl.get() / company.getJrCapacity():0;
+            ylyxs = company.getJrCapacity()!=0?yfdl.get() / company.getJrCapacity():0;
+            nlyxs = company.getJrCapacity()!=0?nfdl.get() / company.getJrCapacity():0;
         }else {
-            rlyxs = rfdl.get() / (company.getJrwindCapacity()+company.getJrCapacity());
-            ylyxs = yfdl.get() / (company.getJrwindCapacity()+company.getJrCapacity());
-            nlyxs = nfdl.get() / (company.getJrwindCapacity()+company.getJrCapacity());
+            rlyxs = (company.getJrwindCapacity()+company.getJrCapacity())!=0?rfdl.get() / (company.getJrwindCapacity()+company.getJrCapacity()):0;
+            ylyxs = (company.getJrwindCapacity()+company.getJrCapacity())!=0?yfdl.get() / (company.getJrwindCapacity()+company.getJrCapacity()):0;
+            nlyxs = (company.getJrwindCapacity()+company.getJrCapacity())!=0?nfdl.get() / (company.getJrwindCapacity()+company.getJrCapacity()):0;
         }
         Date monthFirst = DateUtils.getMonthFirst(currentDate);
         double hoursDiff = DateUtils.hoursDiff2(currentDate, monthFirst);

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

@@ -218,8 +218,6 @@ public class StatusService {
                     }else{
                         resultList.add(PointUtil.createPointData(currentDate,fjxd,fjxdztPoint.getNemCode(),fjxdztPoint.getName()));
                     }
-
-
                 });
             }
             if (agcPoint.getNemCode().equals("INITIAL")){