切入切出接口，月度单机分析接口

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconEquipmentInfoDayTop.java

@@ -381,29 +381,8 @@ public class ProEconEquipmentInfoDayTop extends Model {
     private String dayLevel;
 
     /**
-     * 综合排名
-     */
-    private Integer monthRank;
-
-    /**
-     * 等级
-     */
-    private String monthLevel;
-
-    /**
-     * 综合排名
-     */
-    private Integer yearRank;
-
-    /**
-     * 等级
-     */
-    private String yearLevel;
-
-    /**
      * 分数
      */
     private Double dayScore;
-    private Double monthScore;
-    private Double yearScore;
+
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconInOrOutSpeedTotal.java

@@ -26,8 +26,8 @@ public class ProEconInOrOutSpeedTotal extends Model {
     /**
      * 编号
      */
-    @TableId(value = "id",type = IdType.ASSIGN_UUID)
-    private String id;
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
 
     /**
      * 风机编号
@@ -374,5 +374,6 @@ public class ProEconInOrOutSpeedTotal extends Model {
      */
     private String lineId;
 
-
+    private String companyId;
+    private String types;
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconInOrOutSpeedTotal2.java

@@ -26,8 +26,8 @@ public class ProEconInOrOutSpeedTotal2 extends Model {
     /**
      * 编号
      */
-    @TableId(value = "id",type = IdType.ASSIGN_UUID)
-    private String id;
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
 
     /**
      * 风机编号
@@ -473,6 +473,7 @@ public class ProEconInOrOutSpeedTotal2 extends Model {
      * 线路编号
      */
     private String lineId;
-
+    private String companyId;
+    private String types;
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconInputOrOutputSpeed.java

@@ -66,4 +66,5 @@ public class ProEconInputOrOutputSpeed extends Model {
     private String lineId;
 
 
+
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconWindturbineGoodness.java

@@ -93,5 +93,6 @@ public class ProEconWindturbineGoodness extends Model {
      */
     private Integer yearTop;
 
-
+    private String companyId;
+    private String types;
 }

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

@@ -95,6 +95,7 @@ public class InputOrOutPutService {
                         if (lastStatus == 0 && status == 2)
                         {
                             ProEconInputOrOutputSpeed input = new ProEconInputOrOutputSpeed();
+
                             input.setWindturbineId(wt.getId());
                             input.setWindpowerstationId(wt.getWindpowerstationId());
                             input.setProjectId(wt.getProjectId());
@@ -202,14 +203,28 @@ public class InputOrOutPutService {
                     total1.setProjectId(wt.getProjectId());
                     total1.setLineId(wt.getLineId());
                     total1.setRecordDate(daybegin);
-
+                    total1.setCompanyId(wt.getCompanyId());
+                    if(wt.getWindpowerstationId().contains("FDC"))
+                    {
+                        total1.setTypes("-1");
+                    }else
+                    {
+                        total1.setTypes("-2");
+                    }
                     total2 = new ProEconInOrOutSpeedTotal2();
                     total2.setWindturbineId(wt.getId());
                     total2.setWindpowerstationId(wt.getWindpowerstationId());
                     total2.setProjectId(wt.getProjectId());
                     total2.setLineId(wt.getLineId());
                     total2.setRecordDate(daybegin);
-
+                    total2.setCompanyId(wt.getCompanyId());
+                    if(wt.getWindpowerstationId().contains("FDC"))
+                    {
+                        total2.setTypes("-1");
+                    }else
+                    {
+                        total2.setTypes("-2");
+                    }
 
                     newMethod(end, daybegin, monthbegin, yearbegin, wt.getId(), total1, total2);
                     verify(total1);

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

@@ -51,7 +51,14 @@ public class WindturbineGoodnessService {
             po.setWindturbineId(wt.getId());
             po.setRecordDate(DateUtils.truncate(recordDate));
             po.setWindtpowerstationId(wt.getWindpowerstationId());
-
+            po.setCompanyId(wt.getCompanyId());
+            if(wt.getWindpowerstationId().contains("FDC"))
+            {
+                po.setTypes("-1");
+            }else
+            {
+                po.setTypes("-2");
+            }
             po.setDayGoodness(0.0);
             po.setYearGoodness(0.0);
             po.setMonthGoodness(0.0);