状态规则修改

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

@@ -40,12 +40,12 @@ public class StatusService {
             wpls = wpls.stream().filter(wp -> wp.getCompanyId().equals(company)).collect(Collectors.toList());
         }
         if (type.equals("-1")) {
-            wpls = wpls.stream().filter(wp -> wp.getWindType().equals("-1")).collect(Collectors.toList());
+            wpls = wpls.stream().filter(wp -> wp.getId().contains("_FDC")).collect(Collectors.toList());
         } else if (type.equals("-2")) {
-            wpls = wpls.stream().filter(wp -> wp.getWindType().equals("-2")).collect(Collectors.toList());
+            wpls = wpls.stream().filter(wp -> wp.getId().contains("_GDC")).collect(Collectors.toList());
         }
 
-        wpls.parallelStream().forEach(wp->{
+        wpls.stream().forEach(wp->{
             StatusVo vo = new StatusVo();
             vo.setWpname(wp.getAname());
             vo.setType(wp.getWindType());
@@ -149,8 +149,8 @@ public class StatusService {
                 });
 
             });
-            vo.setAgc001(agc001.get()/subs.size());
-            vo.setAgc002(agc002.get()/subs.size());
+            vo.setAgc001(agc001.get());
+            vo.setAgc002(agc002.get());
             vo.setYcgl(ycgl.get());
             List<ProBasicWeatherStation> weas = weawpls.stream().filter(wea -> wea.getWindpowerstationId().equals(wp.getId())).collect(Collectors.toList());
             weas.stream().forEach(wea->{
@@ -184,8 +184,8 @@ public class StatusService {
                 });
 
             });
-            vo.setQxzfs(fs.get());
-            vo.setQxzfx(fx.get());
+            vo.setQxzfs(fs.get()/weas.size());
+            vo.setQxzfx(fx.get()/weas.size());
             vo.setOrderNum(wp.getOrderNum());
             resultList.add(vo);
         });