单机月度分析接口修改

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

@@ -376,4 +376,5 @@ public class ProEconInOrOutSpeedTotal extends Model {
 
     private String companyId;
     private String types;
+    private String regionId;
 }

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

@@ -475,5 +475,5 @@ public class ProEconInOrOutSpeedTotal2 extends Model {
     private String lineId;
     private String companyId;
     private String types;
-
+    private String regionId;
 }

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

@@ -99,4 +99,5 @@ public class ProEconWindturbineGoodness extends Model {
     private Double daySpeed;
     private Double monthSpeed;
     private Double yearSpeed;
+    private String regionId;
 }

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

@@ -214,6 +214,7 @@ public class InputOrOutPutService {
                     total1.setLineId(wt.getLineId());
                     total1.setRecordDate(daybegin);
                     total1.setCompanyId(wt.getCompanyId());
+                    total1.setRegionId(wt.getRegionId());
                     if(wt.getWindpowerstationId().contains("FDC"))
                     {
                         total1.setTypes("-1");
@@ -227,6 +228,7 @@ public class InputOrOutPutService {
                     total2.setProjectId(wt.getProjectId());
                     total2.setLineId(wt.getLineId());
                     total2.setRecordDate(daybegin);
+                    total2.setRegionId(wt.getRegionId());
                     total2.setCompanyId(wt.getCompanyId());
                     if(wt.getWindpowerstationId().contains("FDC"))
                     {

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

@@ -68,7 +68,7 @@ public class WindturbineGoodnessService {
             po.setRecordDate(DateUtils.truncate(recordDate));
             po.setWindtpowerstationId(wt.getWindpowerstationId());
             po.setCompanyId(wt.getCompanyId());
-
+            po.setRegionId(wt.getRegionId());
             if(wt.getWindpowerstationId().contains("FDC"))
             {
                 po.setTypes("-1");

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

@@ -64,7 +64,7 @@ public class WpwindDayInfoService {
                 ProEconWpwindDayInfo pewp = new ProEconWpwindDayInfo();
                 initial(pewp);
                 pewp.setRecordDate(DateUtils.truncate(recordDate));
-                pewp.setWindpowerstationId(ws.getId());
+                pewp.setWindpowerstationId(ws.getWindpowerstationId());
                 pewp.setWeatherId(ws.getId());
 
                 //昨日的统计结果