矩阵设备增加部分信息补充

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

@@ -227,14 +227,13 @@ public class MatrixService {
                 List<ProBasicProject> qcls = null;
                 powerls = powerPointService.getBaseMapper().selectList(qw);
 
-                qyls = powerls.stream().filter(c-> c.getWindpowerstationId().equals(wp.getId())).collect(Collectors.toList());
+                qyls = powerls.stream().filter(c -> c.getWindpowerstationId().equals(wp.getId())).collect(Collectors.toList());
 
-                if (qyls.isEmpty() || qyls.size()<=0){
-                    qcls = CacheContext.pjls.stream().filter(p->wp.getId().equals(p.getWindpowerstationId())).collect(Collectors.toList());
+                if (qyls.isEmpty() || qyls.size() <= 0) {
+                    qcls = CacheContext.pjls.stream().filter(p -> wp.getId().equals(p.getWindpowerstationId())).collect(Collectors.toList());
                     for (ProBasicProject p : qcls) {
-                        for (ProBasicPowerPoint a : powerls)
-                        {
-                            if (a.getWindpowerstationId().equals(p.getId())){
+                        for (ProBasicPowerPoint a : powerls) {
+                            if (a.getWindpowerstationId().equals(p.getId())) {
                                 qyls.add(a);
                             }
                         }
@@ -248,9 +247,9 @@ public class MatrixService {
                 ProBasicPowerstationPoint ycglcd = null;
 
                 double sum = 0.0;
-                for (ProBasicPowerPoint pp: qyls){
+                for (ProBasicPowerPoint pp : qyls) {
 
-                    if (wp.getId().contains("MLJ_FDC_STA"))continue;
+                    if (wp.getId().contains("MLJ_FDC_STA")) continue;
                     ycglcd = proBasicPowerstationPointService.getPowerstationPoint(pp.getWindpowerstationId(), ContantXk.GLYC);
 
                     double aDouble = 0.0;
@@ -590,14 +589,13 @@ public class MatrixService {
         List<ProBasicProject> qcls = null;
         powerls = powerPointService.getBaseMapper().selectList(qw1);
 
-        qyls = powerls.stream().filter(c-> c.getWindpowerstationId().equals(powerstation.getId())).collect(Collectors.toList());
+        qyls = powerls.stream().filter(c -> c.getWindpowerstationId().equals(powerstation.getId())).collect(Collectors.toList());
 
-        if (qyls.isEmpty() || qyls.size()<=0){
-            qcls = CacheContext.pjls.stream().filter(p->powerstation.getId().equals(p.getWindpowerstationId())).collect(Collectors.toList());
+        if (qyls.isEmpty() || qyls.size() <= 0) {
+            qcls = CacheContext.pjls.stream().filter(p -> powerstation.getId().equals(p.getWindpowerstationId())).collect(Collectors.toList());
             for (ProBasicProject p : qcls) {
-                for (ProBasicPowerPoint a : powerls)
-                {
-                    if (a.getWindpowerstationId().equals(p.getId())){
+                for (ProBasicPowerPoint a : powerls) {
+                    if (a.getWindpowerstationId().equals(p.getId())) {
                         qyls.add(a);
                     }
                 }
@@ -607,9 +605,9 @@ public class MatrixService {
         ProBasicPowerstationPoint ycglcd = null;
         double ycgl = 0.0;
         double sum = 0.0;
-        for (ProBasicPowerPoint pp: qyls){
+        for (ProBasicPowerPoint pp : qyls) {
 
-            if (powerstation.getId().contains("MLJ_FDC_STA"))continue;
+            if (powerstation.getId().contains("MLJ_FDC_STA")) continue;
             ycglcd = proBasicPowerstationPointService.getPowerstationPoint(pp.getWindpowerstationId(), ContantXk.GLYC);
 
             double aDouble = 0.0;
@@ -657,7 +655,7 @@ public class MatrixService {
         resultMap.put("speed", realData.get(14).getPointValueInDouble());
         resultMap.put("bzgl", realData.get(15).getPointValueInDouble());
         resultMap.put("llgl", realData.get(16).getPointValueInDouble());
-        resultMap.put("sjgl", realData.get(17).getPointValueInDouble() /1000);
+        resultMap.put("sjgl", realData.get(17).getPointValueInDouble() / 1000);
         resultMap.put("ycgl", ycgl);
         AtomicReference<Double> cxgl = new AtomicReference<>((double) 0);
         AtomicReference<Double> agc = new AtomicReference<>((double) 0);
@@ -813,21 +811,24 @@ public class MatrixService {
     }
 
 
-    public Map<String,String> equipment(String wtid) throws Exception {
+    public Map<String, String> equipment(String wtid) throws Exception {
 
-        Map<String,String> map = new HashMap<>();
-        List<ProBasicEquipment> collect = CacheContext.wtls.stream().filter(w -> wtid.equals(w.getId())).collect(Collectors.toList());
-        List<ProEconEquipmentmodel> cs = CacheContext.equipmentmodels.stream().filter(m -> collect.get(0).getModelId().equals(m.getId())).collect(Collectors.toList());
+        Map<String, String> map = new HashMap<>();
 
-        List<ProBasicSquare> squares = CacheContext.sqls.stream().filter(s -> collect.get(0).getSquareId().equals(s.getId())).collect(Collectors.toList());
-        if (wtid!=null && !wtid.isEmpty() && wtid.contains("F_WT")){
-                map.put("model",cs.get(0).getId());
-                map.put("manufacturer",cs.get(0).getWindturbineManufacturerId());
-        }
-        if (wtid!=null && !wtid.isEmpty() && wtid.contains("G_IN")){
-            map.put("model",cs.get(0).getId());
-            map.put("manufacturer",cs.get(0).getWindturbineManufacturerId());
-            map.put("squareid",squares.get(0).getTypes());
+        if (wtid != null && !wtid.isEmpty()) {
+            List<ProBasicEquipment> collect = CacheContext.wtls.stream().filter(w -> wtid.equals(w.getId())).collect(Collectors.toList());
+            List<ProEconEquipmentmodel> cs = CacheContext.equipmentmodels.stream().filter(m -> collect.get(0).getModelId().equals(m.getId())).collect(Collectors.toList());
+
+            List<ProBasicSquare> squares = CacheContext.sqls.stream().filter(s -> collect.get(0).getSquareId().equals(s.getId())).collect(Collectors.toList());
+            if (wtid.contains("F_WT")) {
+                map.put("model", cs.get(0).getId());
+                map.put("manufacturer", cs.get(0).getWindturbineManufacturerId());
+            }
+            if (wtid.contains("G_IN")) {
+                map.put("model", cs.get(0).getId());
+                map.put("manufacturer", cs.get(0).getWindturbineManufacturerId());
+                map.put("squareid", squares.get(0).getTypes());
+            }
         }
         return map;
     }