Skip to content

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

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 9daf26a7
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 34 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineDieselView.java
View file @ cef36c57
...@@ -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 BasePowerLineDieselView implements Serializable { ...@@ -64,4 +65,18 @@ public class BasePowerLineDieselView implements Serializable {
@XText("组织机构ID") @XText("组织机构ID")
@TableField @TableField
private String ouId; private String ouId;
/**
* 设备名称
*/
@XText("设备名称")
@TableField
private String deviceName;
/**
* 发电功率
*/
@XText("备用功率(KW)")
@TableField
private BigDecimal standbyPower;
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line_diesel/GetBasePowerLineDieselViewOutput.java
View file @ cef36c57
package pps.core.base.service.data.base_power_line_diesel; package pps.core.base.service.data.base_power_line_diesel;
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 GetBasePowerLineDieselViewOutput { public class GetBasePowerLineDieselViewOutput {
@XText("线路ID") @XText("ID")
private String lineId; private String id;
@XText("柴发设备ID") @XText("柴发设备ID")
private String dieselId; private String dieselId;
@XText("组织机构ID") /**
private String ouId; * 设备名称
*/
@XText("设备名称")
@TableField
private String deviceName;
/**
* 发电功率
*/
@XText("备用功率(KW)")
@TableField
private BigDecimal standbyPower;
} }
C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePowerLineDieselViewMapper.xml
View file @ cef36c57
<?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.BasePowerLineDieselViewMapper"> <mapper namespace="pps.core.base.mapper.BasePowerLineDieselViewMapper">
<resultMap id="BaseResultMap" type="pps.core.base.entity.BasePowerLineDieselView"> <resultMap id="BaseResultMap" type="pps.core.base.entity.BasePowerLineDieselView">
<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="diesel_id" property="dieselId" jdbcType="VARCHAR" /> <result column="diesel_id" property="dieselId" 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,
diesel_id, diesel_id,
ou_id ou_id
</sql> </sql>
<select id="selectOne" parameterType="pps.core.base.entity.BasePowerLineDieselView" resultMap="BaseResultMap">
select <resultMap id="ExtendsResultMap" type="pps.core.base.entity.BasePowerLineDieselView" extends="BaseResultMap">
<include refid="Base_Column_List" /> <result column="device_name" property="deviceName" jdbcType="VARCHAR"/>
from base_power_line_diesel <result column="standby_power" property="standbyPower" jdbcType="DECIMAL"/>
where </resultMap>
id=#{id}
</select> <select id="selectOne" parameterType="pps.core.base.entity.BasePowerLineDieselView" resultMap="BaseResultMap">
<select id="selectList" parameterType="pps.core.base.entity.BasePowerLineDieselView" resultMap="BaseResultMap"> select
select <include refid="Base_Column_List"/>
<include refid="Base_Column_List" /> from base_power_line_diesel
from base_power_line_diesel where
where id=#{id}
id=#{id} </select>
</select>
<select id="selectList" parameterType="pps.core.base.entity.BasePowerLineDieselView" resultMap="ExtendsResultMap">
SELECT l.id,
l.diesel_id,
g.device_name,
g.standby_power
FROM base_power_line_diesel l
LEFT JOIN base_diesel_generator g ON l.diesel_id = g.id
AND g.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