feat(能源管理系统): 系统开发

1.开发基础信息配置-市电峰谷配置模块删除功能,完成接口冒烟测试并生成接口文档;
2.开发基础信息配置-市电峰谷配置模块详情功能,完成接口冒烟测试并生成接口文档;
3.开发基础信息配置-市电峰谷配置模块分页列表功能,完成接口冒烟测试并生成接口文档;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
+import pps.cloud.system.service.SystemAreaService;
+import pps.cloud.system.service.data.GetSysAreaInput;
+import pps.cloud.system.service.data.GetSysAreaOutput;
 import pps.core.base.entity.BasePriceStrategyDetailEnt;
 import pps.core.base.entity.BasePriceStrategyEnt;
 import pps.core.base.entity.BasePriceStrategyMonthEnt;
@@ -21,6 +24,7 @@ import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
 import xstartup.base.util.XCopyUtils;
+import xstartup.data.XListResult;
 import xstartup.data.XPageResult;
 import xstartup.data.XServiceResult;
 import xstartup.data.XSingleResult;
@@ -250,11 +254,32 @@ public class BasePriceStrategyService {
         List<BasePriceStrategyView> list = mapper.selectList(record);
         PageInfo<BasePriceStrategyView> pageInfo = new PageInfo<>(list);
         List<QueryBasePriceStrategyViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePriceStrategyViewOutput.class);
+        List<GetSysAreaOutput> sysAreaOutputList = this.getSysAreaOutputList(context);
+        for (QueryBasePriceStrategyViewOutput output : outputs) {
+            output.setAreaName(sysAreaOutputList.stream()
+                    .filter(area -> StringUtils.equals(output.getAreaCode(), String.valueOf(area.getId())))
+                    .map(GetSysAreaOutput::getName)
+                    .findAny()
+                    .orElse("其他地区"));
+        }
         return XPageResult.success(outputs, input, pageInfo.getTotal());
     }
 
     /*-----------------------------------private-----------------------------------*/
 
+    /**
+     * 获得系统输出列表区域
+     *
+     * @param context 上下文
+     * @return {@link List}<{@link GetSysAreaOutput}>
+     */
+    private List<GetSysAreaOutput> getSysAreaOutputList(XContext context) {
+        SystemAreaService systemAreaService = context.getBean(SystemAreaService.class);
+        XListResult<GetSysAreaOutput> sysAreaList = systemAreaService.getSysAreaList(context, new GetSysAreaInput());
+        sysAreaList.throwIfFail();
+        return sysAreaList.getResult();
+    }
+
     /**
      * 保存策略明细
      *

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/QueryBasePriceStrategyViewOutput.java

 package pps.core.base.service.data.base_price_strategy;
 
+import lombok.Data;
 import xstartup.annotation.XText;
-import java.util.Date;
+import xstartup.base.data.XPageInput;
+
 import java.math.BigDecimal;
 
-import xstartup.base.data.XPageInput;
+/**
+ * 市电峰谷策略
+ *
+ * @author ZWT
+ * @date 2023/08/25
+ */
+@Data
 public class QueryBasePriceStrategyViewOutput extends XPageInput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
     @XText("策略名称")
     private String policyName;
 
@@ -45,108 +32,11 @@ public class QueryBasePriceStrategyViewOutput extends XPageInput {
     @XText("固定电价")
     private BigDecimal fixedElectricityPrice;
 
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getPolicyName() {
-        return this.policyName;
-    }
-
-    public void setPolicyName(String value) {
-        this.policyName = value;
-    }
-
-    public String getAreaCode() {
-        return this.areaCode;
-    }
-
-    public void setAreaCode(String value) {
-        this.areaCode = value;
-    }
-
-    public Integer getStrategyYear() {
-        return this.strategyYear;
-    }
-
-    public void setStrategyYear(Integer value) {
-        this.strategyYear = value;
-    }
-
-    public Integer getIsFixedPrice() {
-        return this.isFixedPrice;
-    }
-
-    public void setIsFixedPrice(Integer value) {
-        this.isFixedPrice = value;
-    }
-
-    public BigDecimal getFixedElectricityPrice() {
-        return this.fixedElectricityPrice;
-    }
+    /*-----------------------------扩展字段-----------------------------*/
 
-    public void setFixedElectricityPrice(BigDecimal value) {
-        this.fixedElectricityPrice = value;
-    }
+    @XText("是否固定电价")
+    private String isFixedPriceValue;
 
+    @XText("适用地区名")
+    private String areaName;
 }

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

@@ -41,7 +41,7 @@
     </select>
 
     <resultMap id="ExtendResultMap" type="pps.core.base.entity.BasePriceStrategyView" extends="BaseResultMap">
-        <result column="is_fixed_price_value" property="areaCode" jdbcType="VARCHAR"/>
+        <result column="is_fixed_price_value" property="isFixedPriceValue" jdbcType="VARCHAR"/>
     </resultMap>
 
     <select id="selectList" parameterType="pps.core.base.entity.BasePriceStrategyView" resultMap="ExtendResultMap">