bug调整

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MatrixService.java

@@ -250,7 +250,7 @@ public class MatrixService {
                 double sum = 0.0;
                 for (ProBasicPowerPoint pp: qyls){
 
-                    if (wp.getId().contains("MLJ_FDC_STA") ||wp.getId().contains("FS_GDC_STA"))continue;
+                    if (wp.getId().contains("MLJ_FDC_STA"))continue;
                     ycglcd = proBasicPowerstationPointService.getPowerstationPoint(pp.getWindpowerstationId(), ContantXk.GLYC);
 
                     double aDouble = 0.0;
@@ -609,7 +609,7 @@ public class MatrixService {
         double sum = 0.0;
         for (ProBasicPowerPoint pp: qyls){
 
-            if (powerstation.getId().contains("MLJ_FDC_STA") || powerstation.getId().contains("FS_GDC_STA"))continue;
+            if (powerstation.getId().contains("MLJ_FDC_STA"))continue;
             ycglcd = proBasicPowerstationPointService.getPowerstationPoint(pp.getWindpowerstationId(), ContantXk.GLYC);
 
             double aDouble = 0.0;

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MonitorService.java

@@ -1379,7 +1379,7 @@ public class MonitorService {
 
             List<List<PowercurveVo>> ls = new ArrayList<>();
             for (ProBasicPowerPoint pp : qyls) {
-                if (pp.getWindpowerstationId().contains("MLJ_FDC_STA") ||pp.getWindpowerstationId().contains("FS_GDC_STA"))continue;
+                if (pp.getWindpowerstationId().contains("MLJ_FDC_STA"))continue;
                 ProBasicPowerstationPoint ycgl = proBasicPowerstationPointService.getPowerstationPoint(pp.getWindpowerstationId(), ContantXk.GLYC);
                 List<PointData> ycglls = edosUtil.getHistoryDatasSnap(ycgl, beginDate.getTime() / 1000, nextDayZeroTime.getTime() / 1000, null, 3600L);
                 vos = new ArrayList<>();

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/PhotovoltaicmatrixService.java

@@ -245,7 +245,7 @@ public class PhotovoltaicmatrixService {
         double sum = 0.0;
         for (ProBasicPowerPoint pp: qyls){
 
-            if (collect.get(0).getId().contains("MLJ_FDC_STA") ||collect.get(0).getId().contains("FS_GDC_STA"))continue;
+            if (collect.get(0).getId().contains("MLJ_FDC_STA"))continue;
             ycglcd = proBasicPowerstationPointService.getPowerstationPoint(pp.getWindpowerstationId(), ContantXk.GLYC);
 
             double aDouble = 0.0;