feat(能源管理系统): 邮件接收

1.统计分析-能耗分析模块重构,删除原有接口及代码,新建能耗分析测试用数据表,生成相关代码并集成到项目中并上传git;
2.统计分析-能耗分析模块能耗概览接口开发,输电线路Cloud模块新增通过组织结构ID列表查询线路列表接口,完成能耗分析模块能耗概览接口业务逻辑开发,添加线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -20,14 +20,13 @@ import pps.core.prediction.service.data.energy_consumption_analysis.*;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
-import xstartup.base.data.CustomQueryInput;
+import xstartup.base.exception.XServiceException;
 import xstartup.base.util.XCopyUtils;
 import xstartup.data.XListResult;
 import xstartup.data.XPageResult;
 import xstartup.data.XSingleResult;
 import xstartup.feature.api.annotation.XApiAnonymous;
 import xstartup.feature.api.annotation.XApiGet;
-import xstartup.feature.mybatis.helper.XMapperHelper;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -73,7 +72,7 @@ public class EnergyConsumptionAnalysisService {
                 startTime = input.getStartTime();
                 break;
             default:
-                return XSingleResult.error(context, BusinessError.DateTypeError);
+                throw new XServiceException(BusinessError.DateTypeError);
         }
         GetEnergyConsumptionAnalysisViewOutput output = new GetEnergyConsumptionAnalysisViewOutput();
         List<DynamicQueryBasePowerLineOutput> lineList = this.getBasePowerLineListByOuIdList(context, this.getOrgIdsByPath(context, input.getOuId()));
@@ -106,26 +105,19 @@ public class EnergyConsumptionAnalysisService {
         return XSingleResult.success(output);
     }
 
-
-//
-//    @XApiAnonymous
-//    @XApiGet
-//    public XPageResult<QueryEnergyConsumptionAnalysisOutput> queryEnergyConsumptionAnalysis(XContext context, QueryEnergyConsumptionAnalysisInput input) {
-//        EnergyConsumptionAnalysisMapper mapper = context.getBean(EnergyConsumptionAnalysisMapper.class);
-//        QueryWrapper<EnergyConsumptionAnalysisEnt> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.lambda().eq(EnergyConsumptionAnalysisEnt::getId, input.getId())
-//                .like(EnergyConsumptionAnalysisEnt::getLineId, input.getLineId())
-//                .eq(EnergyConsumptionAnalysisEnt::getPowerGeneration, input.getPowerGeneration())
-//                .eq(EnergyConsumptionAnalysisEnt::getPowerConsumption, input.getPowerConsumption())
-//                .eq(EnergyConsumptionAnalysisEnt::getDataDate, input.getDataDate());
-//        return XMapperHelper.query(mapper, input, queryWrapper, QueryEnergyConsumptionAnalysisOutput.class);
-//    }
-
+    /**
+     * 能耗分析--绿电消纳/用电趋势
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XListResult}<{@link DynamicQueryEnergyConsumptionAnalysisViewOutput}>
+     */
+    @XText("能耗分析--绿电消纳/用电趋势")
     @XApiAnonymous
     @XApiGet
-    public XPageResult<QueryEnergyConsumptionAnalysisOutput> dynamicQueryEnergyConsumptionAnalysis(XContext context, CustomQueryInput input) {
+    public XListResult<DynamicQueryEnergyConsumptionAnalysisViewOutput> queryEnergyConsumptionAnalysisList(XContext context, DynamicQueryEnergyConsumptionAnalysisInput input) {
         EnergyConsumptionAnalysisMapper mapper = context.getBean(EnergyConsumptionAnalysisMapper.class);
-        return XMapperHelper.query(mapper, input, EnergyConsumptionAnalysisEnt.class, QueryEnergyConsumptionAnalysisOutput.class);
+        return XListResult.success();
     }
 
 

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

-package pps.core.prediction.service.data.energy_consumption_analysis;
-
-import lombok.Data;
-import xstartup.annotation.XText;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 能耗分析表(测试用)
- *
- * @author ZWT
- * @date 2023/11/23
- */
-@Data
-public class DynamicQueryEnergyConsumptionAnalysisOutput {
-    @XText("ID")
-    private Long id;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("发电量(kWh)")
-    private BigDecimal powerGeneration;
-
-    @XText("用电量(kWh)")
-    private BigDecimal powerConsumption;
-
-    @XText("日期")
-    private Date dataDate;
-}

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

-package pps.core.prediction.service.data.energy_consumption_analysis;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import xstartup.annotation.XText;
-import xstartup.base.data.XPageInput;
-
-import java.util.Date;
-
-/**
- * 能耗分析表(测试用)
- *
- * @author ZWT
- * @date 2023/11/23
- */
-@Data
-public class QueryEnergyConsumptionAnalysisInput extends XPageInput {
-    /**
-     * 组织机构ID
-     */
-    @NotBlank(message = "缺少组织机构ID")
-    @XText("组织机构ID")
-    private String ouId;
-
-    /**
-     * 日期类型(1_近7天,2_近30天,3_自定义)
-     */
-    @NotNull(message = "缺少日期类型")
-    @XText("日期类型(1_近7天,2_近30天,3_自定义)")
-    private Integer dateType;
-
-    /**
-     * 开始时间
-     */
-    @XText("开始时间")
-    private Date startTime;
-
-    /**
-     * 结束时间
-     */
-    @XText("结束时间")
-    private Date endTime;
-}

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

-package pps.core.prediction.service.data.energy_consumption_analysis;
-
-import lombok.Data;
-import xstartup.annotation.XText;
-import xstartup.base.data.XPageInput;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 能耗分析表(测试用)
- *
- * @author ZWT
- * @date 2023/11/23
- */
-@Data
-public class QueryEnergyConsumptionAnalysisOutput extends XPageInput {
-    @XText("ID")
-    private Long id;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("发电量(kWh)")
-    private BigDecimal powerGeneration;
-
-    @XText("用电量(kWh)")
-    private BigDecimal powerConsumption;
-
-    @XText("日期")
-    private Date dataDate;
-}

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

@@ -27,6 +27,9 @@ public class QueryEnergyConsumptionAnalysisViewOutput extends XPageInput {
     @XText("用电量(kWh)")
     private BigDecimal powerConsumption;
 
+    @XText("消纳率(%)")
+    private BigDecimal absorptionRate;
+
     @XText("日期")
     private Date dataDate;
 }