feat(吉林演示): 松原

1.修改风电站运行状态接口,增加模拟实际发电功率处理逻辑,完成接口冒烟测试;
2.修改天气数据处理定时任务,解决晚上十一点半天气预报数据处理异常问题,修改风资源预测数据和光伏资源预测数据时间处理逻辑,完成接口冒烟测试;
3.修改风机预测数据模块相关功能接口,增加判断当前部署环境逻辑,解决查询全量数据问题;
4.修改风机预测数据生成模块第三方风力发电数据生成功能,增加数据拆分逻辑,区分15分数据层级,完成功能冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C00-common/pps-common/src/main/java/pps/core/common/constant/BusinessConstant.java

@@ -185,6 +185,17 @@ public class BusinessConstant {
      */
     public static final BigDecimal BIG_DECIMAL_6_67 = BigDecimal.valueOf(6.67);
 
+    /**
+     * 0.6
+     */
+    public static final BigDecimal BIG_DECIMAL_0_6 = BigDecimal.valueOf(0.6);
+
+    /**
+     * 0.4
+     */
+    public static final BigDecimal BIG_DECIMAL_0_4 = BigDecimal.valueOf(0.4);
+
+
     /**
      * 2
      */

C09-base/pps-core-base/src/main/java/pps/core/base/service/ThirdWindPowerGenerationCloudServiceImpl.java

@@ -9,6 +9,7 @@ import pps.core.base.entity.ThirdWindPowerGenerationView;
 import pps.core.base.mapper.ThirdWindPowerGenerationUpdateViewMapper;
 import pps.core.base.mapper.ThirdWindPowerGenerationViewMapper;
 import pps.core.base.utils.ServiceUtil;
+import pps.core.common.constant.BusinessConstant;
 import pps.core.common.utils.BaseUtils;
 import xstartup.annotation.XService;
 import xstartup.base.XContext;
@@ -50,15 +51,18 @@ public class ThirdWindPowerGenerationCloudServiceImpl implements IThirdWindPower
             //查当前环境
             String systemSource = ServiceUtil.getOilFieldCode(context);
             ThirdWindPowerGenerationView copy;
-            for (ThirdWindPowerGenerationView thirdWindPowerGenerationView : list) {
-                thirdWindPowerGenerationView.setSystemSource(systemSource);
-                thirdWindPowerGenerationView.setInputTime(endTime);
-                batchList.add(thirdWindPowerGenerationView);
-                copy = XCopyUtils.copyNewObject(thirdWindPowerGenerationView, ThirdWindPowerGenerationView.class);
-                copy.setCollectTime(DateUtil.offsetMinute(copy.getCollectTime(), -15));
+            for (ThirdWindPowerGenerationView view : list) {
+                view.setSystemSource(systemSource);
+                view.setInputTime(endTime);
+                copy = this.newThirdWindPowerGenerationView(view);
                 batchList.add(copy);
+                //计算原始数据
+                view.setActualWindSpeed(view.getActualWindSpeed().multiply(BusinessConstant.BIG_DECIMAL_0_6));
+                view.setActualPower(view.getActualPower().multiply(BusinessConstant.BIG_DECIMAL_0_6));
+                view.setActualGeneration(view.getActualGeneration().multiply(BusinessConstant.BIG_DECIMAL_0_6));
+                batchList.add(view);
                 //每日最新数据
-                batchUpdateList.add(XCopyUtils.copyNewObject(thirdWindPowerGenerationView, ThirdWindPowerGenerationUpdateView.class));
+                batchUpdateList.add(XCopyUtils.copyNewObject(view, ThirdWindPowerGenerationUpdateView.class));
             }
             //批量新增
             if (batchList.size() > BaseUtils.BATCH_SIZE) {
@@ -83,4 +87,26 @@ public class ThirdWindPowerGenerationCloudServiceImpl implements IThirdWindPower
         }
         return XServiceResult.OK;
     }
+
+    /*--------------------------------- private ---------------------------------*/
+
+    /**
+     * 第三代风力发电新观点
+     *
+     * @param view 看法
+     * @return {@link ThirdWindPowerGenerationView }
+     */
+    private ThirdWindPowerGenerationView newThirdWindPowerGenerationView(ThirdWindPowerGenerationView view) {
+        return ThirdWindPowerGenerationView.builder()
+                .stationName(view.getStationName())
+                .stationId(view.getStationId())
+                .collectTime(DateUtil.offsetMinute(view.getCollectTime(), -15))
+                .actualWindSpeed(view.getActualWindSpeed().multiply(BusinessConstant.BIG_DECIMAL_0_4))
+                .actualPower(view.getActualPower().multiply(BusinessConstant.BIG_DECIMAL_0_4))
+                .actualGeneration(view.getActualGeneration().multiply(BusinessConstant.BIG_DECIMAL_0_4))
+                .actualWindDirection(view.getActualWindDirection())
+                .inputTime(view.getInputTime())
+                .systemSource(view.getSystemSource())
+                .build();
+    }
 }
\ No newline at end of file