feat(吉林演示): 松原

1.修改天气数据抽取定时任务,解决部分历史数据丢失问题;
2.修改第三方风机电站真实数据定时任务,修改代码逻辑,解决时间未按照15分钟间隔推送问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -10,9 +10,11 @@ import pps.core.base.service.data.config_oil_field.GetConfigOilFieldOutput;
 import pps.core.common.utils.BaseUtils;
 import xstartup.annotation.XService;
 import xstartup.base.XContext;
+import xstartup.base.util.XCopyUtils;
 import xstartup.data.XServiceResult;
 import xstartup.data.XSingleResult;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -41,20 +43,26 @@ public class ThirdWindPowerGenerationCloudServiceImpl implements IThirdWindPower
                 .endTime(endTime)
                 .build());
         if (CollUtil.isNotEmpty(list)) {
+            List<ThirdWindPowerGenerationView> batchList = new ArrayList<>(list.size() * 2);
             //查当前环境
             XSingleResult<GetConfigOilFieldOutput> result = context.getBean(ConfigOilFieldService.class).getCurrentConfig(context);
             result.throwIfFail();
             String systemSource = result.getResult().getOilFieldCode();
+            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));
+                batchList.add(copy);
             }
             //批量新增
-            if (list.size() > BaseUtils.BATCH_SIZE) {
-                List<List<ThirdWindPowerGenerationView>> subList = BaseUtils.getSubList(list);
+            if (batchList.size() > BaseUtils.BATCH_SIZE) {
+                List<List<ThirdWindPowerGenerationView>> subList = BaseUtils.getSubList(batchList);
                 subList.forEach(viewMapper::batchInsert);
             } else {
-                viewMapper.batchInsert(list);
+                viewMapper.batchInsert(batchList);
             }
         }
         return XServiceResult.OK;