气象站测点生成规则修改

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProEconTestingPointServiceImpl.java

@@ -226,8 +226,8 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
     public List<ProBasicPowerstationPoint> initalWs(String station,String[] setpoints) {
         List<ProBasicPowerstationPoint> allpoints = new ArrayList<>();
 
-        List<ProEconTestingPoint> fcs = proEconTestingPointService.list().stream().filter(i -> i.getTypeId().equals("fggl") || i.getTypeId().equals("cft")).collect(Collectors.toList());
-        List<ProEconTestingPoint> gcs = proEconTestingPointService.list().stream().filter(i -> i.getTypeId().equals("fggl") || i.getTypeId().equals("qxz")).collect(Collectors.toList());
+        List<ProEconTestingPoint> fcs = proEconTestingPointService.list().stream().filter(i ->  i.getTypeId().equals("cft")).collect(Collectors.toList());
+        List<ProEconTestingPoint> gcs = proEconTestingPointService.list().stream().filter(i ->  i.getTypeId().equals("qxz")).collect(Collectors.toList());
         //获取场站
         for (ProBasicPowerstation postation : CacheContext.wpls) {
             if (null != station && !"".equals(station) && !station.equals(postation.getId())) {
@@ -335,7 +335,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
     public List<ProBasicPowerstationPoint> initalSbs(String station,String[] setpoints) {
         List<ProBasicPowerstationPoint> allpoints = new ArrayList<>();
 
-        List<ProEconTestingPoint> ls = proEconTestingPointService.list().stream().filter(i -> i.getTypeId().equals("agc") || i.getTypeId().equals("agcjsfw") ).collect(Collectors.toList());
+        List<ProEconTestingPoint> ls = proEconTestingPointService.list().stream().filter(i -> i.getTypeId().equals("fggl") || i.getTypeId().equals("agc") || i.getTypeId().equals("agcjsfw") ).collect(Collectors.toList());
         //获取场站
         for (ProBasicPowerstation postation : CacheContext.wpls) {
             if (null != station && !"".equals(station) && !station.equals(postation.getId())) {