调整计算

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

@@ -80,11 +80,12 @@ public class RealtimeService {
             Optional<PointData> ssglOptional = null;
             Optional<PointData> zsglOptional = null;
             try {
-                mxzt = edosUtil.getSectionData(mxztPoint, currentDate.getTime()).getPointValueInDouble();
-                speed = edosUtil.getSectionData(speedPoint, currentDate.getTime()).getPointValueInDouble();
-                ssgl = edosUtil.getSectionData(ssglPoint, currentDate.getTime()).getPointValueInDouble();
+                mxzt = edosUtil.getRealData(mxztPoint).getPointValueInDouble();
+                speed = edosUtil.getRealData(speedPoint).getPointValueInDouble();
+                ssgl = edosUtil.getRealData(ssglPoint).getPointValueInDouble();
                 ssglOptional = edosUtil.getHistStat(ssglPoint, minute15begin.getTime() / 1000, currentDate.getTime() / 1000, 1l, 900l, 2).stream().findFirst();
                 zsglOptional = edosUtil.getHistStat(zsglPoint, minute15begin.getTime() / 1000, currentDate.getTime() / 1000, 1l, 900l, 2).stream().findFirst();
+
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -190,7 +191,7 @@ public class RealtimeService {
 
                 zssbf.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(ssbfPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(ssbfPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -198,7 +199,7 @@ public class RealtimeService {
                 });
                 zssgl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(ssglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(ssglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -206,7 +207,7 @@ public class RealtimeService {
                 });
                 zllgl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(llglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(llglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -214,7 +215,7 @@ public class RealtimeService {
                 });
                 zbzgl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(bzglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(bzglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -222,7 +223,7 @@ public class RealtimeService {
                 });
                 zzsgl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(zsglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(zsglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -230,7 +231,7 @@ public class RealtimeService {
                 });
                 zzygl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(zyglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(zyglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -238,7 +239,7 @@ public class RealtimeService {
                 });
                 zkygl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(kyglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(kyglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -304,7 +305,7 @@ public class RealtimeService {
                 ProBasicPowerstationPoint finalSsbfPoint = ssbfPoint;
                 zssbf.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(finalSsbfPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(finalSsbfPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -312,7 +313,7 @@ public class RealtimeService {
                 });
                 zssgl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(ssglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(ssglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -320,7 +321,7 @@ public class RealtimeService {
                 });
                 zllgl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(llglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(llglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -328,7 +329,7 @@ public class RealtimeService {
                 });
                 zbzgl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(bzglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(bzglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -336,7 +337,7 @@ public class RealtimeService {
                 });
                 zzsgl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(zsglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(zsglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -344,7 +345,7 @@ public class RealtimeService {
                 });
                 zzygl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(zyglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(zyglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -352,7 +353,7 @@ public class RealtimeService {
                 });
                 zkygl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(kyglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(kyglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -419,7 +420,7 @@ public class RealtimeService {
                 ProBasicPowerstationPoint finalSsbfPoint = ssbfPoint;
                 zssbf.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(finalSsbfPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(finalSsbfPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -427,7 +428,7 @@ public class RealtimeService {
                 });
                 zssgl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(ssglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(ssglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -435,7 +436,7 @@ public class RealtimeService {
                 });
                 zllgl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(llglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(llglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -443,7 +444,7 @@ public class RealtimeService {
                 });
                 zbzgl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(bzglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(bzglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -451,7 +452,7 @@ public class RealtimeService {
                 });
                 zzsgl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(zsglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(zsglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -459,7 +460,7 @@ public class RealtimeService {
                 });
                 zzygl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(zyglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(zyglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -467,7 +468,7 @@ public class RealtimeService {
                 });
                 zkygl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(kyglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(kyglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }

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

@@ -91,6 +91,7 @@ public class RegionCalreService  {
             zsspjgzdPoint = powerstationPointMap.get(ContantXk.SSPJGZD);
         }
         ProBasicPowerstationPoint zaqtsPoint = powerstationPointMap.get(ContantXk.AQTS);
+        ProBasicPowerstationPoint zczztPoint = powerstationPointMap.get(ContantXk.CZZT);
         ProBasicPowerstationPoint zsszglPoint = powerstationPointMap.get(ContantXk.SSZGL);
         ProBasicPowerstationPoint zsszllglPoint = powerstationPointMap.get(ContantXk.SSZLLGL);
         ProBasicPowerstationPoint zsszbzglPoint = powerstationPointMap.get(ContantXk.SSZBZGL);
@@ -156,13 +157,15 @@ public class RegionCalreService  {
         AtomicInteger gcComCount = new AtomicInteger();
         AtomicInteger finalGcComCount = gcComCount;
         AtomicInteger finalFcComCount = fcComCount;
+        double zczzt = 0;
 
         List<Double> aqtsList = new ArrayList<>();
-        companys.stream().forEach(company->{
-            if (company.getJrCapacity()>0){
+//        companys.stream().forEach(company->{
+         for(ProBasicCompany company:companys){
+            if (company.getJrCapacity()>0 && company.getSpare3().equals("1")){
                 finalGcComCount.getAndIncrement();
             }
-            if (company.getJrwindCapacity()>0){
+            if (company.getJrwindCapacity()>0  && company.getSpare3().equals("1")){
                 finalFcComCount.getAndIncrement();
             }
             Map<String, ProBasicPowerstationPoint> powerstationPointMap1 = companypointmap.get(company.getId()+type);
@@ -183,6 +186,7 @@ public class RegionCalreService  {
                 }
 
                 ProBasicPowerstationPoint aqtsPoint = powerstationPointMap1.get(ContantXk.AQTS);
+                ProBasicPowerstationPoint czztPoint = powerstationPointMap1.get(ContantXk.CZZT);
                 ProBasicPowerstationPoint sszglPoint = powerstationPointMap1.get(ContantXk.SSZGL);
                 ProBasicPowerstationPoint sszllglPoint = powerstationPointMap1.get(ContantXk.SSZLLGL);
                 ProBasicPowerstationPoint sszbzglPoint = powerstationPointMap1.get(ContantXk.SSZBZGL);
@@ -214,17 +218,27 @@ public class RegionCalreService  {
                 ProBasicPowerstationPoint lxtsPoint = powerstationPointMap1.get(ContantXk.TXZDTS);
 
                 try {
-                    double temp = edosUtil.getSectionData(aqtsPoint, currentDate.getTime()).getPointValueInDouble();
+                    double temp = edosUtil.getRealData(aqtsPoint).getPointValueInDouble();
                     aqtsList.add(temp);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
+                try {
+                    double temp1 = edosUtil.getRealData(czztPoint).getPointValueInDouble();
+                    if (temp1 ==0){
+                        continue;
+                    }else {
+                        zczzt = 1;
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
 
                 if (type.equals("-1")){
                     ProBasicPowerstationPoint finalSspjfsfsPoint = sspjfsPoint;
                     sspjfs.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getSectionData(finalSspjfsfsPoint, currentDate.getTime()).getPointValueInDouble()));
+                            return new Double((double) (v + edosUtil.getRealData(finalSspjfsfsPoint).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -236,7 +250,7 @@ public class RegionCalreService  {
                     ProBasicPowerstationPoint finalSspjgzdPoint = sspjgzdPoint;
                     sspjgzd.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getSectionData(finalSspjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
+                            return new Double((double) (v + edosUtil.getRealData(finalSspjgzdPoint).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -247,7 +261,7 @@ public class RegionCalreService  {
                     ProBasicPowerstationPoint finalSspjfsfsPoint = sspjfsPoint;
                     sspjfs.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getSectionData(finalSspjfsfsPoint, currentDate.getTime()).getPointValueInDouble()));
+                            return new Double((double) (v + edosUtil.getRealData(finalSspjfsfsPoint).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -256,7 +270,7 @@ public class RegionCalreService  {
                     ProBasicPowerstationPoint finalSspjgzdPoint = sspjgzdPoint;
                     sspjgzd.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getSectionData(finalSspjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
+                            return new Double((double) (v + edosUtil.getRealData(finalSspjgzdPoint).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -265,7 +279,7 @@ public class RegionCalreService  {
                 }
                 sszgl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(sszglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(sszglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -273,7 +287,7 @@ public class RegionCalreService  {
                 });
                 zllgl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(sszllglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(sszllglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -281,7 +295,7 @@ public class RegionCalreService  {
                 });
                 zbzgl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(sszbzglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(sszbzglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -289,7 +303,7 @@ public class RegionCalreService  {
                 });
                 znhglzs.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(ssznhglzsPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(ssznhglzsPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -297,7 +311,7 @@ public class RegionCalreService  {
                 });
                 zzygl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(sszzyglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(sszzyglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -305,7 +319,7 @@ public class RegionCalreService  {
                 });
                 zkygl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(sszkyglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(sszkyglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -313,7 +327,7 @@ public class RegionCalreService  {
                 });
                 zycgl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(sszycglPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(sszycglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -324,7 +338,7 @@ public class RegionCalreService  {
 
                 gztsmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(gztsmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(gztsmxPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -332,7 +346,7 @@ public class RegionCalreService  {
                 });
                 cngzmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(cnslmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(cnslmxPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -340,7 +354,7 @@ public class RegionCalreService  {
                 });
                 jxtsmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(jxtsmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(jxtsmxPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -348,7 +362,7 @@ public class RegionCalreService  {
                 });
                 cnjxmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(cnjxmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(cnjxmxPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -356,7 +370,7 @@ public class RegionCalreService  {
                 });
                 djtsmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(djtsmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(djtsmxPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -364,7 +378,7 @@ public class RegionCalreService  {
                 });
                 qxjclmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(qxjclmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(qxjclmxPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -372,7 +386,7 @@ public class RegionCalreService  {
                 });
                 sdtjmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(sdtjmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(sdtjmxPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -380,7 +394,7 @@ public class RegionCalreService  {
                 });
                 xntsmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(xntsmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(xntsmxPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -388,7 +402,7 @@ public class RegionCalreService  {
                 });
                 xdtjmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(xdtjmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(xdtjmxPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -396,7 +410,7 @@ public class RegionCalreService  {
                 });
                 xdjclmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(xdjclmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(xdjclmxPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -404,7 +418,7 @@ public class RegionCalreService  {
                 });
                 cwsldwmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(cwsldwmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(cwsldwmxPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -412,7 +426,7 @@ public class RegionCalreService  {
                 });
                 cwsltqmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(cwsltqmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(cwsltqmxPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -420,7 +434,7 @@ public class RegionCalreService  {
                 });
                 lxtsmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(lxtsmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(lxtsmxPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -428,7 +442,7 @@ public class RegionCalreService  {
                 });
                 txzdmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(txzdmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(txzdmxPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -436,7 +450,7 @@ public class RegionCalreService  {
                 });
                 djts.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(djtsPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(djtsPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -444,7 +458,7 @@ public class RegionCalreService  {
                 });
                 yxts.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(yxtsPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(yxtsPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -452,7 +466,7 @@ public class RegionCalreService  {
                 });
                 gzts.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(gztsPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(gztsPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -460,7 +474,7 @@ public class RegionCalreService  {
                 });
                 whts.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(whtsPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(whtsPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -468,7 +482,7 @@ public class RegionCalreService  {
                 });
                 xdts.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(xdtsPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(xdtsPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -476,7 +490,7 @@ public class RegionCalreService  {
                 });
                 slts.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(sltsPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(sltsPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -484,7 +498,7 @@ public class RegionCalreService  {
                 });
                 lxts.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(lxtsPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(lxtsPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -492,7 +506,7 @@ public class RegionCalreService  {
                 });
             }
 
-        });
+        }
         if (fcComCount.get()==0){
             fcComCount.getAndIncrement();
         }
@@ -512,6 +526,7 @@ public class RegionCalreService  {
         Double aqts = Collections.max(aqtsList);
 
         resultList.add(PointUtil.createPointData(currentDate,aqts,zaqtsPoint.getNemCode(),zaqtsPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,zczzt,zczztPoint.getNemCode(),zczztPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,sszgl.get(),zsszglPoint.getNemCode(),zsszglPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,zllgl.get(),zsszllglPoint.getNemCode(),zsszllglPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,zbzgl.get(),zsszbzglPoint.getNemCode(),zsszbzglPoint.getName()));
@@ -545,8 +560,8 @@ public class RegionCalreService  {
     }
     private void weightingCompany(Date currentDate, Map<String, Map<String, ProBasicPowerstationPoint>> companypointmap, Map<String, Map<String, ProBasicPowerstationPoint>> wppointmap, List<PointData> resultList, ProBasicCompany company, List<ProBasicPowerstation> wps,String type) {
         Map<String, ProBasicPowerstationPoint> powerstationPointMap = companypointmap.get(company.getId()+type);
-        int fdcsize = wps.stream().filter(wp -> wp.getId().contains("_FDC_")).collect(Collectors.toList()).size();
-        int gdcsize = wps.stream().filter(wp -> wp.getId().contains("_GDC_")).collect(Collectors.toList()).size();
+        int fdcsize = wps.stream().filter(wp -> wp.getId().contains("_FDC_") && wp.getSpare3().equals("1")).collect(Collectors.toList()).size();
+        int gdcsize = wps.stream().filter(wp -> wp.getId().contains("_GDC_") && wp.getSpare3().equals("1")).collect(Collectors.toList()).size();
         if (fdcsize==0)
             fdcsize = 1;
         if (gdcsize==0)
@@ -565,7 +580,7 @@ public class RegionCalreService  {
         }
 
         ProBasicPowerstationPoint zaqtsPoint = powerstationPointMap.get(ContantXk.AQTS);
-
+        ProBasicPowerstationPoint zczztPoint = powerstationPointMap.get(ContantXk.CZZT);
         ProBasicPowerstationPoint zsszglPoint = powerstationPointMap.get(ContantXk.SSZGL);
         ProBasicPowerstationPoint zsszllglPoint = powerstationPointMap.get(ContantXk.SSZLLGL);
         ProBasicPowerstationPoint zsszbzglPoint = powerstationPointMap.get(ContantXk.SSZBZGL);
@@ -626,25 +641,25 @@ public class RegionCalreService  {
         AtomicReference<Double> xdts = new AtomicReference<>((double) 0);
         AtomicReference<Double> slts = new AtomicReference<>((double) 0);
         AtomicReference<Double> djts = new AtomicReference<>((double) 0);
-
+        Double zczzt = 0.0;
         List<Double> aqtsList = new ArrayList<>();
-        wps.stream().forEach(wp->{
-
+//        wps.stream().forEach(wp->{
+        for(ProBasicPowerstation wp : wps) {
 
             Map<String, ProBasicPowerstationPoint> powerstationPointMap1 = wppointmap.get(wp.getId());
 
             ProBasicPowerstationPoint sspjfsPoint = null;
             ProBasicPowerstationPoint sspjgzdPoint = null;
 
-            if (wp.getId().contains("_FDC_")){
+            if (wp.getId().contains("_FDC_")) {
                 sspjfsPoint = powerstationPointMap1.get(ContantXk.SSPJFS);
 
-            }else if(wp.getId().contains("_GDC_")){
+            } else if (wp.getId().contains("_GDC_")) {
                 sspjgzdPoint = powerstationPointMap1.get(ContantXk.SSPJGZD);
 
             }
             ProBasicPowerstationPoint aqtsPoint = powerstationPointMap1.get(ContantXk.AQTS);
-
+            ProBasicPowerstationPoint czztPoint = powerstationPointMap1.get(ContantXk.CZZT);
             ProBasicPowerstationPoint sszglPoint = powerstationPointMap1.get(ContantXk.SSZGL);
             ProBasicPowerstationPoint sszllglPoint = powerstationPointMap1.get(ContantXk.SSZLLGL);
             ProBasicPowerstationPoint sszbzglPoint = powerstationPointMap1.get(ContantXk.SSZBZGL);
@@ -677,28 +692,39 @@ public class RegionCalreService  {
 
 
             try {
-                double temp = edosUtil.getSectionData(aqtsPoint, currentDate.getTime()).getPointValueInDouble();
+                double temp = edosUtil.getRealData(aqtsPoint).getPointValueInDouble();
                 aqtsList.add(temp);
             } catch (Exception e) {
                 e.printStackTrace();
             }
 
-            if (wp.getId().contains("_FDC_")){
+            try {
+                double temp1 = edosUtil.getRealData(czztPoint).getPointValueInDouble();
+                if (temp1 == 0) {
+                    continue;
+                }else {
+                    zczzt = 1.0;
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            if (wp.getId().contains("_FDC_")) {
                 ProBasicPowerstationPoint finalSspjfsPoint = sspjfsPoint;
                 sspjfs.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(finalSspjfsPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(finalSspjfsPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
                     return v;
                 });
 
-            }else if (wp.getId().contains("_GDC_")){
+            } else if (wp.getId().contains("_GDC_")) {
                 ProBasicPowerstationPoint finalSspjgzdPoint = sspjgzdPoint;
                 sspjgzd.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(finalSspjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(finalSspjgzdPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -707,7 +733,7 @@ public class RegionCalreService  {
             }
             sszgl.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(sszglPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(sszglPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -715,7 +741,7 @@ public class RegionCalreService  {
             });
             zllgl.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(sszllglPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(sszllglPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -723,7 +749,7 @@ public class RegionCalreService  {
             });
             zbzgl.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(sszbzglPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(sszbzglPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -731,7 +757,7 @@ public class RegionCalreService  {
             });
             znhglzs.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(ssznhglzsPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(ssznhglzsPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -739,7 +765,7 @@ public class RegionCalreService  {
             });
             zzygl.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(sszzyglPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(sszzyglPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -747,7 +773,7 @@ public class RegionCalreService  {
             });
             zkygl.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(sszkyglPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(sszkyglPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -755,7 +781,7 @@ public class RegionCalreService  {
             });
             zycgl.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(sszycglPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(sszycglPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -763,11 +789,9 @@ public class RegionCalreService  {
             });
 
 
-
-
             gztsmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(gztsmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(gztsmxPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -775,7 +799,7 @@ public class RegionCalreService  {
             });
             cngzmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(cnslmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(cnslmxPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -783,7 +807,7 @@ public class RegionCalreService  {
             });
             jxtsmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(jxtsmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(jxtsmxPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -791,7 +815,7 @@ public class RegionCalreService  {
             });
             cnjxmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(cnjxmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(cnjxmxPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -799,7 +823,7 @@ public class RegionCalreService  {
             });
             djtsmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(djtsmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(djtsmxPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -807,7 +831,7 @@ public class RegionCalreService  {
             });
             qxjclmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(qxjclmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(qxjclmxPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -815,7 +839,7 @@ public class RegionCalreService  {
             });
             sdtjmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(sdtjmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(sdtjmxPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -823,7 +847,7 @@ public class RegionCalreService  {
             });
             xntsmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(xntsmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(xntsmxPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -831,7 +855,7 @@ public class RegionCalreService  {
             });
             xdtjmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(xdtjmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(xdtjmxPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -839,7 +863,7 @@ public class RegionCalreService  {
             });
             xdjclmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(xdjclmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(xdjclmxPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -847,7 +871,7 @@ public class RegionCalreService  {
             });
             cwsldwmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(cwsldwmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(cwsldwmxPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -855,7 +879,7 @@ public class RegionCalreService  {
             });
             cwsltqmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(cwsltqmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(cwsltqmxPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -863,7 +887,7 @@ public class RegionCalreService  {
             });
             lxtsmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(lxtsmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(lxtsmxPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -871,7 +895,7 @@ public class RegionCalreService  {
             });
             txzdmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(txzdmxPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(txzdmxPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -879,7 +903,7 @@ public class RegionCalreService  {
             });
             djts.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(djtsPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(djtsPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -887,7 +911,7 @@ public class RegionCalreService  {
             });
             yxts.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(yxtsPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(yxtsPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -895,7 +919,7 @@ public class RegionCalreService  {
             });
             gzts.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(gztsPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(gztsPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -903,7 +927,7 @@ public class RegionCalreService  {
             });
             whts.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(whtsPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(whtsPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -911,7 +935,7 @@ public class RegionCalreService  {
             });
             xdts.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(xdtsPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(xdtsPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -919,7 +943,7 @@ public class RegionCalreService  {
             });
             slts.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(sltsPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(sltsPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -927,13 +951,13 @@ public class RegionCalreService  {
             });
             lxts.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(lxtsPoint, currentDate.getTime()).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getRealData(lxtsPoint).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
                 return v;
             });
-        });
+        }
         if (type.equals("-1")){
             resultList.add(PointUtil.createPointData(currentDate,sspjfs.get()/fdcsize,zsspjfsPoint.getNemCode(),zsspjfsPoint.getName()));
 
@@ -947,6 +971,7 @@ public class RegionCalreService  {
 
         Double aqts = Collections.max(aqtsList);
         resultList.add(PointUtil.createPointData(currentDate,aqts,zaqtsPoint.getNemCode(),zaqtsPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,zczzt,zczztPoint.getNemCode(),zczztPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,sszgl.get(),zsszglPoint.getNemCode(),zsszglPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,zllgl.get(),zsszllglPoint.getNemCode(),zsszllglPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,zbzgl.get(),zsszbzglPoint.getNemCode(),zsszbzglPoint.getName()));