feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/EnergyConsumptionAnalysisService.java

@@ -33,7 +33,6 @@ import pps.core.common.constant.BusinessConstant;
 import pps.core.common.utils.BaseUtils;
 import pps.core.prediction.constant.ThirdPartyApiConstant;
 import pps.core.prediction.entity.*;
-import pps.core.prediction.enums.BusinessError;
 import pps.core.prediction.mapper.*;
 import pps.core.prediction.service.data.energy_consumption_analysis.*;
 import pps.core.prediction.service.data.home_page.GetPowerAnalyseOutput;
@@ -43,7 +42,6 @@ import pps.core.prediction.utils.ServiceUtil;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
-import xstartup.base.exception.XServiceException;
 import xstartup.base.util.XCopyUtils;
 import xstartup.data.XListResult;
 import xstartup.data.XPageData;
@@ -81,30 +79,9 @@ public class EnergyConsumptionAnalysisService {
     @XApiPost
     public XSingleResult<GetElectricityStatisticsOutput> electricityStatistics(XContext context, GetStatisticsInput input) {
         //日期初始化
-        Date beginTime, endTime;
-        if (ObjectUtil.isAllNotEmpty(input.getBeginTime(), input.getEndTime())) {
-            beginTime = input.getBeginTime();
-            endTime = input.getEndTime();
-        } else {
-            DateTime now = DateUtil.date();
-            Integer dateType = ObjectUtil.defaultIfNull(input.getDateType(), 1);
-            switch (dateType) {
-                case 1:
-                    beginTime = DateUtil.beginOfWeek(now);
-                    endTime = DateUtil.endOfWeek(now);
-                    break;
-                case 2:
-                    beginTime = DateUtil.beginOfMonth(now);
-                    endTime = DateUtil.endOfMonth(now);
-                    break;
-                case 3:
-                    beginTime = DateUtil.beginOfYear(now);
-                    endTime = DateUtil.endOfYear(now);
-                    break;
-                default:
-                    throw new XServiceException(BusinessError.DateTypeError);
-            }
-        }
+        input.getBetweenDate();
+        Date beginTime = input.getBeginTime();
+        Date endTime = input.getEndTime();
         //初始化
         GetElectricityStatisticsOutput output = GetElectricityStatisticsOutput.builder()
                 .currentPeriodGenerate(BigDecimal.ZERO)
@@ -130,6 +107,7 @@ public class EnergyConsumptionAnalysisService {
         return XSingleResult.success(output);
     }
 
+
     /**
      * 获取电站日统计数据
      *

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/energy_consumption_analysis/GetStatisticsInput.java

 package pps.core.prediction.service.data.energy_consumption_analysis;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import lombok.Data;
+import pps.core.prediction.enums.BusinessError;
+import xstartup.base.exception.XServiceException;
 
 import java.util.Date;
 
@@ -32,4 +37,33 @@ public class GetStatisticsInput {
      * 结束时间
      */
     private Date endTime;
+
+    /**
+     * 初始化开始结束日期
+     * 1_本周;2_本月;3_本年
+     */
+    public void getBetweenDate() {
+        if (ObjectUtil.isAllEmpty(this.beginTime, this.endTime)) {
+            DateTime now = DateUtil.date();
+            switch (ObjectUtil.defaultIfNull(this.dateType, 1)) {
+                case 1:
+                    this.beginTime = DateUtil.beginOfWeek(now);
+                    this.endTime = DateUtil.endOfWeek(now);
+                    break;
+                case 2:
+                    this.beginTime = DateUtil.beginOfMonth(now);
+                    this.endTime = DateUtil.endOfMonth(now);
+                    break;
+                case 3:
+                    this.beginTime = DateUtil.beginOfYear(now);
+                    this.endTime = DateUtil.endOfYear(now);
+                    break;
+                default:
+                    throw new XServiceException(BusinessError.DateTypeError);
+            }
+        } else {
+            this.beginTime = DateUtil.beginOfDay(this.beginTime);
+            this.endTime = DateUtil.endOfDay(this.endTime);
+        }
+    }
 }