风资源修改

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Windresourceanalysis/WindresourceanalysisService.java

@@ -70,7 +70,9 @@ public class WindresourceanalysisService {
         for (ProBasicWeatherStation wp : wplsf) {
             if (wp.getId().contains("GJYF02")) continue;
 
-            pjfs = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.FCCFTFS70);
+            if (!wp.getId().contains("MLJ")) {
+                pjfs = proBasicPowerstationPointService.getPowerstationPoint(wp.getWindpowerstationId(), ContantXk.SSPJFS);
+            }
             pjfx = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.FCCFTFX70);
 
             List<ProBasicPowerstation> collect = CacheContext.wplsf.stream().filter(c -> c.getId().equals(wp.getWindpowerstationId())).collect(Collectors.toList());
@@ -87,9 +89,13 @@ public class WindresourceanalysisService {
                 double maxsnum = 0.0;
                 double minsnum = 0.0;
                 if (wp.getId().contains("NJLF01")) {
-                    avenum = ave.get(0).getPointValueInDouble() / 10;
-                    maxsnum = maxs.get(0).getPointValueInDouble() / 10;
-                    minsnum = mins.get(0).getPointValueInDouble() /10;
+//                    avenum = ave.get(0).getPointValueInDouble() / 10;
+//                    maxsnum = maxs.get(0).getPointValueInDouble() / 10;
+//                    minsnum = mins.get(0).getPointValueInDouble() /10;
+                    avenum = ave.get(0).getPointValueInDouble();
+                    maxsnum = maxs.get(0).getPointValueInDouble();
+                    minsnum = mins.get(0).getPointValueInDouble();
+
                 } else {
                     avenum = ave.get(0).getPointValueInDouble();
                     maxsnum = maxs.get(0).getPointValueInDouble();
@@ -340,17 +346,20 @@ public class WindresourceanalysisService {
 
         ProBasicPowerstationPoint gzzs = null;
         List<ProBasicWeatherStation> wplsf = null;
+        List<ProBasicPowerstation> wplsf1 = null;
         if (wpid.contains("GJY_FDC")) {
-            wplsf = CacheContext.weawpls.stream().filter(w -> w.getWindpowerstationId().equals(wpid) && w.getId().contains("GJYF01")).collect(Collectors.toList());
+//            wplsf = CacheContext.weawpls.stream().filter(w -> w.getWindpowerstationId().equals(wpid) && w.getId().contains("GJYF01")).collect(Collectors.toList());
+            wplsf1 = CacheContext.wplsf.stream().filter(w->wpid.equals(w.getId())).collect(Collectors.toList());
         } else {
             wplsf = CacheContext.weawpls.stream().filter(w -> w.getWindpowerstationId().equals(wpid)).collect(Collectors.toList());
         }
 
-        gzzs = proBasicPowerstationPointService.getPowerstationPoint(wplsf.get(0).getId(), ContantXk.FCCFTFS70);
+        gzzs = proBasicPowerstationPointService.getPowerstationPoint(wplsf1.get(0).getId(), ContantXk.SSPJFS);
 
 
-        List<PointData> gzzsls = edosUtil.getHistoryDatasRaw(gzzs.getNemCode(), startTime.getTime() / 1000, endTime.getTime() / 1000);
+//        List<PointData> gzzsls = edosUtil.getHistoryDatasRaw(gzzs.getNemCode(), startTime.getTime() / 1000, endTime.getTime() / 1000);
 //        List<PointData> gzzsls = edosUtil.getHistoryDatasSnap(gzzs, startTime.getTime() / 1000, endTime.getTime() / 1000, null, 900L);
+        List<PointData> gzzsls = edosUtil.getHistoryDatasSnap(gzzs, startTime.getTime() / 1000, endTime.getTime() / 1000, null, 60L);
 
         double temp6 = 0;
         for (int i = 0; i < gzzsls.size(); i++) {