修改曲线展示测点

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Forecast/ForecastService.java

@@ -66,17 +66,17 @@ public class ForecastService {
             for (ProBasicProject wp : pjllist) {
                 vos = new ArrayList<>();
                 if (wpId.endsWith("FDC_STA")) {
-                    pjfs = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.PJFS15);
+                    pjfs = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSPJFS);
                     ycgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.GLYC);
-                    sjgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.PJGL15);
+                    sjgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSZGL);
                     llgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSZLLGL);
                     fsyc = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.FSYC);
                 }
                 if (wpId.endsWith("GDC_STA")) {
-                    pjfs = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.PJGZD15);
+                    pjfs = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSPJFS);
                     fsyc = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.GZYC);
                     ycgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.GLYC);
-                    sjgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.PJGL15);
+                    sjgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSZGL);
                     llgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSZLLGL);
                 }
                 List<PointData> pjfsls = edosUtil.getHistoryDatasSnap(pjfs, starttime.getTime() / 1000, currentDate.getTime() / 1000, null, 900L);
@@ -138,17 +138,17 @@ public class ForecastService {
                 List<ForecastVo> vos1 = new ArrayList<>();
                 List<ForecastVo> vos2 = new ArrayList<>();
                 if (wpId.endsWith("FDC_STA")) {
-                    pjfs = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.PJFS15);
+                    pjfs = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSPJFS);
                     ycgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.GLYC);
-                    sjgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.PJGL15);
+                    sjgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSZGL);
                     llgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSZLLGL);
                     fsyc = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.FSYC);
                 }
                 if (wpId.endsWith("GDC_STA")) {
-                    pjfs = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.PJGZD15);
+                    pjfs = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSPJFS);
                     fsyc = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.GZYC);
                     ycgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.GLYC);
-                    sjgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.PJGL15);
+                    sjgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSZGL);
                     llgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSZLLGL);
                 }
                 List<PointData> pjfsls = edosUtil.getHistoryDatasSnap(pjfs, starttime.getTime() / 1000, currentDate.getTime() / 1000, null, 900L);
@@ -377,17 +377,17 @@ public class ForecastService {
             for (ProBasicPowerstation wp : station) {
                 vos = new ArrayList<>();
                 if (wpId.endsWith("FDC_STA")) {
-                    pjfs = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.PJFS15);
+                    pjfs = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSPJFS);
                     fsyc = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.FSYC);
                     ycgl = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.GLYC);
-                    sjgl = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.PJGL15);
+                    sjgl = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
                     llgl = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZLLGL);
                 }
                 if (wpId.endsWith("GDC_STA")) {
-                    pjfs = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.PJGZD15);
+                    pjfs = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSPJFS);
                     fsyc = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.GZYC);
                     ycgl = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.GLYC);
-                    sjgl = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.PJGL15);
+                    sjgl = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
                     llgl = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZLLGL);
                 }
                 List<PointData> pjfsls = edosUtil.getHistoryDatasSnap(pjfs, starttime.getTime() / 1000, currentDate.getTime() / 1000, null, 900L);
@@ -514,17 +514,17 @@ public class ForecastService {
                     llgl = null;
 
                     if (wpId.endsWith("FDC_STA") && type.equals("F")) {
-                        pjfs = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.PJFS15);
+                        pjfs = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSPJFS);
                         ycgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.GLYC);
-                        sjgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.PJGL15);
+                        sjgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSZGL);
                         llgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSZLLGL);
                         fsyc = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.FSYC);
                     }
                     if (wpId.endsWith("GDC_STA") && type.equals("G")) {
-                        pjfs = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.PJGZD15);
+                        pjfs = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSPJGZD);
                         fsyc = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.GZYC);
                         ycgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.GLYC);
-                        sjgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.PJGL15);
+                        sjgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSZGL);
                         llgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSZLLGL);
                     }
 
@@ -1052,17 +1052,17 @@ public class ForecastService {
                     ProBasicPowerstationPoint llgl1 = null;
 
                     if (wpId.endsWith("FDC_STA") && type.equals("F")) {
-                        pjfs1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.PJFS15);
+                        pjfs1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSPJFS);
                         fsyc1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.FSYC);
                         ycgl1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.GLYC);
-                        sjgl1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.PJGL15);
+                        sjgl1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
                         llgl1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZLLGL);
                     }
                     if (wpId.endsWith("GDC_STA") && type.equals("G")) {
-                        pjfs1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.PJGZD15);
+                        pjfs1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSPJFS);
                         fsyc1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.GZYC);
                         ycgl1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.GLYC);
-                        sjgl1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.PJGL15);
+                        sjgl1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
                         llgl1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZLLGL);
                     }
                     if (pjfs1 != null && sjgl1 != null) {