Skip to content

G
gf_back
Commit 9daf26a7 authored by ZWT's avatar ZWT
Browse files
Options

feat(能源管理系统): 基础信息配置 

1.开发基础信息配置-输电线路配置模块修改功能,完成接口冒烟测试并生成接口文档;
2.开发基础信息配置-输电线路配置模块删除功能,完成接口冒烟测试并生成接口文档;
3.开发基础信息配置-输电线路配置模块详情功能,完成接口冒烟测试并生成接口文档;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 69707ffa
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 37 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineStorageView.java
View file @ 9daf26a7
...@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor; ...@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/** /**
...@@ -64,4 +65,18 @@ public class BasePowerLineStorageView implements Serializable { ...@@ -64,4 +65,18 @@ public class BasePowerLineStorageView implements Serializable {
@XText("组织机构ID") @XText("组织机构ID")
@TableField @TableField
private String ouId; private String ouId;
/**
* 设备名称
*/
@XText("设备名称")
@TableField
private String deviceName;
/**
* 装机总量
*/
@XText("设备容量(KWh)")
@TableField
private BigDecimal apparatusCapacity;
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line_plant/GetBasePowerLinePlantViewOutput.java
View file @ 9daf26a7
package pps.core.base.service.data.base_power_line_plant; package pps.core.base.service.data.base_power_line_plant;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data; import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.math.BigDecimal;
/** /**
* 输电线路光伏配置 * 输电线路光伏配置
* *
...@@ -12,12 +15,23 @@ import xstartup.annotation.XText; ...@@ -12,12 +15,23 @@ import xstartup.annotation.XText;
@Data @Data
public class GetBasePowerLinePlantViewOutput { public class GetBasePowerLinePlantViewOutput {
@XText("线路ID") @XText("ID")
private String lineId; private String id;
@XText("光伏电站ID") @XText("光伏电站ID")
private String plantId; private String plantId;
@XText("组织机构ID") /**
private String ouId; * 电站名称
*/
@XText("电站名称")
@TableField
private String stationName;
/**
* 装机总量
*/
@XText("装机总量(KWP)")
@TableField
private BigDecimal totalPower;
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line_storage/GetBasePowerLineStorageViewOutput.java
View file @ 9daf26a7
package pps.core.base.service.data.base_power_line_storage; package pps.core.base.service.data.base_power_line_storage;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data; import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.math.BigDecimal;
/** /**
* 输电线路储能配置 * 输电线路储能配置
* *
...@@ -12,9 +15,23 @@ import xstartup.annotation.XText; ...@@ -12,9 +15,23 @@ import xstartup.annotation.XText;
@Data @Data
public class GetBasePowerLineStorageViewOutput { public class GetBasePowerLineStorageViewOutput {
@XText("ID")
private String id;
@XText("储能设备ID") @XText("储能设备ID")
private String storageId; private String storageId;
@XText("组织机构ID") /**
private String ouId; * 设备名称
*/
@XText("设备名称")
@TableField
private String deviceName;
/**
* 装机总量
*/
@XText("设备容量(KWh)")
@TableField
private BigDecimal apparatusCapacity;
} }
C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePowerLinePlantViewMapper.xml
View file @ 9daf26a7
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
id=#{id} id=#{id}
</select> </select>
<select id="selectList" parameterType="pps.core.base.entity.BasePowerLinePlantView" resultMap="BaseResultMap"> <select id="selectList" parameterType="pps.core.base.entity.BasePowerLinePlantView" resultMap="ExtendsResultMap">
SELECT l.id, SELECT l.id,
l.plant_id, l.plant_id,
p.station_name, p.station_name,
......
C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePowerLineStorageViewMapper.xml
View file @ 9daf26a7
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.base.mapper.BasePowerLineStorageViewMapper"> <mapper namespace="pps.core.base.mapper.BasePowerLineStorageViewMapper">
<resultMap id="BaseResultMap" type="pps.core.base.entity.BasePowerLineStorageView"> <resultMap id="BaseResultMap" type="pps.core.base.entity.BasePowerLineStorageView">
<id column="id" property="id" jdbcType="VARCHAR" /> <id column="id" property="id" jdbcType="VARCHAR"/>
<result column="is_deleted" property="isDeleted" jdbcType="INTEGER" /> <result column="is_deleted" property="isDeleted" jdbcType="INTEGER"/>
<result column="create_by_id" property="createById" jdbcType="VARCHAR" /> <result column="create_by_id" property="createById" jdbcType="VARCHAR"/>
<result column="create_by_name" property="createByName" jdbcType="VARCHAR" /> <result column="create_by_name" property="createByName" jdbcType="VARCHAR"/>
<result column="create_time" property="createTime" jdbcType="DATE" /> <result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="modify_by_id" property="modifyById" jdbcType="VARCHAR" /> <result column="modify_by_id" property="modifyById" jdbcType="VARCHAR"/>
<result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR" /> <result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR"/>
<result column="modify_time" property="modifyTime" jdbcType="DATE" /> <result column="modify_time" property="modifyTime" jdbcType="DATE"/>
<result column="line_id" property="lineId" jdbcType="VARCHAR" /> <result column="line_id" property="lineId" jdbcType="VARCHAR"/>
<result column="storage_id" property="storageId" jdbcType="VARCHAR" /> <result column="storage_id" property="storageId" jdbcType="VARCHAR"/>
<result column="ou_id" property="ouId" jdbcType="VARCHAR"/> <result column="ou_id" property="ouId" jdbcType="VARCHAR"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, id
,
is_deleted, is_deleted,
create_by_id, create_by_id,
create_by_name, create_by_name,
...@@ -26,19 +27,29 @@ ...@@ -26,19 +27,29 @@
line_id, line_id,
storage_id, storage_id,
ou_id ou_id
</sql> </sql>
<select id="selectOne" parameterType="pps.core.base.entity.BasePowerLineStorageView" resultMap="BaseResultMap">
select <resultMap id="ExtendsResultMap" type="pps.core.base.entity.BasePowerLineStorageView" extends="BaseResultMap">
<include refid="Base_Column_List" /> <result column="device_name" property="deviceName" jdbcType="VARCHAR"/>
from base_power_line_storage <result column="apparatus_capacity" property="apparatusCapacity" jdbcType="DECIMAL"/>
where </resultMap>
id=#{id}
</select> <select id="selectOne" parameterType="pps.core.base.entity.BasePowerLineStorageView" resultMap="BaseResultMap">
<select id="selectList" parameterType="pps.core.base.entity.BasePowerLineStorageView" resultMap="BaseResultMap"> select
select <include refid="Base_Column_List"/>
<include refid="Base_Column_List" /> from base_power_line_storage
from base_power_line_storage where
where id=#{id}
id=#{id} </select>
</select>
<select id="selectList" parameterType="pps.core.base.entity.BasePowerLineStorageView" resultMap="ExtendsResultMap">
SELECT l.id,
l.storage_id,
d.device_name,
d.apparatus_capacity
FROM base_power_line_storage l
LEFT JOIN base_energy_storage_device d ON l.storage_id = d.id
AND d.is_deleted = 1
WHERE l.line_id = #{lineId}
</select>
</mapper> </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