Skip to content

G
gf_back
Commit 2284eded authored by ZWT's avatar ZWT
Browse files
Options

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent b37086e7
Show whitespace changes
Inline Side-by-side
Showing with 93 additions and 186 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePriceStrategyView.java
View file @ 2284eded
package pps.core.base.entity;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import xstartup.annotation.XText;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 市电峰谷策略
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class BasePriceStrategyView implements Serializable {
@XText("ID")
@TableField
......@@ -59,108 +68,9 @@ public class BasePriceStrategyView implements Serializable {
@TableField
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("是否固定电价")
@TableField
private String isFixedPriceValue;
}
C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BasePriceStrategyViewMapper.java
View file @ 2284eded
package pps.core.base.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import pps.core.base.entity.BasePriceStrategyView;
import java.util.List;
@Repository(value="pps.core.base.mapper.BasePriceStrategyViewMapper")
/**
* 市电峰谷策略
*
* @author ZWT
* @date 2023/08/25
*/
@Repository(value = "pps.core.base.mapper.BasePriceStrategyViewMapper")
public interface BasePriceStrategyViewMapper {
BasePriceStrategyView selectOne(BasePriceStrategyView record);
List<BasePriceStrategyView> selectList(BasePriceStrategyView record);
/**
* 列表
*
* @param record 记录
* @return {@link List}<{@link BasePriceStrategyView}>
*/
List<BasePriceStrategyView> selectList(@Param(value = "param") BasePriceStrategyView record);
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePriceStrategyService.java
View file @ 2284eded
......@@ -20,7 +20,6 @@ import pps.core.common.session.PpsUserSession;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.data.CustomQueryInput;
import xstartup.base.util.XCopyUtils;
import xstartup.data.XPageResult;
import xstartup.data.XServiceResult;
......@@ -29,7 +28,6 @@ import xstartup.error.XError;
import xstartup.feature.api.annotation.XApiAnonymous;
import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost;
import xstartup.feature.mybatis.helper.XMapperHelper;
import xstartup.helper.XTransactionHelper;
import java.util.*;
......@@ -234,51 +232,16 @@ public class BasePriceStrategyService {
return XSingleResult.success(output);
}
/**
* 市电峰谷策略--分页列表
*
* @param context 上下文
* @param input 输入
* @return {@link XPageResult}<{@link QueryBasePriceStrategyViewOutput}>
*/
@XApiAnonymous
@XApiGet
public XPageResult<QueryBasePriceStrategyOutput> queryBasePriceStrategy(XContext context, QueryBasePriceStrategyInput input) {
BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class);
QueryWrapper<BasePriceStrategyEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(BasePriceStrategyEnt::getId, input.getId())
.eq(BasePriceStrategyEnt::getIsDeleted, input.getIsDeleted())
.like(BasePriceStrategyEnt::getCreateById, input.getCreateById())
.like(BasePriceStrategyEnt::getCreateByName, input.getCreateByName())
.eq(BasePriceStrategyEnt::getCreateTime, input.getCreateTime())
.like(BasePriceStrategyEnt::getModifyById, input.getModifyById())
.like(BasePriceStrategyEnt::getModifyByName, input.getModifyByName())
.eq(BasePriceStrategyEnt::getModifyTime, input.getModifyTime())
.like(BasePriceStrategyEnt::getPolicyName, input.getPolicyName())
.like(BasePriceStrategyEnt::getAreaCode, input.getAreaCode())
.eq(BasePriceStrategyEnt::getStrategyYear, input.getStrategyYear())
.eq(BasePriceStrategyEnt::getIsFixedPrice, input.getIsFixedPrice())
.eq(BasePriceStrategyEnt::getFixedElectricityPrice, input.getFixedElectricityPrice());
return XMapperHelper.query(mapper, input, queryWrapper, QueryBasePriceStrategyOutput.class);
}
@XApiAnonymous
@XApiGet
public XPageResult<QueryBasePriceStrategyOutput> dynamicQueryBasePriceStrategy(XContext context, CustomQueryInput input) {
BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class);
return XMapperHelper.query(mapper, input, BasePriceStrategyEnt.class, QueryBasePriceStrategyOutput.class);
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetBasePriceStrategyViewOutput> getBasePriceStrategyView(XContext context, GetBasePriceStrategyViewInput input) {
BasePriceStrategyViewMapper mapper = context.getBean(BasePriceStrategyViewMapper.class);
BasePriceStrategyView record = new BasePriceStrategyView();
XCopyUtils.copyObject(input, record);
BasePriceStrategyView view = mapper.selectOne(record);
if (view == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetBasePriceStrategyViewOutput output = new GetBasePriceStrategyViewOutput();
XCopyUtils.copyObject(view, output);
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiGet
@XText("市电峰谷策略--分页列表")
public XPageResult<QueryBasePriceStrategyViewOutput> queryBasePriceStrategyView(XContext context, QueryBasePriceStrategyViewInput input) {
BasePriceStrategyViewMapper mapper = context.getBean(BasePriceStrategyViewMapper.class);
BasePriceStrategyView record = new BasePriceStrategyView();
......
C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePriceStrategyViewMapper.xml
View file @ 2284eded
......@@ -2,22 +2,23 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.base.mapper.BasePriceStrategyViewMapper">
<resultMap id="BaseResultMap" type="pps.core.base.entity.BasePriceStrategyView">
<id column="id" property="id" jdbcType="VARCHAR" />
<result column="is_deleted" property="isDeleted" jdbcType="INTEGER" />
<result column="create_by_id" property="createById" jdbcType="VARCHAR" />
<result column="create_by_name" property="createByName" jdbcType="VARCHAR" />
<result column="create_time" property="createTime" jdbcType="DATE" />
<result column="modify_by_id" property="modifyById" jdbcType="VARCHAR" />
<result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR" />
<result column="modify_time" property="modifyTime" jdbcType="DATE" />
<result column="policy_name" property="policyName" jdbcType="VARCHAR" />
<result column="area_code" property="areaCode" jdbcType="VARCHAR" />
<result column="strategy_year" property="strategyYear" jdbcType="INTEGER" />
<result column="is_fixed_price" property="isFixedPrice" jdbcType="INTEGER" />
<result column="fixed_electricity_price" property="fixedElectricityPrice" jdbcType="DECIMAL" />
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="is_deleted" property="isDeleted" jdbcType="INTEGER"/>
<result column="create_by_id" property="createById" jdbcType="VARCHAR"/>
<result column="create_by_name" property="createByName" jdbcType="VARCHAR"/>
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="modify_by_id" property="modifyById" jdbcType="VARCHAR"/>
<result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR"/>
<result column="modify_time" property="modifyTime" jdbcType="DATE"/>
<result column="policy_name" property="policyName" jdbcType="VARCHAR"/>
<result column="area_code" property="areaCode" jdbcType="VARCHAR"/>
<result column="strategy_year" property="strategyYear" jdbcType="INTEGER"/>
<result column="is_fixed_price" property="isFixedPrice" jdbcType="INTEGER"/>
<result column="fixed_electricity_price" property="fixedElectricityPrice" jdbcType="DECIMAL"/>
</resultMap>
<sql id="Base_Column_List">
id,
id
,
is_deleted,
create_by_id,
create_by_name,
......@@ -33,16 +34,35 @@
</sql>
<select id="selectOne" parameterType="pps.core.base.entity.BasePriceStrategyView" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
<include refid="Base_Column_List"/>
from base_price_strategy
where
id=#{id}
</select>
<select id="selectList" parameterType="pps.core.base.entity.BasePriceStrategyView" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from base_price_strategy
where
id=#{id}
<resultMap id="ExtendResultMap" type="pps.core.base.entity.BasePriceStrategyView" extends="BaseResultMap">
<result column="is_fixed_price_value" property="areaCode" jdbcType="VARCHAR"/>
</resultMap>
<select id="selectList" parameterType="pps.core.base.entity.BasePriceStrategyView" resultMap="ExtendResultMap">
SELECT id,
policy_name,
area_code,
strategy_year,
is_fixed_price,
fixed_electricity_price,
CASE
is_fixed_price
WHEN 0 THEN
'是'
ELSE '否'
END is_fixed_price_value
FROM base_price_strategy
<where>
<if test=" param.policyName != null and param.policyName != '' ">
policy_name LIKE CONCAT( '%', #{param.policyName}, '%' )
</if>
</where>
ORDER BY modify_time DESC
</select>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment