Merge remote-tracking branch 'origin/master'

realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/StatusService.java

@@ -4,7 +4,6 @@ import com.gyee.common.contant.Contant;
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
-import com.gyee.common.model.auto.Windturbine;
 import com.gyee.common.util.DateUtils;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.*;
@@ -838,6 +837,115 @@ public class StatusService {
         double mxstatus = 2;
         //远景
         if (windturbineManufacturerId.equals("YJNY_MF")){
+            if (wt.getWindpowerstationId().equals("SDL_LYDL_BEIH_FDC_STA") || wt.getWindpowerstationId().equals("SDL_LYDL_YS_FDC_STA")){
+                Optional<ProBasicStatusPoint> first = statusMap.get(wt.getId()).stream().filter(w -> w.getUniformCode().equals(Contant.AI422)).findFirst();
+                if (first.isPresent()){
+                    ProBasicStatusPoint windturbinestatusdi = first.get();
+
+                    int pointValueInDouble = (int) edosUtil.getRealData(windturbinestatusdi.getNemCode()).getPointValueInDouble();
+                    switch (pointValueInDouble){
+                        case 1:
+                            mxstatus = 12.0;
+                            break;
+                        case 2:
+                        case 8:
+                            mxstatus = 6.0;
+                            break;
+                        case 3:
+                        case 4:
+                        case 5:
+                        case 28:
+                            mxstatus = 1.0;
+                            break;
+                        case 6:
+                        case 7:
+                            mxstatus = 4.0;
+                            break;
+                        case 9:
+                            mxstatus = 10.0;
+                            break;
+                        case 10:
+                            mxstatus = 9.0;
+                            break;
+                        case 11:
+                        case 12:
+                        case 13:
+                        case 14:
+                        case 15:
+                        case 29:
+                        case 30:
+                        case 31:
+                        case 32:
+                        case 33:
+                            mxstatus = 11.0;
+                            break;
+                        case 16:
+                        case 18:
+                        case 19:
+                        case 20:
+                        case 21:
+                            mxstatus = 2.0;
+                            break;
+                        case 17:
+                            mxstatus = 0.0;
+                            break;
+                        case 22:
+                            mxstatus = 3.0;
+                            break;
+                        case 23:
+                        case 24:
+                        case 25:
+                        case 26:
+                            mxstatus = 8.0;
+                            break;
+                        case 27:
+                            mxstatus = 13.0;
+                            break;
+                        default:
+                            mxstatus = 2.0;
+                    }
+                }
+            } else {
+                //多状态根据一个点来判断
+                Optional<ProBasicStatusPoint> first = statusMap.get(wt.getId()).stream().filter(w -> w.getUniformCode().equals(Contant.AI422)).findFirst();
+                if (first.isPresent()){
+                    ProBasicStatusPoint windturbinestatusdi = first.get();
+
+                    int pointValueInDouble = (int) edosUtil.getRealData(windturbinestatusdi.getNemCode()).getPointValueInDouble();
+                    switch (pointValueInDouble){
+                        case 1:
+                        case 3:
+                        case 4:
+                            mxstatus = 1.0;
+                            break;
+                        case 2:
+                        case 10:
+                            mxstatus = 4.0;
+                            break;
+                        case 5:
+                        case 6:
+                            mxstatus = 2.0;
+                            break;
+                        case 7:
+                            mxstatus = 8.0;
+                            break;
+                        case 8:
+                            mxstatus = 13.0;
+                            break;
+                        case 9:
+                            mxstatus = 0.0;
+                            break;
+                        case 11:
+                        case 12:
+                            mxstatus = 6.0;
+                            break;
+                        default:
+                            mxstatus = 2.0;
+                    }
+                }
+            }
+
+        }else if (windturbineManufacturerId.equals("JFKJ_MF") && wt.getCompanyId().equals("SDL_LYDL_ZGS")){
             //多状态根据一个点来判断
             Optional<ProBasicStatusPoint> first = statusMap.get(wt.getId()).stream().filter(w -> w.getUniformCode().equals(Contant.AI422)).findFirst();
             if (first.isPresent()){
@@ -845,37 +953,30 @@ public class StatusService {
 
                 int pointValueInDouble = (int) edosUtil.getRealData(windturbinestatusdi.getNemCode()).getPointValueInDouble();
                 switch (pointValueInDouble){
-                    case 1:
+                    case 0:
                     case 3:
-                    case 4:
+                        mxstatus = 0.0;
+                        break;
+                    case 1:
                         mxstatus = 1.0;
                         break;
                     case 2:
-                    case 10:
                         mxstatus = 4.0;
                         break;
+                    case 4:
                     case 5:
-                    case 6:
                         mxstatus = 2.0;
                         break;
-                    case 7:
-                        mxstatus = 8.0;
-                        break;
+                    case 6:
                     case 8:
-                        mxstatus = 13.0;
-                        break;
                     case 9:
-                        mxstatus = 0.0;
-                        break;
-                    case 11:
-                    case 12:
                         mxstatus = 6.0;
                         break;
                     default:
                         mxstatus = 2.0;
                 }
             }
-        }else if (windturbineManufacturerId.equals("LHDL_MF") && wt.getRegionId().equals("SDL_RGN")){
+        }else if (windturbineManufacturerId.equals("LHDL_MF") && wt.getCompanyId().equals("SDL_SXNY_ZGS")){
             //多状态根据一个点来判断
             Optional<ProBasicStatusPoint> first = statusMap.get(wt.getId()).stream().filter(w -> w.getUniformCode().equals(Contant.AI422)).findFirst();
             if (first.isPresent()){
@@ -1008,31 +1109,25 @@ public class StatusService {
 
                 int pointValueInDouble = (int) edosUtil.getRealData(windturbinestatusdi.getNemCode()).getPointValueInDouble();
                 switch (pointValueInDouble){
+                    case 0:
+                        mxstatus = 12.0;
+                        break;
                     case 1:
-                    case 3:
-                    case 4:
-                        mxstatus = 1.0;
+                    case 6:
+                        mxstatus = 4.0;
                         break;
                     case 2:
-                    case 10:
-                        mxstatus = 4.0;
+                        mxstatus = 6.0;
+                        break;
+                    case 3:
+                        mxstatus = 0.0;
                         break;
+                    case 4:
                     case 5:
-                    case 6:
                         mxstatus = 2.0;
                         break;
-                    case 7:
-                        mxstatus = 8.0;
-                        break;
-                    case 8:
-                        mxstatus = 13.0;
-                        break;
-                    case 9:
-                        mxstatus = 0.0;
-                        break;
                     case 11:
-                    case 12:
-                        mxstatus = 6.0;
+                        mxstatus = 1.0;
                         break;
                     default:
                         mxstatus = 2.0;