Skip to content

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

feat(能源管理系统): 测试问题修复 

1.修改间开制度管理-长期/中短期/短期间开优化定时任务,修改代码结构,处理部分未优化数据无法初始化问题;
2.修改间开制度管理-长期/中短期定时任务,修改离网型算法逻辑,优化代码;
3.修改间开制度管理-短期间开优化详情接口,优化代码;
4.修改间开制度管理-间开优化模块间开制度跟踪接口,解决短期间开制度查询多条导致程序报错问题;
5.修改间开制度管理-短期间开优化定时任务,解决重复添加短期优化记录问题;
6.修改光伏预测-查询预测列表接口,解决缺少电量值问题;
7.修改基础信息管理-井口配置模块分页列表接口,增加线路ID入参字段,修改查询逻辑;
8.修改基础信息管理-光伏电站配置模块分页列表接口,增加线路ID入参字段,修改查询逻辑;
9.修改基础信息管理-柴发设备配置模块分页列表接口,增加线路ID入参字段,修改查询逻辑;
10.修改基础信息管理-储能设备配置模块分页列表接口,增加线路ID入参字段,修改查询逻辑;
11.修改基础信息管理-光伏电站配置模块新增/修改接口,修改光伏电站表,增加字段,同时修改对应代码,修改接口优化代码结构;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent db132e89
Hide whitespace changes
Inline Side-by-side
Showing with 237 additions and 872 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePhotovoltaicPlantEnt.java
View file @ 678292f3
......@@ -50,7 +50,24 @@ public class BasePhotovoltaicPlantEnt extends BaseModel implements Serializable
@XText("组织机构name")
@TableField
private String ouName;
@XText("光伏设备规格型号name(字典获取)")
@TableField
private String photovoltaicModelName;
@XText("经度(°)")
@TableField
private BigDecimal longitude;
@XText("纬度(°)")
@TableField
private BigDecimal latitude;
@XText("高程(m)")
@TableField
private BigDecimal elevation;
@XText("地区编码")
@TableField
private Integer areaCode;
}
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePhotovoltaicPlantView.java
View file @ 678292f3
......@@ -48,6 +48,7 @@ public class BasePhotovoltaicPlantView extends BaseModel implements Serializable
@XText("组织机构name")
@TableField
private String ouName;
@XText("光伏设备规格型号name(字典获取)")
@TableField
private String photovoltaicModelName;
......@@ -59,4 +60,20 @@ public class BasePhotovoltaicPlantView extends BaseModel implements Serializable
@XText("所属省份")
@TableField(exist = false)
private String provinceCode;
@XText("经度(°)")
@TableField
private BigDecimal longitude;
@XText("纬度(°)")
@TableField
private BigDecimal latitude;
@XText("高程(m)")
@TableField
private BigDecimal elevation;
@XText("地区编码")
@TableField
private Integer areaCode;
}
C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BasePhotovoltaicPlantViewMapper.java
View file @ 678292f3
......@@ -5,9 +5,17 @@ import pps.core.base.entity.BasePhotovoltaicPlantView;
import java.util.List;
@Repository(value="pps.core.base.mapper.BasePhotovoltaicPlantViewMapper")
/**
* 光伏电站
*
* @author ZWT
* @date 2023/10/10
*/
@Repository(value = "pps.core.base.mapper.BasePhotovoltaicPlantViewMapper")
public interface BasePhotovoltaicPlantViewMapper {
BasePhotovoltaicPlantView selectOne(BasePhotovoltaicPlantView record);
List<BasePhotovoltaicPlantView> selectList(BasePhotovoltaicPlantView record);
List<BasePhotovoltaicPlantView> selectPlantDetailList(BasePhotovoltaicPlantView record);
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePhotovoltaicPlantService.java
View file @ 678292f3
......@@ -50,33 +50,53 @@ import java.util.Objects;
@XService
public class BasePhotovoltaicPlantService {
@XText("新增")
/**
* 光伏电站模块--新增
* POST /base/base-photovoltaic-plant/create-base-photovoltaic-plant
* 接口ID：105466278
* 接口地址：https://app.apifox.com/project/3196988/apis/api-105466278
*
* @param context 上下文
* @param input 输入
* @return {@link XServiceResult}
*/
@XText("光伏电站模块--新增")
@XApiAnonymous
@XApiPost
public XServiceResult createBasePhotovoltaicPlant(XContext context, CreateBasePhotovoltaicPlantInput input) {
PpsUserSession session = context.getSession(PpsUserSession.class);
BasePhotovoltaicPlantEnt entity = XCopyUtils.copyNewObject(input, BasePhotovoltaicPlantEnt.class);
BaseUtils.setBaseModelDefault(entity, session);
return XTransactionHelper.begin(context, () -> {
BasePhotovoltaicPlantMapper mapper = context.getBean(BasePhotovoltaicPlantMapper.class);
BasePhotovoltaicPlantEnt entity = XCopyUtils.copyNewObject(input, BasePhotovoltaicPlantEnt.class);
PpsUserSession session = context.getSession(PpsUserSession.class);
BaseUtils.setBaseModelDefault(entity, session);
mapper.insert(entity);
return XServiceResult.OK;
});
}
@XText("更新")
/**
* 光伏电站模块--修改
* POST /base/base-photovoltaic-plant/update-base-photovoltaic-plant
* 接口ID：105466279
* 接口地址：https://app.apifox.com/project/3196988/apis/api-105466279
*
* @param context 上下文
* @param input 输入
* @return {@link XServiceResult}
*/
@XText("光伏电站模块--修改")
@XApiAnonymous
@XApiPost
public XServiceResult updateBasePhotovoltaicPlant(XContext context, UpdateBasePhotovoltaicPlantInput input) {
PpsUserSession session = context.getSession(PpsUserSession.class);
BasePhotovoltaicPlantMapper mapper = context.getBean(BasePhotovoltaicPlantMapper.class);
BasePhotovoltaicPlantEnt entity = this.selectOneByPlantId(input.getId(), mapper);
if (Objects.isNull(entity)) {
return XServiceResult.error(context, XError.NotFound);
}
XCopyUtils.copyObject(input, entity);
BaseUtils.setBaseModelDefault(entity, session);
return XTransactionHelper.begin(context, () -> {
BasePhotovoltaicPlantMapper mapper = context.getBean(BasePhotovoltaicPlantMapper.class);
BasePhotovoltaicPlantEnt entity = this.selectOneByPlantId(input.getId(), mapper);
if (Objects.isNull(entity)) {
return XServiceResult.error(context, XError.NotFound);
}
XCopyUtils.copyObject(input, entity);
PpsUserSession session = context.getSession(PpsUserSession.class);
BaseUtils.setBaseModelDefault(entity, session);
mapper.updateById(entity);
return XServiceResult.OK;
});
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/CreateBasePhotovoltaicPlantInput.java
View file @ 678292f3
......@@ -5,6 +5,12 @@ import xstartup.annotation.XText;
import java.math.BigDecimal;
/**
* 光伏电站
*
* @author ZWT
* @date 2023/10/10
*/
@Data
public class CreateBasePhotovoltaicPlantInput {
......@@ -28,9 +34,22 @@ public class CreateBasePhotovoltaicPlantInput {
@XText("阵列朝向")
private BigDecimal arrayOrientation;
@XText("组织机构name")
private String ouName;
@XText("光伏设备规格型号name(字典获取)")
private String photovoltaicModelName;
@XText("经度(°)")
private BigDecimal longitude;
@XText("纬度(°)")
private BigDecimal latitude;
@XText("高程(m)")
private BigDecimal elevation;
@XText("地区编码")
private Integer areaCode;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/CreateBasePhotovoltaicPlantOutput.java deleted 100644 → 0
View file @ db132e89
package pps.core.base.service.data.base_photovoltaic_plant;
import lombok.Data;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class CreateBasePhotovoltaicPlantOutput {
@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("组织机构ID")
private String ouId;
@XText("电站名称")
private String stationName;
@XText("出厂编号")
private String makerNumber;
@XText("光伏设备规格型号key(字典获取)")
private String photovoltaicModelKey;
@XText("安装倾角")
private BigDecimal mountingAngle;
@XText("装机总量(KWP)")
private BigDecimal totalPower;
@XText("阵列朝向")
private BigDecimal arrayOrientation;
@XText("组织机构name")
private String ouName;
@XText("光伏设备规格型号name(字典获取)")
private String photovoltaicModelName;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/DeleteBasePhotovoltaicPlantInput.java
View file @ 678292f3
......@@ -2,9 +2,10 @@ package pps.core.base.service.data.base_photovoltaic_plant;
import lombok.Data;
import xstartup.annotation.XText;
@Data
public class DeleteBasePhotovoltaicPlantInput {
@XText("ID")
private String id;
}
}
\ No newline at end of file
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/DeleteBasePhotovoltaicPlantOutput.java deleted 100644 → 0
View file @ db132e89
package pps.core.base.service.data.base_photovoltaic_plant;
import lombok.Data;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class DeleteBasePhotovoltaicPlantOutput {
@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("组织机构ID")
private String ouId;
@XText("电站名称")
private String stationName;
@XText("出厂编号")
private String makerNumber;
@XText("光伏设备规格型号key(字典获取)")
private String photovoltaicModelKey;
@XText("安装倾角")
private BigDecimal mountingAngle;
@XText("装机总量(KWP)")
private BigDecimal totalPower;
@XText("阵列朝向")
private BigDecimal arrayOrientation;
@XText("组织机构name")
private String ouName;
@XText("光伏设备规格型号name(字典获取)")
private String photovoltaicModelName;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/DynamicQueryBasePhotovoltaicPlantInput.java deleted 100644 → 0
View file @ db132e89
package pps.core.base.service.data.base_photovoltaic_plant;
import lombok.Data;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class DynamicQueryBasePhotovoltaicPlantInput {
@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("组织机构ID")
private String ouId;
@XText("电站名称")
private String stationName;
@XText("出厂编号")
private String makerNumber;
@XText("光伏设备规格型号key(字典获取)")
private String photovoltaicModelKey;
@XText("安装倾角")
private BigDecimal mountingAngle;
@XText("装机总量(KWP)")
private BigDecimal totalPower;
@XText("阵列朝向")
private BigDecimal arrayOrientation;
@XText("组织机构name")
private String ouName;
@XText("光伏设备规格型号name(字典获取)")
private String photovoltaicModelName;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/DynamicQueryBasePhotovoltaicPlantOutput.java deleted 100644 → 0
View file @ db132e89
package pps.core.base.service.data.base_photovoltaic_plant;
import lombok.Data;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class DynamicQueryBasePhotovoltaicPlantOutput {
@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("组织机构ID")
private String ouId;
@XText("电站名称")
private String stationName;
@XText("出厂编号")
private String makerNumber;
@XText("光伏设备规格型号key(字典获取)")
private String photovoltaicModelKey;
@XText("安装倾角")
private BigDecimal mountingAngle;
@XText("装机总量(KWP)")
private BigDecimal totalPower;
@XText("阵列朝向")
private BigDecimal arrayOrientation;
@XText("组织机构name")
private String ouName;
@XText("光伏设备规格型号name(字典获取)")
private String photovoltaicModelName;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/DynamicQueryBasePhotovoltaicPlantViewOutput.java deleted 100644 → 0
View file @ db132e89
package pps.core.base.service.data.base_photovoltaic_plant;
import lombok.Data;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class DynamicQueryBasePhotovoltaicPlantViewOutput {
@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("组织机构ID")
private String ouId;
@XText("电站名称")
private String stationName;
@XText("出厂编号")
private String makerNumber;
@XText("光伏设备规格型号key(字典获取)")
private String photovoltaicModelKey;
@XText("安装倾角")
private BigDecimal mountingAngle;
@XText("装机总量(KWP)")
private BigDecimal totalPower;
@XText("阵列朝向")
private BigDecimal arrayOrientation;
@XText("组织机构name")
private String ouName;
@XText("光伏设备规格型号name(字典获取)")
private String photovoltaicModelName;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/GetBasePhotovoltaicPlantInput.java
View file @ 678292f3
......@@ -2,11 +2,10 @@ package pps.core.base.service.data.base_photovoltaic_plant;
import lombok.Data;
import xstartup.annotation.XText;
@Data
public class GetBasePhotovoltaicPlantInput {
@XText("ID")
private String id;
}
}
\ No newline at end of file
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/GetBasePhotovoltaicPlantOutput.java
View file @ 678292f3
......@@ -8,6 +8,7 @@ import java.util.Date;
@Data
public class GetBasePhotovoltaicPlantOutput {
@XText("ID")
private String id;
......@@ -62,4 +63,15 @@ public class GetBasePhotovoltaicPlantOutput {
@XText("所在地区")
private String province;
@XText("经度(°)")
private BigDecimal longitude;
@XText("纬度(°)")
private BigDecimal latitude;
@XText("高程(m)")
private BigDecimal elevation;
@XText("地区编码")
private Integer areaCode;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/GetBasePhotovoltaicPlantViewInput.java deleted 100644 → 0
View file @ db132e89
package pps.core.base.service.data.base_photovoltaic_plant;
import lombok.Data;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class GetBasePhotovoltaicPlantViewInput {
@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("组织机构ID")
private String ouId;
@XText("电站名称")
private String stationName;
@XText("出厂编号")
private String makerNumber;
@XText("光伏设备规格型号key(字典获取)")
private String photovoltaicModelKey;
@XText("安装倾角")
private BigDecimal mountingAngle;
@XText("装机总量(KWP)")
private BigDecimal totalPower;
@XText("阵列朝向")
private BigDecimal arrayOrientation;
@XText("组织机构name")
private String ouName;
@XText("光伏设备规格型号name(字典获取)")
private String photovoltaicModelName;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/GetBasePhotovoltaicPlantViewOutput.java deleted 100644 → 0
View file @ db132e89
package pps.core.base.service.data.base_photovoltaic_plant;
import lombok.Data;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class GetBasePhotovoltaicPlantViewOutput {
@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("组织机构ID")
private String ouId;
@XText("电站名称")
private String stationName;
@XText("出厂编号")
private String makerNumber;
@XText("光伏设备规格型号key(字典获取)")
private String photovoltaicModelKey;
@XText("安装倾角")
private BigDecimal mountingAngle;
@XText("装机总量(KWP)")
private BigDecimal totalPower;
@XText("阵列朝向")
private BigDecimal arrayOrientation;
@XText("组织机构name")
private String ouName;
@XText("光伏设备规格型号name(字典获取)")
private String photovoltaicModelName;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/GetSysOrganizationAndPlantViewOutput.java
View file @ 678292f3
package pps.core.base.service.data.base_photovoltaic_plant;
import lombok.Data;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class GetSysOrganizationAndPlantViewOutput {
@XText("主键")
private String id;
......@@ -62,6 +64,7 @@ public class GetSysOrganizationAndPlantViewOutput {
@XText("父级id")
private String parentOuId;
private String type;
@XText("经度")
......@@ -73,187 +76,6 @@ public class GetSysOrganizationAndPlantViewOutput {
@XText("高程")
private BigDecimal elevation;
public BigDecimal getLongitude() {
return longitude;
}
public void setLongitude(BigDecimal longitude) {
this.longitude = longitude;
}
public BigDecimal getLatitude() {
return latitude;
}
public void setLatitude(BigDecimal latitude) {
this.latitude = latitude;
}
public BigDecimal getElevation() {
return elevation;
}
public void setElevation(BigDecimal elevation) {
this.elevation = elevation;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getId() {
return this.id;
}
public void setId(String value) {
this.id = value;
}
public String getOuCode() {
return this.ouCode;
}
public void setOuCode(String value) {
this.ouCode = value;
}
public String getOuName() {
return this.ouName;
}
public void setOuName(String value) {
this.ouName = value;
}
public String getShortName() {
return this.shortName;
}
public void setShortName(String value) {
this.shortName = value;
}
public String getOuLevel() {
return this.ouLevel;
}
public void setOuLevel(String value) {
this.ouLevel = value;
}
public String getDescription() {
return this.description;
}
public void setDescription(String value) {
this.description = 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 getPostCode() {
return this.postCode;
}
public void setPostCode(String value) {
this.postCode = value;
}
public String getPostAddress() {
return this.postAddress;
}
public void setPostAddress(String value) {
this.postAddress = value;
}
public String getFaxNo() {
return this.faxNo;
}
public void setFaxNo(String value) {
this.faxNo = value;
}
public String getPhone() {
return this.phone;
}
public void setPhone(String value) {
this.phone = value;
}
public String getCountry() {
return this.country;
}
public void setCountry(String value) {
this.country = value;
}
public Integer getProvince() {
return this.province;
}
public void setProvince(Integer value) {
this.province = value;
}
public String getParentOuId() {
return parentOuId;
}
public void setParentOuId(String parentOuId) {
this.parentOuId = parentOuId;
}
@XText("地区编码")
private Integer areaCode;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/QueryBasePhotovoltaicPlantInput.java
View file @ 678292f3
......@@ -46,4 +46,16 @@ public class QueryBasePhotovoltaicPlantInput extends XPageInput {
@XText("线路ID")
private String lineId;
@XText("经度(°)")
private BigDecimal longitude;
@XText("纬度(°)")
private BigDecimal latitude;
@XText("高程(m)")
private BigDecimal elevation;
@XText("地区编码")
private Integer areaCode;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/QueryBasePhotovoltaicPlantOutput.java
View file @ 678292f3
......@@ -43,4 +43,16 @@ public class QueryBasePhotovoltaicPlantOutput {
@XText("光伏设备规格型号name(字典获取)")
private String photovoltaicModelName;
@XText("经度(°)")
private BigDecimal longitude;
@XText("纬度(°)")
private BigDecimal latitude;
@XText("高程(m)")
private BigDecimal elevation;
@XText("地区编码")
private Integer areaCode;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/QueryBasePhotovoltaicPlantViewInput.java deleted 100644 → 0
View file @ db132e89
package pps.core.base.service.data.base_photovoltaic_plant;
import lombok.Data;
import xstartup.annotation.XText;
import xstartup.base.data.XPageInput;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class QueryBasePhotovoltaicPlantViewInput 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("组织机构ID")
private String ouId;
@XText("电站名称")
private String stationName;
@XText("出厂编号")
private String makerNumber;
@XText("光伏设备规格型号key(字典获取)")
private String photovoltaicModelKey;
@XText("安装倾角")
private BigDecimal mountingAngle;
@XText("装机总量(KWP)")
private BigDecimal totalPower;
@XText("阵列朝向")
private BigDecimal arrayOrientation;
@XText("组织机构name")
private String ouName;
@XText("光伏设备规格型号name(字典获取)")
private String photovoltaicModelName;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/QueryBasePhotovoltaicPlantViewOutput.java deleted 100644 → 0
View file @ db132e89
package pps.core.base.service.data.base_photovoltaic_plant;
import lombok.Data;
import xstartup.annotation.XText;
import xstartup.base.data.XPageInput;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class QueryBasePhotovoltaicPlantViewOutput 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("组织机构ID")
private String ouId;
@XText("电站名称")
private String stationName;
@XText("出厂编号")
private String makerNumber;
@XText("光伏设备规格型号key(字典获取)")
private String photovoltaicModelKey;
@XText("安装倾角")
private BigDecimal mountingAngle;
@XText("装机总量(KWP)")
private BigDecimal totalPower;
@XText("阵列朝向")
private BigDecimal arrayOrientation;
@XText("组织机构name")
private String ouName;
@XText("光伏设备规格型号name(字典获取)")
private String photovoltaicModelName;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/UpdateBasePhotovoltaicPlantInput.java
View file @ 678292f3
......@@ -4,8 +4,16 @@ import lombok.Data;
import xstartup.annotation.XText;
import java.math.BigDecimal;
/**
* 光伏电站
*
* @author ZWT
* @date 2023/10/10
*/
@Data
public class UpdateBasePhotovoltaicPlantInput {
@XText("ID")
private String id;
......@@ -32,7 +40,19 @@ public class UpdateBasePhotovoltaicPlantInput {
@XText("组织机构name")
private String ouName;
@XText("光伏设备规格型号name(字典获取)")
private String photovoltaicModelName;
}
@XText("经度(°)")
private BigDecimal longitude;
@XText("纬度(°)")
private BigDecimal latitude;
@XText("高程(m)")
private BigDecimal elevation;
@XText("地区编码")
private Integer areaCode;
}
\ No newline at end of file
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/UpdateBasePhotovoltaicPlantOutput.java deleted 100644 → 0
View file @ db132e89
package pps.core.base.service.data.base_photovoltaic_plant;
import lombok.Data;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class UpdateBasePhotovoltaicPlantOutput {
@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("组织机构ID")
private String ouId;
@XText("电站名称")
private String stationName;
@XText("出厂编号")
private String makerNumber;
@XText("光伏设备规格型号key(字典获取)")
private String photovoltaicModelKey;
@XText("安装倾角")
private BigDecimal mountingAngle;
@XText("装机总量(KWP)")
private BigDecimal totalPower;
@XText("阵列朝向")
private BigDecimal arrayOrientation;
@XText("组织机构name")
private String ouName;
@XText("光伏设备规格型号name(字典获取)")
private String photovoltaicModelName;
}
C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePhotovoltaicPlantViewMapper.xml
View file @ 678292f3
<?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">
<mapper namespace="pps.core.base.mapper.BasePhotovoltaicPlantViewMapper">
<resultMap id="BaseResultMap" type="pps.core.base.entity.BasePhotovoltaicPlantView">
<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="ou_id" property="ouId" jdbcType="VARCHAR" />
<result column="ou_name" property="ouName" jdbcType="VARCHAR" />
<result column="station_name" property="stationName" jdbcType="VARCHAR" />
<result column="maker_number" property="makerNumber" jdbcType="VARCHAR" />
<result column="photovoltaic_model_key" property="photovoltaicModelKey" jdbcType="VARCHAR" />
<result column="photovoltaic_model_name" property="photovoltaicModelName" jdbcType="VARCHAR" />
<result column="mounting_angle" property="mountingAngle" jdbcType="DECIMAL" />
<result column="total_power" property="totalPower" jdbcType="DECIMAL" />
<result column="array_orientation" property="arrayOrientation" jdbcType="DECIMAL" />
<result column="city_code" property="cityCode" jdbcType="VARCHAR" />
<result column="province_code" property="provinceCode" jdbcType="VARCHAR" />
</resultMap>
<sql id="Base_Column_List">
id,
<resultMap id="BaseResultMap" type="pps.core.base.entity.BasePhotovoltaicPlantView">
<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="ou_id" property="ouId" jdbcType="VARCHAR"/>
<result column="ou_name" property="ouName" jdbcType="VARCHAR"/>
<result column="station_name" property="stationName" jdbcType="VARCHAR"/>
<result column="maker_number" property="makerNumber" jdbcType="VARCHAR"/>
<result column="photovoltaic_model_key" property="photovoltaicModelKey" jdbcType="VARCHAR"/>
<result column="photovoltaic_model_name" property="photovoltaicModelName" jdbcType="VARCHAR"/>
<result column="mounting_angle" property="mountingAngle" jdbcType="DECIMAL"/>
<result column="total_power" property="totalPower" jdbcType="DECIMAL"/>
<result column="array_orientation" property="arrayOrientation" jdbcType="DECIMAL"/>
<result column="city_code" property="cityCode" jdbcType="VARCHAR"/>
<result column="province_code" property="provinceCode" jdbcType="VARCHAR"/>
<result column="longitude" property="longitude" jdbcType="DECIMAL"/>
<result column="latitude" property="latitude" jdbcType="DECIMAL"/>
<result column="elevation" property="elevation" jdbcType="DECIMAL"/>
<result column="area_code" property="areaCode" jdbcType="INTEGER"/>
</resultMap>
<sql id="Base_Column_List">
id
,
is_deleted,
create_by_id,
create_by_name,
......@@ -39,48 +44,50 @@
photovoltaic_model_name,
mounting_angle,
total_power,
array_orientation
</sql>
<select id="selectOne" parameterType="pps.core.base.entity.BasePhotovoltaicPlantView" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from base_photovoltaic_plant
where
id=#{id}
</select>
<select id="selectList" parameterType="pps.core.base.entity.BasePhotovoltaicPlantView" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from base_photovoltaic_plant
where
id=#{id}
</select>
<select id="selectPlantDetailList" parameterType="pps.core.base.entity.BasePhotovoltaicPlantView" resultMap="BaseResultMap">
select
p.id,
p.is_deleted,
p.create_by_id,
p.create_by_name,
p.create_time,
p.modify_by_id,
p.modify_by_name,
p.modify_time,
p.ou_id,
p.ou_name,
p.station_name,
p.maker_number,
p.photovoltaic_model_key,
p.photovoltaic_model_name,
p.mounting_angle,
p.total_power,
p.array_orientation ,
sa.city_code ,
sa.province_code
from
base_photovoltaic_plant p
join sys_organization so on so.id = p.ou_id
left join sys_area sa on sa.id = so.province
where
p.is_deleted = #{isDeleted}
</select>
array_orientation,
longitude,
latitude,
elevation,
area_code
</sql>
<select id="selectOne" parameterType="pps.core.base.entity.BasePhotovoltaicPlantView" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from base_photovoltaic_plant
where
id=#{id}
</select>
<select id="selectList" parameterType="pps.core.base.entity.BasePhotovoltaicPlantView" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from base_photovoltaic_plant
where
id=#{id}
</select>
<select id="selectPlantDetailList" parameterType="pps.core.base.entity.BasePhotovoltaicPlantView"
resultMap="BaseResultMap">
select p.id,
p.is_deleted,
p.create_by_id,
p.create_by_name,
p.create_time,
p.modify_by_id,
p.modify_by_name,
p.modify_time,
p.ou_id,
p.ou_name,
p.station_name,
p.maker_number,
p.photovoltaic_model_key,
p.photovoltaic_model_name,
p.mounting_angle,
p.total_power,
p.array_orientation,
sa.city_code,
sa.province_code
from base_photovoltaic_plant p
join sys_organization so on so.id = p.ou_id
left join sys_area sa on sa.id = so.province
where p.is_deleted = #{isDeleted}
</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