feat(吉林演示): 松原

1.开发中间库表结构及数据导出功能,检查中间库表结构是否有变动,同时获取最新数据,验证数据是否更新;
2.创建场站每日信息统计记录表,新建场站日信息数据采集汇总定时任务,整理汇总场站纬度每日数据,完成功能验证;
3.针对吉林提供的统计数据,对吉林首页部分功能修改;
4.针对中间库每日井口数据统计表结构变动,修改井口日统计定时任务数据处理逻辑,完成功能验证;
5.修改日发电量统计定时任务,排查数据丢失问题,完成功能验证;
6.修改场站每日信息汇总统计定时任务,增加统计每日光伏发电量逻辑,修改表结构及数据结构和业务处理逻辑,完成功能验证;
7.修改吉林首页线路详情接口,区分部署环境,增加吉林个性化数据处理逻辑,完成接口冒烟测试;
8.修改实际发电功率统计定时任务,排查数据丢失问题,完成功能验证;
9.修改实际发电量统计定时任务,排查数据丢失问题,完成功能验证;
10.修改吉林首页井场效果评价数据统计接口,区分部署环境,增加吉林个性化数据处理逻辑,完成接口冒烟测试;
11.能耗分析页面开发吉林个性化功能,完成电量统计接口开发,编辑线上接口文档并生成接口用例,完成接口冒烟测试;
12.能耗分析页面开发吉林个性化功能,完成发电量统计接口开发,编辑线上接口文档并生成接口用例,完成接口冒烟测试;
13.能耗分析页面开发吉林个性化功能,完成用电量统计接口开发,编辑线上接口文档并生成接口用例,完成接口冒烟测试;
14.能耗分析页面开发吉林个性化功能,完成峰谷能耗对比分析接口开发,编辑线上接口文档并生成接口用例,完成接口冒烟测试;
15.能耗分析页面开发吉林个性化功能,完成用能分析接口开发,编辑线上接口文档并生成接口用例,完成接口冒烟测试;
16.间开效果评价页面开发吉林个性化功能,完成发电效益统计接口开发,编辑线上接口文档并生成接口用例,完成接口冒烟测试;
17.间开效果评价页面开发吉林个性化功能,完成发减碳量统计接口开发,编辑线上接口文档并生成接口用例,完成接口冒烟测试;
18.间开效果评价页面开发吉林个性化功能,完成累节电能统计接口开发,编辑线上接口文档并生成接口用例,完成接口冒烟测试;
19.间开效果评价页面开发吉林个性化功能,完成场站分析接口开发,编辑线上接口文档并生成接口用例,完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -81,9 +81,7 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
             case BusinessConstant.ENV_SY:
                 logger.info("------ weatherDataProcess select mail ------");
                 IWeatherAttachmentCloudService service = context.getBean(IWeatherAttachmentCloudService.class);
-                XSingleResult<GetWeatherAttachmentRecordOutput> result = service.getLatestEmail(context, GetWeatherAttachmentRecordInput.builder()
-                        .oilFieldCode(oilFieldCode)
-                        .build());
+                XSingleResult<GetWeatherAttachmentRecordOutput> result = service.getEmail(context, new GetWeatherAttachmentRecordInput());
                 result.throwIfFail();
                 GetWeatherAttachmentRecordOutput output = result.getResult();
                 if (ObjectUtil.isNotNull(output) && CharSequenceUtil.isAllNotBlank(output.getEmailName(), output.getEmailAttachmentUrl())) {

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/IWeatherAttachmentCloudService.java

@@ -24,9 +24,6 @@ public interface IWeatherAttachmentCloudService {
      * @param input   输入
      * @return {@link XSingleResult }<{@link GetWeatherAttachmentRecordOutput }>
      */
-    @XText("获取最新邮件")
-    XSingleResult<GetWeatherAttachmentRecordOutput> getLatestEmail(XContext context, GetWeatherAttachmentRecordInput input);
-
     @XText("获取最新邮件")
     XSingleResult<GetWeatherAttachmentRecordOutput> getEmail(XContext context, GetWeatherAttachmentRecordInput input);
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/WeatherAttachmentCloudServiceImpl.java

 package pps.core.middle.service;
 
-import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import pps.cloud.middle.service.IWeatherAttachmentCloudService;
 import pps.cloud.middle.service.data.weather_attachment_record.GetWeatherAttachmentRecordInput;
@@ -22,24 +22,17 @@ import java.util.List;
  */
 @XService
 public class WeatherAttachmentCloudServiceImpl implements IWeatherAttachmentCloudService {
-    @Override
-    public XSingleResult<GetWeatherAttachmentRecordOutput> getLatestEmail(XContext context, GetWeatherAttachmentRecordInput input) {
-        WeatherAttachmentRecordMapper mapper = context.getBean(WeatherAttachmentRecordMapper.class);
-        String emailName = DateUtil.date().toString("yyyyMMddHH00") + "天气预测数据" + input.getOilFieldCode();
-        List<WeatherAttachmentRecordEnt> list = mapper.selectList(new QueryWrapper<WeatherAttachmentRecordEnt>()
-                .select("EMAIL_DATA_TIME", "EMAIL_ATTACHMENT_URL", "EMAIL_NAME")
-                .eq("EMAIL_NAME", emailName)
-        );
-        return XSingleResult.success(XCopyUtils.copyNewObject(list.get(0), GetWeatherAttachmentRecordOutput.class));
-    }
 
     @Override
     public XSingleResult<GetWeatherAttachmentRecordOutput> getEmail(XContext context, GetWeatherAttachmentRecordInput input) {
         WeatherAttachmentRecordMapper mapper = context.getBean(WeatherAttachmentRecordMapper.class);
         List<WeatherAttachmentRecordEnt> list = mapper.selectList(new QueryWrapper<WeatherAttachmentRecordEnt>()
                 .select("EMAIL_DATA_TIME", "EMAIL_ATTACHMENT_URL", "EMAIL_NAME")
-                .orderByDesc("EMAIL_NAME")
+                .orderByDesc("ID")
         );
+        if (CollUtil.isEmpty(list)) {
+            return XSingleResult.success();
+        }
         return XSingleResult.success(XCopyUtils.copyNewObject(list.get(0), GetWeatherAttachmentRecordOutput.class));
     }
 }