1、风机状态调整

2、标杆风机调整

generationXK-service/src/main/java/com/gyee/generation/init/CacheContext.java

@@ -467,11 +467,11 @@ public class CacheContext implements CommandLineRunner {
         //初始化标杆风机
         for (ProBasicEquipment wt : wtls) {
             if (wpwtmap.containsKey(wt.getWindpowerstationId())) {
-                List<ProBasicEquipment> wts = wpwtmap.get(wt.getWindpowerstationId());
-                for (ProBasicEquipment w : wts) {
-                    wtstandardmap.put(wt.getId(), w.getId());
-                    break;
-                }
+                    if (wt.getProjectId().equals("NX_FGS_HAF01_EG")){
+                        wtstandardmap.put(wt.getId(), "NX_FGS_HA_F_WT_0018_EQ");
+                    }else {
+                        wtstandardmap.put(wt.getId(), "NX_FGS_HA_F_WT_0039_EQ");
+                    }
             }
 
         }

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

@@ -171,7 +171,7 @@ public class MatrixHAService {
                         } else if (jlls.get(0).getPointValue().equals("true")) {
                             ztvo.setStatus(11.0);//解缆
                         } else if (zktjls.get(0).getPointValue().equals("true")) {
-                            ztvo.setStatus(2.0);
+                            ztvo.setStatus(-1.0);
                         } else if (ztls.get(0).getPointValueInDouble() == 0.0) {
                             ztvo.setStatus(-1.0);
                         } else if (ztls.get(0).getPointValueInDouble() == 1.0) {