Commit 7fc4b9eb authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.添加easy excel配置,增加转换器,增加全局excel导出样式,增加场站下拉选解析器;
2.开发光伏电站模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
3.间开制度管理模块新增设为基础制度开关接口,添加线上接口文档并完成接口冒烟测试;
4.开发井口配置模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
5.开发第三方有功功率历史数据导入接口,增加模板配置类,添加线上接口文档并完成接口冒烟测试;
6.开发给长庆使用的获取第三方认证token接口,验证获取token后是否能正常跳转指定页面,创建长庆用演示用户及角色;
7.开发柴发设备配置模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
8.开发储能设备配置模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent cc7a50f2
...@@ -26,4 +26,9 @@ public class QuerySysAreaOutput { ...@@ -26,4 +26,9 @@ public class QuerySysAreaOutput {
* 城市 * 城市
*/ */
private String city; private String city;
/**
* 城市代码
*/
private String cityCode;
} }
...@@ -2,9 +2,11 @@ package pps.core.system.entity; ...@@ -2,9 +2,11 @@ package pps.core.system.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@Data
@TableName("sys_area") @TableName("sys_area")
public class SysAreaEnt implements Serializable { public class SysAreaEnt implements Serializable {
@TableField @TableField
...@@ -19,36 +21,6 @@ public class SysAreaEnt implements Serializable { ...@@ -19,36 +21,6 @@ public class SysAreaEnt implements Serializable {
@TableField @TableField
private Integer lev; private Integer lev;
public Integer getId() { @TableField
return this.id; private String cityCode;
}
public void setId(Integer value) {
this.id = value;
}
public String getName() {
return this.name;
}
public void setName(String value) {
this.name = value;
}
public Integer getParentId() {
return this.parentId;
}
public void setParentId(Integer value) {
this.parentId = value;
}
public Integer getLev() {
return this.lev;
}
public void setLev(Integer value) {
this.lev = value;
}
} }
...@@ -25,6 +25,9 @@ public class SysAreaView implements Serializable { ...@@ -25,6 +25,9 @@ public class SysAreaView implements Serializable {
@TableField @TableField
private Integer lev; private Integer lev;
@TableField
private String cityCode;
/** /**
* 省份 * 省份
*/ */
......
...@@ -6,13 +6,15 @@ ...@@ -6,13 +6,15 @@
<result column="name" property="name" jdbcType="VARCHAR"/> <result column="name" property="name" jdbcType="VARCHAR"/>
<result column="parent_id" property="parentId" jdbcType="INTEGER"/> <result column="parent_id" property="parentId" jdbcType="INTEGER"/>
<result column="lev" property="lev" jdbcType="INTEGER"/> <result column="lev" property="lev" jdbcType="INTEGER"/>
<result column="city_code" property="cityCode" jdbcType="VARCHAR"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id id
, ,
name, name,
parent_id, parent_id,
lev lev,
city_code
</sql> </sql>
<select id="selectOne" parameterType="pps.core.system.entity.SysAreaView" resultMap="BaseResultMap"> <select id="selectOne" parameterType="pps.core.system.entity.SysAreaView" resultMap="BaseResultMap">
select select
...@@ -81,7 +83,8 @@ ...@@ -81,7 +83,8 @@
<select id="selectProvinceAndCity" parameterType="list" resultMap="ExtResultMap"> <select id="selectProvinceAndCity" parameterType="list" resultMap="ExtResultMap">
SELECT p.`name` AS province, SELECT p.`name` AS province,
a.`name` AS city a.`name` AS city,
a.city_code
FROM sys_area p FROM sys_area p
LEFT JOIN sys_area a ON p.id = a.parent_id LEFT JOIN sys_area a ON p.id = a.parent_id
WHERE p.`name` IN WHERE p.`name` IN
......
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