计算服务调整

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

@@ -53,11 +53,11 @@ public class AccessStatusService {
             ProBasicPowerstationPoint qcztPoint = powerstationPointMap.get(ContantXk.QCZT);
 
             ProBasicPowerstationPoint zycglpoint = powerstationPointMap.get(ContantXk.ZYCGL);
-            double djlzt = 1;
-            double fjzt = 1;
-            double agczt = 1;
-            double glyczt = 1;
-            double cftzt = 1;
+            double djlzt = 0;
+            double fjzt = 0;
+            double agczt = 0;
+            double glyczt = 0;
+            double cftzt = 0;
 
             double zycgl = 0;
             Optional<ProBasicMeterPoint> swdlOptional = meterpoints.stream().filter(me -> me.getUniformCode().equals("ZXYG") && me.getMeterType().equals("出线") && me.getMeterSort().equals("主")).findFirst();
@@ -77,8 +77,8 @@ public class AccessStatusService {
 
             try {
                 double qczt = edosUtil.getSectionData(qcztPoint, currentDate.getTime()).getPointValueInDouble();
-                if (qczt == 6){
-                    fjzt = 0;
+                if (qczt != 6){
+                    fjzt = 1;
                 }
 
             } catch (Exception e) {
@@ -88,8 +88,8 @@ public class AccessStatusService {
                 ProBasicMeterPoint proBasicMeterPoint = swdlOptional.get();
                 try {
                     Long pointTime = edosUtil.getRealData(proBasicMeterPoint.getNemCode()).getPointTime();
-                    if ((currentDate.getTime() - pointTime) / 1000 > Integer.parseInt(second)){
-                        djlzt = 0;
+                    if ((currentDate.getTime() - pointTime) / 1000 < Integer.parseInt(second)){
+                        djlzt = 1;
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -100,8 +100,8 @@ public class AccessStatusService {
                 ProBasicPowerstationPoint proBasicPowerstationPoint = basicPowerstationPointMap.get(ContantXk.FCCFTWD);
                 try {
                     Long pointTime = edosUtil.getRealData(proBasicPowerstationPoint.getNemCode()).getPointTime();
-                    if ((currentDate.getTime() - pointTime) / 1000 > Integer.parseInt(second)){
-                        cftzt = 0;
+                    if ((currentDate.getTime() - pointTime) / 1000 < Integer.parseInt(second)){
+                        cftzt = 1;
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -112,8 +112,8 @@ public class AccessStatusService {
                 ProBasicPowerstationPoint agcpowerstationPoint = basicPowerstationPointMap.get(ContantXk.TPOINT_WP_CXGL);
                 try {
                     Long pointTime = edosUtil.getRealData(agcpowerstationPoint.getNemCode()).getPointTime();
-                    if ((currentDate.getTime() - pointTime) / 1000 > Integer.parseInt(second)){
-                        agczt = 0;
+                    if ((currentDate.getTime() - pointTime) / 1000 < Integer.parseInt(second)){
+                        agczt = 1;
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -121,8 +121,8 @@ public class AccessStatusService {
                 ProBasicPowerstationPoint glycpowerstationPoint = basicPowerstationPointMap.get(ContantXk.TPOINT_WP_YCGL);
                 try {
                     Long pointTime = edosUtil.getRealData(glycpowerstationPoint.getNemCode()).getPointTime();
-                    if ((currentDate.getTime() - pointTime) / 1000 > Integer.parseInt(second)){
-                        glyczt = 0;
+                    if ((currentDate.getTime() - pointTime) / 1000 < Integer.parseInt(second)){
+                        glyczt = 1;
                     }
                 } catch (Exception e) {
                     e.printStackTrace();

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

@@ -89,10 +89,11 @@ public class RealtimeService {
             }
             PointData ssbfPointDate = null;
             if (mxzt == 12 || mxzt == 13) {
-                //补风算法(后续补充，暂时用0)
-                ssbfPointDate = PointUtil.createPointData(currentDate, 0, ssbfPoint.getNemCode(), ssbfPoint.getName());
+                //补风算法(后续补充)
+                ssbf = speed>12?12:speed;
+                ssbfPointDate = PointUtil.createPointData(currentDate, ssbf, ssbfPoint.getNemCode(), ssbfPoint.getName());
             } else {
-                ssbf = speed;
+                ssbf = speed>12?12:speed;
                 ssbfPointDate = PointUtil.createPointData(currentDate, ssbf, ssbfPoint.getNemCode(), ssbfPoint.getName());
             }
             wtResultList.add(ssbfPointDate);

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

@@ -213,7 +213,7 @@ public class RegionCalreService  {
                     ProBasicPowerstationPoint finalSspjfsfsPoint = sspjfsPoint;
                     sspjfs.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getSectionData(finalSspjfsfsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                            return new Double((double) (v + edosUtil.getSectionData(finalSspjfsfsPoint, currentDate.getTime()).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -225,7 +225,7 @@ public class RegionCalreService  {
                     ProBasicPowerstationPoint finalSspjgzdPoint = sspjgzdPoint;
                     sspjgzd.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getSectionData(finalSspjgzdPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                            return new Double((double) (v + edosUtil.getSectionData(finalSspjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -236,7 +236,7 @@ public class RegionCalreService  {
                     ProBasicPowerstationPoint finalSspjfsfsPoint = sspjfsPoint;
                     sspjfs.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getSectionData(finalSspjfsfsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                            return new Double((double) (v + edosUtil.getSectionData(finalSspjfsfsPoint, currentDate.getTime()).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -245,7 +245,7 @@ public class RegionCalreService  {
                     ProBasicPowerstationPoint finalSspjgzdPoint = sspjgzdPoint;
                     sspjgzd.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getSectionData(finalSspjgzdPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                            return new Double((double) (v + edosUtil.getSectionData(finalSspjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -254,7 +254,7 @@ public class RegionCalreService  {
                 }
                 sszgl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(sszglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(sszglPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -262,7 +262,7 @@ public class RegionCalreService  {
                 });
                 zllgl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(sszllglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(sszllglPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -270,7 +270,7 @@ public class RegionCalreService  {
                 });
                 zbzgl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(sszbzglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(sszbzglPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -278,7 +278,7 @@ public class RegionCalreService  {
                 });
                 znhglzs.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(ssznhglzsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(ssznhglzsPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -286,7 +286,7 @@ public class RegionCalreService  {
                 });
                 zzygl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(sszzyglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(sszzyglPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -294,7 +294,7 @@ public class RegionCalreService  {
                 });
                 zkygl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(sszkyglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(sszkyglPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -302,7 +302,7 @@ public class RegionCalreService  {
                 });
                 zycgl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(sszycglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(sszycglPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -313,7 +313,7 @@ public class RegionCalreService  {
 
                 gztsmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(gztsmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(gztsmxPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -321,7 +321,7 @@ public class RegionCalreService  {
                 });
                 cngzmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(cnslmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(cnslmxPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -329,7 +329,7 @@ public class RegionCalreService  {
                 });
                 jxtsmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(jxtsmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(jxtsmxPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -337,7 +337,7 @@ public class RegionCalreService  {
                 });
                 cnjxmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(cnjxmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(cnjxmxPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -345,7 +345,7 @@ public class RegionCalreService  {
                 });
                 djtsmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(djtsmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(djtsmxPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -353,7 +353,7 @@ public class RegionCalreService  {
                 });
                 qxjclmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(qxjclmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(qxjclmxPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -361,7 +361,7 @@ public class RegionCalreService  {
                 });
                 sdtjmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(sdtjmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(sdtjmxPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -369,7 +369,7 @@ public class RegionCalreService  {
                 });
                 xntsmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(xntsmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(xntsmxPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -377,7 +377,7 @@ public class RegionCalreService  {
                 });
                 xdtjmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(xdtjmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(xdtjmxPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -385,7 +385,7 @@ public class RegionCalreService  {
                 });
                 xdjclmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(xdjclmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(xdjclmxPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -393,7 +393,7 @@ public class RegionCalreService  {
                 });
                 cwsldwmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(cwsldwmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(cwsldwmxPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -401,7 +401,7 @@ public class RegionCalreService  {
                 });
                 cwsltqmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(cwsltqmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(cwsltqmxPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -409,7 +409,7 @@ public class RegionCalreService  {
                 });
                 lxtsmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(lxtsmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(lxtsmxPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -417,7 +417,7 @@ public class RegionCalreService  {
                 });
                 txzdmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(txzdmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(txzdmxPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -425,7 +425,7 @@ public class RegionCalreService  {
                 });
                 djts.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(djtsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(djtsPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -433,7 +433,7 @@ public class RegionCalreService  {
                 });
                 yxts.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(yxtsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(yxtsPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -441,7 +441,7 @@ public class RegionCalreService  {
                 });
                 gzts.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(gztsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(gztsPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -449,7 +449,7 @@ public class RegionCalreService  {
                 });
                 whts.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(whtsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(whtsPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -457,7 +457,7 @@ public class RegionCalreService  {
                 });
                 xdts.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(xdtsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(xdtsPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -465,7 +465,7 @@ public class RegionCalreService  {
                 });
                 slts.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(sltsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(sltsPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -473,7 +473,7 @@ public class RegionCalreService  {
                 });
                 lxts.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(lxtsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(lxtsPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -660,7 +660,7 @@ public class RegionCalreService  {
                 ProBasicPowerstationPoint finalSspjfsPoint = sspjfsPoint;
                 sspjfs.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(finalSspjfsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(finalSspjfsPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -671,7 +671,7 @@ public class RegionCalreService  {
                 ProBasicPowerstationPoint finalSspjgzdPoint = sspjgzdPoint;
                 sspjgzd.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(finalSspjgzdPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(finalSspjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -680,7 +680,7 @@ public class RegionCalreService  {
             }
             sszgl.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(sszglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(sszglPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -688,7 +688,7 @@ public class RegionCalreService  {
             });
             zllgl.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(sszllglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(sszllglPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -696,7 +696,7 @@ public class RegionCalreService  {
             });
             zbzgl.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(sszbzglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(sszbzglPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -704,7 +704,7 @@ public class RegionCalreService  {
             });
             znhglzs.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(ssznhglzsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(ssznhglzsPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -712,7 +712,7 @@ public class RegionCalreService  {
             });
             zzygl.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(sszzyglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(sszzyglPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -720,7 +720,7 @@ public class RegionCalreService  {
             });
             zkygl.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(sszkyglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(sszkyglPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -728,7 +728,7 @@ public class RegionCalreService  {
             });
             zycgl.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(sszycglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(sszycglPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -740,7 +740,7 @@ public class RegionCalreService  {
 
             gztsmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(gztsmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(gztsmxPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -748,7 +748,7 @@ public class RegionCalreService  {
             });
             cngzmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(cnslmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(cnslmxPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -756,7 +756,7 @@ public class RegionCalreService  {
             });
             jxtsmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(jxtsmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(jxtsmxPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -764,7 +764,7 @@ public class RegionCalreService  {
             });
             cnjxmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(cnjxmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(cnjxmxPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -772,7 +772,7 @@ public class RegionCalreService  {
             });
             djtsmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(djtsmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(djtsmxPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -780,7 +780,7 @@ public class RegionCalreService  {
             });
             qxjclmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(qxjclmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(qxjclmxPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -788,7 +788,7 @@ public class RegionCalreService  {
             });
             sdtjmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(sdtjmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(sdtjmxPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -796,7 +796,7 @@ public class RegionCalreService  {
             });
             xntsmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(xntsmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(xntsmxPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -804,7 +804,7 @@ public class RegionCalreService  {
             });
             xdtjmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(xdtjmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(xdtjmxPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -812,7 +812,7 @@ public class RegionCalreService  {
             });
             xdjclmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(xdjclmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(xdjclmxPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -820,7 +820,7 @@ public class RegionCalreService  {
             });
             cwsldwmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(cwsldwmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(cwsldwmxPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -828,7 +828,7 @@ public class RegionCalreService  {
             });
             cwsltqmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(cwsltqmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(cwsltqmxPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -836,7 +836,7 @@ public class RegionCalreService  {
             });
             lxtsmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(lxtsmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(lxtsmxPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -844,7 +844,7 @@ public class RegionCalreService  {
             });
             txzdmx.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(txzdmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(txzdmxPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -852,7 +852,7 @@ public class RegionCalreService  {
             });
             djts.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(djtsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(djtsPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -860,7 +860,7 @@ public class RegionCalreService  {
             });
             yxts.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(yxtsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(yxtsPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -868,7 +868,7 @@ public class RegionCalreService  {
             });
             gzts.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(gztsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(gztsPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -876,7 +876,7 @@ public class RegionCalreService  {
             });
             whts.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(whtsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(whtsPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -884,7 +884,7 @@ public class RegionCalreService  {
             });
             xdts.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(xdtsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(xdtsPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -892,7 +892,7 @@ public class RegionCalreService  {
             });
             slts.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(sltsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(sltsPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -900,7 +900,7 @@ public class RegionCalreService  {
             });
             lxts.updateAndGet(v -> {
                 try {
-                    return new Double((double) (v + edosUtil.getSectionData(lxtsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    return new Double((double) (v + edosUtil.getSectionData(lxtsPoint, currentDate.getTime()).getPointValueInDouble()));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

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

@@ -24,14 +24,10 @@ import java.util.Map;
 @Service
 public class TheoreticalPowerService {
 
-    @Resource
-    private RedisService redisService;
-    @Resource
-    private IProBasicModelPowerRdService proBasicModelPowerRdService;
+
     @Resource
     private IProEconWtPowerCurveFittingService proEconWtPowerCurveFittingService;
-    @Resource
-    private IEdosUtil edosUtil;
+
     /**
      * 缓存自算功率，最优功率
      * 1个月