部署光伏状态计算

common/src/main/java/com/gyee/common/contant/Contant.java

@@ -68,6 +68,9 @@ public class Contant {
     public static final String MX002 = "MX002";//运行
     public static final String MX008 = "MX008";//维护
     public static final String MX006 = "MX006";//故障
+
+    public static final String MX004 = "MX004";//限电
+    public static final String MX012 = "MX012";//离线（光伏关机）
     //判断降出力
     public static final String AI134 = "AI134"; //叶轮转速给定
 //    public static final String AI129 = "AI129"; //转矩给定

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

@@ -156,7 +156,7 @@ public class StatusService {
                             }
                             if (clauStatusDi.contains(wt.getProjectid())){
                                 //每个状态一个状态点
-                                List<Windturbinestatusdi> windturbinestatusdis = statusMap.get(wt.getId()).stream().filter(w -> w.getUniformcode().equals(Contant.MX000) || w.getUniformcode().equals(Contant.MX002) || w.getUniformcode().equals(Contant.MX006) || w.getUniformcode().equals(Contant.MX008)).collect(Collectors.toList());
+                                List<Windturbinestatusdi> windturbinestatusdis = statusMap.get(wt.getId()).stream().filter(w -> w.getUniformcode().equals(Contant.MX000) || w.getUniformcode().equals(Contant.MX002) || w.getUniformcode().equals(Contant.MX006) || w.getUniformcode().equals(Contant.MX004) || w.getUniformcode().equals(Contant.MX012)).collect(Collectors.toList());
                                 for(Windturbinestatusdi w : windturbinestatusdis){
                                     PointData realData = edosUtil.getRealData(w.getId());
                                     if (realData.getPointValueInDouble()==1){
@@ -190,7 +190,7 @@ public class StatusService {
                             status = 4.0;
                         }else if(mxstatus == 10 || mxstatus == 11){
                             status = 6.0;
-                        }else if(mxstatus == 12){
+                        }else if(mxstatus == 12 || mxstatus == 13){
                             status = 3.0;
                         }
                     }

realtime/generationGF-service/src/main/resources/application-jn.yml

@@ -88,8 +88,8 @@ db:
 runWindpowerstation: SY_GDC
 #计算状态用ai或者di
 clauStatus:
-  ai: SY02_GC   #配置期次
-  di:
+  ai:   #配置期次
+  di: SY02_GC
 
 #判断数据终端
 second: 7200

realtime/generationGF-service/src/test/java/com/gyee/generation/GenerationTest.java

@@ -49,7 +49,7 @@ public class GenerationTest {
     @Test
     public void test1() throws Exception {
 //        averageAndGeneratingService.saveAvespeedAndAvepowerAndScada();
-//        statusService.calculateStatusNumber();
+        statusService.calculateStatus();
 //        realtimeSpeedPowerService.calculateRealtimeSpeedPower();
 //        generationService.saveMeterpointValueRealtime();
 //        theorypowerService.fittingPower();
@@ -57,7 +57,7 @@ public class GenerationTest {
 //        averageAndGeneratingService.saveAvespeedAndAvepowerAndScada();
 //        fiveLossesService.lossesReal();
 //        safetyService.safetyReatimel();
-        fiveLossesService.lossesReal();
+//        fiveLossesService.lossesReal();
     }