feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -8,13 +8,12 @@ import pps.core.base.entity.ThirdWindPowerGenerationUpdateView;
 import pps.core.base.entity.ThirdWindPowerGenerationView;
 import pps.core.base.mapper.ThirdWindPowerGenerationUpdateViewMapper;
 import pps.core.base.mapper.ThirdWindPowerGenerationViewMapper;
-import pps.core.base.service.data.config_oil_field.GetConfigOilFieldOutput;
+import pps.core.base.utils.ServiceUtil;
 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;
@@ -49,9 +48,7 @@ public class ThirdWindPowerGenerationCloudServiceImpl implements IThirdWindPower
             List<ThirdWindPowerGenerationView> batchList = new ArrayList<>(list.size() * 2);
             List<ThirdWindPowerGenerationUpdateView> batchUpdateList = new ArrayList<>(list.size());
             //查当前环境
-            XSingleResult<GetConfigOilFieldOutput> result = context.getBean(ConfigOilFieldService.class).getCurrentConfig(context);
-            result.throwIfFail();
-            String systemSource = result.getResult().getOilFieldCode();
+            String systemSource = ServiceUtil.getOilFieldCode(context);
             ThirdWindPowerGenerationView copy;
             for (ThirdWindPowerGenerationView thirdWindPowerGenerationView : list) {
                 thirdWindPowerGenerationView.setSystemSource(systemSource);

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

@@ -12,6 +12,7 @@ import pps.core.base.entity.WindPredictionHistoryView;
 import pps.core.base.mapper.ThirdWindPowerGenerationMapper;
 import pps.core.base.mapper.WindPredictionFutureMapper;
 import pps.core.base.mapper.WindPredictionHistoryViewMapper;
+import pps.core.base.utils.ServiceUtil;
 import pps.core.common.utils.BaseUtils;
 import xstartup.annotation.XService;
 import xstartup.base.XContext;
@@ -55,6 +56,7 @@ public class WindPredictionHistoryCloudServiceImpl implements IWindPredictionHis
                             "MAX( actual_wind_direction ) AS actual_wind_direction")
                     .lambda()
                     .between(ThirdWindPowerGenerationEnt::getCollectTime, startTime, endTime)
+                    .eq(ThirdWindPowerGenerationEnt::getSystemSource, ServiceUtil.getOilFieldCode(context))
                     .groupBy(ThirdWindPowerGenerationEnt::getStationId, ThirdWindPowerGenerationEnt::getCollectTime)
             );
             Map<String, Map<Date, ThirdWindPowerGenerationEnt>> collect;

C09-base/pps-core-base/src/main/java/pps/core/base/utils/ServiceUtil.java

 package pps.core.base.utils;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import pps.cloud.base.service.data.config_oil_field.GetConfigOilFieldOutput;
 import pps.cloud.system.service.SysOrganizationCloudService;
 import pps.cloud.system.service.SystemAreaService;
 import pps.cloud.system.service.SystemDictionaryService;
@@ -13,8 +15,11 @@ import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewOutput
 import pps.cloud.system.service.data.sys_organization.GetAllOuListByOuIdInput;
 import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewInput;
 import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
+import pps.core.base.service.ConfigOilFieldCloudServiceImpl;
+import pps.core.common.constant.BusinessConstant;
 import xstartup.base.XContext;
 import xstartup.data.XListResult;
+import xstartup.data.XSingleResult;
 
 import java.util.List;
 import java.util.Map;
@@ -28,6 +33,31 @@ import java.util.stream.Collectors;
  */
 public class ServiceUtil {
 
+    /**
+     * 获取油田代码
+     *
+     * @param context 上下文
+     * @return {@link String }
+     */
+    public static String getOilFieldCode(XContext context) {
+        //判断部署环境
+        GetConfigOilFieldOutput currentConfig = getCurrentConfig(context);
+        return ObjectUtil.defaultIfNull(currentConfig.getOilFieldCode(), BusinessConstant.DEFAULT_VALUE);
+    }
+
+    /**
+     * 获取当前配置
+     *
+     * @param context 上下文
+     * @return {@link GetConfigOilFieldOutput }
+     */
+    public static GetConfigOilFieldOutput getCurrentConfig(XContext context) {
+        ConfigOilFieldCloudServiceImpl service = context.getBean(ConfigOilFieldCloudServiceImpl.class);
+        XSingleResult<GetConfigOilFieldOutput> result = service.getCurrentConfig(context);
+        result.throwIfFail();
+        return result.getResult();
+    }
+
     /*-------------------------服务调用-------------------------*/
 
     /**

C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/ThirdWindPowerGenerationUpdateViewMapper.xml

@@ -112,42 +112,42 @@
         SELECT IFNULL(SUM(actual_generation), 0) AS today_power,
         (SELECT IFNULL(SUM(actual_generation), 0)
         FROM third_wind_power_generation_update
-        WHERE collect_time BETWEEN #{dateList[2]} AND #{dateList[3]} AND station_name IN
+        WHERE collect_time BETWEEN #{dateList[2]} AND #{dateList[3]} AND station_id IN
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
         ) AS month_power,
         (SELECT IFNULL(SUM(actual_generation), 0)
         FROM third_wind_power_generation_update
-        WHERE collect_time BETWEEN #{dateList[4]} AND #{dateList[5]} AND station_name IN
+        WHERE collect_time BETWEEN #{dateList[4]} AND #{dateList[5]} AND station_id IN
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
         ) AS last_month_power,
         (SELECT IFNULL(SUM(actual_generation), 0)
         FROM third_wind_power_generation_update
-        WHERE collect_time BETWEEN #{dateList[6]} AND #{dateList[7]} AND station_name IN
+        WHERE collect_time BETWEEN #{dateList[6]} AND #{dateList[7]} AND station_id IN
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
         ) AS season_power,
         (SELECT IFNULL(SUM(actual_generation), 0)
         FROM third_wind_power_generation_update
-        WHERE collect_time BETWEEN #{dateList[8]} AND #{dateList[9]} AND station_name IN
+        WHERE collect_time BETWEEN #{dateList[8]} AND #{dateList[9]} AND station_id IN
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
         ) AS last_season_power,
         (SELECT IFNULL(SUM(actual_generation), 0)
         FROM third_wind_power_generation_update
-        WHERE collect_time BETWEEN #{dateList[10]} AND #{dateList[11]} AND station_name IN
+        WHERE collect_time BETWEEN #{dateList[10]} AND #{dateList[11]} AND station_id IN
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
         ) AS year_power,
         (SELECT IFNULL(SUM(actual_generation), 0)
         FROM third_wind_power_generation_update
-        WHERE collect_time BETWEEN #{dateList[12]} AND #{dateList[13]} AND station_name IN
+        WHERE collect_time BETWEEN #{dateList[12]} AND #{dateList[13]} AND station_id IN
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
@@ -155,7 +155,7 @@
         FROM third_wind_power_generation_update
         WHERE collect_time BETWEEN #{dateList[0]}
         AND #{dateList[1]}
-        AND station_name IN
+        AND station_id IN
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>